clang-format-5.0

9 files changed, 115 insertions, 153 deletions

diff --git a/test/ChunkedDecodingStreamFilterTest.cc b/test/ChunkedDecodingStreamFilterTest.cc
index 89665a1a..2b2a8256 100644
--- a/test/ChunkedDecodingStreamFilterTest.cc
+++ b/test/ChunkedDecodingStreamFilterTest.cc
@@ -209,10 +209,9 @@ void ChunkedDecodingStreamFilterTest::testTransform()
 void ChunkedDecodingStreamFilterTest::testTransform_withoutTrailer()
 {
   CPPUNIT_ASSERT_EQUAL(
-      (ssize_t)0,
-      filter_->transform(writer_, segment_,
-                         reinterpret_cast<const unsigned char*>("0\r\n\r\n"),
-                         5));
+      (ssize_t)0, filter_->transform(
+                      writer_, segment_,
+                      reinterpret_cast<const unsigned char*>("0\r\n\r\n"), 5));
   CPPUNIT_ASSERT(filter_->finished());
 }
 
diff --git a/test/HandshakeExtensionMessageTest.cc b/test/HandshakeExtensionMessageTest.cc
index 034bf536..6a6a46e2 100644
--- a/test/HandshakeExtensionMessageTest.cc
+++ b/test/HandshakeExtensionMessageTest.cc
@@ -113,12 +113,10 @@ void HandshakeExtensionMessageTest::testDoReceivedAction()
   msg.doReceivedAction();
 
   CPPUNIT_ASSERT_EQUAL((uint16_t)6889, peer->getPort());
-  CPPUNIT_ASSERT_EQUAL(
-      (uint8_t)1,
-      peer->getExtensionMessageID(ExtensionMessageRegistry::UT_PEX));
-  CPPUNIT_ASSERT_EQUAL(
-      (uint8_t)3,
-      peer->getExtensionMessageID(ExtensionMessageRegistry::UT_METADATA));
+  CPPUNIT_ASSERT_EQUAL((uint8_t)1, peer->getExtensionMessageID(
+                                       ExtensionMessageRegistry::UT_PEX));
+  CPPUNIT_ASSERT_EQUAL((uint8_t)3, peer->getExtensionMessageID(
+                                       ExtensionMessageRegistry::UT_METADATA));
   CPPUNIT_ASSERT(peer->isSeeder());
   auto attrs = bittorrent::getTorrentAttrs(dctx);
   CPPUNIT_ASSERT_EQUAL((size_t)1_k, attrs->metadataSize);
diff --git a/test/HttpRequestTest.cc b/test/HttpRequestTest.cc
index 65cd2f20..432852b0 100644
--- a/test/HttpRequestTest.cc
+++ b/test/HttpRequestTest.cc
@@ -625,8 +625,9 @@ void HttpRequestTest::testCreateRequest_wantDigest()
                              "Cache-Control: no-cache\r\n"
                              "Connection: close\r\n"
                              "Want-Digest: " +
-                             wantDigest + "\r\n"
-                                          "\r\n";
+                             wantDigest +
+                             "\r\n"
+                             "\r\n";
 
   CPPUNIT_ASSERT_EQUAL(expectedText, httpRequest.createRequest());
 }
diff --git a/test/IndexedListTest.cc b/test/IndexedListTest.cc
index 7b8878c8..8cbd1de5 100644
--- a/test/IndexedListTest.cc
+++ b/test/IndexedListTest.cc
@@ -405,7 +405,7 @@ namespace {
 struct RemoveOdd {
   bool operator()(int* p) const { return *p % 2 == 1; }
 };
-}
+} // namespace
 void IndexedListTest::testRemoveIf()
 {
   int a[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
diff --git a/test/MetalinkProcessorTest.cc b/test/MetalinkProcessorTest.cc
index 905f6613..68ab322b 100644
--- a/test/MetalinkProcessorTest.cc
+++ b/test/MetalinkProcessorTest.cc
@@ -140,7 +140,7 @@ void MetalinkProcessorTest::testParseFileV4()
                        mu->url);
   CPPUNIT_ASSERT_EQUAL(2, mu->priority);
   CPPUNIT_ASSERT_EQUAL(std::string("torrent"), mu->mediatype);
-#else // !ENABLE_BITTORRENT
+#else  // !ENABLE_BITTORRENT
   CPPUNIT_ASSERT_EQUAL((size_t)0, e->metaurls.size());
 #endif // !ENABLE_BITTORRENT
 }
