Merge pull request #1913 from jphickey/fix-1912-bitmask-checks

Fix #1912, Update time tests to use bitmask check macros
nasa · Sep 1, 2021 · 6aa555a · 6aa555a
2 parents 811d1fd + 7b83bed
commit 6aa555a
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/modules/cfe_testcase/src/time_current_test.c b/modules/cfe_testcase/src/time_current_test.c
@@ -125,31 +125,30 @@ void TestClock(void)
 {
     UtPrintf("Testing: CFE_TIME_GetClockState, CFE_TIME_GetClockInfo");
 
-    CFE_TIME_ClockState_Enum_t state     = CFE_TIME_GetClockState();
-    uint16                     ClockInfo = CFE_TIME_GetClockInfo();
+    CFE_TIME_ClockState_Enum_t state = CFE_TIME_GetClockState();
 
     if (state >= 0)
     {
-        UtAssert_UINT32_EQ(ClockInfo, ClockInfo | CFE_TIME_FLAG_CLKSET);
+        UtAssert_BITMASK_SET(CFE_TIME_GetClockInfo(), CFE_TIME_FLAG_CLKSET);
 
         if (state == 0)
         {
-            UtAssert_UINT32_NEQ(ClockInfo, ClockInfo | CFE_TIME_FLAG_FLYING);
+            UtAssert_BITMASK_UNSET(CFE_TIME_GetClockInfo(), CFE_TIME_FLAG_FLYING);
         }
         else
         {
-            UtAssert_UINT32_EQ(ClockInfo, ClockInfo | CFE_TIME_FLAG_FLYING);
+            UtAssert_BITMASK_SET(CFE_TIME_GetClockInfo(), CFE_TIME_FLAG_FLYING);
         }
     }
     else
     {
-        UtAssert_UINT32_NEQ(ClockInfo, ClockInfo | CFE_TIME_FLAG_CLKSET);
+        UtAssert_BITMASK_UNSET(CFE_TIME_GetClockInfo(), CFE_TIME_FLAG_CLKSET);
     }
 
-    UtAssert_UINT32_EQ(ClockInfo, ClockInfo | CFE_TIME_FLAG_SRCINT);
-    UtAssert_UINT32_EQ(ClockInfo, ClockInfo | CFE_TIME_FLAG_SIGPRI);
-    UtAssert_UINT32_NEQ(ClockInfo, ClockInfo | CFE_TIME_FLAG_REFERR);
-    UtAssert_UINT32_NEQ(ClockInfo, ClockInfo | CFE_TIME_FLAG_UNUSED);
+    UtAssert_BITMASK_SET(CFE_TIME_GetClockInfo(), CFE_TIME_FLAG_SRCINT);
+    UtAssert_BITMASK_SET(CFE_TIME_GetClockInfo(), CFE_TIME_FLAG_SIGPRI);
+    UtAssert_BITMASK_UNSET(CFE_TIME_GetClockInfo(), CFE_TIME_FLAG_REFERR);
+    UtAssert_BITMASK_UNSET(CFE_TIME_GetClockInfo(), CFE_TIME_FLAG_UNUSED);
 }
 
 void TimeCurrentTestSetup(void)