Skip to content

Commit afdf4ea

Browse files
tony-josi-awstony-josi-aws
committed
Fix IPv4 and IPv4 diff config unit tests
1 parent 8f21df8 commit afdf4ea

File tree

2 files changed

+14
-53
lines changed

2 files changed

+14
-53
lines changed

‎test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c‎

Lines changed: 14 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ void test_prvAllowIPPacketIPv4_NotMatchingIP( void )
252252

253253
pxNetworkBuffer = &xNetworkBuffer;
254254
pxNetworkBuffer->pucEthernetBuffer = ucEthBuffer;
255-
pxNetworkBuffer->pxEndPoint = NULL;
255+
pxNetworkBuffer->pxEndPoint = &xEndpoint;
256256
pxIPPacket = ( IPPacket_t * ) pxNetworkBuffer->pucEthernetBuffer;
257257
pxIPHeader = &( pxIPPacket->xIPHeader );
258258

@@ -261,8 +261,6 @@ void test_prvAllowIPPacketIPv4_NotMatchingIP( void )
261261
pxIPHeader->ucVersionHeaderLength = 0x45;
262262
pxIPHeader->ulDestinationIPAddress = pxEndpoint->ipv4_settings.ulIPAddress + 1;
263263

264-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
265-
266264
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
267265

268266
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -299,8 +297,6 @@ void test_prvAllowIPPacketIPv4_SourceIPBrdCast_DestIPMatch( void )
299297

300298
pxIPHeader->ulSourceIPAddress = 0xFFFFFFFF;
301299

302-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( pxEndpoint ); /* From prvAllowIPPacketIPv4() */
303-
304300
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
305301

306302
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -327,7 +323,7 @@ void test_prvAllowIPPacketIPv4_SourceIPBrdCast_DestIPBrdCast( void )
327323

328324
pxNetworkBuffer = &xNetworkBuffer;
329325
pxNetworkBuffer->pucEthernetBuffer = ucEthBuffer;
330-
pxNetworkBuffer->pxEndPoint = NULL;
326+
pxNetworkBuffer->pxEndPoint = pxEndpoint;
331327
pxIPPacket = ( IPPacket_t * ) pxNetworkBuffer->pucEthernetBuffer;
332328
pxIPHeader = &( pxIPPacket->xIPHeader );
333329

@@ -339,8 +335,6 @@ void test_prvAllowIPPacketIPv4_SourceIPBrdCast_DestIPBrdCast( void )
339335
pxIPHeader->ulSourceIPAddress = 0xFFFFFFFF;
340336

341337

342-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
343-
344338
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
345339

346340
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -366,7 +360,7 @@ void test_prvAllowIPPacketIPv4_SourceIPBrdCast_DestIPLLMNR( void )
366360
memset( pxEndpoint, 0, sizeof( NetworkEndPoint_t ) );
367361

368362
pxNetworkBuffer = &xNetworkBuffer;
369-
pxNetworkBuffer->pxEndPoint = NULL;
363+
pxNetworkBuffer->pxEndPoint = pxEndpoint;
370364
pxNetworkBuffer->pucEthernetBuffer = ucEthBuffer;
371365
pxIPPacket = ( IPPacket_t * ) pxNetworkBuffer->pucEthernetBuffer;
372366
pxIPHeader = &( pxIPPacket->xIPHeader );
@@ -379,8 +373,6 @@ void test_prvAllowIPPacketIPv4_SourceIPBrdCast_DestIPLLMNR( void )
379373
pxIPHeader->ulSourceIPAddress = 0xFFFFFFFF;
380374

381375

382-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
383-
384376
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
385377

386378
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -400,12 +392,13 @@ void test_prvAllowIPPacketIPv4_SourceIPBrdCast_NoLocalIP( void )
400392
UBaseType_t uxHeaderLength = 0;
401393
uint8_t ucEthBuffer[ ipconfigTCP_MSS ];
402394
IPHeader_t * pxIPHeader;
395+
NetworkEndPoint_t xEndpoint;
403396

404397
memset( ucEthBuffer, 0, ipconfigTCP_MSS );
405398

406399
pxNetworkBuffer = &xNetworkBuffer;
407400
pxNetworkBuffer->pucEthernetBuffer = ucEthBuffer;
408-
pxNetworkBuffer->pxEndPoint = NULL;
401+
pxNetworkBuffer->pxEndPoint = &xEndpoint;
409402
pxIPPacket = ( IPPacket_t * ) pxNetworkBuffer->pucEthernetBuffer;
410403
pxIPHeader = &( pxIPPacket->xIPHeader );
411404

@@ -414,9 +407,6 @@ void test_prvAllowIPPacketIPv4_SourceIPBrdCast_NoLocalIP( void )
414407

415408
pxIPHeader->ulSourceIPAddress = 0xFFFFFFFF;
416409

417-
418-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
419-
420410
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
421411

