Skip to content

Commit cf2b617

Browse files
Dimi1010Dimi1010
authored
Partial tests update to use the new resource system - Part 3 (#1944)
* Update Vrrp tests. * Add new utility function for loading hex resource. * Update usages of READ_FILE_INTO_BUFFER. * Lint * Updated GTP tests and http tests.
1 parent e3f4199 commit cf2b617

20 files changed

+203
-255
lines changed

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,10 @@ PTF_TEST_CASE(DhcpCreationTest)
209209

210210
newPacket.computeCalculateFields();
211211

212-
READ_FILE_INTO_BUFFER(1, "PacketExamples/Dhcp1.dat");
212+
auto resource1 = pcpp_tests::loadHexResourceToVector("PacketExamples/Dhcp1.dat");
213213

214-
PTF_ASSERT_EQUAL(newPacket.getRawPacket()->getRawDataLen(), bufferLength1);
215-
PTF_ASSERT_BUF_COMPARE(newPacket.getRawPacket()->getRawData(), buffer1, bufferLength1);
216-
217-
delete[] buffer1;
214+
PTF_ASSERT_EQUAL(newPacket.getRawPacket()->getRawDataLen(), resource1.size());
215+
PTF_ASSERT_BUF_COMPARE(newPacket.getRawPacket()->getRawData(), resource1.data(), resource1.size());
218216
} // DhcpCreationTest
219217

220218
PTF_TEST_CASE(DhcpEditTest)
@@ -253,12 +251,10 @@ PTF_TEST_CASE(DhcpEditTest)
253251

254252
dhcpPacket.computeCalculateFields();
255253

256-
READ_FILE_INTO_BUFFER(2, "PacketExamples/Dhcp3.dat");
257-
258-
PTF_ASSERT_EQUAL(dhcpPacket.getRawPacket()->getRawDataLen(), bufferLength2);
259-
PTF_ASSERT_BUF_COMPARE(dhcpPacket.getRawPacket()->getRawData(), buffer2, bufferLength2);
254+
auto resource2 = pcpp_tests::loadHexResourceToVector("PacketExamples/Dhcp3.dat");
260255

261-
delete[] buffer2;
256+
PTF_ASSERT_EQUAL(dhcpPacket.getRawPacket()->getRawDataLen(), resource2.size());
257+
PTF_ASSERT_BUF_COMPARE(dhcpPacket.getRawPacket()->getRawData(), resource2.data(), resource2.size());
262258

263259
PTF_ASSERT_TRUE(dhcpLayer->removeAllOptions());
264260

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ PTF_TEST_CASE(EthDot3LayerParsingTest)
279279

280280
PTF_TEST_CASE(EthDot3LayerCreateEditTest)
281281
{
282-
READ_FILE_INTO_BUFFER(1, "PacketExamples/EthDot3.dat");
283-
READ_FILE_INTO_BUFFER(2, "PacketExamples/EthDot3_2.dat");
282+
auto resource1 = pcpp_tests::loadHexResourceToVector("PacketExamples/EthDot3.dat");
283+
auto resource2 = pcpp_tests::loadHexResourceToVector("PacketExamples/EthDot3_2.dat");
284284

285285
// create a new EthDot3 packet
286286

@@ -297,7 +297,7 @@ PTF_TEST_CASE(EthDot3LayerCreateEditTest)
297297
PTF_ASSERT_TRUE(newEthDot3Packet.addLayer(&newPayloadLayer));
298298
newEthDot3Packet.computeCalculateFields();
299299

300-
PTF_ASSERT_BUF_COMPARE(newEthDot3Packet.getRawPacket()->getRawData(), buffer1, bufferLength1);
300+
PTF_ASSERT_BUF_COMPARE(newEthDot3Packet.getRawPacket()->getRawData(), resource1.data(), resource1.size());
301301

302302
// edit an EthDot3 packet
303303

@@ -311,9 +311,6 @@ PTF_TEST_CASE(EthDot3LayerCreateEditTest)
311311
PTF_ASSERT_TRUE(newEthDot3Packet.addLayer(newPayloadLayer2, true));
312312
newEthDot3Packet.computeCalculateFields();
313313

314-
PTF_ASSERT_BUF_COMPARE(newEthDot3Packet.getRawPacket()->getRawData(), buffer2, bufferLength2);
315-
316-
delete[] buffer1;
317-
delete[] buffer2;
314+
PTF_ASSERT_BUF_COMPARE(newEthDot3Packet.getRawPacket()->getRawData(), resource2.data(), resource2.size());
318315

319316
} // EthDot3LayerCreateEditTest

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ PTF_TEST_CASE(GreParsingTest)
157157

