From 285cd1252621f07926446f276fa1577fdce298f0 Mon Sep 17 00:00:00 2001 From: Alex Campbell Date: Thu, 27 May 2021 15:03:45 -0400 Subject: [PATCH 1/2] Fix #814, add ES Misc Functional test --- modules/cfe_testcase/CMakeLists.txt | 1 + modules/cfe_testcase/src/cfe_test.c | 1 + modules/cfe_testcase/src/cfe_test.h | 1 + modules/cfe_testcase/src/es_misc_test.c | 70 +++++++++++++++++++++++++ 4 files changed, 73 insertions(+) create mode 100644 modules/cfe_testcase/src/es_misc_test.c diff --git a/modules/cfe_testcase/CMakeLists.txt b/modules/cfe_testcase/CMakeLists.txt index d93898691..b46528fbc 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_misc_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..97f18af76 100644 --- a/modules/cfe_testcase/src/cfe_test.c +++ b/modules/cfe_testcase/src/cfe_test.c @@ -53,6 +53,7 @@ void CFE_TestMain(void) ESInfoTestSetup(); ESTaskTestSetup(); ESCDSTestSetup(); + ESMiscTestSetup(); FSHeaderTestSetup(); TimeCurrentTestSetup(); diff --git a/modules/cfe_testcase/src/cfe_test.h b/modules/cfe_testcase/src/cfe_test.h index e99090141..745f61956 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 ESMiscTestSetup(void); void FSHeaderTestSetup(void); void TimeCurrentTestSetup(void); diff --git a/modules/cfe_testcase/src/es_misc_test.c b/modules/cfe_testcase/src/es_misc_test.c new file mode 100644 index 000000000..770517c54 --- /dev/null +++ b/modules/cfe_testcase/src/es_misc_test.c @@ -0,0 +1,70 @@ +/************************************************************************* +** +** 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_misc_test.c +** +** Purpose: +** Functional test of basic ES Miscellaneous APIs +** +** Demonstration of how to register and use the UT assert functions. +** +*************************************************************************/ + +/* + * Includes + */ + +#include "cfe_test.h" + +void TestCalculateCRC(void) +{ + const char *Data = "Random Stuff"; + uint8 Data2[12]; + uint32 expectedCrc = 20824; + uint32 inputCrc = 345353; + uint32 expectedBlockCrc = 2688; + + UtPrintf("Testing: CFE_ES_CalculateCRC"); + + UtAssert_INT32_EQ(CFE_ES_CalculateCRC(Data, sizeof(Data), 0, CFE_MISSION_ES_DEFAULT_CRC), expectedCrc); + + memset(Data2, 1, sizeof(Data2)); + UtAssert_INT32_EQ(CFE_ES_CalculateCRC(&Data2, sizeof(Data2), inputCrc, CFE_MISSION_ES_CRC_16), expectedBlockCrc); + + UtAssert_INT32_EQ(CFE_ES_CalculateCRC(Data, sizeof(Data), 0, CFE_MISSION_ES_CRC_8), 0); + UtAssert_INT32_EQ(CFE_ES_CalculateCRC(Data, sizeof(Data), 0, CFE_MISSION_ES_CRC_32), 0); + + UtAssert_INT32_EQ(CFE_ES_CalculateCRC(NULL, sizeof(Data), expectedCrc, CFE_MISSION_ES_CRC_8), expectedCrc); + UtAssert_INT32_EQ(CFE_ES_CalculateCRC(Data, 0, expectedBlockCrc, CFE_MISSION_ES_CRC_8), expectedBlockCrc); +} + +void TestWriteToSysLog(void) +{ + UtPrintf("Testing: CFE_ES_WriteToSysLog"); + CFE_ES_WriteToSysLog("MIR (Manual Inspection Required) for CFE_ES_WriteToSysLog"); + UtAssertEx(false, UTASSERT_CASETYPE_MIR, __FILE__, __LINE__, "%s", + "MIR (Manual Inspection Required) for CFE_ES_WriteToSysLog"); +} + +void ESMiscTestSetup(void) +{ + UtTest_Add(TestCalculateCRC, NULL, NULL, "Test Calculate CRC"); + UtTest_Add(TestWriteToSysLog, NULL, NULL, "Test Write To Sys Log"); +} From 04fbc9aa723bc7ef77194f9081938d8e299bbef2 Mon Sep 17 00:00:00 2001 From: Alex Campbell Date: Tue, 15 Jun 2021 09:25:41 -0400 Subject: [PATCH 2/2] Fix #814, add additional vararg tests --- modules/cfe_testcase/src/es_misc_test.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/cfe_testcase/src/es_misc_test.c b/modules/cfe_testcase/src/es_misc_test.c index 770517c54..f86d660d6 100644 --- a/modules/cfe_testcase/src/es_misc_test.c +++ b/modules/cfe_testcase/src/es_misc_test.c @@ -43,22 +43,27 @@ void TestCalculateCRC(void) UtPrintf("Testing: CFE_ES_CalculateCRC"); - UtAssert_INT32_EQ(CFE_ES_CalculateCRC(Data, sizeof(Data), 0, CFE_MISSION_ES_DEFAULT_CRC), expectedCrc); + UtAssert_UINT32_EQ(CFE_ES_CalculateCRC(Data, sizeof(Data), 0, CFE_MISSION_ES_DEFAULT_CRC), expectedCrc); memset(Data2, 1, sizeof(Data2)); - UtAssert_INT32_EQ(CFE_ES_CalculateCRC(&Data2, sizeof(Data2), inputCrc, CFE_MISSION_ES_CRC_16), expectedBlockCrc); + UtAssert_UINT32_EQ(CFE_ES_CalculateCRC(&Data2, sizeof(Data2), inputCrc, CFE_MISSION_ES_CRC_16), expectedBlockCrc); - UtAssert_INT32_EQ(CFE_ES_CalculateCRC(Data, sizeof(Data), 0, CFE_MISSION_ES_CRC_8), 0); - UtAssert_INT32_EQ(CFE_ES_CalculateCRC(Data, sizeof(Data), 0, CFE_MISSION_ES_CRC_32), 0); + UtAssert_UINT32_EQ(CFE_ES_CalculateCRC(Data, sizeof(Data), 0, CFE_MISSION_ES_CRC_8), 0); + UtAssert_UINT32_EQ(CFE_ES_CalculateCRC(Data, sizeof(Data), 0, CFE_MISSION_ES_CRC_32), 0); - UtAssert_INT32_EQ(CFE_ES_CalculateCRC(NULL, sizeof(Data), expectedCrc, CFE_MISSION_ES_CRC_8), expectedCrc); - UtAssert_INT32_EQ(CFE_ES_CalculateCRC(Data, 0, expectedBlockCrc, CFE_MISSION_ES_CRC_8), expectedBlockCrc); + UtAssert_UINT32_EQ(CFE_ES_CalculateCRC(NULL, sizeof(Data), expectedCrc, CFE_MISSION_ES_CRC_16), expectedCrc); + UtAssert_UINT32_EQ(CFE_ES_CalculateCRC(Data, 0, expectedBlockCrc, CFE_MISSION_ES_CRC_16), expectedBlockCrc); } void TestWriteToSysLog(void) { + const char *TestString = "Test String for CFE_ES_WriteToSysLog Functional Test"; + UtPrintf("Testing: CFE_ES_WriteToSysLog"); CFE_ES_WriteToSysLog("MIR (Manual Inspection Required) for CFE_ES_WriteToSysLog"); + CFE_ES_WriteToSysLog(NULL); + CFE_ES_WriteToSysLog("%s", TestString); + UtAssertEx(false, UTASSERT_CASETYPE_MIR, __FILE__, __LINE__, "%s", "MIR (Manual Inspection Required) for CFE_ES_WriteToSysLog"); }