summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/BNodeTest.cc16
-rw-r--r--test/DHTAnnouncePeerMessageTest.cc4
-rw-r--r--test/DHTBucketTest.cc22
-rw-r--r--test/DHTFindNodeMessageTest.cc4
-rw-r--r--test/DHTGetPeersMessageTest.cc10
-rw-r--r--test/DHTIDCloserTest.cc10
-rw-r--r--test/DHTMessageFactoryImplTest.cc64
-rw-r--r--test/DHTPingMessageTest.cc4
-rw-r--r--test/DefaultBtRequestFactoryTest.cc12
-rw-r--r--test/DefaultPeerStorageTest.cc10
-rw-r--r--test/SequentialPickerTest.cc4
-rw-r--r--test/SingletonHolderTest.cc2
12 files changed, 83 insertions, 79 deletions
diff --git a/test/BNodeTest.cc b/test/BNodeTest.cc
index f5ddac6e..730225b1 100644
--- a/test/BNodeTest.cc
+++ b/test/BNodeTest.cc
@@ -68,7 +68,7 @@ void BNodeTest::testFindBucketFor()
{
BNode b(bucket5);
- CPPUNIT_ASSERT(bucket5 == BNode::findBucketFor(&b, localNodeID));
+ CPPUNIT_ASSERT(*bucket5 == *BNode::findBucketFor(&b, localNodeID));
}
{
BNode b(bucket1);
@@ -97,7 +97,7 @@ void BNodeTest::testFindBucketFor()
bp4->setLeft(bp3);
bp4->setRight(b2);
- CPPUNIT_ASSERT(bucket5 == BNode::findBucketFor(bp4, localNode->getID()));
+ CPPUNIT_ASSERT(*bucket5 == *BNode::findBucketFor(bp4, localNode->getID()));
delete bp4;
}
@@ -220,7 +220,7 @@ void BNodeTest::testEnumerateBucket()
std::vector<SharedHandle<DHTBucket> > buckets;
BNode::enumerateBucket(buckets, &b);
CPPUNIT_ASSERT_EQUAL((size_t)1, buckets.size());
- CPPUNIT_ASSERT(bucket1 == buckets[0]);
+ CPPUNIT_ASSERT(*bucket1 == *buckets[0]);
}
{
BNode* b1 = new BNode(bucket1);
@@ -248,11 +248,11 @@ void BNodeTest::testEnumerateBucket()
std::vector<SharedHandle<DHTBucket> > buckets;
BNode::enumerateBucket(buckets, bp4);
CPPUNIT_ASSERT_EQUAL((size_t)5, buckets.size());
- CPPUNIT_ASSERT(bucket1 == buckets[0]);
- CPPUNIT_ASSERT(bucket3 == buckets[1]);
- CPPUNIT_ASSERT(bucket5 == buckets[2]);
- CPPUNIT_ASSERT(bucket4 == buckets[3]);
- CPPUNIT_ASSERT(bucket2 == buckets[4]);
+ CPPUNIT_ASSERT(*bucket1 == *buckets[0]);
+ CPPUNIT_ASSERT(*bucket3 == *buckets[1]);
+ CPPUNIT_ASSERT(*bucket5 == *buckets[2]);
+ CPPUNIT_ASSERT(*bucket4 == *buckets[3]);
+ CPPUNIT_ASSERT(*bucket2 == *buckets[4]);
delete bp4;
}
diff --git a/test/DHTAnnouncePeerMessageTest.cc b/test/DHTAnnouncePeerMessageTest.cc
index 1a8c8149..20bc28db 100644
--- a/test/DHTAnnouncePeerMessageTest.cc
+++ b/test/DHTAnnouncePeerMessageTest.cc
@@ -111,8 +111,8 @@ void DHTAnnouncePeerMessageTest::testDoReceivedAction()
SharedHandle<MockDHTResponseMessage> m
(dynamic_pointer_cast<MockDHTResponseMessage>
(dispatcher.messageQueue_[0].message_));
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(std::string("announce_peer"), m->getMessageType());
CPPUNIT_ASSERT_EQUAL(transactionID, m->getTransactionID());
std::vector<SharedHandle<Peer> > peers;
diff --git a/test/DHTBucketTest.cc b/test/DHTBucketTest.cc
index 14da5016..11adca59 100644
--- a/test/DHTBucketTest.cc
+++ b/test/DHTBucketTest.cc
@@ -319,7 +319,7 @@ void DHTBucketTest::testAddNode()
// nodes[0] is located at the tail of the bucket(least recent seen)
nodes[0]->markBad();
CPPUNIT_ASSERT(bucket.addNode(newNode));
- CPPUNIT_ASSERT(bucket.getNodes().back() == newNode);
+ CPPUNIT_ASSERT(*bucket.getNodes().back() == *newNode);
}
void DHTBucketTest::testMoveToHead()
@@ -337,7 +337,7 @@ void DHTBucketTest::testMoveToHead()
CPPUNIT_ASSERT(bucket.addNode(nodes[i]));
}
bucket.moveToHead(nodes[DHTBucket::K-1]);
- CPPUNIT_ASSERT(bucket.getNodes().front() == nodes[DHTBucket::K-1]);
+ CPPUNIT_ASSERT(*bucket.getNodes().front() == *nodes[DHTBucket::K-1]);
}
void DHTBucketTest::testMoveToTail()
@@ -355,7 +355,7 @@ void DHTBucketTest::testMoveToTail()
CPPUNIT_ASSERT(bucket.addNode(nodes[i]));
}
bucket.moveToTail(nodes[0]);
- CPPUNIT_ASSERT(bucket.getNodes().back() == nodes[0]);
+ CPPUNIT_ASSERT(*bucket.getNodes().back() == *nodes[0]);
}
void DHTBucketTest::testGetGoodNodes()
@@ -400,12 +400,12 @@ void DHTBucketTest::testCacheNode()
bucket.cacheNode(n1);
bucket.cacheNode(n2);
CPPUNIT_ASSERT_EQUAL((size_t)2, bucket.getCachedNodes().size());
- CPPUNIT_ASSERT(n2 == bucket.getCachedNodes()[0]);
+ CPPUNIT_ASSERT(*n2 == *bucket.getCachedNodes()[0]);
bucket.cacheNode(n3);
CPPUNIT_ASSERT_EQUAL((size_t)2, bucket.getCachedNodes().size());
- CPPUNIT_ASSERT(n3 == bucket.getCachedNodes()[0]);
- CPPUNIT_ASSERT(n2 == bucket.getCachedNodes()[1]);
+ CPPUNIT_ASSERT(*n3 == *bucket.getCachedNodes()[0]);
+ CPPUNIT_ASSERT(*n2 == *bucket.getCachedNodes()[1]);
}
void DHTBucketTest::testDropNode()
@@ -432,7 +432,7 @@ void DHTBucketTest::testDropNode()
{
std::deque<SharedHandle<DHTNode> > tnodes = bucket.getNodes();
CPPUNIT_ASSERT_EQUAL((size_t)8, tnodes.size());
- CPPUNIT_ASSERT(nodes[3] == tnodes[3]);
+ CPPUNIT_ASSERT(*nodes[3] == *tnodes[3]);
}
bucket.cacheNode(cachedNode1);
@@ -442,11 +442,13 @@ void DHTBucketTest::testDropNode()
{
std::deque<SharedHandle<DHTNode> > tnodes = bucket.getNodes();
CPPUNIT_ASSERT_EQUAL((size_t)8, tnodes.size());
- CPPUNIT_ASSERT(tnodes.end() == std::find(tnodes.begin(), tnodes.end(), nodes[3]));
- CPPUNIT_ASSERT(cachedNode2 == tnodes[7]);
+ CPPUNIT_ASSERT(tnodes.end() ==
+ std::find_if(tnodes.begin(), tnodes.end(),
+ derefEqual(nodes[3])));
+ CPPUNIT_ASSERT(*cachedNode2 == *tnodes[7]);
}
CPPUNIT_ASSERT_EQUAL((size_t)1, bucket.getCachedNodes().size());
- CPPUNIT_ASSERT(cachedNode1 == bucket.getCachedNodes()[0]);
+ CPPUNIT_ASSERT(*cachedNode1 == *bucket.getCachedNodes()[0]);
}
} // namespace aria2
diff --git a/test/DHTFindNodeMessageTest.cc b/test/DHTFindNodeMessageTest.cc
index c9f0ce54..984c7238 100644
--- a/test/DHTFindNodeMessageTest.cc
+++ b/test/DHTFindNodeMessageTest.cc
@@ -103,8 +103,8 @@ void DHTFindNodeMessageTest::testDoReceivedAction()
SharedHandle<MockDHTResponseMessage> m
(dynamic_pointer_cast<MockDHTResponseMessage>
(dispatcher.messageQueue_[0].message_));
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(std::string("find_node"), m->getMessageType());
CPPUNIT_ASSERT_EQUAL(msg.getTransactionID(), m->getTransactionID());
CPPUNIT_ASSERT_EQUAL((size_t)1, m->nodes_.size());
diff --git a/test/DHTGetPeersMessageTest.cc b/test/DHTGetPeersMessageTest.cc
index 11a280c1..be100ea2 100644
--- a/test/DHTGetPeersMessageTest.cc
+++ b/test/DHTGetPeersMessageTest.cc
@@ -124,8 +124,8 @@ void DHTGetPeersMessageTest::testDoReceivedAction()
SharedHandle<MockDHTResponseMessage> m
(dynamic_pointer_cast<MockDHTResponseMessage>
(dispatcher.messageQueue_[0].message_));
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(std::string("get_peers"), m->getMessageType());
CPPUNIT_ASSERT_EQUAL(msg.getTransactionID(), m->getTransactionID());
CPPUNIT_ASSERT_EQUAL(tokenTracker.generateToken(infoHash, remoteNode->getIPAddress(), remoteNode->getPort()), m->token_);
@@ -161,13 +161,13 @@ void DHTGetPeersMessageTest::testDoReceivedAction()
SharedHandle<MockDHTResponseMessage> m
(dynamic_pointer_cast<MockDHTResponseMessage>
(dispatcher.messageQueue_[0].message_));
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(std::string("get_peers"), m->getMessageType());
CPPUNIT_ASSERT_EQUAL(msg.getTransactionID(), m->getTransactionID());
CPPUNIT_ASSERT_EQUAL(tokenTracker.generateToken(infoHash, remoteNode->getIPAddress(), remoteNode->getPort()), m->token_);
CPPUNIT_ASSERT_EQUAL((size_t)1, m->nodes_.size());
- CPPUNIT_ASSERT(returnNode1 == m->nodes_[0]);
+ CPPUNIT_ASSERT(*returnNode1 == *m->nodes_[0]);
CPPUNIT_ASSERT_EQUAL((size_t)0, m->peers_.size());
}
}
diff --git a/test/DHTIDCloserTest.cc b/test/DHTIDCloserTest.cc
index 032aba6d..a5e3a944 100644
--- a/test/DHTIDCloserTest.cc
+++ b/test/DHTIDCloserTest.cc
@@ -58,11 +58,11 @@ void DHTIDCloserTest::testOperator()
std::sort(entries.begin(), entries.end(), DHTIDCloser(e3->node->getID()));
- CPPUNIT_ASSERT(e3 == entries[0]);
- CPPUNIT_ASSERT(e2 == entries[1]);
- CPPUNIT_ASSERT(e4 == entries[2]);
- CPPUNIT_ASSERT(e1 == entries[3]);
- CPPUNIT_ASSERT(e5 == entries[4]);
+ CPPUNIT_ASSERT(*e3 == *entries[0]);
+ CPPUNIT_ASSERT(*e2 == *entries[1]);
+ CPPUNIT_ASSERT(*e4 == *entries[2]);
+ CPPUNIT_ASSERT(*e1 == *entries[3]);
+ CPPUNIT_ASSERT(*e5 == *entries[4]);
}
} // namespace aria2
diff --git a/test/DHTMessageFactoryImplTest.cc b/test/DHTMessageFactoryImplTest.cc
index c28b80de..f2515158 100644
--- a/test/DHTMessageFactoryImplTest.cc
+++ b/test/DHTMessageFactoryImplTest.cc
@@ -100,8 +100,8 @@ void DHTMessageFactoryImplTest::testCreatePingMessage()
remoteNode->setIPAddress("192.168.0.1");
remoteNode->setPort(6881);
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(util::toHex(transactionID, DHT_TRANSACTION_ID_LENGTH),
util::toHex(m->getTransactionID()));
}
@@ -125,8 +125,8 @@ void DHTMessageFactoryImplTest::testCreatePingReplyMessage()
remoteNode->getIPAddress(),
remoteNode->getPort())));
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(util::toHex(transactionID, DHT_TRANSACTION_ID_LENGTH),
util::toHex(m->getTransactionID()));
}
@@ -151,8 +151,8 @@ void DHTMessageFactoryImplTest::testCreateFindNodeMessage()
remoteNode->setIPAddress("192.168.0.1");
remoteNode->setPort(6881);
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(util::toHex(transactionID, DHT_TRANSACTION_ID_LENGTH),
util::toHex(m->getTransactionID()));
CPPUNIT_ASSERT_EQUAL(util::toHex(targetNodeID, DHT_ID_LENGTH),
@@ -196,11 +196,11 @@ void DHTMessageFactoryImplTest::testCreateFindNodeReplyMessage()
remoteNode->getIPAddress(),
remoteNode->getPort())));
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL((size_t)DHTBucket::K, m->getClosestKNodes().size());
- CPPUNIT_ASSERT(nodes[0] == m->getClosestKNodes()[0]);
- CPPUNIT_ASSERT(nodes[7] == m->getClosestKNodes()[7]);
+ CPPUNIT_ASSERT(*nodes[0] == *m->getClosestKNodes()[0]);
+ CPPUNIT_ASSERT(*nodes[7] == *m->getClosestKNodes()[7]);
CPPUNIT_ASSERT_EQUAL(util::toHex(transactionID, DHT_TRANSACTION_ID_LENGTH),
util::toHex(m->getTransactionID()));
} catch(Exception& e) {
@@ -249,11 +249,11 @@ void DHTMessageFactoryImplTest::testCreateFindNodeReplyMessage6()
remoteNode->getIPAddress(),
remoteNode->getPort())));
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL((size_t)DHTBucket::K, m->getClosestKNodes().size());
- CPPUNIT_ASSERT(nodes[0] == m->getClosestKNodes()[0]);
- CPPUNIT_ASSERT(nodes[7] == m->getClosestKNodes()[7]);
+ CPPUNIT_ASSERT(*nodes[0] == *m->getClosestKNodes()[0]);
+ CPPUNIT_ASSERT(*nodes[7] == *m->getClosestKNodes()[7]);
CPPUNIT_ASSERT_EQUAL(util::toHex(transactionID, DHT_TRANSACTION_ID_LENGTH),
util::toHex(m->getTransactionID()));
} catch(Exception& e) {
@@ -282,8 +282,8 @@ void DHTMessageFactoryImplTest::testCreateGetPeersMessage()
remoteNode->setIPAddress("192.168.0.1");
remoteNode->setPort(6881);
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(util::toHex(transactionID, DHT_TRANSACTION_ID_LENGTH),
util::toHex(m->getTransactionID()));
CPPUNIT_ASSERT_EQUAL(util::toHex(infoHash, DHT_ID_LENGTH),
@@ -343,15 +343,15 @@ void DHTMessageFactoryImplTest::testCreateGetPeersReplyMessage()
remoteNode->getIPAddress(),
remoteNode->getPort())));
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(std::string("token"), m->getToken());
CPPUNIT_ASSERT_EQUAL((size_t)DHTBucket::K, m->getClosestKNodes().size());
- CPPUNIT_ASSERT(nodes[0] == m->getClosestKNodes()[0]);
- CPPUNIT_ASSERT(nodes[7] == m->getClosestKNodes()[7]);
+ CPPUNIT_ASSERT(*nodes[0] == *m->getClosestKNodes()[0]);
+ CPPUNIT_ASSERT(*nodes[7] == *m->getClosestKNodes()[7]);
CPPUNIT_ASSERT_EQUAL((size_t)4, m->getValues().size());
- CPPUNIT_ASSERT(peers[0] == m->getValues()[0]);
- CPPUNIT_ASSERT(peers[3] == m->getValues()[3]);
+ CPPUNIT_ASSERT(*peers[0] == *m->getValues()[0]);
+ CPPUNIT_ASSERT(*peers[3] == *m->getValues()[3]);
CPPUNIT_ASSERT_EQUAL(util::toHex(transactionID, DHT_TRANSACTION_ID_LENGTH),
util::toHex(m->getTransactionID()));
} catch(Exception& e) {
@@ -416,15 +416,15 @@ void DHTMessageFactoryImplTest::testCreateGetPeersReplyMessage6()
remoteNode->getIPAddress(),
remoteNode->getPort())));
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(std::string("token"), m->getToken());
CPPUNIT_ASSERT_EQUAL((size_t)DHTBucket::K, m->getClosestKNodes().size());
- CPPUNIT_ASSERT(nodes[0] == m->getClosestKNodes()[0]);
- CPPUNIT_ASSERT(nodes[7] == m->getClosestKNodes()[7]);
+ CPPUNIT_ASSERT(*nodes[0] == *m->getClosestKNodes()[0]);
+ CPPUNIT_ASSERT(*nodes[7] == *m->getClosestKNodes()[7]);
CPPUNIT_ASSERT_EQUAL((size_t)4, m->getValues().size());
- CPPUNIT_ASSERT(peers[0] == m->getValues()[0]);
- CPPUNIT_ASSERT(peers[3] == m->getValues()[3]);
+ CPPUNIT_ASSERT(*peers[0] == *m->getValues()[0]);
+ CPPUNIT_ASSERT(*peers[3] == *m->getValues()[3]);
CPPUNIT_ASSERT_EQUAL(util::toHex(transactionID, DHT_TRANSACTION_ID_LENGTH),
util::toHex(m->getTransactionID()));
} catch(Exception& e) {
@@ -458,8 +458,8 @@ void DHTMessageFactoryImplTest::testCreateAnnouncePeerMessage()
remoteNode->setIPAddress("192.168.0.1");
remoteNode->setPort(6882);
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(token, m->getToken());
CPPUNIT_ASSERT_EQUAL(util::toHex(transactionID, DHT_TRANSACTION_ID_LENGTH),
util::toHex(m->getTransactionID()));
@@ -490,8 +490,8 @@ void DHTMessageFactoryImplTest::testCreateAnnouncePeerReplyMessage()
remoteNode->getIPAddress(),
remoteNode->getPort())));
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(util::toHex(transactionID, DHT_TRANSACTION_ID_LENGTH),
util::toHex(m->getTransactionID()));
}
diff --git a/test/DHTPingMessageTest.cc b/test/DHTPingMessageTest.cc
index dd12c20d..671a2734 100644
--- a/test/DHTPingMessageTest.cc
+++ b/test/DHTPingMessageTest.cc
@@ -92,8 +92,8 @@ void DHTPingMessageTest::testDoReceivedAction()
SharedHandle<MockDHTResponseMessage> m
(dynamic_pointer_cast<MockDHTResponseMessage>
(dispatcher.messageQueue_[0].message_));
- CPPUNIT_ASSERT(localNode == m->getLocalNode());
- CPPUNIT_ASSERT(remoteNode == m->getRemoteNode());
+ CPPUNIT_ASSERT(*localNode == *m->getLocalNode());
+ CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode());
CPPUNIT_ASSERT_EQUAL(std::string("ping_reply"), m->getMessageType());
CPPUNIT_ASSERT_EQUAL(msg.getTransactionID(), m->getTransactionID());
}
diff --git a/test/DefaultBtRequestFactoryTest.cc b/test/DefaultBtRequestFactoryTest.cc
index 941fa0e4..43d4d0bc 100644
--- a/test/DefaultBtRequestFactoryTest.cc
+++ b/test/DefaultBtRequestFactoryTest.cc
@@ -210,16 +210,16 @@ void DefaultBtRequestFactoryTest::testRemoveTargetPiece() {
requestFactory_->addTargetPiece(piece1);
- CPPUNIT_ASSERT(std::find(requestFactory_->getTargetPieces().begin(),
- requestFactory_->getTargetPieces().end(),
- piece1) !=
+ CPPUNIT_ASSERT(std::find_if(requestFactory_->getTargetPieces().begin(),
+ requestFactory_->getTargetPieces().end(),
+ derefEqual(piece1)) !=
requestFactory_->getTargetPieces().end());
requestFactory_->removeTargetPiece(piece1);
- CPPUNIT_ASSERT(std::find(requestFactory_->getTargetPieces().begin(),
- requestFactory_->getTargetPieces().end(),
- piece1) ==
+ CPPUNIT_ASSERT(std::find_if(requestFactory_->getTargetPieces().begin(),
+ requestFactory_->getTargetPieces().end(),
+ derefEqual(piece1)) ==
requestFactory_->getTargetPieces().end());
}
diff --git a/test/DefaultPeerStorageTest.cc b/test/DefaultPeerStorageTest.cc
index 9b1f7149..1394cf1f 100644
--- a/test/DefaultPeerStorageTest.cc
+++ b/test/DefaultPeerStorageTest.cc
@@ -121,7 +121,8 @@ void DefaultPeerStorageTest::testAddPeer() {
CPPUNIT_ASSERT(ps.addPeer(peer4));
// peer2 was deleted. While peer1 is oldest, its cuid is not 0.
CPPUNIT_ASSERT_EQUAL((size_t)3, ps.countPeer());
- CPPUNIT_ASSERT(std::find(ps.getPeers().begin(), ps.getPeers().end(), peer2) == ps.getPeers().end());
+ CPPUNIT_ASSERT(std::find_if(ps.getPeers().begin(), ps.getPeers().end(),
+ derefEqual(peer2)) == ps.getPeers().end());
SharedHandle<Peer> peer5(new Peer("192.168.0.4", 0));
@@ -224,13 +225,14 @@ void DefaultPeerStorageTest::testReturnPeer()
ps.returnPeer(peer2); // peer2 removed from the container
CPPUNIT_ASSERT_EQUAL((size_t)2, ps.getPeers().size());
- CPPUNIT_ASSERT(std::find(ps.getPeers().begin(), ps.getPeers().end(), peer2)
- == ps.getPeers().end());
+ CPPUNIT_ASSERT(std::find_if(ps.getPeers().begin(), ps.getPeers().end(),
+ derefEqual(peer2)) == ps.getPeers().end());
CPPUNIT_ASSERT_EQUAL((size_t)1, ps.getDroppedPeers().size());
ps.returnPeer(peer1); // peer1 is removed from the container
CPPUNIT_ASSERT_EQUAL((size_t)1, ps.getPeers().size());
- CPPUNIT_ASSERT(std::find(ps.getPeers().begin(), ps.getPeers().end(), peer1) == ps.getPeers().end());
+ CPPUNIT_ASSERT(std::find_if(ps.getPeers().begin(), ps.getPeers().end(),
+ derefEqual(peer1)) == ps.getPeers().end());
CPPUNIT_ASSERT_EQUAL((size_t)1, ps.getDroppedPeers().size());
}
diff --git a/test/SequentialPickerTest.cc b/test/SequentialPickerTest.cc
index 171e201a..347e617f 100644
--- a/test/SequentialPickerTest.cc
+++ b/test/SequentialPickerTest.cc
@@ -35,7 +35,7 @@ void SequentialPickerTest::testPick()
picker.pickNext();
CPPUNIT_ASSERT(picker.isPicked());
- CPPUNIT_ASSERT_EQUAL(Integer(new int(1)), picker.getPickedEntry());
+ CPPUNIT_ASSERT_EQUAL(*Integer(new int(1)), *picker.getPickedEntry());
picker.dropPickedEntry();
@@ -44,7 +44,7 @@ void SequentialPickerTest::testPick()
picker.pickNext();
- CPPUNIT_ASSERT_EQUAL(Integer(new int(2)), picker.getPickedEntry());
+ CPPUNIT_ASSERT_EQUAL(*Integer(new int(2)), *picker.getPickedEntry());
CPPUNIT_ASSERT(!picker.hasNext());
}
diff --git a/test/SingletonHolderTest.cc b/test/SingletonHolderTest.cc
index 6b939824..b2dc2c84 100644
--- a/test/SingletonHolderTest.cc
+++ b/test/SingletonHolderTest.cc
@@ -51,7 +51,7 @@ void SingletonHolderTest::testInstance()
IntHandle i(new int(100));
SingletonHolder<IntHandle>::instance(i);
- std::cerr << SingletonHolder<IntHandle>::instance() << std::endl;
+ std::cerr << *SingletonHolder<IntHandle>::instance() << std::endl;
std::cerr << SingletonHolder<MHandle>::instance()->greeting() << std::endl;
generated by cgit (git 2.46.0) at 2026-10-12 05:46:45 +0000