422412
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -436,12 +426,13 @@ void test_prvAllowIPPacketIPv4_DestMACBrdCast_DestIPUnicast( void )
436426
UBaseType_t uxHeaderLength = 0;
437427
uint8_t ucEthBuffer[ ipconfigTCP_MSS ];
438428
IPHeader_t * pxIPHeader;
429+
NetworkEndPoint_t xEndpoint;
439430

440431
memset( ucEthBuffer, 0, ipconfigTCP_MSS );
441432

442433
pxNetworkBuffer = &xNetworkBuffer;
443434
pxNetworkBuffer->pucEthernetBuffer = ucEthBuffer;
444-
pxNetworkBuffer->pxEndPoint = NULL;
435+
pxNetworkBuffer->pxEndPoint = &xEndpoint;
445436
pxIPPacket = ( IPPacket_t * ) pxNetworkBuffer->pucEthernetBuffer;
446437
pxIPHeader = &( pxIPPacket->xIPHeader );
447438

@@ -452,8 +443,6 @@ void test_prvAllowIPPacketIPv4_DestMACBrdCast_DestIPUnicast( void )
452443
memcpy( pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes, xBroadcastMACAddress.ucBytes, sizeof( MACAddress_t ) );
453444

454445

455-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
456-
457446
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
458447

459448
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -472,12 +461,13 @@ void test_prvAllowIPPacketIPv4_SrcMACBrdCast( void )
472461
UBaseType_t uxHeaderLength = 0;
473462
uint8_t ucEthBuffer[ ipconfigTCP_MSS ];
474463
IPHeader_t * pxIPHeader;
464+
NetworkEndPoint_t xEndpoint;
475465

476466
memset( ucEthBuffer, 0, ipconfigTCP_MSS );
477467

478468
pxNetworkBuffer = &xNetworkBuffer;
479469
pxNetworkBuffer->pucEthernetBuffer = ucEthBuffer;
480-
pxNetworkBuffer->pxEndPoint = NULL;
470+
pxNetworkBuffer->pxEndPoint = &xEndpoint;
481471
pxIPPacket = ( IPPacket_t * ) pxNetworkBuffer->pucEthernetBuffer;
482472
pxIPHeader = &( pxIPPacket->xIPHeader );
483473

@@ -488,8 +478,6 @@ void test_prvAllowIPPacketIPv4_SrcMACBrdCast( void )
488478
memcpy( pxIPPacket->xEthernetHeader.xSourceAddress.ucBytes, xBroadcastMACAddress.ucBytes, sizeof( MACAddress_t ) );
489479

490480

491-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
492-
493481
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
494482

495483
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -509,12 +497,13 @@ void test_prvAllowIPPacketIPv4_SrcMACBrdCastDestMACBrdCast( void )
509497
UBaseType_t uxHeaderLength = 0;
510498
uint8_t ucEthBuffer[ ipconfigTCP_MSS ];
511499
IPHeader_t * pxIPHeader;
500+
NetworkEndPoint_t xEndpoint;
512501

513502
memset( ucEthBuffer, 0, ipconfigTCP_MSS );
514503

515504
pxNetworkBuffer = &xNetworkBuffer;
516505
pxNetworkBuffer->pucEthernetBuffer = ucEthBuffer;
517-
pxNetworkBuffer->pxEndPoint = NULL;
506+
pxNetworkBuffer->pxEndPoint = &xEndpoint;
518507
pxIPPacket = ( IPPacket_t * ) pxNetworkBuffer->pucEthernetBuffer;
519508
pxIPHeader = &( pxIPPacket->xIPHeader );
520509

@@ -525,9 +514,6 @@ void test_prvAllowIPPacketIPv4_SrcMACBrdCastDestMACBrdCast( void )
525514
memcpy( pxIPPacket->xEthernetHeader.xSourceAddress.ucBytes, xBroadcastMACAddress.ucBytes, sizeof( MACAddress_t ) );
526515
memcpy( pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes, xBroadcastMACAddress.ucBytes, sizeof( MACAddress_t ) );
527516

528-
529-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
530-
531517
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
532518

533519
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -556,7 +542,7 @@ void test_prvAllowIPPacketIPv4_SrcIPAddrIsMulticast( void )
556542
pxNetworkBuffer->pucEthernetBuffer = ucEthBuffer;
557543
pxIPPacket = ( IPPacket_t * ) pxNetworkBuffer->pucEthernetBuffer;
558544
pxIPHeader = &( pxIPPacket->xIPHeader );
559-
pxNetworkBuffer->pxEndPoint = NULL;
545+
pxNetworkBuffer->pxEndPoint = &xEndpoint;
560546

561547
pxEndpoint->ipv4_settings.ulIPAddress = 0xFFFFFFFF;
562548

@@ -569,8 +555,6 @@ void test_prvAllowIPPacketIPv4_SrcIPAddrIsMulticast( void )
569555
pxIPHeader->ulSourceIPAddress = FreeRTOS_htonl( 0xE0000000 + 1 );
570556

571557

572-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
573-
574558
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
575559