158158
PTF_TEST_CASE(GreCreationTest)
159159
{
160-
READ_FILE_INTO_BUFFER(1, "PacketExamples/GREv1_3.dat");
161-
READ_FILE_INTO_BUFFER(2, "PacketExamples/GREv0_3.dat");
160+
auto resource1 = pcpp_tests::loadHexResourceToVector("PacketExamples/GREv1_3.dat");
161+
auto resource2 = pcpp_tests::loadHexResourceToVector("PacketExamples/GREv0_3.dat");
162162

163163
// GREv1 packet creation
164164

@@ -187,8 +187,8 @@ PTF_TEST_CASE(GreCreationTest)
187187

188188
grev1Packet.computeCalculateFields();
189189

190-
PTF_ASSERT_EQUAL(grev1Packet.getRawPacket()->getRawDataLen(), bufferLength1);
191-
PTF_ASSERT_BUF_COMPARE(grev1Packet.getRawPacket()->getRawData(), buffer1, bufferLength1);
190+
PTF_ASSERT_EQUAL(grev1Packet.getRawPacket()->getRawDataLen(), resource1.size());
191+
PTF_ASSERT_BUF_COMPARE(grev1Packet.getRawPacket()->getRawData(), resource1.data(), resource1.size());
192192

193193
// GREv0 packet creation
194194

@@ -213,11 +213,9 @@ PTF_TEST_CASE(GreCreationTest)
213213
PTF_ASSERT_TRUE(grev0Packet.addLayer(&grev0Layer2));
214214
grev0Packet.computeCalculateFields();
215215

216-
PTF_ASSERT_EQUAL(grev0Packet.getRawPacket()->getRawDataLen(), bufferLength2);
217-
PTF_ASSERT_BUF_COMPARE(grev0Packet.getRawPacket()->getRawData(), buffer2, bufferLength2);
216+
PTF_ASSERT_EQUAL(grev0Packet.getRawPacket()->getRawDataLen(), resource2.size());
217+
PTF_ASSERT_BUF_COMPARE(grev0Packet.getRawPacket()->getRawData(), resource2.data(), resource2.size());
218218

219-
delete[] buffer1;
220-
delete[] buffer2;
221219
} // GreCreationTest
222220

223221
PTF_TEST_CASE(GreEditTest)

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ PTF_TEST_CASE(GtpV1LayerCreationTest)
249249
PTF_TEST_CASE(GtpV1LayerEditTest)
250250
{
251251
auto rawPacket1 = createPacketFromHexResource("PacketExamples/gtp-u-ipv6.dat");
252-
READ_FILE_INTO_BUFFER(2, "PacketExamples/gtp-u-ipv6-edited.dat");
252+
auto resource2 = pcpp_tests::loadHexResourceToVector("PacketExamples/gtp-u-ipv6-edited.dat");
253253

254254
pcpp::Packet gtpPacket1(rawPacket1.get());
255255

@@ -289,11 +289,10 @@ PTF_TEST_CASE(GtpV1LayerEditTest)
289289

290290
gtpPacket1.computeCalculateFields();
291291

292-
PTF_ASSERT_EQUAL(bufferLength2, gtpPacket1.getRawPacket()->getRawDataLen());
293-
PTF_ASSERT_BUF_COMPARE(gtpPacket1.getRawPacket()->getRawData(), buffer2,
292+
PTF_ASSERT_EQUAL(resource2.size(), gtpPacket1.getRawPacket()->getRawDataLen());
293+
PTF_ASSERT_BUF_COMPARE(gtpPacket1.getRawPacket()->getRawData(), resource2.data(),
294294
gtpPacket1.getRawPacket()->getRawDataLen());
295295

296-
delete[] buffer2;
297296
} // GtpLayerEditTest
298297

299298
PTF_TEST_CASE(GtpV2LayerParsingTest)

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,16 +182,13 @@ PTF_TEST_CASE(HttpRequestLayerEditTest)
182182
PTF_ASSERT_NOT_NULL(userAgentField);
183183
httpReqLayer->insertField(userAgentField, PCPP_HTTP_REFERER_FIELD, "http://www.ynet.co.il/home/0,7340,L-8,00.html");
184184

185-
READ_FILE_INTO_BUFFER(2, "PacketExamples/TwoHttpRequests2.dat");
185+
auto resource2 = pcpp_tests::loadHexResourceToVector("PacketExamples/TwoHttpRequests2.dat");
186186

187-
PTF_ASSERT_EQUAL(bufferLength2, httpRequest.getRawPacket()->getRawDataLen());
187+
PTF_ASSERT_EQUAL(resource2.size(), httpRequest.getRawPacket()->getRawDataLen());
188188

189189
httpRequest.computeCalculateFields();
190190

191-
PTF_ASSERT_BUF_COMPARE(buffer2, httpRequest.getRawPacket()->getRawData(), bufferLength2);
192-
193-
delete[] buffer2;
194-
191+
PTF_ASSERT_BUF_COMPARE(resource2.data(), httpRequest.getRawPacket()->getRawData(), resource2.size());
195192
} // HttpRequestLayerEditTest
196193