diff --git a/test/PeerSessionResourceTest.cc b/test/PeerSessionResourceTest.cc
index a764432a..1cb08263 100644
--- a/test/PeerSessionResourceTest.cc
+++ b/test/PeerSessionResourceTest.cc
@@ -140,9 +140,8 @@ void PeerSessionResourceTest::testGetExtensionMessageID()
   res.addExtension(ExtensionMessageRegistry::UT_PEX, 9);
   CPPUNIT_ASSERT_EQUAL(
       (uint8_t)9, res.getExtensionMessageID(ExtensionMessageRegistry::UT_PEX));
-  CPPUNIT_ASSERT_EQUAL(
-      (uint8_t)0,
-      res.getExtensionMessageID(ExtensionMessageRegistry::UT_METADATA));
+  CPPUNIT_ASSERT_EQUAL((uint8_t)0, res.getExtensionMessageID(
+                                       ExtensionMessageRegistry::UT_METADATA));
 
   CPPUNIT_ASSERT_EQUAL(std::string("ut_pex"),
                        std::string(res.getExtensionName(9)));
diff --git a/test/RequestGroupManTest.cc b/test/RequestGroupManTest.cc
index 09a69f30..08bab619 100644
--- a/test/RequestGroupManTest.cc
+++ b/test/RequestGroupManTest.cc
@@ -149,53 +149,38 @@ void RequestGroupManTest::testChangeReservedGroupPosition()
       std::make_shared<RequestGroup>(GroupId::create(), util::copy(option_))};
   RequestGroupMan rm(gs, 0, option_.get());
 
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)0,
-      rm.changeReservedGroupPosition(gs[0]->getGID(), 0, OFFSET_MODE_SET));
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)1,
-      rm.changeReservedGroupPosition(gs[0]->getGID(), 1, OFFSET_MODE_SET));
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)3,
-      rm.changeReservedGroupPosition(gs[0]->getGID(), 10, OFFSET_MODE_SET));
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)0,
-      rm.changeReservedGroupPosition(gs[0]->getGID(), -10, OFFSET_MODE_SET));
-
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)1,
-      rm.changeReservedGroupPosition(gs[1]->getGID(), 0, OFFSET_MODE_CUR));
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)2,
-      rm.changeReservedGroupPosition(gs[1]->getGID(), 1, OFFSET_MODE_CUR));
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)1,
-      rm.changeReservedGroupPosition(gs[1]->getGID(), -1, OFFSET_MODE_CUR));
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)0,
-      rm.changeReservedGroupPosition(gs[1]->getGID(), -10, OFFSET_MODE_CUR));
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)1,
-      rm.changeReservedGroupPosition(gs[1]->getGID(), 1, OFFSET_MODE_CUR));
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)3,
-      rm.changeReservedGroupPosition(gs[1]->getGID(), 10, OFFSET_MODE_CUR));
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)1,
-      rm.changeReservedGroupPosition(gs[1]->getGID(), -2, OFFSET_MODE_CUR));
-
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)3,
-      rm.changeReservedGroupPosition(gs[3]->getGID(), 0, OFFSET_MODE_END));
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)2,
-      rm.changeReservedGroupPosition(gs[3]->getGID(), -1, OFFSET_MODE_END));
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)0,
-      rm.changeReservedGroupPosition(gs[3]->getGID(), -10, OFFSET_MODE_END));
-  CPPUNIT_ASSERT_EQUAL(
-      (size_t)3,
-      rm.changeReservedGroupPosition(gs[3]->getGID(), 10, OFFSET_MODE_END));
+  CPPUNIT_ASSERT_EQUAL((size_t)0, rm.changeReservedGroupPosition(
+                                      gs[0]->getGID(), 0, OFFSET_MODE_SET));
+  CPPUNIT_ASSERT_EQUAL((size_t)1, rm.changeReservedGroupPosition(
+                                      gs[0]->getGID(), 1, OFFSET_MODE_SET));
+  CPPUNIT_ASSERT_EQUAL((size_t)3, rm.changeReservedGroupPosition(
+                                      gs[0]->getGID(), 10, OFFSET_MODE_SET));
+  CPPUNIT_ASSERT_EQUAL((size_t)0, rm.changeReservedGroupPosition(
+                                      gs[0]->getGID(), -10, OFFSET_MODE_SET));
+
+  CPPUNIT_ASSERT_EQUAL((size_t)1, rm.changeReservedGroupPosition(
+                                      gs[1]->getGID(), 0, OFFSET_MODE_CUR));
+  CPPUNIT_ASSERT_EQUAL((size_t)2, rm.changeReservedGroupPosition(
+                                      gs[1]->getGID(), 1, OFFSET_MODE_CUR));
+  CPPUNIT_ASSERT_EQUAL((size_t)1, rm.changeReservedGroupPosition(
+                                      gs[1]->getGID(), -1, OFFSET_MODE_CUR));
+  CPPUNIT_ASSERT_EQUAL((size_t)0, rm.changeReservedGroupPosition(
+                                      gs[1]->getGID(), -10, OFFSET_MODE_CUR));
+  CPPUNIT_ASSERT_EQUAL((size_t)1, rm.changeReservedGroupPosition(
+                                      gs[1]->getGID(), 1, OFFSET_MODE_CUR));
+  CPPUNIT_ASSERT_EQUAL((size_t)3, rm.changeReservedGroupPosition(
+                                      gs[1]->getGID(), 10, OFFSET_MODE_CUR));
+  CPPUNIT_ASSERT_EQUAL((size_t)1, rm.changeReservedGroupPosition(
+                                      gs[1]->getGID(), -2, OFFSET_MODE_CUR));
+
+  CPPUNIT_ASSERT_EQUAL((size_t)3, rm.changeReservedGroupPosition(
+                                      gs[3]->getGID(), 0, OFFSET_MODE_END));
+  CPPUNIT_ASSERT_EQUAL((size_t)2, rm.changeReservedGroupPosition(
+                                      gs[3]->getGID(), -1, OFFSET_MODE_END));
+  CPPUNIT_ASSERT_EQUAL((size_t)0, rm.changeReservedGroupPosition(
+                                      gs[3]->getGID(), -10, OFFSET_MODE_END));
+  CPPUNIT_ASSERT_EQUAL((size_t)3, rm.changeReservedGroupPosition(
+                                      gs[3]->getGID(), 10, OFFSET_MODE_END));
 
   CPPUNIT_ASSERT_EQUAL((size_t)4, rm.getReservedGroups().size());
 
