1 files changed, 23 insertions, 18 deletions

diff --git a/test/MetalinkPostDownloadHandlerTest.cc b/test/MetalinkPostDownloadHandlerTest.cc
index bef0b654..66f813b0 100644
--- a/test/MetalinkPostDownloadHandlerTest.cc
+++ b/test/MetalinkPostDownloadHandlerTest.cc
@@ -12,7 +12,7 @@
 
 namespace aria2 {
 
-class MetalinkPostDownloadHandlerTest:public CppUnit::TestFixture {
+class MetalinkPostDownloadHandlerTest : public CppUnit::TestFixture {
 
   CPPUNIT_TEST_SUITE(MetalinkPostDownloadHandlerTest);
   CPPUNIT_TEST(testCanHandle_extension);
@@ -20,13 +20,12 @@ class MetalinkPostDownloadHandlerTest:public CppUnit::TestFixture {
   CPPUNIT_TEST(testGetNextRequestGroups);
   CPPUNIT_TEST(testGetNextRequestGroups_withBaseUri);
   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();
@@ -34,13 +33,12 @@ public:
   void testGetNextRequestGroups_withBaseUri();
 };
 
-
-CPPUNIT_TEST_SUITE_REGISTRATION( MetalinkPostDownloadHandlerTest );
+CPPUNIT_TEST_SUITE_REGISTRATION(MetalinkPostDownloadHandlerTest);
 
 void MetalinkPostDownloadHandlerTest::testCanHandle_extension()
 {
-  std::shared_ptr<DownloadContext> dctx
-    (new DownloadContext(0, 0, "test.metalink"));
+  std::shared_ptr<DownloadContext> dctx(
+      new DownloadContext(0, 0, "test.metalink"));
   RequestGroup rg(GroupId::create(), option_);
   rg.setDownloadContext(dctx);
 
@@ -69,27 +67,32 @@ void MetalinkPostDownloadHandlerTest::testCanHandle_contentType()
 
 void MetalinkPostDownloadHandlerTest::testGetNextRequestGroups()
 {
-  std::shared_ptr<DownloadContext> dctx
-    (new DownloadContext(1_k, 0, A2_TEST_DIR"/test.xml"));
+  std::shared_ptr<DownloadContext> dctx(
+      new DownloadContext(1_k, 0, A2_TEST_DIR "/test.xml"));
   RequestGroup rg(GroupId::create(), option_);
   rg.setDownloadContext(dctx);
   rg.initPieceStorage();
   rg.getPieceStorage()->getDiskAdaptor()->enableReadOnly();
 
   MetalinkPostDownloadHandler handler;
-  std::vector<std::shared_ptr<RequestGroup> > groups;
+  std::vector<std::shared_ptr<RequestGroup>> groups;
   handler.getNextRequestGroups(groups, &rg);
 #ifdef ENABLE_BITTORRENT
-  CPPUNIT_ASSERT_EQUAL((size_t)6/* 5 + 1 torrent file download */, groups.size());
+  CPPUNIT_ASSERT_EQUAL((size_t)6 /* 5 + 1 torrent file download */,
+                       groups.size());
 #else
   CPPUNIT_ASSERT_EQUAL((size_t)5, groups.size());
 #endif // ENABLE_BITTORRENT
+
+  for (auto& nrg : groups) {
+    CPPUNIT_ASSERT_EQUAL(rg.getGID(), nrg->following());
+  }
 }
 
 void MetalinkPostDownloadHandlerTest::testGetNextRequestGroups_withBaseUri()
 {
-  std::shared_ptr<DownloadContext> dctx
-    (new DownloadContext(1_k, 0, A2_TEST_DIR"/base_uri.xml"));
+  std::shared_ptr<DownloadContext> dctx(
+      new DownloadContext(1_k, 0, A2_TEST_DIR "/base_uri.xml"));
   dctx->getFirstFileEntry()->addUri("http://base/dir/base_uri.xml");
   RequestGroup rg(GroupId::create(), option_);
   rg.setDownloadContext(dctx);
@@ -97,12 +100,14 @@ void MetalinkPostDownloadHandlerTest::testGetNextRequestGroups_withBaseUri()
   rg.getPieceStorage()->getDiskAdaptor()->enableReadOnly();
 
   MetalinkPostDownloadHandler 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("http://base/dir/example.ext"),
-                       groups[0]->getDownloadContext()->
-                       getFirstFileEntry()->getRemainingUris()[0]);
+                       groups[0]
+                           ->getDownloadContext()
+                           ->getFirstFileEntry()
+                           ->getRemainingUris()[0]);
 }
 
 } // namespace aria2