Skip to content

Commit 630690d

Browse files
tony-josi-awstony-josi-aws
committed
Fix unit tests
1 parent 4d9b2df commit 630690d

File tree

7 files changed

+255
-33
lines changed

7 files changed

+255
-33
lines changed

‎test/unit-test/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ include( ${UNIT_TEST_DIR}/FreeRTOS_Routing_ConfigCompatibleWithSingle/ut.cmake )
311311
add_custom_target( coverage
312312
COMMAND ${CMAKE_COMMAND} -P ${MODULE_ROOT_DIR}/test/unit-test/cmock/coverage.cmake
313313
DEPENDS cmock unity
314-
FreeRTOS_ARP_utest
314+
FreeRTOS_ARP_utest
315315
FreeRTOS_ARP_DataLenLessThanMinPacket_utest
316316
FreeRTOS_BitConfig_utest
317317
FreeRTOS_DHCP_utest

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

+6-11
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include "mock_FreeRTOS_IP_Private.h"
4949
#include "mock_FreeRTOS_IPv4_Private.h"
5050
#include "mock_FreeRTOS_IP_Utils.h"
51+
#include "mock_FreeRTOS_IPv6_Utils.h"
5152
#include "mock_FreeRTOS_IP_Timers.h"
5253
#include "mock_FreeRTOS_TCP_IP.h"
5354
#include "mock_FreeRTOS_ICMP.h"
@@ -170,6 +171,7 @@ void test_vIPNetworkUpCalls( void )
170171
NetworkEndPoint_t xEndPoint = { 0 };
171172

172173
xEndPoint.bits.bEndPointUp = pdFALSE;
174+
xEndPoint.bits.bIPv6 = pdFALSE;
173175

174176
vApplicationIPNetworkEventHook_Multi_Expect( eNetworkUp, &xEndPoint );
175177
vDNSInitialise_Expect();
@@ -4002,11 +4004,6 @@ static void prvIPNetworkUpCalls_Generic( const uint8_t * pucAddress,
40024004
xEndPoint.bits.bWantDHCP = pdFALSE_UNSIGNED;
40034005
memcpy( xEndPoint.ipv6_settings.xIPAddress.ucBytes, pucAddress, ipSIZE_OF_IPv6_ADDRESS );
40044006

4005-
if( ( uxSetMembers & ipHAS_METHOD ) != 0U )
4006-
{
4007-
xInterface.pfAddAllowedMAC = pfAddAllowedMAC;
4008-
}
4009-
40104007
if( ( uxSetMembers & ipHAS_INTERFACE ) != 0U )
40114008
{
40124009
xEndPoint.pxNetworkInterface = &xInterface;
@@ -4029,8 +4026,8 @@ static void prvIPNetworkUpCalls_Generic( const uint8_t * pucAddress,
40294026

40304027
if( xEndPoint.bits.bIPv6 == pdTRUE_UNSIGNED )
40314028
{
4032-
/* The xIPv6_GetIPType() function is mocked. */
4033-
xIPv6_GetIPType_ExpectAnyArgsAndReturn( eType );
4029+
/* The vManageSolicitedNodeAddress() function is mocked. */
4030+
vManageSolicitedNodeAddress_Expect( &xEndPoint, pdTRUE );
40344031
}
40354032

40364033
vApplicationIPNetworkEventHook_Multi_Expect( eNetworkUp, &xEndPoint );
@@ -4040,8 +4037,6 @@ static void prvIPNetworkUpCalls_Generic( const uint8_t * pucAddress,
40404037
vIPNetworkUpCalls( &xEndPoint );
40414038

40424039
TEST_ASSERT_EQUAL( pdTRUE, xEndPoint.bits.bEndPointUp );
4043-
/* See if pfAddAllowedMAC() was called when it has to. */
4044-
TEST_ASSERT_EQUAL( xMACAddExpected, xMACFunctionCalled );
40454040
}
40464041

40474042
void test_prvIPNetworkUpCalls_LinkLocal()
@@ -4060,9 +4055,9 @@ void test_prvIPNetworkUpCalls_LinkLocal()
40604055
};
40614056

40624057
/* Test all combinations of what might go wrong. */
4063-
prvIPNetworkUpCalls_Generic( ucAddress, eIPv6_LinkLocal, ipHAS_IPV6 | ipHAS_METHOD | ipHAS_INTERFACE );
40644058
prvIPNetworkUpCalls_Generic( ucAddress, eIPv6_LinkLocal, ipHAS_IPV6 | ipHAS_INTERFACE );
4065-
prvIPNetworkUpCalls_Generic( ucAddress, eIPv6_LinkLocal, ipHAS_IPV6 | ipHAS_METHOD );
4059+
prvIPNetworkUpCalls_Generic( ucAddress, eIPv6_LinkLocal, ipHAS_IPV6 | ipHAS_INTERFACE );
4060+
prvIPNetworkUpCalls_Generic( ucAddress, eIPv6_LinkLocal, ipHAS_IPV6 );
40664061
prvIPNetworkUpCalls_Generic( ucAddress, eIPv6_LinkLocal, ipHAS_INTERFACE );
40674062
}
40684063

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

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ list(APPEND mock_list
2323
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IPv4_Private.h"
2424
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP_Timers.h"
2525
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP_Utils.h"
26+
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IPv6_Utils.h"
2627
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_ARP.h"
2728
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_ICMP.h"
2829
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_DNS.h"

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

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ list(APPEND mock_list
2020
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IPv4_Private.h"
2121
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP_Timers.h"
2222
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP_Utils.h"
23+
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IPv6_Utils.h"
2324
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_ARP.h"
2425
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_ICMP.h"
2526
"${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_DNS.h"

‎test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c

+17-21
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,8 @@ void test_prvProcessNetworkDownEvent_PassDHCPv6( void )
621621

622622
if( xEndPoint.bits.bIPv6 == pdTRUE_UNSIGNED )
623623
{
624-
/* The xIPv6_GetIPType() function is mocked. */
625-
xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_Multicast );
624+
/* The vManageSolicitedNodeAddress() function is mocked. */
625+
vManageSolicitedNodeAddress_Expect( &xEndPoint, pdFALSE );
626626
}
627627

628628
FreeRTOS_NextEndPoint_IgnoreAndReturn( NULL );
@@ -658,8 +658,8 @@ void test_prvProcessNetworkDownEvent_PassRA( void )
658658

659659
if( xEndPoint.bits.bIPv6 == pdTRUE_UNSIGNED )
660660
{
661-
/* The xIPv6_GetIPType() function is mocked. */
662-
xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_Multicast );
661+
/* The vManageSolicitedNodeAddress() function is mocked. */
662+
vManageSolicitedNodeAddress_Expect( &xEndPoint, pdFALSE );
663663
}
664664

665665
FreeRTOS_NextEndPoint_IgnoreAndReturn( NULL );
@@ -697,8 +697,8 @@ void test_prvProcessNetworkDownEvent_PassStaticIP( void )
697697

698698
if( xEndPoint.bits.bIPv6 == pdTRUE_UNSIGNED )
699699
{
700-
/* The xIPv6_GetIPType() function is mocked. */
701-
xIPv6_GetIPType_ExpectAnyArgsAndReturn( eIPv6_Multicast );
700+
/* The vManageSolicitedNodeAddress() function is mocked. */
701+
vManageSolicitedNodeAddress_Expect( &xEndPoint, pdFALSE );
702702
}
703703

704704
FreeRTOS_NextEndPoint_IgnoreAndReturn( NULL );
@@ -3107,11 +3107,6 @@ static void prvProcessNetworkDownEvent_Generic( const uint8_t * pucAddress,
31073107
xEndPoint.bits.bWantDHCP = pdFALSE_UNSIGNED;
31083108
memcpy( xEndPoint.ipv6_settings.xIPAddress.ucBytes, pucAddress, ipSIZE_OF_IPv6_ADDRESS );
31093109

3110-
if( ( uxSetMembers & ipHAS_METHOD ) != 0U )
3111-
{
3112-
xInterface.pfRemoveAllowedMAC = pfRemoveAllowedMAC;
3113-
}
3114-
31153110
if( ( uxSetMembers & ipHAS_INTERFACE ) != 0U )
31163111
{
31173112
xEndPoint.pxNetworkInterface = &xInterface;
@@ -3138,8 +3133,8 @@ static void prvProcessNetworkDownEvent_Generic( const uint8_t * pucAddress,
31383133

31393134
if( xEndPoint.bits.bIPv6 == pdTRUE_UNSIGNED )
31403135
{
3141-
/* The xIPv6_GetIPType() function is mocked. */
3142-
xIPv6_GetIPType_ExpectAnyArgsAndReturn( eType );
3136+
/* The vManageSolicitedNodeAddress() function is mocked. */
3137+
vManageSolicitedNodeAddress_Expect( &xEndPoint, pdFALSE );
31433138
}
31443139

31453140
FreeRTOS_NextEndPoint_IgnoreAndReturn( NULL );
@@ -3171,9 +3166,9 @@ void test_prvProcessNetworkDownEvent_LinkLocal()
31713166
};
31723167

31733168
/* Test all combinations of what might go wrong. */
3174-
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_LinkLocal, ipHAS_IPV6 | ipHAS_METHOD | ipHAS_INTERFACE );
31753169
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_LinkLocal, ipHAS_IPV6 | ipHAS_INTERFACE );
3176-
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_LinkLocal, ipHAS_IPV6 | ipHAS_METHOD );
3170+
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_LinkLocal, ipHAS_IPV6 | ipHAS_INTERFACE );
3171+
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_LinkLocal, ipHAS_IPV6 );
31773172
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_LinkLocal, ipHAS_INTERFACE );
31783173
}
31793174

