From 967758633690a7ffb8b9e12e282a89d0399994af Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 19 May 2017 21:32:25 +0900 Subject: clang-format-4.0 --- src/ActivePeerConnectionCommand.cc | 6 +- src/BitfieldMan.cc | 28 +++--- src/FtpConnection.cc | 6 +- src/FtpNegotiationCommand.cc | 5 +- src/LibgnutlsTLSSession.cc | 6 +- src/LibsslTLSContext.cc | 7 +- src/OpenedFileCounter.cc | 5 +- src/OptionHandlerFactory.cc | 12 +-- src/version_usage.cc | 7 +- test/BtRequestMessageTest.cc | 8 +- test/ChunkedDecodingStreamFilterTest.cc | 7 +- test/DefaultExtensionMessageFactoryTest.cc | 6 +- test/HandshakeExtensionMessageTest.cc | 10 +- test/IndexedListTest.cc | 2 +- test/PeerSessionResourceTest.cc | 5 +- test/RequestGroupManTest.cc | 79 +++++++++------- test/RpcMethodTest.cc | 9 +- test/UTPexExtensionMessageTest.cc | 22 +++-- test/UriSplitTest.cc | 145 +++++++++++++++++------------ 19 files changed, 212 insertions(+), 163 deletions(-) diff --git a/src/ActivePeerConnectionCommand.cc b/src/ActivePeerConnectionCommand.cc index 7e566b42..2cf2441a 100644 --- a/src/ActivePeerConnectionCommand.cc +++ b/src/ActivePeerConnectionCommand.cc @@ -107,9 +107,9 @@ bool ActivePeerConnectionCommand::execute() int numConnection = 0; if (pieceStorage_->downloadFinished()) { if (btRuntime_->getMaxPeers() > btRuntime_->getConnections()) { - numConnection = - std::min(numNewConnection_, btRuntime_->getMaxPeers() - - btRuntime_->getConnections()); + numConnection = std::min(numNewConnection_, + btRuntime_->getMaxPeers() - + btRuntime_->getConnections()); } } else { diff --git a/src/BitfieldMan.cc b/src/BitfieldMan.cc index 0a47b1a8..bb8e2882 100644 --- a/src/BitfieldMan.cc +++ b/src/BitfieldMan.cc @@ -173,10 +173,10 @@ bool BitfieldMan::hasMissingPiece(const unsigned char* peerBitfield, bool BitfieldMan::getFirstMissingUnusedIndex(size_t& index) const { if (filterEnabled_) { - return bitfield::getFirstSetBitIndex(index, ~array(bitfield_) & - ~array(useBitfield_) & - array(filterBitfield_), - blocks_); + return bitfield::getFirstSetBitIndex( + index, + ~array(bitfield_) & ~array(useBitfield_) & array(filterBitfield_), + blocks_); } else { return bitfield::getFirstSetBitIndex( @@ -305,8 +305,9 @@ bool BitfieldMan::getSparseMissingUnusedIndex( { if (filterEnabled_) { return aria2::getSparseMissingUnusedIndex( - index, minSplitSize, array(ignoreBitfield) | ~array(filterBitfield_) | - array(bitfield_) | array(useBitfield_), + index, minSplitSize, + array(ignoreBitfield) | ~array(filterBitfield_) | array(bitfield_) | + array(useBitfield_), useBitfield_, blockLength_, blocks_); } else { @@ -361,8 +362,9 @@ bool BitfieldMan::getGeomMissingUnusedIndex(size_t& index, int32_t minSplitSize, { if (filterEnabled_) { return aria2::getGeomMissingUnusedIndex( - index, minSplitSize, array(ignoreBitfield) | ~array(filterBitfield_) | - array(bitfield_) | array(useBitfield_), + index, minSplitSize, + array(ignoreBitfield) | ~array(filterBitfield_) | array(bitfield_) | + array(useBitfield_), useBitfield_, blockLength_, blocks_, base, offsetIndex); } else { @@ -497,8 +499,9 @@ bool BitfieldMan::getAllMissingIndexes(unsigned char* misbitfield, size_t len, return false; } if (filterEnabled_) { - return copyBitfield(misbitfield, ~array(bitfield_) & array(peerBitfield) & - array(filterBitfield_), + return copyBitfield(misbitfield, + ~array(bitfield_) & array(peerBitfield) & + array(filterBitfield_), blocks_); } else { @@ -523,8 +526,9 @@ bool BitfieldMan::getAllMissingUnusedIndexes(unsigned char* misbitfield, blocks_); } else { - return copyBitfield(misbitfield, ~array(bitfield_) & ~array(useBitfield_) & - array(peerBitfield), + return copyBitfield(misbitfield, + ~array(bitfield_) & ~array(useBitfield_) & + array(peerBitfield), blocks_); } } diff --git a/src/FtpConnection.cc b/src/FtpConnection.cc index 415b8ebd..febc81aa 100644 --- a/src/FtpConnection.cc +++ b/src/FtpConnection.cc @@ -235,9 +235,9 @@ bool FtpConnection::sendPort(const std::shared_ptr& serverSocket) bool FtpConnection::sendRest(const std::shared_ptr& segment) { if (socketBuffer_.sendBufferIsEmpty()) { - std::string request = - fmt("REST %" PRId64 "\r\n", segment ? segment->getPositionToWrite() - : static_cast(0LL)); + std::string request = fmt("REST %" PRId64 "\r\n", + segment ? segment->getPositionToWrite() + : static_cast(0LL)); A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, cuid_, request.c_str())); socketBuffer_.pushStr(std::move(request)); } diff --git a/src/FtpNegotiationCommand.cc b/src/FtpNegotiationCommand.cc index b2c797b6..d9100b42 100644 --- a/src/FtpNegotiationCommand.cc +++ b/src/FtpNegotiationCommand.cc @@ -87,8 +87,9 @@ FtpNegotiationCommand::FtpNegotiationCommand( : AbstractCommand(cuid, req, fileEntry, requestGroup, e, socket), sequence_(seq), ftp_(std::make_shared( - cuid, socket, req, e->getAuthConfigFactory()->createAuthConfig( - req, requestGroup->getOption().get()), + cuid, socket, req, + e->getAuthConfigFactory()->createAuthConfig( + req, requestGroup->getOption().get()), getOption().get())), pasvPort_(0) { diff --git a/src/LibgnutlsTLSSession.cc b/src/LibgnutlsTLSSession.cc index 386819a2..42f7ce0c 100644 --- a/src/LibgnutlsTLSSession.cc +++ b/src/LibgnutlsTLSSession.cc @@ -107,9 +107,9 @@ int GnuTLSSession::init(sock_t sockfd) rv_ = gnutls_init(&sslSession_, flags); #else // GNUTLS_VERSION_NUMBER >= 0x030000 - rv_ = gnutls_init(&sslSession_, tlsContext_->getSide() == TLS_CLIENT - ? GNUTLS_CLIENT - : GNUTLS_SERVER); + rv_ = gnutls_init(&sslSession_, + tlsContext_->getSide() == TLS_CLIENT ? GNUTLS_CLIENT + : GNUTLS_SERVER); #endif // GNUTLS_VERSION_NUMBER >= 0x030000 if (rv_ != GNUTLS_E_SUCCESS) { return TLS_ERR_ERROR; diff --git a/src/LibsslTLSContext.cc b/src/LibsslTLSContext.cc index fb74ccc6..171e498c 100644 --- a/src/LibsslTLSContext.cc +++ b/src/LibsslTLSContext.cc @@ -125,12 +125,13 @@ OpenSSLTLSContext::OpenSSLTLSContext(TLSSessionSide side, TLSVersion minVer) }; // Disable SSLv2 and enable all workarounds for buggy servers - SSL_CTX_set_options(sslCtx_, SSL_OP_ALL | SSL_OP_NO_SSLv2 | ver_opts + SSL_CTX_set_options(sslCtx_, + SSL_OP_ALL | SSL_OP_NO_SSLv2 | ver_opts #ifdef SSL_OP_SINGLE_ECDH_USE - | SSL_OP_SINGLE_ECDH_USE + | SSL_OP_SINGLE_ECDH_USE #endif // SSL_OP_SINGLE_ECDH_USE #ifdef SSL_OP_NO_COMPRESSION - | SSL_OP_NO_COMPRESSION + | SSL_OP_NO_COMPRESSION #endif // SSL_OP_NO_COMPRESSION ); SSL_CTX_set_mode(sslCtx_, SSL_MODE_AUTO_RETRY); diff --git a/src/OpenedFileCounter.cc b/src/OpenedFileCounter.cc index d97b2bbf..dd213768 100644 --- a/src/OpenedFileCounter.cc +++ b/src/OpenedFileCounter.cc @@ -67,8 +67,9 @@ void OpenedFileCounter::ensureMaxOpenFileLimit(size_t numNewFiles) auto& requestGroups = rgman_->getRequestGroups(); auto mark = std::begin(requestGroups); - std::advance(mark, SimpleRandomizer::getInstance()->getRandomNumber( - requestGroups.size())); + std::advance( + mark, + SimpleRandomizer::getInstance()->getRandomNumber(requestGroups.size())); auto closeFun = [&left](const std::shared_ptr& group) { auto& ps = group->getPieceStorage(); diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc index b8f07770..b1721c80 100644 --- a/src/OptionHandlerFactory.cc +++ b/src/OptionHandlerFactory.cc @@ -319,14 +319,14 @@ std::vector OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op( - new ParameterOptionHandler(PREF_FILE_ALLOCATION, TEXT_FILE_ALLOCATION, - V_PREALLOC, {V_NONE, V_PREALLOC, V_TRUNC, + OptionHandler* op(new ParameterOptionHandler( + PREF_FILE_ALLOCATION, TEXT_FILE_ALLOCATION, V_PREALLOC, + {V_NONE, V_PREALLOC, V_TRUNC, #ifdef HAVE_SOME_FALLOCATE - V_FALLOC + V_FALLOC #endif // HAVE_SOME_FALLOCATE - }, - 'a')); + }, + 'a')); op->addTag(TAG_BASIC); op->addTag(TAG_FILE); op->setInitialOption(true); diff --git a/src/version_usage.cc b/src/version_usage.cc index e30e41d9..d9d65320 100644 --- a/src/version_usage.cc +++ b/src/version_usage.cc @@ -108,9 +108,8 @@ void showUsage(const std::string& keyword, out->printf("\n"); out->printf(_("Options:")); out->printf("\n"); - for (std::vector::const_iterator - i = handlers.begin(), - eoi = handlers.end(); + for (std::vector::const_iterator i = handlers.begin(), + eoi = handlers.end(); i != eoi; ++i) { write(out, *(*i)); out->printf("\n"); @@ -125,7 +124,7 @@ void showUsage(const std::string& keyword, out->printf("\n"); out->printf(_("Options:")); out->printf("\n"); - for (std::vector::const_iterator + for (std::vector::const_iterator i = handlers.begin(), eoi = handlers.end(); i != eoi; ++i) { diff --git a/test/BtRequestMessageTest.cc b/test/BtRequestMessageTest.cc index 2177cef8..4063b1dd 100644 --- a/test/BtRequestMessageTest.cc +++ b/test/BtRequestMessageTest.cc @@ -274,10 +274,10 @@ void BtRequestMessageTest::testValidate_lengthTooLong() CPPUNIT_FAIL("exception must be thrown."); } catch (DlAbortEx& e) { - CPPUNIT_ASSERT_EQUAL("Length too long: " + - util::uitos(MAX_BLOCK_LENGTH + 1) + " > " + - util::uitos(MAX_BLOCK_LENGTH / 1024) + "KB", - std::string(e.what())); + CPPUNIT_ASSERT_EQUAL( + "Length too long: " + util::uitos(MAX_BLOCK_LENGTH + 1) + " > " + + util::uitos(MAX_BLOCK_LENGTH / 1024) + "KB", + std::string(e.what())); } } diff --git a/test/ChunkedDecodingStreamFilterTest.cc b/test/ChunkedDecodingStreamFilterTest.cc index 2b2a8256..89665a1a 100644 --- a/test/ChunkedDecodingStreamFilterTest.cc +++ b/test/ChunkedDecodingStreamFilterTest.cc @@ -209,9 +209,10 @@ void ChunkedDecodingStreamFilterTest::testTransform() void ChunkedDecodingStreamFilterTest::testTransform_withoutTrailer() { CPPUNIT_ASSERT_EQUAL( - (ssize_t)0, filter_->transform( - writer_, segment_, - reinterpret_cast("0\r\n\r\n"), 5)); + (ssize_t)0, + filter_->transform(writer_, segment_, + reinterpret_cast("0\r\n\r\n"), + 5)); CPPUNIT_ASSERT(filter_->finished()); } diff --git a/test/DefaultExtensionMessageFactoryTest.cc b/test/DefaultExtensionMessageFactoryTest.cc index 31818d21..68e7368f 100644 --- a/test/DefaultExtensionMessageFactoryTest.cc +++ b/test/DefaultExtensionMessageFactoryTest.cc @@ -141,9 +141,9 @@ void DefaultExtensionMessageFactoryTest::testCreateMessage_UTPex() std::string data = getExtensionMessageID(ExtensionMessageRegistry::UT_PEX) + "d5:added12:" + std::string(&c1[0], &c1[6]) + - std::string(&c2[0], &c2[6]) + "7:added.f2:207:dropped12:" + - std::string(&c3[0], &c3[6]) + std::string(&c4[0], &c4[6]) + - "e"; + std::string(&c2[0], &c2[6]) + + "7:added.f2:207:dropped12:" + std::string(&c3[0], &c3[6]) + + std::string(&c4[0], &c4[6]) + "e"; auto m = createMessage(data); CPPUNIT_ASSERT_EQUAL( diff --git a/test/HandshakeExtensionMessageTest.cc b/test/HandshakeExtensionMessageTest.cc index 6a6a46e2..034bf536 100644 --- a/test/HandshakeExtensionMessageTest.cc +++ b/test/HandshakeExtensionMessageTest.cc @@ -113,10 +113,12 @@ 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/IndexedListTest.cc b/test/IndexedListTest.cc index d3c05a55..7b8878c8 100644 --- a/test/IndexedListTest.cc +++ b/test/IndexedListTest.cc @@ -109,7 +109,7 @@ void IndexedListTest::testErase() CPPUNIT_ASSERT_EQUAL((size_t)(std::distance(i, list.end())), list.size()); int* pp = ++p; - for (IndexedList::iterator j = list.begin(); j != list.end(); + for (IndexedList::iterator j = list.begin(); j != list.end(); ++j, ++pp) { CPPUNIT_ASSERT_EQUAL(*pp, **j); } diff --git a/test/PeerSessionResourceTest.cc b/test/PeerSessionResourceTest.cc index 1cb08263..a764432a 100644 --- a/test/PeerSessionResourceTest.cc +++ b/test/PeerSessionResourceTest.cc @@ -140,8 +140,9 @@ 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 08bab619..09a69f30 100644 --- a/test/RequestGroupManTest.cc +++ b/test/RequestGroupManTest.cc @@ -149,38 +149,53 @@ void RequestGroupManTest::testChangeReservedGroupPosition() std::make_shared(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 f85fd0dd..292709ba 100644 --- a/test/RpcMethodTest.cc +++ b/test/RpcMethodTest.cc @@ -369,10 +369,11 @@ 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() diff --git a/test/UTPexExtensionMessageTest.cc b/test/UTPexExtensionMessageTest.cc index 2f76276a..f11a9903 100644 --- a/test/UTPexExtensionMessageTest.cc +++ b/test/UTPexExtensionMessageTest.cc @@ -108,8 +108,9 @@ void UTPexExtensionMessageTest::testGetBencodedData() "d5:added12:" + std::string(&c1[0], &c1[6]) + std::string(&c2[0], &c2[6]) + "7:added.f2:" + fromHex("0200") + "6:added618:" + std::string(&c5[0], &c5[COMPACT_LEN_IPV6]) + - "8:added6.f1:" + fromHex("00") + "7:dropped12:" + - std::string(&c3[0], &c3[6]) + std::string(&c4[0], &c4[6]) + + "8:added6.f1:" + fromHex("00") + + "7:dropped12:" + std::string(&c3[0], &c3[6]) + + std::string(&c4[0], &c4[6]) + "8:dropped618:" + std::string(&c6[0], &c6[COMPACT_LEN_IPV6]) + "e"; std::string bd = msg.getPayload(); CPPUNIT_ASSERT_EQUAL(util::percentEncode(expected), util::percentEncode(bd)); @@ -195,14 +196,15 @@ void UTPexExtensionMessageTest::testCreate() char id[1] = {1}; - std::string data = std::string(&id[0], &id[1]) + "d5:added12:" + - std::string(&c1[0], &c1[6]) + std::string(&c2[0], &c2[6]) + - "7:added.f2:" + fromHex("0200") + "6:added618:" + - std::string(&c5[0], &c5[COMPACT_LEN_IPV6]) + - "8:added6.f1:" + fromHex("00") + "7:dropped12:" + - std::string(&c3[0], &c3[6]) + std::string(&c4[0], &c4[6]) + - "8:dropped618:" + - std::string(&c6[0], &c6[COMPACT_LEN_IPV6]) + "e"; + std::string data = + std::string(&id[0], &id[1]) + + "d5:added12:" + std::string(&c1[0], &c1[6]) + + std::string(&c2[0], &c2[6]) + "7:added.f2:" + fromHex("0200") + + "6:added618:" + std::string(&c5[0], &c5[COMPACT_LEN_IPV6]) + + "8:added6.f1:" + fromHex("00") + + "7:dropped12:" + std::string(&c3[0], &c3[6]) + + std::string(&c4[0], &c4[6]) + + "8:dropped618:" + std::string(&c6[0], &c6[COMPACT_LEN_IPV6]) + "e"; auto msg = UTPexExtensionMessage::create( reinterpret_cast(data.c_str()), data.size()); diff --git a/test/UriSplitTest.cc b/test/UriSplitTest.cc index 091b8d0b..c0658b81 100644 --- a/test/UriSplitTest.cc +++ b/test/UriSplitTest.cc @@ -61,8 +61,9 @@ 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)); @@ -71,9 +72,10 @@ 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)); @@ -87,9 +89,10 @@ 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"), @@ -101,8 +104,9 @@ 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)); @@ -112,9 +116,10 @@ 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)); @@ -126,9 +131,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)); @@ -152,8 +157,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)); + 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)); @@ -161,9 +167,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)); @@ -172,8 +178,9 @@ 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)); @@ -200,8 +207,9 @@ 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); @@ -210,8 +218,9 @@ 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); @@ -220,9 +229,10 @@ 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)); @@ -233,9 +243,10 @@ 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)); @@ -246,9 +257,10 @@ 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)); @@ -258,9 +270,10 @@ 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)); @@ -270,8 +283,9 @@ 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)); @@ -280,8 +294,9 @@ 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)); @@ -290,8 +305,9 @@ 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)); @@ -317,8 +333,9 @@ 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)); @@ -328,9 +345,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)); @@ -340,16 +357,18 @@ 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)); @@ -357,8 +376,9 @@ 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)); @@ -366,10 +386,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)); @@ -378,8 +398,9 @@ 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)); -- cgit