@@ -125,31 +125,30 @@ void TestClock(void)
125
125
{
126
126
UtPrintf ("Testing: CFE_TIME_GetClockState, CFE_TIME_GetClockInfo" );
127
127
128
- CFE_TIME_ClockState_Enum_t state = CFE_TIME_GetClockState ();
129
- uint16 ClockInfo = CFE_TIME_GetClockInfo ();
128
+ CFE_TIME_ClockState_Enum_t state = CFE_TIME_GetClockState ();
130
129
131
130
if (state >= 0 )
132
131
{
133
- UtAssert_UINT32_EQ ( ClockInfo , ClockInfo | CFE_TIME_FLAG_CLKSET );
132
+ UtAssert_BITMASK_SET ( CFE_TIME_GetClockInfo (), CFE_TIME_FLAG_CLKSET );
134
133
135
134
if (state == 0 )
136
135
{
137
- UtAssert_UINT32_NEQ ( ClockInfo , ClockInfo | CFE_TIME_FLAG_FLYING );
136
+ UtAssert_BITMASK_UNSET ( CFE_TIME_GetClockInfo (), CFE_TIME_FLAG_FLYING );
138
137
}
139
138
else
140
139
{
141
- UtAssert_UINT32_EQ ( ClockInfo , ClockInfo | CFE_TIME_FLAG_FLYING );
140
+ UtAssert_BITMASK_SET ( CFE_TIME_GetClockInfo (), CFE_TIME_FLAG_FLYING );
142
141
}
143
142
}
144
143
else
145
144
{
146
- UtAssert_UINT32_NEQ ( ClockInfo , ClockInfo | CFE_TIME_FLAG_CLKSET );
145
+ UtAssert_BITMASK_UNSET ( CFE_TIME_GetClockInfo (), CFE_TIME_FLAG_CLKSET );
147
146
}
148
147
149
- UtAssert_UINT32_EQ ( ClockInfo , ClockInfo | CFE_TIME_FLAG_SRCINT );
150
- UtAssert_UINT32_EQ ( ClockInfo , ClockInfo | CFE_TIME_FLAG_SIGPRI );
151
- UtAssert_UINT32_NEQ ( ClockInfo , ClockInfo | CFE_TIME_FLAG_REFERR );
152
- UtAssert_UINT32_NEQ ( ClockInfo , ClockInfo | CFE_TIME_FLAG_UNUSED );
148
+ UtAssert_BITMASK_SET ( CFE_TIME_GetClockInfo (), CFE_TIME_FLAG_SRCINT );
149
+ UtAssert_BITMASK_SET ( CFE_TIME_GetClockInfo (), CFE_TIME_FLAG_SIGPRI );
150
+ UtAssert_BITMASK_UNSET ( CFE_TIME_GetClockInfo (), CFE_TIME_FLAG_REFERR );
151
+ UtAssert_BITMASK_UNSET ( CFE_TIME_GetClockInfo (), CFE_TIME_FLAG_UNUSED );
153
152
}
154
153
155
154
void TimeCurrentTestSetup (void )
0 commit comments