summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/BtAllowedFastMessageTest.cc6
-rw-r--r--test/BtBitfieldMessageTest.cc7
-rw-r--r--test/BtCancelMessageTest.cc6
-rw-r--r--test/BtChokeMessageTest.cc6
-rw-r--r--test/BtExtendedMessageTest.cc7
-rw-r--r--test/BtHandshakeMessageTest.cc22
-rw-r--r--test/BtHaveAllMessageTest.cc6
-rw-r--r--test/BtHaveMessageTest.cc6
-rw-r--r--test/BtHaveNoneMessageTest.cc6
-rw-r--r--test/BtInterestedMessageTest.cc6
-rw-r--r--test/BtKeepAliveMessageTest.cc7
-rw-r--r--test/BtNotInterestedMessageTest.cc6
-rw-r--r--test/BtPortMessageTest.cc6
-rw-r--r--test/BtRejectMessageTest.cc6
-rw-r--r--test/BtRequestMessageTest.cc6
-rw-r--r--test/BtSuggestPieceMessageTest.cc6
-rw-r--r--test/BtUnchokeMessageTest.cc6
17 files changed, 59 insertions, 62 deletions
diff --git a/test/BtAllowedFastMessageTest.cc b/test/BtAllowedFastMessageTest.cc
index ccc2cad8..ee2509ae 100644
--- a/test/BtAllowedFastMessageTest.cc
+++ b/test/BtAllowedFastMessageTest.cc
@@ -70,9 +70,9 @@ void BtAllowedFastMessageTest::testCreateMessage()
unsigned char data[9];
bittorrent::createPeerMessageString(data, sizeof(data), 5, 17);
bittorrent::setIntParam(&data[5], 12345);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 9) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)9, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtAllowedFastMessageTest::testDoReceivedAction()
diff --git a/test/BtBitfieldMessageTest.cc b/test/BtBitfieldMessageTest.cc
index a3059381..90b07810 100644
--- a/test/BtBitfieldMessageTest.cc
+++ b/test/BtBitfieldMessageTest.cc
@@ -76,10 +76,9 @@ void BtBitfieldMessageTest::testCreateMessage()
unsigned char data[5 + 2];
bittorrent::createPeerMessageString(data, sizeof(data), 3, 5);
memcpy(&data[5], bitfield, sizeof(bitfield));
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 7) == 0);
- delete[] rawmsg;
- CPPUNIT_ASSERT_EQUAL((size_t)7, msg.getMessageLength());
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)7, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtBitfieldMessageTest::testDoReceivedAction()
diff --git a/test/BtCancelMessageTest.cc b/test/BtCancelMessageTest.cc
index f1a7e0a8..37ee4987 100644
--- a/test/BtCancelMessageTest.cc
+++ b/test/BtCancelMessageTest.cc
@@ -95,9 +95,9 @@ void BtCancelMessageTest::testCreateMessage()
bittorrent::setIntParam(&data[5], 12345);
bittorrent::setIntParam(&data[9], 256);
bittorrent::setIntParam(&data[13], 1_k);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 17) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)17, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtCancelMessageTest::testDoReceivedAction()
diff --git a/test/BtChokeMessageTest.cc b/test/BtChokeMessageTest.cc
index fa73742b..debd2530 100644
--- a/test/BtChokeMessageTest.cc
+++ b/test/BtChokeMessageTest.cc
@@ -109,9 +109,9 @@ void BtChokeMessageTest::testCreateMessage()
BtChokeMessage msg;
unsigned char data[5];
bittorrent::createPeerMessageString(data, sizeof(data), 1, 0);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 5) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)5, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtChokeMessageTest::testDoReceivedAction()
diff --git a/test/BtExtendedMessageTest.cc b/test/BtExtendedMessageTest.cc
index 65d4fdbc..f32f3426 100644
--- a/test/BtExtendedMessageTest.cc
+++ b/test/BtExtendedMessageTest.cc
@@ -78,10 +78,9 @@ void BtExtendedMessageTest::testCreateMessage()
bittorrent::createPeerMessageString(data, sizeof(data), 13, 20);
*(data + 5) = extendedMessageID;
memcpy(data + 6, payload.c_str(), payload.size());
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 17) == 0);
- delete[] rawmsg;
- CPPUNIT_ASSERT_EQUAL((size_t)17, msg.getMessageLength());
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)17, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtExtendedMessageTest::testDoReceivedAction()
diff --git a/test/BtHandshakeMessageTest.cc b/test/BtHandshakeMessageTest.cc
index a86ae54a..b8569d73 100644
--- a/test/BtHandshakeMessageTest.cc
+++ b/test/BtHandshakeMessageTest.cc
@@ -73,23 +73,23 @@ void BtHandshakeMessageTest::testCreate()
void BtHandshakeMessageTest::testCreateMessage()
{
- unsigned char infoHash[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
- unsigned char peerId[] = {0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
- 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
- 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0};
-
- std::shared_ptr<BtHandshakeMessage> msg(new BtHandshakeMessage());
+ constexpr unsigned char infoHash[] = {
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+ constexpr unsigned char peerId[] = {0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+ 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+ 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0};
+
+ auto msg = std::make_shared<BtHandshakeMessage>();
msg->setInfoHash(infoHash);
msg->setPeerId(peerId);
unsigned char data[68];
createHandshakeMessageData(data);
- unsigned char* rawmsg = msg->createMessage();
+ auto rawmsg = msg->createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)68, rawmsg.size());
CPPUNIT_ASSERT_EQUAL(util::toHex((const unsigned char*)data, 68),
- util::toHex(rawmsg, 68));
- delete[] rawmsg;
+ util::toHex(rawmsg.data(), 68));
}
void BtHandshakeMessageTest::testToString()
diff --git a/test/BtHaveAllMessageTest.cc b/test/BtHaveAllMessageTest.cc
index 56e9504f..9bff0632 100644
--- a/test/BtHaveAllMessageTest.cc
+++ b/test/BtHaveAllMessageTest.cc
@@ -65,9 +65,9 @@ void BtHaveAllMessageTest::testCreateMessage()
BtHaveAllMessage msg;
unsigned char data[5];
bittorrent::createPeerMessageString(data, sizeof(data), 1, 14);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 5) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)5, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtHaveAllMessageTest::testDoReceivedAction()
diff --git a/test/BtHaveMessageTest.cc b/test/BtHaveMessageTest.cc
index 562a5033..677ff2b2 100644
--- a/test/BtHaveMessageTest.cc
+++ b/test/BtHaveMessageTest.cc
@@ -71,9 +71,9 @@ void BtHaveMessageTest::testCreateMessage()
unsigned char data[9];
bittorrent::createPeerMessageString(data, sizeof(data), 5, 4);
bittorrent::setIntParam(&data[5], 12345);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 9) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)9, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtHaveMessageTest::testDoReceivedAction()
diff --git a/test/BtHaveNoneMessageTest.cc b/test/BtHaveNoneMessageTest.cc
index c5ee6d0d..71ab3f3e 100644
--- a/test/BtHaveNoneMessageTest.cc
+++ b/test/BtHaveNoneMessageTest.cc
@@ -62,9 +62,9 @@ void BtHaveNoneMessageTest::testCreateMessage()
BtHaveNoneMessage msg;
unsigned char data[5];
bittorrent::createPeerMessageString(data, sizeof(data), 1, 15);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 5) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)5, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtHaveNoneMessageTest::testDoReceivedAction()
diff --git a/test/BtInterestedMessageTest.cc b/test/BtInterestedMessageTest.cc
index c3096d3e..79e73216 100644
--- a/test/BtInterestedMessageTest.cc
+++ b/test/BtInterestedMessageTest.cc
@@ -64,9 +64,9 @@ void BtInterestedMessageTest::testCreateMessage()
BtInterestedMessage msg;
unsigned char data[5];
bittorrent::createPeerMessageString(data, sizeof(data), 1, 2);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 5) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)5, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtInterestedMessageTest::testDoReceivedAction()
diff --git a/test/BtKeepAliveMessageTest.cc b/test/BtKeepAliveMessageTest.cc
index 3bd27543..2d9d4872 100644
--- a/test/BtKeepAliveMessageTest.cc
+++ b/test/BtKeepAliveMessageTest.cc
@@ -27,10 +27,9 @@ void BtKeepAliveMessageTest::testCreateMessage()
memset(data, 0, sizeof(data));
BtKeepAliveMessage message;
CPPUNIT_ASSERT_EQUAL((uint8_t)99, message.getId());
- CPPUNIT_ASSERT_EQUAL((size_t)4, message.getMessageLength());
- unsigned char* rawmsg = message.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 4) == 0);
- delete[] rawmsg;
+ auto rawmsg = message.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)4, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtKeepAliveMessageTest::testToString()
diff --git a/test/BtNotInterestedMessageTest.cc b/test/BtNotInterestedMessageTest.cc
index 1f3bbac5..88d233c2 100644
--- a/test/BtNotInterestedMessageTest.cc
+++ b/test/BtNotInterestedMessageTest.cc
@@ -64,9 +64,9 @@ void BtNotInterestedMessageTest::testCreateMessage()
BtNotInterestedMessage msg;
unsigned char data[5];
bittorrent::createPeerMessageString(data, sizeof(data), 1, 3);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 5) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)5, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtNotInterestedMessageTest::testDoReceivedAction()
diff --git a/test/BtPortMessageTest.cc b/test/BtPortMessageTest.cc
index cceb893c..c0370efc 100644
--- a/test/BtPortMessageTest.cc
+++ b/test/BtPortMessageTest.cc
@@ -99,9 +99,9 @@ void BtPortMessageTest::testCreateMessage()
unsigned char data[7];
bittorrent::createPeerMessageString(data, sizeof(data), 3, 9);
bittorrent::setShortIntParam(&data[5], 6881);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 7) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)7, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtPortMessageTest::testDoReceivedAction()
diff --git a/test/BtRejectMessageTest.cc b/test/BtRejectMessageTest.cc
index 3e3b7f8e..3c85ff92 100644
--- a/test/BtRejectMessageTest.cc
+++ b/test/BtRejectMessageTest.cc
@@ -129,9 +129,9 @@ void BtRejectMessageTest::testCreateMessage()
bittorrent::setIntParam(&data[5], 12345);
bittorrent::setIntParam(&data[9], 256);
bittorrent::setIntParam(&data[13], 1_k);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 17) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)17, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtRejectMessageTest::testDoReceivedAction()
diff --git a/test/BtRequestMessageTest.cc b/test/BtRequestMessageTest.cc
index 3ff3d7a9..a68fb4d4 100644
--- a/test/BtRequestMessageTest.cc
+++ b/test/BtRequestMessageTest.cc
@@ -151,9 +151,9 @@ void BtRequestMessageTest::testCreateMessage()
bittorrent::setIntParam(&data[5], 12345);
bittorrent::setIntParam(&data[9], 256);
bittorrent::setIntParam(&data[13], 1_k);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 17) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)17, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtRequestMessageTest::testDoReceivedAction_hasPieceAndAmNotChoking()
diff --git a/test/BtSuggestPieceMessageTest.cc b/test/BtSuggestPieceMessageTest.cc
index 7e48628e..9be0b8b1 100644
--- a/test/BtSuggestPieceMessageTest.cc
+++ b/test/BtSuggestPieceMessageTest.cc
@@ -62,9 +62,9 @@ void BtSuggestPieceMessageTest::testCreateMessage()
unsigned char data[9];
bittorrent::createPeerMessageString(data, sizeof(data), 5, 13);
bittorrent::setIntParam(&data[5], 12345);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 9) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)9, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtSuggestPieceMessageTest::testToString()
diff --git a/test/BtUnchokeMessageTest.cc b/test/BtUnchokeMessageTest.cc
index dea19a9d..1fe0bbe9 100644
--- a/test/BtUnchokeMessageTest.cc
+++ b/test/BtUnchokeMessageTest.cc
@@ -64,9 +64,9 @@ void BtUnchokeMessageTest::testCreateMessage()
BtUnchokeMessage msg;
unsigned char data[5];
bittorrent::createPeerMessageString(data, sizeof(data), 1, 1);
- unsigned char* rawmsg = msg.createMessage();
- CPPUNIT_ASSERT(memcmp(rawmsg, data, 5) == 0);
- delete[] rawmsg;
+ auto rawmsg = msg.createMessage();
+ CPPUNIT_ASSERT_EQUAL((size_t)5, rawmsg.size());
+ CPPUNIT_ASSERT(std::equal(std::begin(rawmsg), std::end(rawmsg), data));
}
void BtUnchokeMessageTest::testDoReceivedAction()
generated by cgit (git 2.46.0) at 2026-10-12 01:38:34 +0000