Merge branch 'master' into random-webseeding

1 files changed, 17 insertions, 16 deletions

diff --git a/test/BtPostDownloadHandlerTest.cc b/test/BtPostDownloadHandlerTest.cc
index ef27de5b..467b82ab 100644
--- a/test/BtPostDownloadHandlerTest.cc
+++ b/test/BtPostDownloadHandlerTest.cc
@@ -13,33 +13,31 @@
 
 namespace aria2 {
 
-class BtPostDownloadHandlerTest:public CppUnit::TestFixture {
+class BtPostDownloadHandlerTest : public CppUnit::TestFixture {
 
   CPPUNIT_TEST_SUITE(BtPostDownloadHandlerTest);
   CPPUNIT_TEST(testCanHandle_extension);
   CPPUNIT_TEST(testCanHandle_contentType);
   CPPUNIT_TEST(testGetNextRequestGroups);
   CPPUNIT_TEST_SUITE_END();
+
 private:
   std::shared_ptr<Option> option_;
+
 public:
-  void setUp()
-  {
-    option_.reset(new Option());
-  }
+  void setUp() { option_.reset(new Option()); }
 
   void testCanHandle_extension();
   void testCanHandle_contentType();
   void testGetNextRequestGroups();
 };
 
-
-CPPUNIT_TEST_SUITE_REGISTRATION( BtPostDownloadHandlerTest );
+CPPUNIT_TEST_SUITE_REGISTRATION(BtPostDownloadHandlerTest);
 
 void BtPostDownloadHandlerTest::testCanHandle_extension()
 {
-  std::shared_ptr<DownloadContext> dctx
-    (new DownloadContext(0, 0, A2_TEST_DIR"/test.torrent"));
+  std::shared_ptr<DownloadContext> dctx(
+      new DownloadContext(0, 0, A2_TEST_DIR "/test.torrent"));
   RequestGroup rg(GroupId::create(), option_);
   rg.setDownloadContext(dctx);
 
@@ -47,7 +45,7 @@ void BtPostDownloadHandlerTest::testCanHandle_extension()
 
   CPPUNIT_ASSERT(handler.canHandle(&rg));
 
-  dctx->getFirstFileEntry()->setPath(A2_TEST_DIR"/test.torrent2");
+  dctx->getFirstFileEntry()->setPath(A2_TEST_DIR "/test.torrent2");
   CPPUNIT_ASSERT(!handler.canHandle(&rg));
 }
 
@@ -68,22 +66,25 @@ void BtPostDownloadHandlerTest::testCanHandle_contentType()
 
 void BtPostDownloadHandlerTest::testGetNextRequestGroups()
 {
-  std::shared_ptr<DownloadContext> dctx
-    (new DownloadContext(1_k, 0, A2_TEST_DIR"/test.torrent"));
+  std::shared_ptr<DownloadContext> dctx(
+      new DownloadContext(1_k, 0, A2_TEST_DIR "/test.torrent"));
   RequestGroup rg(GroupId::create(), option_);
   rg.setDownloadContext(dctx);
   rg.initPieceStorage();
   rg.getPieceStorage()->getDiskAdaptor()->enableReadOnly();
 
   BtPostDownloadHandler handler;
-  std::vector<std::shared_ptr<RequestGroup> > groups;
+  std::vector<std::shared_ptr<RequestGroup>> groups;
   handler.getNextRequestGroups(groups, &rg);
   CPPUNIT_ASSERT_EQUAL((size_t)1, groups.size());
-  CPPUNIT_ASSERT_EQUAL
-    (std::string("248d0a1cd08284299de78d5c1ed359bb46717d8c"),
-     bittorrent::getInfoHashString(groups.front()->getDownloadContext()));
+  CPPUNIT_ASSERT_EQUAL(
+      std::string("248d0a1cd08284299de78d5c1ed359bb46717d8c"),
+      bittorrent::getInfoHashString(groups.front()->getDownloadContext()));
   CPPUNIT_ASSERT(std::find(rg.followedBy().begin(), rg.followedBy().end(),
                            groups.front()->getGID()) != rg.followedBy().end());
+  for (auto& nrg : groups) {
+    CPPUNIT_ASSERT_EQUAL(rg.getGID(), nrg->following());
+  }
 }
 
 } // namespace aria2