576560
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -596,7 +580,7 @@ void test_prvAllowIPPacketIPv4_IncorrectChecksum( void )
596580

597581
pxNetworkBuffer = &xNetworkBuffer;
598582
pxNetworkBuffer->pucEthernetBuffer = ucEthBuffer;
599-
pxNetworkBuffer->pxEndPoint = NULL;
583+
pxNetworkBuffer->pxEndPoint = &xEndpoint;
600584
pxIPPacket = ( ( IPPacket_t * ) pxNetworkBuffer->pucEthernetBuffer );
601585
pxIPHeader = &( pxIPPacket->xIPHeader );
602586

@@ -610,9 +594,6 @@ void test_prvAllowIPPacketIPv4_IncorrectChecksum( void )
610594

611595
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
612596

613-
614-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
615-
616597
FreeRTOS_FindEndPointOnMAC_ExpectAnyArgsAndReturn( NULL );
617598

618599
usGenerateChecksum_ExpectAndReturn( 0U, ( uint8_t * ) &( pxIPHeader->ucVersionHeaderLength ), ( size_t ) uxHeaderLength, ipCORRECT_CRC - 1 );
@@ -642,7 +623,7 @@ void test_prvAllowIPPacketIPv4_IncorrectProtocolChecksum( void )
642623

643624
pxNetworkBuffer = &xNetworkBuffer;
644625
pxNetworkBuffer->pucEthernetBuffer = ucEthBuffer;
645-
pxNetworkBuffer->pxEndPoint = NULL;
626+
pxNetworkBuffer->pxEndPoint = &xEndpoint;
646627
pxIPPacket = ( IPPacket_t * ) pxNetworkBuffer->pucEthernetBuffer;
647628
pxIPHeader = &( pxIPPacket->xIPHeader );
648629

@@ -656,9 +637,6 @@ void test_prvAllowIPPacketIPv4_IncorrectProtocolChecksum( void )
656637

657638
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
658639

659-
660-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
661-
662640
FreeRTOS_FindEndPointOnMAC_ExpectAnyArgsAndReturn( NULL );
663641

664642
usGenerateChecksum_ExpectAndReturn( 0U, ( uint8_t * ) &( pxIPHeader->ucVersionHeaderLength ), ( size_t ) uxHeaderLength, ipCORRECT_CRC );
@@ -704,8 +682,6 @@ void test_prvAllowIPPacketIPv4_HappyPath( void )
704682
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
705683

706684

707-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
708-
709685
FreeRTOS_FindEndPointOnMAC_ExpectAnyArgsAndReturn( NULL );
710686

711687
usGenerateChecksum_ExpectAndReturn( 0U, ( uint8_t * ) &( pxIPHeader->ucVersionHeaderLength ), ( size_t ) uxHeaderLength, ipCORRECT_CRC );
@@ -789,9 +765,6 @@ void test_prvAllowIPPacketIPv4_DestMacBroadcastIPNotBroadcast( void )
789765

790766
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
791767

792-
793-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( pxEndpoint ); /* From prvAllowIPPacketIPv4() */
794-
795768
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
796769

797770
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -958,8 +931,6 @@ void test_xBadIPv4Loopback_0_test( void )
958931

959932
memcpy( pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes, xMACAddress.ucBytes, sizeof( MACAddress_t ) );
960933

961-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( pxEndpoint );
962-
963934
FreeRTOS_FindEndPointOnMAC_ExpectAnyArgsAndReturn( NULL );
964935

965936
usGenerateChecksum_ExpectAndReturn( 0U, ( uint8_t * ) &( pxIPHeader->ucVersionHeaderLength ), ( size_t ) uxHeaderLength, ipCORRECT_CRC );

‎test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ void test_prvAllowIPPacketIPv4_BroadcastSourceIP( void )
106106

107107
pxIPHeader->ulSourceIPAddress = 0xFFFFFFFF;
108108

109-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
110-
111109
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
112110

113111
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -149,8 +147,6 @@ void test_prvAllowIPPacketIPv4_BufferLengthLessThanMinimum( void )
149147
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
150148

151149

152-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
153-
154150
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
155151

156152
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -196,8 +192,6 @@ void test_prvAllowIPPacketIPv4_UDPCheckSumZero( void )
196192
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
197193

198194

199-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
200-
201195
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
202196

203197
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -249,8 +243,6 @@ void test_prvAllowIPPacketIPv4_UDP_HappyPath( void )
249243
pxProtPack->xUDPPacket.xUDPHeader.usChecksum = 0xFF12;
250244

251245

252-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
253-
254246
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
255247

256248
TEST_ASSERT_EQUAL( eProcessBuffer, eResult );
@@ -296,8 +288,6 @@ void test_prvAllowIPPacketIPv4_TCP_HappyPath( void )
296288
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
297289

298290

299-
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL ); /* From prvAllowIPPacketIPv4() */
300-
301291
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
302292

303293
TEST_ASSERT_EQUAL( eProcessBuffer, eResult );

0 commit comments

Comments
 (0)