197194
PTF_TEST_CASE(HttpResponseParseStatusCodeTest)

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

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -325,19 +325,19 @@ PTF_TEST_CASE(IPv4OptionsParsingTest)
325325
PTF_TEST_CASE(IPv4OptionsEditTest)
326326
{
327327
auto rawPacket1 = createPacketFromHexResource("PacketExamples/IPv4-NoOptions1.dat");
328-
READ_FILE_INTO_BUFFER(11, "PacketExamples/IPv4Option1.dat");
328+
auto resource11 = pcpp_tests::loadHexResourceToVector("PacketExamples/IPv4Option1.dat");
329329
auto rawPacket2 = createPacketFromHexResource("PacketExamples/IPv4-NoOptions2.dat");
330-
READ_FILE_INTO_BUFFER(22, "PacketExamples/IPv4Option2.dat");
330+
auto resource22 = pcpp_tests::loadHexResourceToVector("PacketExamples/IPv4Option2.dat");
331331
auto rawPacket3 = createPacketFromHexResource("PacketExamples/IPv4-NoOptions3.dat");
332-
READ_FILE_INTO_BUFFER(33, "PacketExamples/IPv4Option3.dat");
332+
auto resource33 = pcpp_tests::loadHexResourceToVector("PacketExamples/IPv4Option3.dat");
333333
auto rawPacket4 = createPacketFromHexResource("PacketExamples/IPv4-NoOptions4.dat");
334-
READ_FILE_INTO_BUFFER(44, "PacketExamples/IPv4Option4.dat");
334+
auto resource44 = pcpp_tests::loadHexResourceToVector("PacketExamples/IPv4Option4.dat");
335335
auto rawPacket5 = createPacketFromHexResource("PacketExamples/IPv4-NoOptions5.dat");
336-
READ_FILE_INTO_BUFFER(55, "PacketExamples/IPv4Option5.dat");
336+
auto resource55 = pcpp_tests::loadHexResourceToVector("PacketExamples/IPv4Option5.dat");
337337
auto rawPacket6 = createPacketFromHexResource("PacketExamples/IPv4-NoOptions6.dat");
338-
READ_FILE_INTO_BUFFER(66, "PacketExamples/IPv4Option6.dat");
338+
auto resource66 = pcpp_tests::loadHexResourceToVector("PacketExamples/IPv4Option6.dat");
339339
auto rawPacket7 = createPacketFromHexResource("PacketExamples/IPv4-NoOptions7.dat");
340-
READ_FILE_INTO_BUFFER(77, "PacketExamples/IPv4Option7.dat");
340+
auto resource77 = pcpp_tests::loadHexResourceToVector("PacketExamples/IPv4Option7.dat");
341341

342342
pcpp::Packet ipOpt1(rawPacket1.get());
343343
pcpp::Packet ipOpt2(rawPacket2.get());
@@ -358,8 +358,9 @@ PTF_TEST_CASE(IPv4OptionsEditTest)
358358
// clang-format on
359359
ipOpt1.computeCalculateFields();
360360

361-
PTF_ASSERT_EQUAL(ipOpt1.getRawPacket()->getRawDataLen(), bufferLength11);
362-
PTF_ASSERT_BUF_COMPARE(ipOpt1.getRawPacket()->getRawData(), buffer11, ipOpt1.getRawPacket()->getRawDataLen());
361+
PTF_ASSERT_EQUAL(ipOpt1.getRawPacket()->getRawDataLen(), resource11.size());
362+
PTF_ASSERT_BUF_COMPARE(ipOpt1.getRawPacket()->getRawData(), resource11.data(),
363+
ipOpt1.getRawPacket()->getRawDataLen());
363364

364365
ipLayer = ipOpt2.getLayerOfType<pcpp::IPv4Layer>();
365366
pcpp::IPv4TimestampOptionValue tsOption;
@@ -371,16 +372,18 @@ PTF_TEST_CASE(IPv4OptionsEditTest)
371372
}
372373
PTF_ASSERT_FALSE(ipLayer->addOption(pcpp::IPv4OptionBuilder(tsOption)).isNull());
373374
ipOpt2.computeCalculateFields();
374-
PTF_ASSERT_EQUAL(ipOpt2.getRawPacket()->getRawDataLen(), bufferLength22);
375-
PTF_ASSERT_BUF_COMPARE(ipOpt2.getRawPacket()->getRawData(), buffer22, ipOpt2.getRawPacket()->getRawDataLen());
375+
PTF_ASSERT_EQUAL(ipOpt2.getRawPacket()->getRawDataLen(), resource22.size());
376+
PTF_ASSERT_BUF_COMPARE(ipOpt2.getRawPacket()->getRawData(), resource22.data(),
377+
ipOpt2.getRawPacket()->getRawDataLen());
376378

