Fix #1912, Update time tests to use bitmask check macros #1913
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replace UtAssert_UINT32_EQ with bitmask-specific check macros
jphickey
force-pushed
the
fix-1912-bitmask-checks
branch
from
cf2ebfa
to
7b83bed
Compare
jphickey
added
the
CCB:Ready
zanzaben
approved these changes
Aug 31, 2021
|
Dependent on nasa/osal#1136 |
|
Passes tests against integration-candidate bundle which includes the needed dependency |
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Sep 1, 2021
This was referenced Sep 1, 2021
astrogeco
added
CCB:Approved
|
CCB:2021-09-01 APPROVED |
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Sep 1, 2021
**Combines** nasa/cFE#1885, v6.8.0-rc1+dev980 nasa/osal#1138, v5.1.0-rc1+dev598 nasa/cFS-GroundSystem#195, v2.2.0-rc1+dev63 **Includes** *cFE* nasa/cFE#1870, Add SB API test cases nasa/cFE#1869, Add ES API test cases nasa/cFE#1872, Add TBL API test cases nasa/cFE#1871, Add FS API test cases nasa/cFE#1860, Add Time Clock Test nasa/cFE#1862, EVS coverage test nasa/cFE#1876, SB test improvements nasa/cFE#1865, CFE_TBL_Modified: Test CRC, updated flag nasa/cFE#1881, Improve EVS code coverage nasa/cFE#1877, add call to CFE_ES_ExitChildTask nasa/cFE#1902, Incorrect OSAL Format in Users Guide Reference nasa/cFE#1884, Improve FS coverage nasa/cFE, Improve MSG branch coverage nasa/cFE#1891, Improve resource ID branch coverage nasa/cFE#1894, Improve SBR branch coverage nasa/cFE#1896, Fix #1895, Improve TIME branch coverage nasa/cFE#1904, Improve TBL code coverage nasa/cFE#1864, Support custom PSP directory nasa/cFE#1913, Update time tests to use bitmask check macros nasa/cFE#1923, remove extra word in comment *osal* nasa/osal#1136, add bitmask assert macros *cFS-GroundSystem* nasa/cFS-GroundSystem#190, Fix #189, Virtualenv and Pipenv .gitignore support nasa/cFS-GroundSystem#194, Fix doc, comment, and message typos Co-authored-by: Jacob Hageman <[email protected]> Co-authored-by: Joseph Hickey <[email protected]> Co-authored-by: Alex Campbell <[email protected]> Co-authored-by: Ariel Adams <[email protected]> Co-authored-by: Jose F Martinez Pedraza <[email protected]> Co-authored-by: Avi <[email protected]> Co-authored-by: Paul <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the contribution
The new bitmask check macros provide more concise information the resulting log file. This updates the time test to use those macros when checking the state flags.
Testing performed
Build and run all tests, confirm log output is correct
Expected behavior changes
Improved test log file info
System(s) tested on
Ubuntu
Additional context
Note this also changes the code to call
CFE_TIME_GetClockInfo()repeatedly, rather than storing in a local variable and checking that value. The intent is to clearly indicate in the log that this function was invoked, not just what its output was. This helps with tracking/confirming that the function is covered by the functional test.This just reads a global so it should not be different in subsequent calls, unless the clock actually changes state during the test. But that was already a risk with the separate call to
CFE_TIME_GetClockState, this does not really change that - and the flags are not really connected otherwise.Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.