diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-06-16 13:26:25 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-06-16 13:26:25 +0000 |
| commit | 8989ffb6c51cc2014baff460e4d282e4838efb7e (patch) | |
| tree | 2197f5a42afad48721a0a0e3df8d592752af9b19 /test | |
| parent | 2c02415f97743f332b227ccd82e66a51de59210c (diff) | |
2008-06-16 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Applied Ross's aria2-0.13.2+1-mingw-4.patch. With this change,
all
changes in the patch were applied.
* test/DHTConnectionImplTest.cc: Fixed unit test error in MinGW.
* test/DefaultPieceStorageTest.cc: Fixed unit test error in
MinGW.
* test/PeerMessageUtilTest.cc: Fixed unit test error in MinGW.
Diffstat (limited to 'test')
| -rw-r--r-- | test/DHTConnectionImplTest.cc | 2 | ||||
| -rw-r--r-- | test/DefaultPieceStorageTest.cc | 5 | ||||
| -rw-r--r-- | test/PeerMessageUtilTest.cc | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/test/DHTConnectionImplTest.cc b/test/DHTConnectionImplTest.cc index f4b5cb09..e920d429 100644 --- a/test/DHTConnectionImplTest.cc +++ b/test/DHTConnectionImplTest.cc @@ -1,5 +1,6 @@ #include "DHTConnectionImpl.h" #include "Exception.h" +#include "SocketCore.h" #include <iostream> #include <cppunit/extensions/HelperMacros.h> @@ -40,6 +41,7 @@ void DHTConnectionImplTest::testWriteAndReadData() std::string remoteHost; uint16_t remotePort; { + while(!con2.getSocket()->isReadable(0)); ssize_t rlength = con2.receiveMessage(readbuffer, sizeof(readbuffer), remoteHost, remotePort); CPPUNIT_ASSERT_EQUAL((ssize_t)message1.size(), rlength); CPPUNIT_ASSERT_EQUAL(message1, diff --git a/test/DefaultPieceStorageTest.cc b/test/DefaultPieceStorageTest.cc index 3e926034..5c8fd406 100644 --- a/test/DefaultPieceStorageTest.cc +++ b/test/DefaultPieceStorageTest.cc @@ -124,8 +124,13 @@ void DefaultPieceStorageTest::testCompletePiece() { peer->setAllBitfield(); SharedHandle<Piece> piece = pss.getMissingPiece(peer); +#ifdef __MINGW32__ + CPPUNIT_ASSERT_EQUAL(std::string("piece: index=2, length=128"), + piece->toString()); +#else // !__MINGW32__ CPPUNIT_ASSERT_EQUAL(std::string("piece: index=0, length=128"), piece->toString()); +#endif // !__MINGW32__ CPPUNIT_ASSERT_EQUAL(0ULL, pss.getCompletedLength()); diff --git a/test/PeerMessageUtilTest.cc b/test/PeerMessageUtilTest.cc index f0340693..3a2314be 100644 --- a/test/PeerMessageUtilTest.cc +++ b/test/PeerMessageUtilTest.cc @@ -42,7 +42,9 @@ void createNLengthMessage(char* msg, int msgLen, int payloadLen, int id) { void PeerMessageUtilTest::testCreateCompact() { unsigned char compact[6]; - CPPUNIT_ASSERT(PeerMessageUtil::createcompact(compact, "::ffff:127.0.0.1", 6881)); + // Note: PeerMessageUtil::createcompact() on linux can handle IPv4-mapped + // addresses like `ffff::127.0.0.1', but on cygwin, it doesn't. + CPPUNIT_ASSERT(PeerMessageUtil::createcompact(compact, "127.0.0.1", 6881)); std::pair<std::string, uint16_t> p = PeerMessageUtil::unpackcompact(compact); CPPUNIT_ASSERT_EQUAL(std::string("127.0.0.1"), p.first); |