From a2025534eba7c0992aa1df0ec289154dd5d1c750 Mon Sep 17 00:00:00 2001 From: Alex Campbell Date: Fri, 4 Jun 2021 10:40:59 -0400 Subject: [PATCH] Fix #811, add Mempool functional tets --- modules/cfe_testcase/CMakeLists.txt | 1 + modules/cfe_testcase/src/cfe_test.c | 11 +-- modules/cfe_testcase/src/cfe_test.h | 1 + modules/cfe_testcase/src/es_mempool_test.c | 84 ++++++++++++++++++++++ 4 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 modules/cfe_testcase/src/es_mempool_test.c diff --git a/modules/cfe_testcase/CMakeLists.txt b/modules/cfe_testcase/CMakeLists.txt index d93898691..cbe5b8161 100644 --- a/modules/cfe_testcase/CMakeLists.txt +++ b/modules/cfe_testcase/CMakeLists.txt @@ -5,6 +5,7 @@ add_cfe_app(cfe_testcase src/es_info_test.c src/es_task_test.c src/es_cds_test.c + src/es_mempool_test.c src/fs_header_test.c src/time_current_test.c ) diff --git a/modules/cfe_testcase/src/cfe_test.c b/modules/cfe_testcase/src/cfe_test.c index d68d65756..c0a0fbd1c 100644 --- a/modules/cfe_testcase/src/cfe_test.c +++ b/modules/cfe_testcase/src/cfe_test.c @@ -50,11 +50,12 @@ void CFE_TestMain(void) /* * Register test cases in UtAssert */ - ESInfoTestSetup(); - ESTaskTestSetup(); - ESCDSTestSetup(); - FSHeaderTestSetup(); - TimeCurrentTestSetup(); + //ESInfoTestSetup(); + //ESTaskTestSetup(); + //ESCDSTestSetup(); + ESMemPoolTestSetup(); + //FSHeaderTestSetup(); + //TimeCurrentTestSetup(); /* * Execute the tests diff --git a/modules/cfe_testcase/src/cfe_test.h b/modules/cfe_testcase/src/cfe_test.h index e99090141..aac6b68ec 100644 --- a/modules/cfe_testcase/src/cfe_test.h +++ b/modules/cfe_testcase/src/cfe_test.h @@ -56,6 +56,7 @@ void CFE_TestMain(void); void ESInfoTestSetup(void); void ESTaskTestSetup(void); void ESCDSTestSetup(void); +void ESMemPoolTestSetup(void); void FSHeaderTestSetup(void); void TimeCurrentTestSetup(void); diff --git a/modules/cfe_testcase/src/es_mempool_test.c b/modules/cfe_testcase/src/es_mempool_test.c new file mode 100644 index 000000000..b40598ef2 --- /dev/null +++ b/modules/cfe_testcase/src/es_mempool_test.c @@ -0,0 +1,84 @@ +/************************************************************************* +** +** GSC-18128-1, "Core Flight Executive Version 6.7" +** +** Copyright (c) 2006-2019 United States Government as represented by +** the Administrator of the National Aeronautics and Space Administration. +** All Rights Reserved. +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +** +** File: es_info_test.c +** +** Purpose: +** Functional test of basic ES Critical Data Store APIs +** +** Demonstration of how to register and use the UT assert functions. +** +*************************************************************************/ + +/* + * Includes + */ + +#include "cfe_test.h" + +void TestMemPool(void) +{ + CFE_ES_MemHandle_t PoolID1; /* Poo1 1 handle, no mutex */ + CFE_ES_MemHandle_t PoolID2; /* Poo1 2 handle, with mutex */ + size_t Buffer1 = 256; + size_t Buffer2 = 512; + int8 Pool1[512]; + int8 Pool2[1024]; + CFE_ES_MemPoolBuf_t addressp1 = CFE_ES_MEMPOOLBUF_C(0); /* Pool 1 buffer address */ + CFE_ES_MemPoolBuf_t addressp2 = CFE_ES_MEMPOOLBUF_C(0); /* Pool 2 buffer address */ + + UtPrintf("Testing: CFE_ES_PoolCreateNoSem, CFE_ES_PoolCreate, CFE_ES_GetPoolBuf, CFE_ES_GetPoolBufInfo, " + "CFE_ES_PutPoolBuf"); + + UtAssert_INT32_EQ(CFE_ES_PoolCreateNoSem(&PoolID1, Pool1, sizeof(Pool1)), CFE_SUCCESS); + UtAssert_INT32_EQ(CFE_ES_PoolCreate(&PoolID2, Pool2, sizeof(Pool2)), CFE_SUCCESS); + + UtAssert_INT32_EQ(CFE_ES_GetPoolBuf(&addressp1, PoolID1, Buffer1), Buffer1); + UtAssert_INT32_EQ(CFE_ES_GetPoolBuf(&addressp2, PoolID2, Buffer2), Buffer2); + + UtAssert_INT32_EQ(CFE_ES_GetPoolBufInfo(PoolID1, addressp1), Buffer1); + UtAssert_INT32_EQ(CFE_ES_GetPoolBufInfo(PoolID2, addressp2), Buffer2); + + UtAssert_INT32_EQ(CFE_ES_PutPoolBuf(PoolID1, addressp1), Buffer1); + UtAssert_INT32_EQ(CFE_ES_PutPoolBuf(PoolID2, addressp2), Buffer2); + + UtAssert_INT32_EQ(CFE_ES_GetPoolBuf(&addressp1, PoolID1, Buffer1), Buffer1); + UtAssert_INT32_EQ(CFE_ES_GetPoolBuf(&addressp2, PoolID2, Buffer2), Buffer2); +} + +void TestMemPoolDelete(void) +{ + CFE_ES_MemHandle_t PoolID; /* Poo1 1 handle, no mutex */ + uint8 Buffer[1024]; + CFE_ES_MemPoolStats_t Stats; + + UtPrintf("Testing: CFE_ES_PoolDelete, CFE_ES_GetMemPoolStats, CFE_ES_PoolCreateEx"); + + UtAssert_INT32_EQ(CFE_ES_PoolCreateEx(&PoolID, Buffer, sizeof(Buffer), 0, NULL, CFE_ES_NO_MUTEX), CFE_SUCCESS); + UtAssert_INT32_EQ(CFE_ES_GetMemPoolStats(&Stats, PoolID), CFE_SUCCESS); + UtAssert_INT32_EQ(CFE_ES_PoolDelete(PoolID), CFE_SUCCESS); + UtAssert_INT32_EQ(CFE_ES_GetMemPoolStats(&Stats, PoolID), CFE_ES_ERR_RESOURCEID_NOT_VALID); +} + +void ESMemPoolTestSetup(void) +{ + UtTest_Add(TestMemPool, NULL, NULL, "Test Mem Pool"); + UtTest_Add(TestMemPoolDelete, NULL, NULL, "Test Mem Pool Delete"); +}