Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #2090, UT updates for alternate time configuration #2099

Merged
merged 1 commit into from
May 19, 2022
Merged

Fix #2090, UT updates for alternate time configuration #2099

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 57 additions & 61 deletions modules/time/ut-coverage/time_UT.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,13 +300,12 @@ void Test_Init(void)

UtAssert_INT32_EQ(CFE_TIME_TaskInit(), ExpRtn);

/* Test response to failure of the fake tone signal commands
/* Test response to failure of the 1Hz signal commands
* subscription
*/
UT_InitData();
ExpRtn = 0;

#if (CFE_MISSION_TIME_CFG_FAKE_TONE == true)
#if (CFE_PLATFORM_TIME_CFG_CLIENT == true)
SubErrCnt++;
UT_SetDeferredRetcode(UT_KEY(CFE_SB_Subscribe), SubErrCnt, -SubErrCnt);
Expand All @@ -320,9 +319,6 @@ void Test_Init(void)
#endif

UtAssert_INT32_EQ(CFE_TIME_TaskInit(), ExpRtn);
#else
UtAssert_NA("*Not tested* Fake tone signal commands subscription failure");
#endif

/* Test response to failure of the time at tone signal commands
* subscription
Expand Down Expand Up @@ -1210,35 +1206,35 @@ void Test_External(void)
* state not set
*/
UT_InitData();
CFE_TIME_Global.ClockSource = CFE_TIME_SourceSelect_EXTERNAL;
CFE_TIME_Global.ClockSetState = CFE_TIME_SetState_NOT_SET;
CFE_TIME_Global.ExternalCount = 0;
settime.Seconds = 0;
settime.Subseconds = 0;
CFE_TIME_Global.ClockSource = CFE_TIME_SourceSelect_EXTERNAL;
CFE_TIME_Global.ReferenceState[0].ClockSetState = CFE_TIME_SetState_NOT_SET;
CFE_TIME_Global.ExternalCount = 0;
settime.Seconds = 0;
settime.Subseconds = 0;
CFE_TIME_ExternalTime(settime);
UtAssert_UINT32_EQ(CFE_TIME_Global.ExternalCount, 1);

/* Test setting time data from Time using an external source with the clock
* state set and time less than the minimum
*/
UT_InitData();
CFE_TIME_Global.ClockSource = CFE_TIME_SourceSelect_EXTERNAL;
CFE_TIME_Global.ClockSetState = CFE_TIME_SetState_WAS_SET;
settime.Seconds = 0;
settime.Subseconds = 0;
CFE_TIME_Global.InternalCount = 0;
CFE_TIME_Global.AtToneMET.Seconds = 0;
CFE_TIME_Global.AtToneMET.Subseconds = 0;
CFE_TIME_Global.AtToneSTCF.Seconds = 10;
CFE_TIME_Global.AtToneSTCF.Subseconds = 0;
CFE_TIME_Global.AtToneDelay.Seconds = 0;
CFE_TIME_Global.AtToneDelay.Subseconds = 0;
CFE_TIME_Global.AtToneLatch.Seconds = 0;
CFE_TIME_Global.AtToneLatch.Subseconds = 0;
CFE_TIME_Global.MaxDelta.Seconds = 0;
CFE_TIME_Global.MaxDelta.Subseconds = 1;
CFE_TIME_Global.MaxLocalClock.Seconds = 0;
CFE_TIME_Global.MaxLocalClock.Subseconds = 0;
CFE_TIME_Global.ClockSource = CFE_TIME_SourceSelect_EXTERNAL;
CFE_TIME_Global.ReferenceState[0].ClockSetState = CFE_TIME_SetState_WAS_SET;
settime.Seconds = 0;
settime.Subseconds = 0;
CFE_TIME_Global.InternalCount = 0;
CFE_TIME_Global.ReferenceState[0].AtToneMET.Seconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneMET.Subseconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneSTCF.Seconds = 10;
CFE_TIME_Global.ReferenceState[0].AtToneSTCF.Subseconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneDelay.Seconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneDelay.Subseconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneLatch.Seconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneLatch.Subseconds = 0;
CFE_TIME_Global.MaxDelta.Seconds = 0;
CFE_TIME_Global.MaxDelta.Subseconds = 1;
CFE_TIME_Global.MaxLocalClock.Seconds = 0;
CFE_TIME_Global.MaxLocalClock.Subseconds = 0;
UT_SetBSP_Time(0, 0);
CFE_TIME_ExternalTime(settime);
UtAssert_INT32_EQ(CFE_TIME_Global.InternalCount, 1);
Expand All @@ -1247,46 +1243,46 @@ void Test_External(void)
* state set and time greater than the maximum
*/
UT_InitData();
CFE_TIME_Global.ClockSource = CFE_TIME_SourceSelect_EXTERNAL;
CFE_TIME_Global.ClockSetState = CFE_TIME_SetState_WAS_SET;
settime.Seconds = 20;
settime.Subseconds = 0;
CFE_TIME_Global.InternalCount = 0;
CFE_TIME_Global.AtToneMET.Seconds = 0;
CFE_TIME_Global.AtToneMET.Subseconds = 0;
CFE_TIME_Global.AtToneSTCF.Seconds = 10;
CFE_TIME_Global.AtToneSTCF.Subseconds = 0;
CFE_TIME_Global.AtToneDelay.Seconds = 0;
CFE_TIME_Global.AtToneDelay.Subseconds = 0;
CFE_TIME_Global.AtToneLatch.Seconds = 0;
CFE_TIME_Global.AtToneLatch.Subseconds = 0;
CFE_TIME_Global.MaxDelta.Seconds = 0;
CFE_TIME_Global.MaxDelta.Subseconds = 1;
CFE_TIME_Global.MaxLocalClock.Seconds = 0;
CFE_TIME_Global.MaxLocalClock.Subseconds = 0;
CFE_TIME_Global.ClockSource = CFE_TIME_SourceSelect_EXTERNAL;
CFE_TIME_Global.ReferenceState[0].ClockSetState = CFE_TIME_SetState_WAS_SET;
settime.Seconds = 20;
settime.Subseconds = 0;
CFE_TIME_Global.InternalCount = 0;
CFE_TIME_Global.ReferenceState[0].AtToneMET.Seconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneMET.Subseconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneSTCF.Seconds = 10;
CFE_TIME_Global.ReferenceState[0].AtToneSTCF.Subseconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneDelay.Seconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneDelay.Subseconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneLatch.Seconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneLatch.Subseconds = 0;
CFE_TIME_Global.MaxDelta.Seconds = 0;
CFE_TIME_Global.MaxDelta.Subseconds = 1;
CFE_TIME_Global.MaxLocalClock.Seconds = 0;
CFE_TIME_Global.MaxLocalClock.Subseconds = 0;
UT_SetBSP_Time(0, 0);
CFE_TIME_ExternalTime(settime);
UtAssert_UINT32_EQ(CFE_TIME_Global.InternalCount, 1);