diff --git a/test/RpcMethodTest.cc b/test/RpcMethodTest.cc
index 292709ba..dbdccf74 100644
--- a/test/RpcMethodTest.cc
+++ b/test/RpcMethodTest.cc
@@ -369,11 +369,10 @@ void RpcMethodTest::testAddTorrent()
     CPPUNIT_ASSERT_EQUAL(e_->getOption()->get(PREF_DIR) +
                              "/aria2-0.8.2.tar.bz2",
                          group->getFirstFilePath());
-    CPPUNIT_ASSERT_EQUAL((size_t)1,
-                         group->getDownloadContext()
-                             ->getFirstFileEntry()
-                             ->getRemainingUris()
-                             .size());
+    CPPUNIT_ASSERT_EQUAL((size_t)1, group->getDownloadContext()
+                                        ->getFirstFileEntry()
+                                        ->getRemainingUris()
+                                        .size());
     CPPUNIT_ASSERT_EQUAL(std::string("http://localhost/aria2-0.8.2.tar.bz2"),
                          group->getDownloadContext()
                              ->getFirstFileEntry()
@@ -1288,7 +1287,9 @@ void RpcMethodTest::testGetSessionInfo()
 void RpcMethodTest::testPause()
 {
   std::vector<std::string> uris{
-      "http://url1", "http://url2", "http://url3",
+      "http://url1",
+      "http://url2",
+      "http://url3",
   };
   option_->put(PREF_FORCE_SEQUENTIAL, A2_V_TRUE);
   std::vector<std::shared_ptr<RequestGroup>> groups;
diff --git a/test/UriSplitTest.cc b/test/UriSplitTest.cc
index c0658b81..091b8d0b 100644
--- a/test/UriSplitTest.cc
+++ b/test/UriSplitTest.cc
@@ -61,9 +61,8 @@ void UriSplitTest::testUriSplit()
   uri = "http://user@aria2.sf.net/path/";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
-                      (1 << USR_USERINFO) | (1 << USR_USER));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
+                           (1 << USR_USERINFO) | (1 << USR_USER));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2.sf.net"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("/path/"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user"), mkstr(res, USR_USERINFO, uri));
@@ -72,10 +71,9 @@ void UriSplitTest::testUriSplit()
   uri = "http://user:pass@aria2.sf.net/path/";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
