From b1132d6b10cd3791b9529d7031d723fd0e2d8215 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 27 Dec 2015 18:39:47 +0900 Subject: make clang-format using clang-format-3.6 --- test/FileEntryTest.cc | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'test/FileEntryTest.cc') diff --git a/test/FileEntryTest.cc b/test/FileEntryTest.cc index 15e4d79b..86338f72 100644 --- a/test/FileEntryTest.cc +++ b/test/FileEntryTest.cc @@ -23,6 +23,7 @@ class FileEntryTest : public CppUnit::TestFixture { CPPUNIT_TEST(testRemoveUri); CPPUNIT_TEST(testPutBackRequest); CPPUNIT_TEST_SUITE_END(); + public: void setUp() {} @@ -40,17 +41,15 @@ public: void testPutBackRequest(); }; - -CPPUNIT_TEST_SUITE_REGISTRATION( FileEntryTest ); +CPPUNIT_TEST_SUITE_REGISTRATION(FileEntryTest); namespace { std::shared_ptr createFileEntry() { auto fileEntry = std::make_shared(); - fileEntry->setUris(std::vector{ - "http://localhost/aria2.zip", - "ftp://localhost/aria2.zip", - "http://mirror/aria2.zip" }); + fileEntry->setUris(std::vector{"http://localhost/aria2.zip", + "ftp://localhost/aria2.zip", + "http://mirror/aria2.zip"}); return fileEntry; } } // namespace @@ -64,7 +63,6 @@ void FileEntryTest::testRemoveURIWhoseHostnameIs() fileEntry->getRemainingUris()[0]); } - void FileEntryTest::testExtractURIResult() { FileEntry fileEntry; @@ -178,8 +176,8 @@ void FileEntryTest::testGetRequest_withReferer() auto fileEntry = createFileEntry(); InorderURISelector selector{}; std::vector> usedHosts; - auto req = fileEntry->getRequest(&selector, true, usedHosts, - "http://referer"); + auto req = + fileEntry->getRequest(&selector, true, usedHosts, "http://referer"); CPPUNIT_ASSERT_EQUAL(std::string("http://referer"), req->getReferer()); // URI is used as referer if "*" is given. req = fileEntry->getRequest(&selector, true, usedHosts, "*"); @@ -193,7 +191,7 @@ void FileEntryTest::testReuseUri() fileEntry->setMaxConnectionPerServer(3); size_t numUris = fileEntry->getRemainingUris().size(); std::vector> usedHosts; - for(size_t i = 0; i < numUris; ++i) { + for (size_t i = 0; i < numUris; ++i) { fileEntry->getRequest(&selector, false, usedHosts); } CPPUNIT_ASSERT_EQUAL((size_t)0, fileEntry->getRemainingUris().size()); @@ -205,7 +203,7 @@ void FileEntryTest::testReuseUri() auto uris = fileEntry->getRemainingUris(); CPPUNIT_ASSERT_EQUAL(std::string("ftp://localhost/aria2.zip"), uris[0]); CPPUNIT_ASSERT_EQUAL(std::string("http://mirror/aria2.zip"), uris[1]); - for(size_t i = 0; i < 2; ++i) { + for (size_t i = 0; i < 2; ++i) { fileEntry->getRequest(&selector, false, usedHosts); } CPPUNIT_ASSERT_EQUAL((size_t)0, fileEntry->getRemainingUris().size()); @@ -254,7 +252,8 @@ void FileEntryTest::testInsertUri() CPPUNIT_ASSERT_EQUAL(std::string("http://example.org/4"), uris[3]); // Test for percent-encode CPPUNIT_ASSERT(file.insertUri("http://host:80/file