yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!771 补充cmsis queue测试用例 

Merge pull request !771 from xuxinyu/CmsisTestCase
This commit is contained in:
openharmony_ci 2022-08-11 06:42:40 +00:00 committed by Gitee
parent 8b19c3cbe4 08404f3252
commit b83d17039e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 372 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kal/cmsis/cmsis_liteos2.c
View File

@ -1255,7 +1255,7 @@ osMessageQueueId_t osMessageQueueNew(uint32_t msg_count, uint32_t msg_size, cons
#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1) #if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)
queueSize = attr->mq_size; queueSize = attr->mq_size;
staticMem = attr->mq_mem; staticMem = attr->mq_mem;
if ((queueSize == 0 || staticMem == NULL)) { if (((queueSize == 0) && (staticMem != NULL)) || ((queueSize != 0) && (staticMem == NULL))) {
return (osMessageQueueId_t)NULL; return (osMessageQueueId_t)NULL;
} }
#endif #endif

1
kernel/src/los_queue.c
View File

@ -703,6 +703,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_QueueDelete(UINT32 queueID)
queue = queueCB->queue; queue = queueCB->queue;
queueCB->queue = (UINT8 *)NULL; queueCB->queue = (UINT8 *)NULL;
queueCB->queueName = (UINT8 *)NULL;
queueCB->queueState = OS_QUEUE_UNUSED; queueCB->queueState = OS_QUEUE_UNUSED;
#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1) #if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)

371
testsuites/sample/cmsis/cmsis_func_test.c
View File

@ -43,6 +43,10 @@
#define Level1 0 #define Level1 0
#define LITE_TEST_CASE(module, function, flag) static int function(void) #define LITE_TEST_CASE(module, function, flag) static int function(void)
#define STATCI_BUFF_SIZE 32
#define READ_BUFFER_SIZIE 7
#define QUEUE_WAIT_TIMEOUT 3
static VOID CmsisStackFunc01(void) static VOID CmsisStackFunc01(void)
{ {
g_testCount++; g_testCount++;
@ -77,8 +81,371 @@ EXIT:
return LOS_OK; return LOS_OK;
}; };
void CmsisFuncTestSuite(void) /* set and get queue name test */
LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis007, Function | MediumTest | Level1)
{ {
ADD_TEST_CASE(TestCmsis001); osMessageQueueId_t msgQueueId;
osMessageQueueAttr_t attr;
CHAR staticBuff[STATCI_BUFF_SIZE] = {0};
CHAR strbuff[] = "hello world";
CHAR *name = NULL;
INT32 ret;
memset(&attr, 0, sizeof(attr));
attr.name = "q1";
/* dynamic test */
msgQueueId = osMessageQueueNew(1, strlen(strbuff), &attr);
ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId);
name = osMessageQueueGetName(msgQueueId);
ret = strcmp(name, "q1");
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
name = osMessageQueueGetName(msgQueueId);
ICUNIT_ASSERT_EQUAL(name, NULL, name);
#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)
attr.mq_mem = staticBuff;
attr.mq_size = STATCI_BUFF_SIZE;
msgQueueId = osMessageQueueNew(1, STATCI_BUFF_SIZE, &attr);
ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId);
name = osMessageQueueGetName(msgQueueId);
ret = strcmp(name, "q1");
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
name = osMessageQueueGetName(msgQueueId);
ICUNIT_ASSERT_EQUAL(name, NULL, name);
#endif
return LOS_OK;
EXIT:
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
return LOS_OK;
}
#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)
static osMessageQueueId_t g_msgQueueId1;
static osMessageQueueId_t g_msgQueueId2;
static osThreadId_t threadId1;
static osThreadId_t threadId2;
static CHAR g_strbuff1[] = "hello";
static CHAR g_strbuff2[] = "world";
static CHAR g_staticBuff[STATCI_BUFF_SIZE] = {0};
static VOID CmsisQueueTestThread1(VOID)
{
CHAR data[READ_BUFFER_SIZIE] = {0};
INT32 ret;
osStatus_t status;
ret = osMessageQueuePut(g_msgQueueId1, &g_strbuff1, 0U, 0U);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
status = osMessageQueueGet(g_msgQueueId2, &data, NULL, QUEUE_WAIT_TIMEOUT);
ICUNIT_ASSERT_EQUAL(status, osOK, status);
ret = strcmp(data, "world");
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
}
static VOID CmsisQueueTestThread2(VOID)
{
CHAR data[READ_BUFFER_SIZIE] = {0};
INT32 ret;
osStatus_t status;
status = osMessageQueueGet(g_msgQueueId1, &data, NULL, QUEUE_WAIT_TIMEOUT);
ICUNIT_ASSERT_EQUAL(status, osOK, status);
ret = strcmp(data, "hello");
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = osMessageQueuePut(g_msgQueueId2, &g_strbuff2, 0U, 0U);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
}
static INT32 ThreadReadWriteTest(VOID)
{
osMessageQueueAttr_t attr;
INT32 ret;
memset(&attr, 0, sizeof(attr));
g_msgQueueId1 = osMessageQueueNew(1, strlen(g_strbuff1), NULL);
ICUNIT_ASSERT_NOT_EQUAL(g_msgQueueId1, NULL, g_msgQueueId1);
attr.mq_mem = g_staticBuff;
attr.mq_size = strlen(g_strbuff2) + 1;
g_msgQueueId2 = osMessageQueueNew(1, strlen(g_strbuff2), &attr);
ICUNIT_ASSERT_NOT_EQUAL(g_msgQueueId2, NULL, g_msgQueueId2);
threadId1 = osThreadNew(CmsisQueueTestThread1, NULL, NULL);
ICUNIT_ASSERT_NOT_EQUAL(threadId1, NULL, threadId1);
threadId2 = osThreadNew(CmsisQueueTestThread2, NULL, NULL);
ICUNIT_ASSERT_NOT_EQUAL(threadId2, NULL, threadId2);
osThreadJoin(threadId1);
ret = strcmp(g_staticBuff, "world");
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = osMessageQueueDelete(g_msgQueueId1);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
ret = osMessageQueueDelete(g_msgQueueId2);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
return 0;
}
/* mix read write */
LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis006, Function | MediumTest | Level1)
{
INT32 ret;
ret = ThreadReadWriteTest();
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
return LOS_OK;
}
#endif
/* read-write exception */
LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis005, Function | MediumTest | Level1)
{
osMessageQueueId_t msgQueueId;
osMessageQueueAttr_t attr;
CHAR staticBuff[STATCI_BUFF_SIZE] = {0};
CHAR strbuff[] = "hello world";
CHAR data[STATCI_BUFF_SIZE] = {0};
INT32 ret;
memset(&attr, 0, sizeof(attr));
ret = osMessageQueuePut(NULL, &strbuff, 0U, 0U);
ICUNIT_ASSERT_EQUAL(ret, osErrorParameter, ret);
ret = osMessageQueueGet(NULL, &data, NULL, 0U);
ICUNIT_ASSERT_EQUAL(ret, osErrorParameter, ret);
/* dynmic test */
msgQueueId = osMessageQueueNew(1, strlen(strbuff), NULL);
ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId);
ret = osMessageQueuePut(msgQueueId, NULL, 0U, 0U);
ICUNIT_GOTO_EQUAL(ret, osErrorParameter, ret, EXIT);
ret = osMessageQueueGet(msgQueueId, NULL, NULL, 0U);
ICUNIT_GOTO_EQUAL(ret, osErrorParameter, ret, EXIT);
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
ret = osMessageQueuePut(msgQueueId, &strbuff, 0U, 0U);
ICUNIT_GOTO_EQUAL(ret, osErrorParameter, ret, EXIT);
ret = osMessageQueueGet(msgQueueId, &data, NULL, 0U);
ICUNIT_GOTO_EQUAL(ret, osErrorParameter, ret, EXIT);
#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)
/* static test */
attr.mq_mem = staticBuff;
attr.mq_size = STATCI_BUFF_SIZE;
msgQueueId = osMessageQueueNew(1, STATCI_BUFF_SIZE, &attr);
ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId);
ret = osMessageQueuePut(msgQueueId, NULL, 0U, 0U);
ICUNIT_GOTO_EQUAL(ret, osErrorParameter, ret, EXIT);
ret = osMessageQueueGet(msgQueueId, NULL, NULL, 0U);
ICUNIT_GOTO_EQUAL(ret, osErrorParameter, ret, EXIT);
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
ret = osMessageQueuePut(msgQueueId, &strbuff, 0U, 0U);
ICUNIT_GOTO_EQUAL(ret, osErrorParameter, ret, EXIT);
ret = osMessageQueueGet(msgQueueId, &data, NULL, 0U);
ICUNIT_GOTO_EQUAL(ret, osErrorParameter, ret, EXIT);
#endif
return LOS_OK;
EXIT:
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
return LOS_OK;
}
/* read write test */
LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis004, Function | MediumTest | Level1)
{
osMessageQueueId_t msgQueueId;
osMessageQueueAttr_t attr;
CHAR staticBuff[STATCI_BUFF_SIZE] = {0};
CHAR strbuff[] = "hello world";
CHAR data[STATCI_BUFF_SIZE] = {0};
INT32 ret;
memset(&attr, 0, sizeof(attr));
/* dynamic test */
msgQueueId = osMessageQueueNew(1, strlen(strbuff), NULL);
ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId);
ret = osMessageQueuePut(msgQueueId, &strbuff, 0U, 0U);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
ret = osMessageQueueGet(msgQueueId, &data, NULL, 0U);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
ret = strcmp(data, strbuff);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)
/* static test */
attr.mq_mem = staticBuff;
attr.mq_size = strlen(strbuff) + 1;
msgQueueId = osMessageQueueNew(1, strlen(strbuff), &attr);
ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId);
ret = osMessageQueuePut(msgQueueId, &strbuff, 0U, 0U);
ICUNIT_GOTO_EQUAL(ret, osOK, ret, EXIT);
ret = osMessageQueueGet(msgQueueId, &data, NULL, 0U);
ICUNIT_GOTO_EQUAL(ret, osOK, ret, EXIT);
ret = strcmp(data, strbuff);
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ret = strcmp(staticBuff, strbuff);
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
#endif
return LOS_OK;
EXIT:
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
return LOS_OK;
}
/* create exception parameters test */
LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis003, Function | MediumTest | Level1)
{
osMessageQueueId_t msgQueueId;
osMessageQueueAttr_t attr;
CHAR staticBuff[STATCI_BUFF_SIZE] = {0};
CHAR strbuff[] = "hello world";
memset(&attr, 0, sizeof(attr));
/* dynmic test */
msgQueueId = osMessageQueueNew(0, strlen(strbuff), NULL);
ICUNIT_ASSERT_EQUAL(msgQueueId, NULL, msgQueueId);
msgQueueId = osMessageQueueNew(1, 0xFFFFFFFF, NULL);
ICUNIT_ASSERT_EQUAL(msgQueueId, NULL, msgQueueId);
#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)
/* static test */
attr.mq_mem = staticBuff;
attr.mq_size = STATCI_BUFF_SIZE;
msgQueueId = osMessageQueueNew(0, strlen(strbuff), &attr);
ICUNIT_ASSERT_EQUAL(msgQueueId, NULL, msgQueueId);
msgQueueId = osMessageQueueNew(0xFFFFFFFF, strlen(strbuff), &attr);
ICUNIT_ASSERT_EQUAL(msgQueueId, NULL, msgQueueId);
attr.mq_mem = staticBuff;
attr.mq_size = 0;
msgQueueId = osMessageQueueNew(1, strlen(strbuff), &attr);
ICUNIT_ASSERT_EQUAL(msgQueueId, NULL, msgQueueId);
attr.mq_mem = NULL;
attr.mq_size = STATCI_BUFF_SIZE;
msgQueueId = osMessageQueueNew(1, strlen(strbuff), &attr);
ICUNIT_ASSERT_EQUAL(msgQueueId, NULL, msgQueueId);
#endif
return LOS_OK;
};
/* create and delete test */
LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis002, Function | MediumTest | Level1)
{
osMessageQueueId_t msgQueueId;
osMessageQueueAttr_t attr;
CHAR staticBuff[STATCI_BUFF_SIZE] = {0};
CHAR strbuff[] = "hello world";
INT32 ret;
memset(&attr, 0, sizeof(attr));
/* dynamic test */
msgQueueId = osMessageQueueNew(1, strlen(strbuff), NULL);
ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId);
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osErrorParameter, ret);
#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)
/* static test */
attr.mq_mem = staticBuff;
attr.mq_size = STATCI_BUFF_SIZE;
msgQueueId = osMessageQueueNew(1, STATCI_BUFF_SIZE, &attr);
ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId);
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osErrorParameter, ret);
#endif
return LOS_OK;
};
void CmsisFuncTestSuite(void)
{
PRINTF("***********************BEGIN CMSIS TEST**********************\n");
ADD_TEST_CASE(TestCmsis001);
ADD_TEST_CASE(TestCmsis002);
ADD_TEST_CASE(TestCmsis003);
ADD_TEST_CASE(TestCmsis004);
ADD_TEST_CASE(TestCmsis005);
#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)
ADD_TEST_CASE(TestCmsis006);
#endif
ADD_TEST_CASE(TestCmsis007);
} }

1
testsuites/sample/kernel/queue/It_los_queue_static_002.c
View File

@ -30,6 +30,7 @@
*/ */
#include "It_los_queue.h" #include "It_los_queue.h"
#define QUEUW_INVALID_VALUE 1025 #define QUEUW_INVALID_VALUE 1025
#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1) #if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)