-                      (1 << USR_USERINFO) | (1 << USR_USER) |
-                      (1 << USR_PASSWD));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
+                           (1 << USR_USERINFO) | (1 << USR_USER) |
+                           (1 << USR_PASSWD));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2.sf.net"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("/path/"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user:pass"), mkstr(res, USR_USERINFO, uri));
@@ -89,10 +87,9 @@ void UriSplitTest::testUriSplit()
   uri = "http://user@foo.com:pass@aria2.sf.net/path/";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
-                      (1 << USR_USERINFO) | (1 << USR_USER) |
-                      (1 << USR_PASSWD));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
+                           (1 << USR_USERINFO) | (1 << USR_USER) |
+                           (1 << USR_PASSWD));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2.sf.net"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("/path/"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user@foo.com:pass"),
@@ -104,9 +101,8 @@ void UriSplitTest::testUriSplit()
   uri = "https://aria2.sf.net:443/path/";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
-                      (1 << USR_PATH));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
+                           (1 << USR_PATH));
   CPPUNIT_ASSERT_EQUAL(std::string("https"), mkstr(res, USR_SCHEME, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2.sf.net"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("/path/"), mkstr(res, USR_PATH, uri));
@@ -116,10 +112,9 @@ void UriSplitTest::testUriSplit()
   uri = "https://user:pass@aria2.sf.net:443/path/";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
-                      (1 << USR_PATH) | (1 << USR_USERINFO) | (1 << USR_USER) |
-                      (1 << USR_PASSWD));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
+                           (1 << USR_PATH) | (1 << USR_USERINFO) |
+                           (1 << USR_USER) | (1 << USR_PASSWD));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2.sf.net"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("/path/"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user:pass"), mkstr(res, USR_USERINFO, uri));
@@ -131,9 +126,9 @@ void UriSplitTest::testUriSplit()
   uri = "https://user@aria2.sf.net:443/path/";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
-                      (1 << USR_PATH) | (1 << USR_USERINFO) | (1 << USR_USER));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
+                           (1 << USR_PATH) | (1 << USR_USERINFO) |
+                           (1 << USR_USER));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2.sf.net"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("/path/"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user"), mkstr(res, USR_USERINFO, uri));
@@ -157,9 +152,8 @@ void UriSplitTest::testUriSplit()
   uri = "http://user@aria2";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_USERINFO) |
-                      (1 << USR_USER));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) |
+                           (1 << USR_USERINFO) | (1 << USR_USER));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user"), mkstr(res, USR_USERINFO, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user"), mkstr(res, USR_USER, uri));
@@ -167,9 +161,9 @@ void UriSplitTest::testUriSplit()
   uri = "http://user:@aria2";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_USERINFO) |