@@ -3192,9 +3187,9 @@ void test_prvProcessNetworkDownEvent_Global()
31923187
0x70U, 0x09U
31933188
};
31943189

3195-
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_Global, ipHAS_IPV6 | ipHAS_METHOD | ipHAS_INTERFACE );
31963190
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_Global, ipHAS_IPV6 | ipHAS_INTERFACE );
3197-
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_Global, ipHAS_IPV6 | ipHAS_METHOD );
3191+
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_Global, ipHAS_IPV6 | ipHAS_INTERFACE );
3192+
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_Global, ipHAS_IPV6 );
31983193
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_Global, ipHAS_INTERFACE );
31993194
}
32003195

@@ -3213,9 +3208,9 @@ void test_prvProcessNetworkDownEvent_SiteLocal()
32133208
0x70U, 0x09U
32143209
};
32153210

3216-
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_SiteLocal, ipHAS_IPV6 | ipHAS_METHOD | ipHAS_INTERFACE );
32173211
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_SiteLocal, ipHAS_IPV6 | ipHAS_INTERFACE );
3218-
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_SiteLocal, ipHAS_IPV6 | ipHAS_METHOD );
3212+
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_SiteLocal, ipHAS_IPV6 | ipHAS_INTERFACE );
3213+
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_SiteLocal, ipHAS_IPV6 );
32193214
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_SiteLocal, ipHAS_INTERFACE );
32203215
}
32213216

@@ -3235,10 +3230,11 @@ void test_prvProcessNetworkDownEvent_Multicast()
32353230
0x00U, 0xFBU
32363231
};
32373232

3238-
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_Multicast, ipHAS_IPV6 | ipHAS_METHOD | ipHAS_INTERFACE );
32393233
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_Multicast, ipHAS_IPV6 | ipHAS_INTERFACE );
3240-
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_Multicast, ipHAS_IPV6 | ipHAS_METHOD );
3234+
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_Multicast, ipHAS_IPV6 | ipHAS_INTERFACE );
3235+
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_Multicast, ipHAS_IPV6 );
32413236
prvProcessNetworkDownEvent_Generic( ucAddress, eIPv6_Multicast, ipHAS_INTERFACE );
3237+
}
32423238

32433239
/**
32443240
* @brief test_eGetDHCPState

0 commit comments

Comments
 (0)