From 857ebf373efe8e88c64040fa9e0d532f49bc4901 Mon Sep 17 00:00:00 2001 From: "Jose F. Martinez Pedraza" Date: Thu, 29 Jul 2021 14:01:26 -0400 Subject: [PATCH] Fix #1725 Update time_UT.c to use UtAssert_MIR --- modules/cfe_testcase/src/es_misc_test.c | 3 +-- modules/time/ut-coverage/time_UT.c | 20 ++++++++------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/modules/cfe_testcase/src/es_misc_test.c b/modules/cfe_testcase/src/es_misc_test.c index f86d660d6..61073a2e1 100644 --- a/modules/cfe_testcase/src/es_misc_test.c +++ b/modules/cfe_testcase/src/es_misc_test.c @@ -64,8 +64,7 @@ void TestWriteToSysLog(void) 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"); + UtAssert_MIR("MIR (Manual Inspection Required) for CFE_ES_WriteToSysLog"); } void ESMiscTestSetup(void) diff --git a/modules/time/ut-coverage/time_UT.c b/modules/time/ut-coverage/time_UT.c index fd8bea75d..9ab3829a9 100644 --- a/modules/time/ut-coverage/time_UT.c +++ b/modules/time/ut-coverage/time_UT.c @@ -848,9 +848,8 @@ void Test_Print(void) } else { - UtAssertEx(false, UTASSERT_CASETYPE_MIR, __FILE__, __LINE__, - "Confirm adding seconds = %u, subseconds = %u to configured EPOCH results in time %s", time.Seconds, - time.Subseconds, timeBuf); + UtAssert_MIR("Confirm adding seconds = %u, subseconds = %u to configured EPOCH results in time %s", + time.Seconds, time.Subseconds, timeBuf); } /* Test with a time value that causes seconds >= 60 when @@ -867,9 +866,8 @@ void Test_Print(void) } else { - UtAssertEx(false, UTASSERT_CASETYPE_MIR, __FILE__, __LINE__, - "Confirm adding seconds = %u, subseconds = %u to configured EPOCH results in time %s", time.Seconds, - time.Subseconds, timeBuf); + UtAssert_MIR("Confirm adding seconds = %u, subseconds = %u to configured EPOCH results in time %s", + time.Seconds, time.Subseconds, timeBuf); } /* Test with mission representative time values */ @@ -884,9 +882,8 @@ void Test_Print(void) } else { - UtAssertEx(false, UTASSERT_CASETYPE_MIR, __FILE__, __LINE__, - "Confirm adding seconds = %u, subseconds = %u to configured EPOCH results in time %s", time.Seconds, - time.Subseconds, timeBuf); + UtAssert_MIR("Confirm adding seconds = %u, subseconds = %u to configured EPOCH results in time %s", + time.Seconds, time.Subseconds, timeBuf); } /* Test with maximum seconds and subseconds values */ @@ -901,9 +898,8 @@ void Test_Print(void) } else { - UtAssertEx(false, UTASSERT_CASETYPE_MIR, __FILE__, __LINE__, - "Confirm adding seconds = %u, subseconds = %u to configured EPOCH results in time %s", time.Seconds, - time.Subseconds, timeBuf); + UtAssert_MIR("Confirm adding seconds = %u, subseconds = %u to configured EPOCH results in time %s", + time.Seconds, time.Subseconds, timeBuf); } }