Skip to content

Commit 29a9002

Browse files
HTRamseyHTRamsey
committed
Fix Tests
1 parent 6a8b501 commit 29a9002

File tree

6 files changed

+21
-18
lines changed

6 files changed

+21
-18
lines changed

‎.github/.cSpellWords.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1263,6 +1263,7 @@ STLIDMPUSR
12631263
STLIMPUOR
12641264
STLNVICACTVOR
12651265
STLNVICPENDOR
1266+
Storex
12661267
strbt
12671268
STRBT
12681269
strexb

‎test/unit-test/FreeRTOS_ARP/FreeRTOS_ARP_utest.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -1961,7 +1961,7 @@ void test_eARPGetCacheEntryByMac_NoMatchingEntries( void )
19611961
eResolutionLookupResult_t eResult;
19621962
MACAddress_t xMACAddress = { 0x22, 0x22, 0x22, 0x22, 0x22, 0x22 };
19631963
int i;
1964-
struct xNetworkInterface * xInterface;
1964+
NetworkInterface_t xInterface, * pxInterface = &xInterface;
19651965

19661966
/* =================================================== */
19671967
/* Make sure no entry matches. */
@@ -1971,7 +1971,7 @@ void test_eARPGetCacheEntryByMac_NoMatchingEntries( void )
19711971
memset( xARPCache[ i ].xMACAddress.ucBytes, 0x11, sizeof( xMACAddress.ucBytes ) );
19721972
}
19731973

1974-
eResult = eARPGetCacheEntryByMac( &xMACAddress, &ulIPAddress, &xInterface );
1974+
eResult = eARPGetCacheEntryByMac( &xMACAddress, &ulIPAddress, &pxInterface );
19751975
TEST_ASSERT_EQUAL( eResolutionCacheMiss, eResult );
19761976
TEST_ASSERT_EQUAL( 0x12345678, ulIPAddress );
19771977
/* =================================================== */
@@ -1984,7 +1984,7 @@ void test_eARPGetCacheEntryByMac_OneMatchingEntry( void )
19841984
MACAddress_t xMACAddress = { 0x22, 0x22, 0x22, 0x22, 0x22, 0x22 };
19851985
int i;
19861986
NetworkEndPoint_t xNetworkEndPoint = { 0 };
1987-
NetworkInterface_t xInterface, * pxInterface = NULL;
1987+
NetworkInterface_t xInterface, * pxInterface = &xInterface;
19881988

19891989
xNetworkEndPoint.pxNetworkInterface = &xInterface;
19901990

@@ -2000,7 +2000,7 @@ void test_eARPGetCacheEntryByMac_OneMatchingEntry( void )
20002000
ulEntryToTest = 1;
20012001
memset( xARPCache[ ulEntryToTest ].xMACAddress.ucBytes, 0x22, sizeof( xMACAddress.ucBytes ) );
20022002
xARPCache[ ulEntryToTest ].ulIPAddress = 0xAABBCCEE;
2003-
eResult = eARPGetCacheEntryByMac( &xMACAddress, &ulIPAddress, &xInterface );
2003+
eResult = eARPGetCacheEntryByMac( &xMACAddress, &ulIPAddress, &pxInterface );
20042004
TEST_ASSERT_EQUAL( eResolutionCacheHit, eResult );
20052005
TEST_ASSERT_EQUAL( xARPCache[ ulEntryToTest ].ulIPAddress, ulIPAddress );
20062006
TEST_ASSERT_EQUAL( &xInterface, pxInterface );
@@ -2010,7 +2010,7 @@ void test_eARPGetCacheEntryByMac_OneMatchingEntry( void )
20102010
TEST_ASSERT_EQUAL( xARPCache[ ulEntryToTest ].ulIPAddress, ulIPAddress );
20112011
/* =================================================== */
20122012
xARPCache[ ulEntryToTest ].pxEndPoint = NULL;
2013-
eResult = eARPGetCacheEntryByMac( &xMACAddress, &ulIPAddress, &xInterface );
2013+
eResult = eARPGetCacheEntryByMac( &xMACAddress, &ulIPAddress, &pxInterface );
20142014
TEST_ASSERT_EQUAL( eResolutionCacheHit, eResult );
20152015
TEST_ASSERT_EQUAL( xARPCache[ ulEntryToTest ].ulIPAddress, ulIPAddress );
20162016
/* =================================================== */

