len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-12-15 16:15:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Update unit tests to match changes in queue.c (#614)

Browse source
This commit is contained in:
Dan Good 2021-06-01 15:33:43 -04:00 • committed by GitHub
parent ea798d0612
commit f37753da06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 57 additions and 535 deletions
Download patch file Download diff file Expand all files Collapse all files

24
FreeRTOS/Test/CMock/queue/generic/queue_create_dynamic_utest.c
View file

@ -113,19 +113,11 @@ void test_macro_xQueueCreate_zeroQueueLength_zeroItemSize()
QueueHandle_t xQueue = xQueueCreate( 0, 0 );
/* validate returned queue handle */
TEST_ASSERT_NOT_EQUAL( NULL, xQueue );
TEST_ASSERT_EQUAL( NULL, xQueue );
/* verify that configASSERT was called */
TEST_ASSERT_EQUAL( true, fakeAssertGetFlagAndClear() );
TEST_ASSERT_EQUAL( QUEUE_T_SIZE, getLastMallocSize() );
/* Veify that queue is empty */
TEST_ASSERT_EQUAL( 0, uxQueueMessagesWaiting( xQueue ) );
/* Veify that queue is also full */
TEST_ASSERT_EQUAL( 0, uxQueueSpacesAvailable( xQueue ) );
vQueueDelete( xQueue );
TEST_ASSERT_EQUAL( 0, getNumberMallocCalls() );
}
/**
@ -141,19 +133,11 @@ void test_macro_xQueueCreate_zeroQueueLength_oneItemSize( void )
QueueHandle_t xQueue = xQueueCreate( 0, 1 );
/* validate returned queue handle */
TEST_ASSERT_NOT_EQUAL( NULL, xQueue );
TEST_ASSERT_EQUAL( NULL, xQueue );
/* verify that configASSERT was called */
TEST_ASSERT_EQUAL( true, fakeAssertGetFlagAndClear() );
TEST_ASSERT_EQUAL( QUEUE_T_SIZE, getLastMallocSize() );
/* Veify that new queue is empty */
TEST_ASSERT_EQUAL( 0, uxQueueMessagesWaiting( xQueue ) );
/* Valdiate that the queue is full */
TEST_ASSERT_EQUAL( 0, uxQueueSpacesAvailable( xQueue ) );
vQueueDelete( xQueue );
TEST_ASSERT_EQUAL( 0, getNumberMallocCalls() );
}
/**

38
FreeRTOS/Test/CMock/queue/generic/queue_create_static_utest.c
View file

@ -99,7 +99,7 @@ void test_macro_xQueueCreateStatic_null_QueueStorage_fail( void )
QueueHandle_t xQueue = xQueueCreateStatic( MAX_QUEUE_ITEMS, sizeof( uint32_t ), NULL, &queueBuffer );
/* Validate the queue handle */
TEST_ASSERT_EQUAL( &queueBuffer, xQueue );
TEST_ASSERT_EQUAL( NULL, xQueue );
TEST_ASSERT_EQUAL( true, fakeAssertGetFlagAndClear() );
}
@ -121,8 +121,8 @@ void test_macro_xQueueCreateStatic_null_queueBuffer_fail( void )
/* Validate that the queue handle is NULL */
TEST_ASSERT_EQUAL( NULL, xQueue );
/* Check that configASSERT was called */
TEST_ASSERT_EQUAL( true, fakeAssertGetFlagAndClear() );
/* Check that configASSERT was called twice */
fakeAssertVerifyNumAssertsAndClear( 2 );
}
/**
@ -170,20 +170,12 @@ void test_macro_xQueueCreateStatic_validQueueStorage_zeroItem_zeroLength( void )
TEST_ASSERT_EQUAL( true, fakeAssertGetFlagAndClear() );
/* validate returned queue handle */
TEST_ASSERT_NOT_EQUAL( NULL, xQueue );
/* Veify that new queue is empty */
TEST_ASSERT_EQUAL( 0, uxQueueMessagesWaiting( xQueue ) );
/* Valdiate that the queue has 0 space remaining */
TEST_ASSERT_EQUAL( 0, uxQueueSpacesAvailable( xQueue ) );
vQueueDelete( xQueue );
TEST_ASSERT_EQUAL( NULL, xQueue );
}
/**
* @brief Test xQueueCreateStatic with a valid buffer, uxQueueLength=1, uxItemSize=0
* @details This configuration is equivalent to a binary semaphore.
* @details This configuration is invalid and causes a configASSERT.
* @coverage xQueueGenericCreateStatic
*/
void test_macro_xQueueCreateStatic_validQueueStorage_oneItem_zeroLength( void )
@ -191,8 +183,8 @@ void test_macro_xQueueCreateStatic_validQueueStorage_oneItem_zeroLength( void )
StaticQueue_t queueBuffer;
uint32_t queueData;
/* Expect that xQueueCreateStatic will assert because data storage is not
* necessary for a zero itemLength queue */
/* Expect that xQueueCreateStatic will assert because data storage is
* prohibited for a zero itemLength queue */
fakeAssertExpectFail();
QueueHandle_t xQueue = xQueueCreateStatic( 1, 0, ( void * ) &queueData, &queueBuffer );
@ -200,21 +192,7 @@ void test_macro_xQueueCreateStatic_validQueueStorage_oneItem_zeroLength( void )
TEST_ASSERT_EQUAL( true, fakeAssertGetFlagAndClear() );
/* validate returned queue handle */
TEST_ASSERT_NOT_EQUAL( NULL, xQueue );
/* Veify that new queue is empty */
TEST_ASSERT_EQUAL( 0, uxQueueMessagesWaiting( xQueue ) );
/* Valdiate that the queue has 1 space remaining */
TEST_ASSERT_EQUAL( 1, uxQueueSpacesAvailable( xQueue ) );
/* Send a test value */
TEST_ASSERT_EQUAL( pdTRUE, xQueueSend( xQueue, NULL, 0 ) );
/* Test receive */
TEST_ASSERT_EQUAL( pdTRUE, xQueueReceive( xQueue, NULL, 0 ) );
vQueueDelete( xQueue );
TEST_ASSERT_EQUAL( NULL, xQueue );
}
/**

146
FreeRTOS/Test/CMock/queue/generic/queue_send_nonblocking_utest.c
View file

@ -133,70 +133,6 @@ void test_macro_xQueueSend_fail_full( void )
vQueueDelete( xQueue );
}
/**
* @brief Test xQueueSend with a queue of uxQueueLength=0, uxItemSize=0
* @details This is an invalid queue configuration and causes a failed configASSERT.
* @coverage xQueueGenericSend
*/
void test_macro_xQueueSend_fail_zeroQueueLength_zeroItemSize()
{
/* Expect that xQueueCreate will assert because a length of 0 is invalid */
fakeAssertExpectFail();
QueueHandle_t xQueue = xQueueCreate( 0, 0 );
/* Clear the assert flag*/
fakeAssertGetFlagAndClear();
uint32_t testVal = getNextMonotonicTestValue();
TEST_ASSERT_EQUAL( pdFALSE, xQueueSend( xQueue, &testVal, 0 ) );
vQueueDelete( xQueue );
}
/**
* @brief Test xQueueSend with a queue of uxQueueLength=0, uxItemSize=0 and NULL item.
* @details This is an invalid queue configuration and causes a failed configASSERT.
* @coverage xQueueGenericSend
*/
void test_macro_xQueueSend_fail_zeroQueueLength_zeroItemSize_null()
{
/* Expect that xQueueCreate will assert because a length of 0 is invalid */
fakeAssertExpectFail();
QueueHandle_t xQueue = xQueueCreate( 0, 0 );
/* Clear the assert flag*/
fakeAssertGetFlagAndClear();
TEST_ASSERT_EQUAL( pdFALSE, xQueueSend( xQueue, NULL, 0 ) );
vQueueDelete( xQueue );
}
/**
* @brief Test xQueueSend with uxQueueLength=0, uxItemSize=1
* @details xQueueSend should return pdFALSE because the queue is full.
* @coverage xQueueGenericSend
*/
void test_macro_xQueueSend_zeroQueueLength_oneItemSize( void )
{
/* Expect that xQueueCreate will assert because a length of 0 is invalid */
fakeAssertExpectFail();
QueueHandle_t xQueue = xQueueCreate( 0, 1 );
/* Clear the assert flag*/
fakeAssertGetFlagAndClear();
uint8_t testVal = getNextMonotonicTestValue();
TEST_ASSERT_EQUAL( pdFALSE, xQueueSend( xQueue, &testVal, 0 ) );
vQueueDelete( xQueue );
}
/**
* @brief Test xQueueSend with uxQueueLength=1, uxItemSize=0
* @details xQueueSend should return pdTRUE because the queue is empty.
@ -464,88 +400,6 @@ void test_macro_xQueueSendFromISR_fail( void )
vQueueDelete( xQueue );
}
/**
* @brief Test xQueueSendFromISR with a queue of uxQueueLength=0, uxItemSize=0
* @details This is an invalid queue configuration and causes a failed configASSERT.
* @coverage xQueueGenericSendFromISR
*/
void test_macro_xQueueSendFromISR_fail_zeroQueueLength_zeroItemSize()
{
/* Expect that xQueueCreate will assert because a length of 0 is invalid */
fakeAssertExpectFail();
QueueHandle_t xQueue = xQueueCreate( 0, 0 );
/* Clear the assert flag*/
fakeAssertGetFlagAndClear();
vFakePortAssertIfInterruptPriorityInvalid_Expect();
uint32_t testVal = getNextMonotonicTestValue();
TEST_ASSERT_EQUAL( 0, uxQueueMessagesWaiting( xQueue ) );
TEST_ASSERT_EQUAL( pdFALSE, xQueueSendFromISR( xQueue, &testVal, 0 ) );
TEST_ASSERT_EQUAL( 0, uxQueueMessagesWaiting( xQueue ) );
vQueueDelete( xQueue );
}
/**
* @brief Test xQueueSendFromISR with a queue of uxQueueLength=0, uxItemSize=0 and NULL item.
* @details This is an invalid queue configuration and causes a failed configASSERT.
* @coverage xQueueGenericSendFromISR
*/
void test_macro_xQueueSendFromISR_fail_zeroQueueLength_zeroItemSize_null()
{
/* Expect that xQueueCreate will assert because a length of 0 is invalid */
fakeAssertExpectFail();
QueueHandle_t xQueue = xQueueCreate( 0, 0 );
vFakePortAssertIfInterruptPriorityInvalid_Expect();
/* Clear the assert flag*/
fakeAssertGetFlagAndClear();
TEST_ASSERT_EQUAL( 0, uxQueueMessagesWaiting( xQueue ) );
TEST_ASSERT_EQUAL( pdFALSE, xQueueSendFromISR( xQueue, NULL, 0 ) );
TEST_ASSERT_EQUAL( 0, uxQueueMessagesWaiting( xQueue ) );
vQueueDelete( xQueue );
}
/**
* @brief Test xQueueSendFromISR with uxQueueLength=0, uxItemSize=1
* @details xQueueSendFromISR should return pdFALSE because the queue is full.
* @coverage xQueueGenericSendFromISR
*/
void test_macro_xQueueSendFromISR_zeroQueueLength_oneItemSize( void )
{
/* Expect that xQueueCreate will assert because a length of 0 is invalid */
fakeAssertExpectFail();
QueueHandle_t xQueue = xQueueCreate( 0, 1 );
/* Clear the assert flag*/
fakeAssertGetFlagAndClear();
uint8_t testVal = getNextMonotonicTestValue();
vFakePortAssertIfInterruptPriorityInvalid_Expect();
TEST_ASSERT_EQUAL( 0, uxQueueMessagesWaiting( xQueue ) );
TEST_ASSERT_EQUAL( pdFALSE, xQueueSendFromISR( xQueue, &testVal, 0 ) );
TEST_ASSERT_EQUAL( 0, uxQueueMessagesWaiting( xQueue ) );
vQueueDelete( xQueue );
}
/**
* @brief Test xQueueSendFromISR with uxQueueLength=1, uxItemSize=0
* @details xQueueSendFromISR should return pdTRUE because the queue is empty.