/* Test setting time data from Time (external source, state set) */
UT_InitData();
CFE_TIME_Global.ClockSource = CFE_TIME_SourceSelect_EXTERNAL;
CFE_TIME_Global.ClockSetState = CFE_TIME_SetState_WAS_SET;
settime.Seconds = 10;
settime.Subseconds = 0;
CFE_TIME_Global.ExternalCount = 0;
CFE_TIME_Global.AtToneMET.Seconds = 0;
CFE_TIME_Global.AtToneMET.Subseconds = 0;
CFE_TIME_Global.AtToneSTCF.Seconds = 10;
CFE_TIME_Global.AtToneSTCF.Subseconds = 0;
CFE_TIME_Global.AtToneDelay.Seconds = 0;
CFE_TIME_Global.AtToneDelay.Subseconds = 0;
CFE_TIME_Global.AtToneLatch.Seconds = 0;
CFE_TIME_Global.AtToneLatch.Subseconds = 0;
CFE_TIME_Global.MaxDelta.Seconds = 0;
CFE_TIME_Global.MaxDelta.Subseconds = 1;
CFE_TIME_Global.MaxLocalClock.Seconds = 0;
CFE_TIME_Global.MaxLocalClock.Subseconds = 0;
CFE_TIME_Global.ClockSource = CFE_TIME_SourceSelect_EXTERNAL;
CFE_TIME_Global.ReferenceState[0].ClockSetState = CFE_TIME_SetState_WAS_SET;
settime.Seconds = 10;
settime.Subseconds = 0;
CFE_TIME_Global.ExternalCount = 0;
CFE_TIME_Global.ReferenceState[0].AtToneMET.Seconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneMET.Subseconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneSTCF.Seconds = 10;
CFE_TIME_Global.ReferenceState[0].AtToneSTCF.Subseconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneDelay.Seconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneDelay.Subseconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneLatch.Seconds = 0;
CFE_TIME_Global.ReferenceState[0].AtToneLatch.Subseconds = 0;
CFE_TIME_Global.MaxDelta.Seconds = 0;
CFE_TIME_Global.MaxDelta.Subseconds = 1;
CFE_TIME_Global.MaxLocalClock.Seconds = 0;
CFE_TIME_Global.MaxLocalClock.Subseconds = 0;
UT_SetBSP_Time(0, 0);
CFE_TIME_ExternalTime(settime);
UtAssert_UINT32_EQ(CFE_TIME_Global.ExternalCount, 1);
Expand Down