‎test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/ut.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ list(APPEND mock_define_list
4141
# list the files you would like to test here
4242
set(real_source_files "")
4343
list(APPEND real_source_files
44-
${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/${project_name}.c
44+
${CMAKE_BINARY_DIR}/Annexed_TCP_Sources/FreeRTOS_ARP.c
4545
)
4646
# list the directories the module under test includes
4747
set(real_include_directories "")

‎test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -2116,7 +2116,7 @@ void test_prvProcessEthernetPacket_ARPFrameType2( void )
21162116

21172117
/**
21182118
* @brief test_prvProcessEthernetPacket_ARPFrameType_WaitingARPResolution
2119-
* To validate the flow to handle ARP packets but eARPProcessPacket() returns eWaitingARPResolution
2119+
* To validate the flow to handle ARP packets but eARPProcessPacket() returns eWaitingResolution
21202120
* without pxARPWaitingNetworkBuffer.
21212121
*/
21222122
void test_prvProcessEthernetPacket_ARPFrameType_WaitingARPResolution( void )
@@ -2141,7 +2141,7 @@ void test_prvProcessEthernetPacket_ARPFrameType_WaitingARPResolution( void )
21412141

21422142
pxEthernetHeader->usFrameType = ipARP_FRAME_TYPE;
21432143

2144-
eARPProcessPacket_ExpectAndReturn( pxNetworkBuffer, eWaitingARPResolution );
2144+
eARPProcessPacket_ExpectAndReturn( pxNetworkBuffer, eWaitingResolution );
21452145

21462146
vIPTimerStartARPResolution_ExpectAnyArgs();
21472147

@@ -2150,7 +2150,7 @@ void test_prvProcessEthernetPacket_ARPFrameType_WaitingARPResolution( void )
21502150

21512151
/**
21522152
* @brief test_prvProcessEthernetPacket_ARPFrameType_WaitingARPResolution2
2153-
* To validate the flow to handle ARP packets but eARPProcessPacket() returns eWaitingARPResolution
2153+
* To validate the flow to handle ARP packets but eARPProcessPacket() returns eWaitingResolution
21542154
* with pxARPWaitingNetworkBuffer.
21552155
*/
21562156
void test_prvProcessEthernetPacket_ARPFrameType_WaitingARPResolution2( void )
@@ -2175,7 +2175,7 @@ void test_prvProcessEthernetPacket_ARPFrameType_WaitingARPResolution2( void )
21752175

21762176
pxEthernetHeader->usFrameType = ipARP_FRAME_TYPE;
21772177

2178-
eARPProcessPacket_ExpectAndReturn( pxNetworkBuffer, eWaitingARPResolution );
2178+
eARPProcessPacket_ExpectAndReturn( pxNetworkBuffer, eWaitingResolution );
21792179

21802180
vReleaseNetworkBufferAndDescriptor_Expect( pxNetworkBuffer );
21812181

@@ -2489,7 +2489,7 @@ void test_prvProcessIPPacket_ValidHeader_ARPResolutionReqd( void )
24892489

24902490
eResult = prvProcessIPPacket( pxIPPacket, pxNetworkBuffer );
24912491

2492-
TEST_ASSERT_EQUAL( eWaitingARPResolution, eResult );
2492+
TEST_ASSERT_EQUAL( eWaitingResolution, eResult );
24932493
}
24942494

24952495
/**
@@ -2825,12 +2825,12 @@ void test_prvProcessIPPacket_ARPResolutionReqd_UDP( void )
28252825
prvAllowIPPacketIPv4_ExpectAndReturn( pxIPPacket, pxNetworkBuffer, ( pxIPHeader->ucVersionHeaderLength & 0x0FU ) << 2, eProcessBuffer );
28262826

28272827
xProcessReceivedUDPPacket_ExpectAndReturn( pxNetworkBuffer, pxUDPPacket->xUDPHeader.usDestinationPort, NULL, pdFAIL );
2828-
xProcessReceivedUDPPacket_IgnoreArg_pxIsWaitingForARPResolution();
2829-
xProcessReceivedUDPPacket_ReturnThruPtr_pxIsWaitingForARPResolution( &xReturnValue );
2828+
xProcessReceivedUDPPacket_IgnoreArg_pxIsWaitingForResolution();
2829+
xProcessReceivedUDPPacket_ReturnThruPtr_pxIsWaitingForResolution( &xReturnValue );
28302830

28312831
eResult = prvProcessIPPacket( pxIPPacket, pxNetworkBuffer );
28322832

2833-
TEST_ASSERT_EQUAL( eWaitingARPResolution, eResult );
2833+
TEST_ASSERT_EQUAL( eWaitingResolution, eResult );
28342834
TEST_ASSERT_EQUAL( FreeRTOS_ntohs( pxUDPPacket->xUDPHeader.usLength ) - sizeof( UDPHeader_t ) + sizeof( UDPPacket_t ), pxNetworkBuffer->xDataLength );
28352835
TEST_ASSERT_EQUAL( pxNetworkBuffer->usPort, pxUDPPacket->xUDPHeader.usSourcePort );
28362836
TEST_ASSERT_EQUAL( pxNetworkBuffer->xIPAddress.ulIP_IPv4, pxUDPPacket->xIPHeader.ulSourceIPAddress );
@@ -2876,12 +2876,12 @@ void test_prvProcessIPPacket_ARPResolutionReqd_UDP1( void )
28762876
prvAllowIPPacketIPv4_ExpectAndReturn( pxIPPacket, pxNetworkBuffer, ( pxIPHeader->ucVersionHeaderLength & 0x0FU ) << 2, eProcessBuffer );
28772877

28782878
xProcessReceivedUDPPacket_ExpectAndReturn( pxNetworkBuffer, pxUDPPacket->xUDPHeader.usDestinationPort, NULL, pdFAIL );
2879-
xProcessReceivedUDPPacket_IgnoreArg_pxIsWaitingForARPResolution();
2880-
xProcessReceivedUDPPacket_ReturnThruPtr_pxIsWaitingForARPResolution( &xReturnValue );
2879+
xProcessReceivedUDPPacket_IgnoreArg_pxIsWaitingForResolution();
2880+
xProcessReceivedUDPPacket_ReturnThruPtr_pxIsWaitingForResolution( &xReturnValue );
28812881

28822882
eResult = prvProcessIPPacket( pxIPPacket, pxNetworkBuffer );
28832883

2884-
TEST_ASSERT_EQUAL( eWaitingARPResolution, eResult );
2884+
TEST_ASSERT_EQUAL( eWaitingResolution, eResult );
28852885
TEST_ASSERT_EQUAL( pxNetworkBuffer->usPort, pxUDPPacket->xUDPHeader.usSourcePort );
28862886
TEST_ASSERT_EQUAL( pxNetworkBuffer->xIPAddress.ulIP_IPv4, pxUDPPacket->xIPHeader.ulSourceIPAddress );
28872887
}
@@ -3360,7 +3360,7 @@ void test_prvProcessIPPacket_TCP_IPv6_ARPResolution( void )
33603360

33613361
eResult = prvProcessIPPacket( ( IPPacket_t * ) pxIPPacket, pxNetworkBuffer );
33623362

3363-
TEST_ASSERT_EQUAL( eWaitingARPResolution, eResult );
3363+
TEST_ASSERT_EQUAL( eWaitingResolution, eResult );
33643364
}
33653365

33663366
/**

‎test/unit-test/FreeRTOS_IP_Timers/FreeRTOS_IP_Timers_stubs.c

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
volatile BaseType_t xInsideInterrupt = pdFALSE;
4444

4545
NetworkBufferDescriptor_t * pxARPWaitingNetworkBuffer;
46+
NetworkBufferDescriptor_t * pxNDWaitingNetworkBuffer;
4647

4748
struct xNetworkEndPoint * pxNetworkEndPoints;
4849
struct xNetworkInterface * pxNetworkInterfaces;

‎test/unit-test/FreeRTOS_IP_Utils/ut.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ list(APPEND mock_list
1818
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP_Private.h"
1919
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP_Timers.h"
2020
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_ARP.h"
21+
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_ND.h"
2122
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_DHCP.h"
2223
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_DHCPv6.h"
2324
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_Routing.h"

0 commit comments

Comments
 (0)