Merge pull request #1732 from pepepr08/fix1725-use-mir-macro

Fix #1725, Update time_UT.c to use UtAssert_MIR
nasa · Aug 4, 2021 · e0f0f7a · e0f0f7a
2 parents 64f68ea + a5a9556
commit e0f0f7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git 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
@@ -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",
-                   (unsigned int)time.Seconds, (unsigned int)time.Subseconds, timeBuf);
+        UtAssert_MIR("Confirm adding seconds = %u, subseconds = %u to configured EPOCH results in time %s",
+                     (unsigned int)time.Seconds, (unsigned int)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",
-                   (unsigned int)time.Seconds, (unsigned int)time.Subseconds, timeBuf);
+        UtAssert_MIR("Confirm adding seconds = %u, subseconds = %u to configured EPOCH results in time %s",
+                     (unsigned int)time.Seconds, (unsigned int)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",
-                   (unsigned int)time.Seconds, (unsigned int)time.Subseconds, timeBuf);
+        UtAssert_MIR("Confirm adding seconds = %u, subseconds = %u to configured EPOCH results in time %s",
+                     (unsigned int)time.Seconds, (unsigned int)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",
-                   (unsigned int)time.Seconds, (unsigned int)time.Subseconds, timeBuf);
+        UtAssert_MIR("Confirm adding seconds = %u, subseconds = %u to configured EPOCH results in time %s",
+                     (unsigned int)time.Seconds, (unsigned int)time.Subseconds, timeBuf);
     }
 }