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 #628, Update UtAssert macros with dynamic string formatting #629

Merged
merged 1 commit into from
Nov 3, 2020

Conversation

asgibson
Copy link
Contributor

Describe the contribution
Changed all UtAssert macros to take variable string arguments, feature request #628

Testing performed
Steps taken to test the contribution, cFS/main branch commit 20097ef64e455ace25a1535ea43090a739eb7c0c:
https://github.com/nasa/cFS/

  1. make clean
  2. make ENABLE_UNIT_TESTS=TRUE SIMULATION=native
  3. make test
  4. All cFE unit tests pass

Expected behavior changes
A clear and concise description of how this contribution will change behavior and level of impact.
UtAssert_True wrapper around call will no longer be necessary to accommodate dynamic string output, thus removing the double assert. UtAssert macros will now be able to offer more information by themselves.

System(s) tested on
PC, RHEL 7.6

Contributor Info - All information REQUIRED for consideration of pull request
Alan Gibson NASA GSFC/587

@asgibson asgibson added enhancement unit-test Tickets related to the OSAL unit testing (functional and/or coverage) labels Oct 21, 2020
Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@skliper skliper added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Oct 22, 2020
@astrogeco astrogeco added CCB-20201028 conflicts and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Oct 28, 2020
@astrogeco
Copy link
Contributor

CCB 2020-10-28 APPROVED

@astrogeco astrogeco changed the base branch from main to integration-candidate October 30, 2020 15:46
@astrogeco
Copy link
Contributor

@asgibson can you resolve the merge conflicts on this?

@asgibson
Copy link
Contributor Author

asgibson commented Nov 2, 2020 via email

@astrogeco astrogeco changed the title Updated UtAssert macros to use dynamic string formatting Fix #628, Update UtAssert macros with dynamic string formatting Nov 3, 2020
@astrogeco
Copy link
Contributor

@asgibson I went ahead and rebased your branch on top of integration-candidate, two tips for next time:

  • Build your changes on a separate branch in your fork (not main)
  • When conflicts pop up, rebase on top of the integration candidate and always pull from the nasa remote before creating a new branch

@astrogeco astrogeco merged commit e347d41 into nasa:integration-candidate Nov 3, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Nov 3, 2020
@skliper skliper added this to the 6.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
enhancement unit-test Tickets related to the OSAL unit testing (functional and/or coverage)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants