Skip to content

Commit fa82f3f

Browse files
tony-josi-awstony-josi-aws
committed
Fix unit tests
1 parent 43d9881 commit fa82f3f

File tree

5 files changed

+57
-57
lines changed

5 files changed

+57
-57
lines changed

‎source/FreeRTOS_Sockets.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3054,7 +3054,7 @@ static const ListItem_t * pxListFindListItemWithValue( const List_t * pxList,
30543054
/* coverity[misra_c_2012_rule_11_3_violation] */
30553055
const ListItem_t * pxEnd = ( ( const ListItem_t * ) &( pxList->xListEnd ) );
30563056

3057-
for( pxIterator = listGET_HEAD_ENTRY( pxList );
3057+
for( pxIterator = listGET_HEAD_ENTRY( ( const List_t * ) pxList );
30583058
pxIterator != pxEnd;
30593059
pxIterator = listGET_NEXT( pxIterator ) )
30603060
{
@@ -6107,7 +6107,7 @@ BaseType_t FreeRTOS_GetIPType( ConstSocket_t xSocket )
61076107
}
61086108
#endif /* ipconfigUSE_TCP == 1 */
61096109

6110-
for( pxIterator = listGET_HEAD_ENTRY( pxList );
6110+
for( pxIterator = listGET_HEAD_ENTRY( ( const List_t * ) pxList );
61116111
pxIterator != pxEnd;
61126112
pxIterator = listGET_NEXT( pxIterator ) )
61136113
{

‎test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void test_xDNSDoCallback_success_not_equal_identifier( void )
118118
listGET_LIST_ITEM_OWNER_IgnoreAndReturn( ( DNSCallback_t * ) 1234 );
119119
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 ); /* xEnd */
120120
vTaskSuspendAll_Expect();
121-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
121+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
122122

123123
listGET_LIST_ITEM_VALUE_ExpectAnyArgsAndReturn( 12345 );
124124
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
@@ -149,7 +149,7 @@ void test_xDNSDoCallback_success_equal_identifier( void )
149149
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
150150

151151
vTaskSuspendAll_Expect();
152-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
152+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
153153

154154
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
155155
listGET_LIST_ITEM_VALUE_ExpectAnyArgsAndReturn( 123 );
@@ -183,7 +183,7 @@ void test_xDNSDoCallback_success_equal_identifier_set_timer( void )
183183
/* Expectations */
184184
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
185185
vTaskSuspendAll_Expect();
186-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
186+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
187187

188188
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
189189
listGET_LIST_ITEM_VALUE_ExpectAnyArgsAndReturn( 123 );
@@ -224,7 +224,7 @@ void test_xDNSDoCallback_success_equal_port_number_equal_name( void )
224224
/* Expectations */
225225
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
226226
vTaskSuspendAll_Expect();
227-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
227+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
228228

229229
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( pxDnsCallback );
230230
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
@@ -264,7 +264,7 @@ void test_xDNSDoCallback_fail_equal_port_number_not_equal_name( void )
264264
/* Expectations */
265265
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
266266
vTaskSuspendAll_Expect();
267-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
267+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
268268

269269
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
270270
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 4 );
@@ -367,7 +367,7 @@ void test_vDNSCheckCallback_success_search_id_not_null( void )
367367
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
368368
vListInitialise_ExpectAnyArgs();
369369
vTaskSuspendAll_Expect();
370-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
370+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
371371
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
372372
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
373373
uxListRemove_ExpectAnyArgsAndReturn( pdFALSE );
@@ -395,7 +395,7 @@ void test_vDNSCheckCallback_success_search_id_not_null_list_empty( void )
395395
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
396396
vListInitialise_ExpectAnyArgs();
397397
vTaskSuspendAll_Expect();
398-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
398+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
399399
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
400400
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
401401
uxListRemove_ExpectAnyArgsAndReturn( pdFALSE );
@@ -422,7 +422,7 @@ void test_vDNSCheckCallback_success_search_id_null( void )
422422
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
423423
vListInitialise_ExpectAnyArgs();
424424
vTaskSuspendAll_Expect();
425-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
425+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
426426
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
427427
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
428428

@@ -454,7 +454,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout( void )
454454
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
455455
vListInitialise_ExpectAnyArgs();
456456
vTaskSuspendAll_Expect();
457-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
457+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
458458
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
459459
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
460460

@@ -466,7 +466,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout( void )
466466
listLIST_IS_EMPTY_ExpectAnyArgsAndReturn( pdFALSE );
467467

468468
listGET_END_MARKER_ExpectAnyArgsAndReturn( NULL );
469-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
469+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
470470
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
471471
listGET_NEXT_ExpectAnyArgsAndReturn( NULL ); /* end marker */
472472
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
@@ -498,7 +498,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout_IPv6( void )
498498
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
499499
vListInitialise_ExpectAnyArgs();
500500
vTaskSuspendAll_Expect();
501-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
501+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
502502
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
503503
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
504504

@@ -510,7 +510,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout_IPv6( void )
510510
listLIST_IS_EMPTY_ExpectAnyArgsAndReturn( pdFALSE );
511511

512512
listGET_END_MARKER_ExpectAnyArgsAndReturn( NULL );
513-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
513+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
514514
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
515515
listGET_NEXT_ExpectAnyArgsAndReturn( NULL ); /* end marker */
516516
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
@@ -542,7 +542,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout2( void )
542542
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
543543
vListInitialise_ExpectAnyArgs();
544544
vTaskSuspendAll_Expect();
545-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
545+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
546546
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
547547
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
548548

@@ -554,7 +554,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout2( void )
554554
listLIST_IS_EMPTY_ExpectAnyArgsAndReturn( pdFALSE );
555555

556556
listGET_END_MARKER_ExpectAnyArgsAndReturn( NULL );
557-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
557+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
558558
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
559559
listGET_NEXT_ExpectAnyArgsAndReturn( NULL ); /* end marker */
560560
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );
@@ -586,7 +586,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout2_IPv6( void )
586586
listGET_END_MARKER_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 );
587587
vListInitialise_ExpectAnyArgs();
588588
vTaskSuspendAll_Expect();
589-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
589+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
590590
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
591591
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 8 ); /* end marker */
592592

