Skip to content

Commit 0a710c4

Browse files
Dimi1010Dimi1010
authored
Partial update tests to use new resource system. (#1929)
* Added RawPacketFactory to replace macros `READ_FILE_AND_CREATE_PACKET` and `READ_FILE_AND_CREATE_PACKET_LINKTYPE`. * Added example usage. * Reverted test utils changes. * Added project pcpp test utils for common utils. * Added PcppTestUtilities to replace packet load macros. * Moved default resource provider into PcppTestUtilities. * Lint * Fix std::uint8_t to uint8_t. * Fix explicit ctors. * Fix includes. * Fix constness. * Fix cmake define. * Fix typo. * Replaced READ_FILE_AND_CREATE_PACKET with `createPacketFromHexResource`. * Replaced READ_FILE_AND_CREATE_PACKET with `createPacketFromHexResource`. * Replaced READ_FILE_AND_CREATE_PACKET with `createPacketFromHexResource`. * Replaced READ_FILE_AND_CREATE_PACKET_LINKTYPE with createPacketFromHexResource. * Fix style. * Simplified readHexResource. * Removed reserve. * Removed extra overloads on ResourceProvider. * Remove BinaryData for now. * Fix missed tests * Fixed OS separator. * Fixed header extensions. * Lint * Added documentation. * Removed unused PacketFactory API. * Lint * Fixed malformed hex data files. * Lint * Updated simple cases. * Fixed malformed hex data files. * Lint * Fix telnet one off error.
1 parent 420ed69 commit 0a710c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+820
-924
lines changed

‎Tests/Packet++Test/PacketExamples/GREv0_4.dat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
00aef352aad100021537a24408004500005200010000402f70730102030404030201200065580000fde800010203040500012345567808004500002800010000400666c70a0000040a00000504d0005000000000000000005002200076ba0000
1+
00aef352aad100021537a24408004500005200010000402f70730102030404030201200065580000fde800010203040500012345567808004500002800010000400666c70a0000040a00000504d0005000000000000000005002200076ba0000

‎Tests/Packet++Test/PacketExamples/dhcpv6_1.dat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
33330001000280e01d00fcea86dd60000000008f1101fe8000000000000082e01dfffe00fceaff02000000000000000000000001000202220223008f85f1019a0006000100120002000000094647453139343731345153000006000e0017001800f300f2003b00f20027000800020000000f000a6578722d636f6e6669670010003300000009002d505845436c69656e743a417263683a30303030393a554e44493a3030333031303a5049443a4e43532d353530380003000c1d00fcea00000e1000001518
1+
33330001000280e01d00fcea86dd60000000008f1101fe8000000000000082e01dfffe00fceaff02000000000000000000000001000202220223008f85f1019a0006000100120002000000094647453139343731345153000006000e0017001800f300f2003b00f20027000800020000000f000a6578722d636f6e6669670010003300000009002d505845436c69656e743a417263683a30303030393a554e44493a3030333031303a5049443a4e43532d353530380003000c1d00fcea00000e1000001518

‎Tests/Packet++Test/PacketExamples/ftpIpv4CmdOnlyReq.dat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
00000000000000000000000008004510003a7efb40004006bdb07f0000017f000001991a0015a11240363cc091be80187fe6fe2e00000101080aaefa0886aef8fc96535953540d0a
1+
00000000000000000000000008004510003a7efb40004006bdb07f0000017f000001991a0015a11240363cc091be80187fe6fe2e00000101080aaefa0886aef8fc96535953540d0a

‎Tests/Packet++Test/PacketExamples/ipv4-malformed1.dat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
00005e000102804e702c4b28080055040010a2b7400141070e87e4138ec18c406b16ea5901bb774b3a3db71a92c08b50247172c581240121ad4831ea57daf71b2dee
1+
00005e000102804e702c4b28080055040010a2b7400141070e87e4138ec18c406b16ea5901bb774b3a3db71a92c08b50247172c581240121ad4831ea57daf71b2dee

‎Tests/Packet++Test/PacketExamples/nflogPacket.dat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0200002a080001000000030005000a0000000000080005000000000208000b000000000008000e0000000000410009004500003d021040004011208f0a00020f0a000203a542003500294156c04e0100000100000000000003777777076578616d706c65036e657400000100012f0a31
1+
0200002a080001000000030005000a0000000000080005000000000208000b000000000008000e0000000000410009004500003d021040004011208f0a00020f0a000203a542003500294156c04e0100000100000000000003777777076578616d706c65036e657400000100012f0a31

‎Tests/Packet++Test/PacketExamples/ssl-malformed1.dat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
30f70d4883a2f04f7c6be7070800450000e12bc0400040064b8dc0a843c60c91b1ca9d8701bb71d79c6561687c3d501839085829000016030100b4010000b0030251a91820c5e11bd04287eb7311ab99d9bc3563a2d47e3e60f68e8855938a5f11000044c014c00ac022c02100390038c00fc0050035c012c008c01cc01b00160013c00dc003000ac013c009c01fc01e00330032c00ec004002fc011c007c00cc0020005000400ff0100004300000001010000fffcfc6562352e736563757265696e7465726e657462616e6b2e636f6d000b00020100000a0008000600190018001700230000000f00010133740000
1+
30f70d4883a2f04f7c6be7070800450000e12bc0400040064b8dc0a843c60c91b1ca9d8701bb71d79c6561687c3d501839085829000016030100b4010000b0030251a91820c5e11bd04287eb7311ab99d9bc3563a2d47e3e60f68e8855938a5f11000044c014c00ac022c02100390038c00fc0050035c012c008c01cc01b00160013c00dc003000ac013c009c01fc01e00330032c00ec004002fc011c007c00cc0020005000400ff0100004300000001010000fffcfc6562352e736563757265696e7465726e657462616e6b2e636f6d000b00020100000a0008000600190018001700230000000f00010133740000

‎Tests/Packet++Test/Tests/BgpTests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
#include "BgpLayer.h"
99
#include "SystemUtils.h"
1010

11+
using pcpp_tests::utils::createPacketFromHexResource;
12+
1113
PTF_TEST_CASE(BgpLayerParsingTest)
1214
{
13-
using pcpp_tests::utils::createPacketFromHexResource;
14-
1515
auto rawPacket1 = createPacketFromHexResource("PacketExamples/Bgp_keepalive.dat");
1616
auto rawPacket2 = createPacketFromHexResource("PacketExamples/Bgp_open.dat");
1717
auto rawPacket3 = createPacketFromHexResource("PacketExamples/Bgp_notification.dat");

‎Tests/Packet++Test/Tests/CiscoHdlcTests.cpp‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,19 @@
66
#include "IPv6Layer.h"
77
#include "SystemUtils.h"
88

9+
using pcpp_tests::utils::createPacketFromHexResource;
10+
911
PTF_TEST_CASE(CiscoHdlcParsingTest)
1012
{
1113
timeval time;
1214
gettimeofday(&time, nullptr);
1315

16+
pcpp_tests::utils::PacketFactory packetFactory(pcpp::LINKTYPE_C_HDLC);
17+
1418
{
15-
READ_FILE_AND_CREATE_PACKET_LINKTYPE(1, "PacketExamples/CiscoHDLC-IPv4.dat", pcpp::LINKTYPE_C_HDLC);
19+
auto rawPacket1 = createPacketFromHexResource("PacketExamples/CiscoHDLC-IPv4.dat", packetFactory);
1620

17-
const pcpp::Packet ciscoHdlcPacket(&rawPacket1);
21+
const pcpp::Packet ciscoHdlcPacket(rawPacket1.get());
1822

1923
PTF_ASSERT_TRUE(ciscoHdlcPacket.isPacketOfType(pcpp::CiscoHDLC));
2024
const auto ciscoHdlcLayer = ciscoHdlcPacket.getLayerOfType<pcpp::CiscoHdlcLayer>();
@@ -28,9 +32,9 @@ PTF_TEST_CASE(CiscoHdlcParsingTest)
2832
}
2933

3034
{
31-
READ_FILE_AND_CREATE_PACKET_LINKTYPE(1, "PacketExamples/CiscoHDLC-IPv6.dat", pcpp::LINKTYPE_C_HDLC);
35+
auto rawPacket1 = createPacketFromHexResource("PacketExamples/CiscoHDLC-IPv6.dat", packetFactory);
3236

33-
const pcpp::Packet ciscoHdlcPacket(&rawPacket1);
37+
const pcpp::Packet ciscoHdlcPacket(rawPacket1.get());
3438

3539
PTF_ASSERT_TRUE(ciscoHdlcPacket.isPacketOfType(pcpp::CiscoHDLC));
3640
const auto ciscoHdlcLayer = ciscoHdlcPacket.getLayerOfType<pcpp::CiscoHdlcLayer>();
@@ -41,9 +45,9 @@ PTF_TEST_CASE(CiscoHdlcParsingTest)
4145
}
4246

4347
{
44-
READ_FILE_AND_CREATE_PACKET_LINKTYPE(1, "PacketExamples/CiscoHDLC-SLARP.dat", pcpp::LINKTYPE_C_HDLC);
48+
auto rawPacket1 = createPacketFromHexResource("PacketExamples/CiscoHDLC-SLARP.dat", packetFactory);
4549

46-
const pcpp::Packet ciscoHdlcPacket(&rawPacket1);
50+
const pcpp::Packet ciscoHdlcPacket(rawPacket1.get());
4751

4852
PTF_ASSERT_TRUE(ciscoHdlcPacket.isPacketOfType(pcpp::CiscoHDLC));
4953
const auto ciscoHdlcLayer = ciscoHdlcPacket.getLayerOfType<pcpp::CiscoHdlcLayer>();
@@ -70,8 +74,7 @@ PTF_TEST_CASE(CiscoHdlcParsingTest)
7074

7175
PTF_TEST_CASE(CiscoHdlcLayerCreationTest)
7276
{
73-
timeval time;
74-
gettimeofday(&time, nullptr);
77+
pcpp_tests::utils::PacketFactory packetFactory(pcpp::LINKTYPE_C_HDLC);
7578

7679
{
7780
pcpp::CiscoHdlcLayer newHdlcLayer(pcpp::CiscoHdlcLayer::AddressType::Unicast);
@@ -82,9 +85,9 @@ PTF_TEST_CASE(CiscoHdlcLayerCreationTest)
8285
newHdlcPacket.addLayer(&ipv4Layer);
8386
newHdlcPacket.computeCalculateFields();
8487

85-
READ_FILE_AND_CREATE_PACKET_LINKTYPE(1, "PacketExamples/CiscoHDLC-IPv4.dat", pcpp::LINKTYPE_C_HDLC);
88+
auto rawPacket1 = createPacketFromHexResource("PacketExamples/CiscoHDLC-IPv4.dat", packetFactory);
8689

87-
const pcpp::Packet hdlcPacket(&rawPacket1);
90+
const pcpp::Packet hdlcPacket(rawPacket1.get());
8891

8992
const auto hdlcLayer = hdlcPacket.getLayerOfType<pcpp::CiscoHdlcLayer>();
9093
PTF_ASSERT_NOT_NULL(hdlcLayer);
@@ -105,9 +108,9 @@ PTF_TEST_CASE(CiscoHdlcLayerCreationTest)
105108
newHdlcPacket.addLayer(&ipv6Layer);
106109
newHdlcPacket.computeCalculateFields();
107110

108-
READ_FILE_AND_CREATE_PACKET_LINKTYPE(1, "PacketExamples/CiscoHDLC-IPv6.dat", pcpp::LINKTYPE_C_HDLC);
111+
auto rawPacket1 = createPacketFromHexResource("PacketExamples/CiscoHDLC-IPv6.dat", packetFactory);
109112

110-
const pcpp::Packet hdlcPacket(&rawPacket1);
113+
const pcpp::Packet hdlcPacket(rawPacket1.get());
111114

112115
const auto hdlcLayer = hdlcPacket.getLayerOfType<pcpp::CiscoHdlcLayer>();
113116
PTF_ASSERT_NOT_NULL(hdlcLayer);

‎Tests/Packet++Test/Tests/CotpTests.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66

77
using namespace std;
88

9+
using pcpp_tests::utils::createPacketFromHexResource;
10+
911
PTF_TEST_CASE(CotpLayerTest)
1012
{
11-
timeval time;
12-
gettimeofday(&time, nullptr);
13-
14-
READ_FILE_AND_CREATE_PACKET(1, "PacketExamples/tpkt_cotp.dat");
13+
auto rawPacket1 = createPacketFromHexResource("PacketExamples/tpkt_cotp.dat");
1514

16-
pcpp::Packet cotpPacket(&rawPacket1);
15+
pcpp::Packet cotpPacket(rawPacket1.get());
1716
PTF_ASSERT_TRUE(cotpPacket.isPacketOfType(pcpp::COTP));
1817
auto cotpLayer = cotpPacket.getLayerOfType<pcpp::CotpLayer>();
1918
PTF_ASSERT_NOT_NULL(cotpLayer);

‎Tests/Packet++Test/Tests/DhcpTests.cpp‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
#include "UdpLayer.h"
99
#include "SystemUtils.h"
1010

11+
using pcpp_tests::utils::createPacketFromHexResource;
12+
1113
PTF_TEST_CASE(DhcpParsingTest)
1214
{
13-
timeval time;
14-
gettimeofday(&time, nullptr);
15-
16-
READ_FILE_AND_CREATE_PACKET(1, "PacketExamples/Dhcp1.dat");
15+
auto rawPacket1 = createPacketFromHexResource("PacketExamples/Dhcp1.dat");
1716

18-
pcpp::Packet dhcpPacket(&rawPacket1);
17+
pcpp::Packet dhcpPacket(rawPacket1.get());
1918
PTF_ASSERT_TRUE(dhcpPacket.isPacketOfType(pcpp::DHCP));
2019
pcpp::DhcpLayer* dhcpLayer = dhcpPacket.getLayerOfType<pcpp::DhcpLayer>();
2120
PTF_ASSERT_NOT_NULL(dhcpLayer);
@@ -73,9 +72,9 @@ PTF_TEST_CASE(DhcpParsingTest)
7372

7473
PTF_ASSERT_EQUAL(dhcpLayer->getMessageType(), pcpp::DHCP_OFFER, enum);
7574

76-
READ_FILE_AND_CREATE_PACKET(2, "PacketExamples/Dhcp2.dat");
75+
auto rawPacket2 = createPacketFromHexResource("PacketExamples/Dhcp2.dat");
7776

78-
pcpp::Packet dhcpPacket2(&rawPacket2);
77+
pcpp::Packet dhcpPacket2(rawPacket2.get());
7978

8079
dhcpLayer = dhcpPacket2.getLayerOfType<pcpp::DhcpLayer>();
8180
PTF_ASSERT_NOT_NULL(dhcpLayer);
@@ -220,12 +219,11 @@ PTF_TEST_CASE(DhcpCreationTest)
220219

221220
PTF_TEST_CASE(DhcpEditTest)
222221
{
223-
timeval time;
224-
gettimeofday(&time, nullptr);
222+
using pcpp_tests::utils::createPacketFromHexResource;
225223

226-
READ_FILE_AND_CREATE_PACKET(1, "PacketExamples/Dhcp4.dat");
224+
auto rawPacket1 = createPacketFromHexResource("PacketExamples/Dhcp4.dat");
227225

228-
pcpp::Packet dhcpPacket(&rawPacket1);
226+
pcpp::Packet dhcpPacket(rawPacket1.get());
229227

230228
pcpp::DhcpLayer* dhcpLayer = dhcpPacket.getLayerOfType<pcpp::DhcpLayer>();
231229

0 commit comments

Comments
 (0)