-                      (1 << USR_USER) | (1 << USR_PASSWD));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) |
+                           (1 << USR_USERINFO) | (1 << USR_USER) |
+                           (1 << USR_PASSWD));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user:"), mkstr(res, USR_USERINFO, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user"), mkstr(res, USR_USER, uri));
@@ -178,9 +172,8 @@ void UriSplitTest::testUriSplit()
   uri = "http://aria2/?foo#bar";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
-                      (1 << USR_QUERY) | (1 << USR_FRAGMENT));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
+                           (1 << USR_QUERY) | (1 << USR_FRAGMENT));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("/"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("foo"), mkstr(res, USR_QUERY, uri));
@@ -207,9 +200,8 @@ void UriSplitTest::testUriSplit()
   uri = "https://aria2:443?foo";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
-                      (1 << USR_QUERY));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
+                           (1 << USR_QUERY));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("foo"), mkstr(res, USR_QUERY, uri));
   CPPUNIT_ASSERT_EQUAL((uint16_t)443, res.port);
@@ -218,9 +210,8 @@ void UriSplitTest::testUriSplit()
   uri = "https://aria2:443#bar";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
-                      (1 << USR_FRAGMENT));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
+                           (1 << USR_FRAGMENT));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("bar"), mkstr(res, USR_FRAGMENT, uri));
   CPPUNIT_ASSERT_EQUAL((uint16_t)443, res.port);
@@ -229,10 +220,9 @@ void UriSplitTest::testUriSplit()
   uri = "https://user:pass@aria2:443?foo";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
-                      (1 << USR_QUERY) | (1 << USR_USERINFO) | (1 << USR_USER) |
-                      (1 << USR_PASSWD));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
+                           (1 << USR_QUERY) | (1 << USR_USERINFO) |
+                           (1 << USR_USER) | (1 << USR_PASSWD));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user"), mkstr(res, USR_USER, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("pass"), mkstr(res, USR_PASSWD, uri));
@@ -243,10 +233,9 @@ void UriSplitTest::testUriSplit()
   uri = "https://user:pass@aria2:443#bar";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
-                      (1 << USR_FRAGMENT) | (1 << USR_USERINFO) |
-                      (1 << USR_USER) | (1 << USR_PASSWD));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
+                           (1 << USR_FRAGMENT) | (1 << USR_USERINFO) |
+                           (1 << USR_USER) | (1 << USR_PASSWD));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user"), mkstr(res, USR_USER, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("pass"), mkstr(res, USR_PASSWD, uri));
@@ -257,10 +246,9 @@ void UriSplitTest::testUriSplit()
   uri = "http://user:pass@aria2?foo";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_QUERY) |
-                      (1 << USR_USERINFO) | (1 << USR_USER) |
-                      (1 << USR_PASSWD));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_QUERY) |
+                           (1 << USR_USERINFO) | (1 << USR_USER) |
+                           (1 << USR_PASSWD));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user"), mkstr(res, USR_USER, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("pass"), mkstr(res, USR_PASSWD, uri));
@@ -270,10 +258,9 @@ void UriSplitTest::testUriSplit()
   uri = "http://user:pass@aria2#bar";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_FRAGMENT) |
-                      (1 << USR_USERINFO) | (1 << USR_USER) |
-                      (1 << USR_PASSWD));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) |
+                           (1 << USR_FRAGMENT) | (1 << USR_USERINFO) |
+                           (1 << USR_USER) | (1 << USR_PASSWD));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user"), mkstr(res, USR_USER, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("pass"), mkstr(res, USR_PASSWD, uri));
@@ -283,9 +270,8 @@ void UriSplitTest::testUriSplit()
   uri = "http://aria2/?";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
-                      (1 << USR_QUERY));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
+                           (1 << USR_QUERY));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("/"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string(""), mkstr(res, USR_QUERY, uri));
@@ -294,9 +280,8 @@ void UriSplitTest::testUriSplit()
   uri = "http://aria2/#";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
-                      (1 << USR_FRAGMENT));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
+                           (1 << USR_FRAGMENT));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("/"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string(""), mkstr(res, USR_FRAGMENT, uri));
@@ -305,9 +290,8 @@ void UriSplitTest::testUriSplit()
   uri = "http://aria2/?#";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