@@ -598,7 +598,7 @@ void test_vDNSCheckCallback_success_search_id_null_timeout2_IPv6( void )
598598
listLIST_IS_EMPTY_ExpectAnyArgsAndReturn( pdFALSE );
599599

600600
listGET_END_MARKER_ExpectAnyArgsAndReturn( NULL );
601-
listGET_NEXT_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
601+
listGET_HEAD_ENTRY_ExpectAnyArgsAndReturn( ( ListItem_t * ) 16 );
602602
listGET_LIST_ITEM_OWNER_ExpectAnyArgsAndReturn( dnsCallback );
603603
listGET_NEXT_ExpectAnyArgsAndReturn( NULL ); /* end marker */
604604
uxListRemove_ExpectAnyArgsAndReturn( pdTRUE );

‎test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_GenericAPI_utest.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3185,7 +3185,7 @@ void test_vSocketSelect_UDPSocketsOnly( void )
31853185
xSocket4.pxSocketSet = &xSocketSet;
31863186

31873187
/* Round 0. Not same socket set. */
3188-
listGET_NEXT_ExpectAndReturn( ( ListItem_t * ) &( xBoundUDPSocketsList.xListEnd ), &xLocalListItem );
3188+
listGET_HEAD_ENTRY_ExpectAndReturn( ( List_t * ) &( xBoundUDPSocketsList ), &xLocalListItem );
31893189
listGET_LIST_ITEM_OWNER_ExpectAndReturn( &xLocalListItem, &xSocket );
31903190

31913191
/* Round 1. Same socket set. No select bits. */
@@ -3210,7 +3210,7 @@ void test_vSocketSelect_UDPSocketsOnly( void )
32103210
listGET_NEXT_ExpectAndReturn( &xLocalListItem, ( ListItem_t * ) &( xBoundUDPSocketsList.xListEnd ) );
32113211

32123212
/* Last item. Nothing in TCP. */
3213-
listGET_NEXT_ExpectAndReturn( ( ListItem_t * ) &( xBoundTCPSocketsList.xListEnd ), ( ListItem_t * ) &( xBoundTCPSocketsList.xListEnd ) );
3213+
listGET_HEAD_ENTRY_ExpectAndReturn( ( List_t * ) &( xBoundTCPSocketsList ), ( ListItem_t * ) &( xBoundTCPSocketsList.xListEnd ) );
32143214

32153215
xEventGroupClearBits_ExpectAndReturn( xSocketSet.xSelectGroup, 0, 0 );
32163216

@@ -3249,10 +3249,10 @@ void test_vSocketSelect_TCPSocketsOnly( void )
32493249
xSocket[ 0 ].ucProtocol = FREERTOS_IPPROTO_TCP;
32503250

32513251
/* Last item. Nothing in UDP. */
3252-
listGET_NEXT_ExpectAndReturn( ( ListItem_t * ) &( xBoundUDPSocketsList.xListEnd ), ( ListItem_t * ) &( xBoundUDPSocketsList.xListEnd ) );
3252+
listGET_HEAD_ENTRY_ExpectAndReturn( ( List_t * ) &( xBoundUDPSocketsList ), ( ListItem_t * ) &( xBoundUDPSocketsList.xListEnd ) );
32533253

32543254
/* Round 0. Not same socket set. */
3255-
listGET_NEXT_ExpectAndReturn( ( ListItem_t * ) &( xBoundTCPSocketsList.xListEnd ), &xLocalListItem );
3255+
listGET_HEAD_ENTRY_ExpectAndReturn( ( List_t * ) &( xBoundTCPSocketsList ), &xLocalListItem );
32563256
listGET_LIST_ITEM_OWNER_ExpectAndReturn( &xLocalListItem, &xSocket[ 0 ] );
32573257

32583258
/* Round 1. Same socket set. No bits Set. */
@@ -3354,10 +3354,10 @@ void test_vSocketSelect_NoSocketsAtAll( void )
33543354
uint8_t ucStream[ 20 ];
33553355

33563356
/* Last item. Nothing in UDP. */
3357-
listGET_NEXT_ExpectAndReturn( ( ListItem_t * ) &( xBoundUDPSocketsList.xListEnd ), ( ListItem_t * ) &( xBoundUDPSocketsList.xListEnd ) );
3357+
listGET_HEAD_ENTRY_ExpectAndReturn( ( List_t * ) &( xBoundUDPSocketsList ), ( ListItem_t * ) &( xBoundUDPSocketsList.xListEnd ) );
33583358

33593359
/* Last item. Nothing in TCP. */
3360-
listGET_NEXT_ExpectAndReturn( ( ListItem_t * ) &( xBoundTCPSocketsList.xListEnd ), ( ListItem_t * ) &( xBoundTCPSocketsList.xListEnd ) );
3360+
listGET_HEAD_ENTRY_ExpectAndReturn( ( List_t * ) &( xBoundTCPSocketsList ), ( ListItem_t * ) &( xBoundTCPSocketsList.xListEnd ) );
33613361

33623362
xEventGroupClearBits_ExpectAndReturn( xSocketSet.xSelectGroup, 0, eSELECT_READ );
33633363
xEventGroupClearBits_ExpectAnyArgsAndReturn( pdPASS );

0 commit comments

Comments
 (0)