377379
ipLayer = ipOpt3.getLayerOfType<pcpp::IPv4Layer>();
378380
uint16_t routerAlerVal = 0;
379381
PTF_ASSERT_FALSE(
380382
ipLayer->addOption(pcpp::IPv4OptionBuilder(pcpp::IPV4OPT_RouterAlert, (uint16_t)routerAlerVal)).isNull());
381383
ipOpt3.computeCalculateFields();
382-
PTF_ASSERT_EQUAL(ipOpt3.getRawPacket()->getRawDataLen(), bufferLength33);
383-
PTF_ASSERT_BUF_COMPARE(ipOpt3.getRawPacket()->getRawData(), buffer33, ipOpt3.getRawPacket()->getRawDataLen());
384+
PTF_ASSERT_EQUAL(ipOpt3.getRawPacket()->getRawDataLen(), resource33.size());
385+
PTF_ASSERT_BUF_COMPARE(ipOpt3.getRawPacket()->getRawData(), resource33.data(),
386+
ipOpt3.getRawPacket()->getRawDataLen());
384387

385388
ipLayer = ipOpt4.getLayerOfType<pcpp::IPv4Layer>();
386389
std::vector<pcpp::IPv4Address> ipListValue;
@@ -392,8 +395,9 @@ PTF_TEST_CASE(IPv4OptionsEditTest)
392395
PTF_ASSERT_FALSE(ipLayer->addOption(pcpp::IPv4OptionBuilder(pcpp::IPV4OPT_RecordRoute, ipListValue)).isNull());
393396
PTF_ASSERT_FALSE(ipLayer->addOption(pcpp::IPv4OptionBuilder(pcpp::IPV4OPT_EndOfOptionsList, nullptr, 0)).isNull());
394397
ipOpt4.computeCalculateFields();
395-
PTF_ASSERT_EQUAL(ipOpt4.getRawPacket()->getRawDataLen(), bufferLength44);
396-
PTF_ASSERT_BUF_COMPARE(ipOpt4.getRawPacket()->getRawData(), buffer44, ipOpt4.getRawPacket()->getRawDataLen());
398+
PTF_ASSERT_EQUAL(ipOpt4.getRawPacket()->getRawDataLen(), resource44.size());
399+
PTF_ASSERT_BUF_COMPARE(ipOpt4.getRawPacket()->getRawData(), resource44.data(),
400+
ipOpt4.getRawPacket()->getRawDataLen());
397401

398402
ipLayer = ipOpt5.getLayerOfType<pcpp::IPv4Layer>();
399403
tsOption.clear();
@@ -424,8 +428,9 @@ PTF_TEST_CASE(IPv4OptionsEditTest)
424428
PTF_ASSERT_EQUAL(tsOption.ipAddresses.size(), 3);
425429
PTF_ASSERT_EQUAL(tsOption.ipAddresses.at(2), pcpp::IPv4Address("10.0.0.138"));
426430
ipOpt5.computeCalculateFields();
427-
PTF_ASSERT_EQUAL(ipOpt5.getRawPacket()->getRawDataLen(), bufferLength55);
428-
PTF_ASSERT_BUF_COMPARE(ipOpt5.getRawPacket()->getRawData(), buffer55, ipOpt5.getRawPacket()->getRawDataLen());
431+
PTF_ASSERT_EQUAL(ipOpt5.getRawPacket()->getRawDataLen(), resource55.size());
432+
PTF_ASSERT_BUF_COMPARE(ipOpt5.getRawPacket()->getRawData(), resource55.data(),
433+
ipOpt5.getRawPacket()->getRawDataLen());
429434