-                      (1 << USR_QUERY) | (1 << USR_FRAGMENT));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
+                           (1 << USR_QUERY) | (1 << USR_FRAGMENT));
   CPPUNIT_ASSERT_EQUAL(std::string("aria2"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("/"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string(""), mkstr(res, USR_QUERY, uri));
@@ -333,9 +317,8 @@ void UriSplitTest::testUriSplit()
   uri = "https://user@[::1]";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_USERINFO) |
-                      (1 << USR_USER));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) |
+                           (1 << USR_USERINFO) | (1 << USR_USER));
   CPPUNIT_ASSERT_EQUAL(std::string("::1"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user"), mkstr(res, USR_USERINFO, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user"), mkstr(res, USR_USER, uri));
@@ -345,9 +328,9 @@ void UriSplitTest::testUriSplit()
   uri = "https://user:pass@[::1]";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_USERINFO) |
-                      (1 << USR_USER) | (1 << USR_PASSWD));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) |
+                           (1 << USR_USERINFO) | (1 << USR_USER) |
+                           (1 << USR_PASSWD));
   CPPUNIT_ASSERT_EQUAL(std::string("::1"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user:pass"), mkstr(res, USR_USERINFO, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user"), mkstr(res, USR_USER, uri));
@@ -357,18 +340,16 @@ void UriSplitTest::testUriSplit()
   uri = "http://aria2/f";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
-                      (1 << USR_BASENAME));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
+                           (1 << USR_BASENAME));
   CPPUNIT_ASSERT_EQUAL(std::string("/f"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("f"), mkstr(res, USR_BASENAME, uri));
 
   uri = "http://[::1]/f";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
-                      (1 << USR_BASENAME));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
+                           (1 << USR_BASENAME));
   CPPUNIT_ASSERT_EQUAL(std::string("::1"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("/f"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("f"), mkstr(res, USR_BASENAME, uri));
@@ -376,9 +357,8 @@ void UriSplitTest::testUriSplit()
   uri = "http://[::1]:8080/f";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
-                      (1 << USR_PATH) | (1 << USR_BASENAME));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PORT) |
+                           (1 << USR_PATH) | (1 << USR_BASENAME));
   CPPUNIT_ASSERT_EQUAL((uint16_t)8080, res.port);
   CPPUNIT_ASSERT_EQUAL(std::string("/f"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("f"), mkstr(res, USR_BASENAME, uri));
@@ -386,10 +366,10 @@ void UriSplitTest::testUriSplit()
   uri = "https://user:pass@host/f";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_USERINFO) |
-                      (1 << USR_USER) | (1 << USR_PASSWD) | (1 << USR_PATH) |
-                      (1 << USR_BASENAME));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) |
+                           (1 << USR_USERINFO) | (1 << USR_USER) |
+                           (1 << USR_PASSWD) | (1 << USR_PATH) |
+                           (1 << USR_BASENAME));
   CPPUNIT_ASSERT_EQUAL(std::string("host"), mkstr(res, USR_HOST, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("user:pass"), mkstr(res, USR_USERINFO, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("/f"), mkstr(res, USR_PATH, uri));
@@ -398,9 +378,8 @@ void UriSplitTest::testUriSplit()
   uri = "http://aria2/index.html?foo";
   memset(&res, 0, sizeof(res));
   CPPUNIT_ASSERT_EQUAL(0, uri_split(&res, uri));
-  CHECK_FIELD_SET(res,
-                  (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
-                      (1 << USR_QUERY) | (1 << USR_BASENAME));
+  CHECK_FIELD_SET(res, (1 << USR_SCHEME) | (1 << USR_HOST) | (1 << USR_PATH) |
+                           (1 << USR_QUERY) | (1 << USR_BASENAME));
   CPPUNIT_ASSERT_EQUAL(std::string("/index.html"), mkstr(res, USR_PATH, uri));
   CPPUNIT_ASSERT_EQUAL(std::string("index.html"),
                        mkstr(res, USR_BASENAME, uri));