diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-07-06 00:59:43 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-07-06 15:56:08 +0900 |
| commit | 68f2a333553dff378483cd628ba52aa6c5de63b8 (patch) | |
| tree | 84dac597c645e8e63470284eed3fee6d98c9fda3 /test/SessionSerializerTest.cc | |
| parent | 697c1008f715669cdd6c8e5b7610a20182375253 (diff) | |
DownloadEngine: Use std::unique_ptr for RequestGroupMan
Diffstat (limited to 'test/SessionSerializerTest.cc')
| -rw-r--r-- | test/SessionSerializerTest.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/test/SessionSerializerTest.cc b/test/SessionSerializerTest.cc index c67b8156..1019eb2f 100644 --- a/test/SessionSerializerTest.cc +++ b/test/SessionSerializerTest.cc @@ -48,9 +48,8 @@ void SessionSerializerTest::testSave() CPPUNIT_ASSERT_EQUAL((size_t)5, result.size()); result[4]->getOption()->put(PREF_PAUSE, A2_V_TRUE); option->put(PREF_MAX_DOWNLOAD_RESULT, "10"); - std::shared_ptr<RequestGroupMan> rgman - (new RequestGroupMan(result, 1, option.get())); - SessionSerializer s(rgman); + RequestGroupMan rgman{result, 1, option.get()}; + SessionSerializer s(&rgman); std::shared_ptr<DownloadResult> drs[] = { // REMOVED downloads will not be saved. createDownloadResult(error_code::REMOVED, "http://removed"), @@ -76,13 +75,13 @@ void SessionSerializerTest::testSave() drs[3]->option->put(PREF_FORCE_SAVE, A2_V_TRUE); for(size_t i = 0; i < sizeof(drs)/sizeof(drs[0]); ++i) { - rgman->addDownloadResult(drs[i]); + rgman.addDownloadResult(drs[i]); } DownloadEngine e(std::shared_ptr<EventPoll>(new SelectEventPoll())); e.setOption(option.get()); - rgman->fillRequestGroupFromReserver(&e); - CPPUNIT_ASSERT_EQUAL((size_t)1, rgman->getRequestGroups().size()); + rgman.fillRequestGroupFromReserver(&e); + CPPUNIT_ASSERT_EQUAL((size_t)1, rgman.getRequestGroups().size()); std::string filename = A2_TEST_OUT_DIR"/aria2_SessionSerializerTest_testSave"; s.save(filename); @@ -148,11 +147,10 @@ void SessionSerializerTest::testSaveErrorDownload() (dr->fileEntries[0]->getRemainingUris()); std::shared_ptr<Option> option(new Option()); option->put(PREF_MAX_DOWNLOAD_RESULT, "10"); - std::shared_ptr<RequestGroupMan> rgman - (new RequestGroupMan(std::vector<std::shared_ptr<RequestGroup> >(), 1, - option.get())); - rgman->addDownloadResult(dr); - SessionSerializer s(rgman); + RequestGroupMan rgman{std::vector<std::shared_ptr<RequestGroup> >(), 1, + option.get()}; + rgman.addDownloadResult(dr); + SessionSerializer s(&rgman); std::string filename = A2_TEST_OUT_DIR"/aria2_SessionSerializerTest_testSaveErrorDownload"; CPPUNIT_ASSERT(s.save(filename)); |
