Fix #1843, Add Time Clock Test#1860
Conversation
a1ab28e to
80f083f
Compare
80f083f to
914d9b3
Compare
jphickey
left a comment
There was a problem hiding this comment.
I think we should improve the values being logged here, otherwise looks fine.
|
|
||
| if (state >= 0) | ||
| { | ||
| UtAssert_BOOL_TRUE(ClockFlagCheck(ClockInfo, CFE_TIME_FLAG_CLKSET)); |
There was a problem hiding this comment.
I'm not sure about the "ClockFlagCheck" helper here. This seems to be hiding info, or at least will result in the log file having less detail than it could.
What about doing something like:
UtAssert_UINT32_EQ(ClockInfo, ClockInfo | CFE_TIME_FLAG_CLKSET);
The reason I like this is that it will show the raw value for ClockInfo value. In comparison, calling the ClockFlagCheck function will only display the result (true or false) and neither the raw value nor the bit being tested will be shown in the log.
(FWIW, I acknowledge that this does not show the bit being tested either, could also do UtAssert_UINT32_EQ(ClockInfo & CFE_TIME_FLAG_CLKSET, CFE_TIME_FLAG_CLKSET) but then this only shows the flag, not the raw value - depends on which is more interesting).
At the end of the day, could also introduce a new macro to test a bit field, that logs both the raw value and the bit being tested (not a bad idea, really).
|
CCB:2021-08-25 APPROVED with CHANGES
|
jphickey
left a comment
There was a problem hiding this comment.
Looks good. I still think a macro that works with bitmasks is a good addition, so I wrote nasa/osal#1135
**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]>
Describe the contribution
Fixes #1843
Adds test to cover Clock APIs.
Testing performed
Build and run unit test
Expected behavior changes
No impact to behavior
System(s) tested on
Ubuntu 20.04
Contributor Info - All information REQUIRED for consideration of pull request
Alex Campbell GSFC