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

Jump to bottom

cFE Integration candidate: Caelum-rc4_dev9 #2098

Merged
merged 15 commits into from
May 19, 2022
Merged

cFE Integration candidate: Caelum-rc4_dev9 #2098

Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c74da48
Fix #1097, adds truncation warning suppression flags
chillfig Apr 6, 2022
f5835d9
Fix #2084, Add support for fractional seconds in epoch
Apr 14, 2022
6fddcab
Fix #2092, Doc deploy from local workflow on main branch push
skliper Apr 21, 2022
7182928
FIX #2096 update RTEMS Toolchain files
alanc-gsfc Apr 26, 2022
2854070
FIX 2096 format and clean up i686-rtems toolchain files
alanc-gsfc Apr 26, 2022
e2c35fc
FIX #2096 Re-organize RTEMS toolchain files
alanc-gsfc Apr 28, 2022
15d4e05
Merge pull request #2088 from METECS/main
astrogeco May 2, 2022
c6a00d0
Merge pull request #2078 from chillfig/supress_trunc_warnings
astrogeco May 2, 2022
8f0b383
Merge pull request #2094 from skliper/fix2092-doc_deploy_fix
astrogeco May 2, 2022
6f45684
Fix #2090, UT updates for alternate time configuration
skliper May 11, 2022
41cadde
Merge pull request #2097 from acudmore:fix-2096-update-rtems-toolchai…
astrogeco May 17, 2022
107dbf5
Merge pull request #2099 from skliper:fix2090-alt_time_config_ut
astrogeco May 18, 2022
abdbca3
Fix #2106, Redundant word in App Developers Guide
HugoValente11 Feb 7, 2022
6aaba57
Merge pull request #2044 from HugoValente11/fix/doc
astrogeco May 18, 2022
c3840ad
IC: Caelum-rc4+dev9, cFE v7.0.0-rc4+dev127
astrogeco May 18, 2022
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