430435
ipLayer = ipOpt6.getLayerOfType<pcpp::IPv4Layer>();
431436
ipListValue.clear();
@@ -441,17 +446,19 @@ PTF_TEST_CASE(IPv4OptionsEditTest)
441446
PTF_ASSERT_EQUAL(optData.getIPv4OptionType(), pcpp::IPV4OPT_NOP, enum);
442447
PTF_ASSERT_EQUAL(optData.getTotalSize(), 1);
443448
ipOpt6.computeCalculateFields();
444-
PTF_ASSERT_EQUAL(ipOpt6.getRawPacket()->getRawDataLen(), bufferLength66);
445-
PTF_ASSERT_BUF_COMPARE(ipOpt6.getRawPacket()->getRawData(), buffer66, ipOpt6.getRawPacket()->getRawDataLen());
449+
PTF_ASSERT_EQUAL(ipOpt6.getRawPacket()->getRawDataLen(), resource66.size());
450+
PTF_ASSERT_BUF_COMPARE(ipOpt6.getRawPacket()->getRawData(), resource66.data(),
451+
ipOpt6.getRawPacket()->getRawDataLen());
446452

447453
ipLayer = ipOpt7.getLayerOfType<pcpp::IPv4Layer>();
448454
PTF_ASSERT_FALSE(ipLayer->addOption(pcpp::IPv4OptionBuilder(pcpp::IPV4OPT_NOP, nullptr, 0)).isNull());
449455
ipListValue.clear();
450456
ipListValue.push_back(pcpp::IPv4Address::Zero);
451457
PTF_ASSERT_FALSE(ipLayer->addOption(pcpp::IPv4OptionBuilder(pcpp::IPV4OPT_LooseSourceRoute, ipListValue)).isNull());
452458
ipOpt7.computeCalculateFields();
453-
PTF_ASSERT_EQUAL(ipOpt7.getRawPacket()->getRawDataLen(), bufferLength77);
454-
PTF_ASSERT_BUF_COMPARE(ipOpt7.getRawPacket()->getRawData(), buffer77, ipOpt7.getRawPacket()->getRawDataLen());
459+
PTF_ASSERT_EQUAL(ipOpt7.getRawPacket()->getRawDataLen(), resource77.size());
460+
PTF_ASSERT_BUF_COMPARE(ipOpt7.getRawPacket()->getRawData(), resource77.data(),
461+
ipOpt7.getRawPacket()->getRawDataLen());
455462
PTF_ASSERT_EQUAL(ipLayer->getOptionCount(), 2);
456463

457464
tsOption.clear();
@@ -485,22 +492,15 @@ PTF_TEST_CASE(IPv4OptionsEditTest)
485492
PTF_ASSERT_TRUE(ipLayer->removeOption(pcpp::IPV4OPT_Timestamp));
486493
PTF_ASSERT_EQUAL(ipLayer->getOptionCount(), 2);
487494
ipOpt7.computeCalculateFields();
488-
PTF_ASSERT_EQUAL(ipOpt7.getRawPacket()->getRawDataLen(), bufferLength77);
489-
PTF_ASSERT_BUF_COMPARE(ipOpt7.getRawPacket()->getRawData(), buffer77, ipOpt7.getRawPacket()->getRawDataLen());
495+
PTF_ASSERT_EQUAL(ipOpt7.getRawPacket()->getRawDataLen(), resource77.size());
496+
PTF_ASSERT_BUF_COMPARE(ipOpt7.getRawPacket()->getRawData(), resource77.data(),
497+
ipOpt7.getRawPacket()->getRawDataLen());
490498

491499
PTF_ASSERT_TRUE(ipLayer->removeAllOptions());
492500
ipOpt7.computeCalculateFields();
493501
PTF_ASSERT_EQUAL(ipOpt7.getRawPacketReadOnly()->getRawDataLen(), 42);
494502
ipLayer = ipOpt7.getLayerOfType<pcpp::IPv4Layer>();
495503
PTF_ASSERT_EQUAL(ipLayer->getOptionCount(), 0);
496-
497-
delete[] buffer11;
498-
delete[] buffer22;
499-
delete[] buffer33;
500-
delete[] buffer44;
501-
delete[] buffer55;
502-
delete[] buffer66;
503-
delete[] buffer77;
504504
} // Ipv4OptionsEditTest
505505

506506
PTF_TEST_CASE(IPv4UdpChecksum)

0 commit comments

Comments
 (0)