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.

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 #1725 Update time_UT.c to use UtAssert_MIR #1732

Merged

Conversation

pepepr08
Copy link
Contributor

@pepepr08 pepepr08 commented Jul 29, 2021

Describe the contribution
Fixes #1725 Updated time_UT.c to start using the new UtAssert_MIR to avoid incorrect use of UtAssertEx.

This update requires nasa/osal#1122 to be merged first. cFS will fail to compile otherwise.

Testing performed
Steps taken to test the contribution:

  1. Pulled OSAL repo with the UtAssert_MIR changes

  2. Rebuild cFS

  3. Run unit tests.... All passed.

  4. Set a custom epoch time

  5. rebuild and run unit tests... All passed.

  6. Manually run ./coverage-time-ALL-testrunner and verify expected output:
    [ MIR] 06.004 time_UT.c:902 - Confirm adding seconds = 4294967295, subseconds = 4294967295 to configured EPOCH results in time 0214-039-06:28:15.99999

  7. Manually run functional tests and verify expected output:
    EVS Port1 66/1/CFE_TEST_APP 5: [ MIR] 15.001 es_misc_test.c:67 - MIR (Manual Inspection Required) for CFE_ES_WriteToSysLog

Expected behavior changes
No expected changes in behavior.

System(s) tested on
Ubuntu 18.04 VM

Contributor Info - All information REQUIRED for consideration of pull request
Jose F. Martinez Pedraza / NASA GSFC

@pepepr08 pepepr08 added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Jul 29, 2021
Copy link
Contributor

@zanzaben zanzaben left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also update the assert in es_mic_test.c to the new macro.

@pepepr08 pepepr08 force-pushed the fix1725-use-mir-macro branch from 35e0269 to 857ebf3 Compare July 29, 2021 19:19
@pepepr08 pepepr08 force-pushed the fix1725-use-mir-macro branch 2 times, most recently from 8b77b79 to a6fc229 Compare July 30, 2021 14:38
@pepepr08 pepepr08 marked this pull request as draft July 30, 2021 14:41
@pepepr08 pepepr08 force-pushed the fix1725-use-mir-macro branch from a6fc229 to a5a9556 Compare July 30, 2021 14:43
@pepepr08 pepepr08 marked this pull request as ready for review July 30, 2021 14:46
@astrogeco astrogeco changed the base branch from main to integration-candidate August 4, 2021 15:13
@astrogeco astrogeco added conflicts CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Aug 4, 2021
@astrogeco
Copy link
Contributor

CCB:2021-08-04 APPROVED

@astrogeco astrogeco merged commit e0f0f7a into nasa:integration-candidate Aug 4, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 4, 2021
nasa/cFE#1742, Remove SB get last message sender info requirement

nasa/cFE#1732, Fix #1725 Update UTs to use UtAssert_MIR

nasa/cFE#1736, Add Functional Tests cFE Message ID

nasa/cFE#1707, Add Time Conversion Functional Test
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 6, 2021
**Combines**

nasa/cFE#1759, v6.8.0-rc1+dev810
nasa/osal#1126, v5.1.0-rc1+dev586

**Includes**

*cFE*

- nasa/cFE#1752, Add null pointer check to table GetAddresses and ReleaseAddresses
- nasa/cFE#1742, Remove SB get last message sender info requirement
- nasa/cFE#1732, Fix #1725 Update UTs to use UtAssert_MIR
- nasa/cFE#1736, Add Functional Tests cFE Message ID
- nasa/cFE#1707, Add Time Conversion Functional Test
- nasa/cFE#1739, Add cast to MIR prints

*osal*

- nasa/osal#1122, Add UtAssert_MIR macro
- nasa/osal#1125, add generic asserts from CFE coverage testing
- nasa/osal#1121, add osapi-shell-stubs.c to OSAL stub library

Co-authored-by: Jacob Hageman <[email protected]>
Co-authored-by: Joseph Hickey <[email protected]>
Co-authored-by: Alex Campbell <[email protected]>
Co-authored-by: Jose F Martinez Pedraza <[email protected]>
Co-authored-by: Niall Mullane <[email protected]>
Co-authored-by: Ariel Adams <[email protected]>
Co-authored-by: Paul <[email protected]>
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update time_UT.c:Test_Print to use the UtAssert_MIR macro
4 participants