diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2015-12-27 18:39:47 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2015-12-27 18:40:08 +0900 |
| commit | b1132d6b10cd3791b9529d7031d723fd0e2d8215 (patch) | |
| tree | 9ce465b42bf09372118335c7c619bb2b41869eaf /test/ProtocolDetectorTest.cc | |
| parent | 4abad2f64c9ff80144a61c5a9c2bea144852b883 (diff) | |
make clang-format using clang-format-3.6
Diffstat (limited to 'test/ProtocolDetectorTest.cc')
| -rw-r--r-- | test/ProtocolDetectorTest.cc | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/test/ProtocolDetectorTest.cc b/test/ProtocolDetectorTest.cc index 72bd51d0..a2b6c790 100644 --- a/test/ProtocolDetectorTest.cc +++ b/test/ProtocolDetectorTest.cc @@ -7,7 +7,7 @@ namespace aria2 { -class ProtocolDetectorTest:public CppUnit::TestFixture { +class ProtocolDetectorTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(ProtocolDetectorTest); CPPUNIT_TEST(testIsStreamProtocol); @@ -15,6 +15,7 @@ class ProtocolDetectorTest:public CppUnit::TestFixture { CPPUNIT_TEST(testGuessTorrentMagnet); CPPUNIT_TEST(testGuessMetalinkFile); CPPUNIT_TEST_SUITE_END(); + public: void setUp() {} @@ -26,7 +27,6 @@ public: void testGuessMetalinkFile(); }; - CPPUNIT_TEST_SUITE_REGISTRATION(ProtocolDetectorTest); void ProtocolDetectorTest::testIsStreamProtocol() @@ -40,32 +40,30 @@ void ProtocolDetectorTest::testIsStreamProtocol() void ProtocolDetectorTest::testGuessTorrentFile() { ProtocolDetector detector; - CPPUNIT_ASSERT(detector.guessTorrentFile(A2_TEST_DIR"/test.torrent")); + CPPUNIT_ASSERT(detector.guessTorrentFile(A2_TEST_DIR "/test.torrent")); CPPUNIT_ASSERT(!detector.guessTorrentFile("http://localhost/test.torrent")); - CPPUNIT_ASSERT(!detector.guessTorrentFile(A2_TEST_DIR"/test.xml")); + CPPUNIT_ASSERT(!detector.guessTorrentFile(A2_TEST_DIR "/test.xml")); } void ProtocolDetectorTest::testGuessTorrentMagnet() { ProtocolDetector detector; #ifdef ENABLE_BITTORRENT - CPPUNIT_ASSERT - (detector.guessTorrentMagnet - ("magnet:?xt=urn:btih:248d0a1cd08284299de78d5c1ed359bb46717d8c")); + CPPUNIT_ASSERT(detector.guessTorrentMagnet( + "magnet:?xt=urn:btih:248d0a1cd08284299de78d5c1ed359bb46717d8c")); CPPUNIT_ASSERT(!detector.guessTorrentMagnet("magnet:?")); -#else // !ENABLE_BITTORRENT - CPPUNIT_ASSERT - (!detector.guessTorrentMagnet - ("magnet:?xt=urn:btih:248d0a1cd08284299de78d5c1ed359bb46717d8c")); +#else // !ENABLE_BITTORRENT + CPPUNIT_ASSERT(!detector.guessTorrentMagnet( + "magnet:?xt=urn:btih:248d0a1cd08284299de78d5c1ed359bb46717d8c")); #endif // !ENABLE_BITTORRENT } void ProtocolDetectorTest::testGuessMetalinkFile() { ProtocolDetector detector; - CPPUNIT_ASSERT(detector.guessMetalinkFile(A2_TEST_DIR"/test.xml")); + CPPUNIT_ASSERT(detector.guessMetalinkFile(A2_TEST_DIR "/test.xml")); CPPUNIT_ASSERT(!detector.guessMetalinkFile("http://localhost/test.xml")); - CPPUNIT_ASSERT(!detector.guessMetalinkFile(A2_TEST_DIR"/test.torrent")); + CPPUNIT_ASSERT(!detector.guessMetalinkFile(A2_TEST_DIR "/test.torrent")); } } // namespace aria2 |