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 #1743, update coverage test to use UtAssert macros #1744

Merged

Conversation

jphickey
Copy link
Contributor

Describe the contribution
A number of CFE coverage-specific macros and generic assert functions were moved into OSAL UtAssert library so it can be used in a wider variety of tests.

This removes the CFE coverage-specific version, and changes allreferences to use the equivalent UtAssert macro.

Fixes #1743

Testing performed
Build and run all tests

Expected behavior changes
None - UtAssert-provided macros should be equivalent in function

System(s) tested on
Ubuntu

Additional context
Requires nasa/osal#1125

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

A number of CFE coverage-specific macros and generic assert functions
were moved into OSAL UtAssert library so it can be used in a wider
variety of tests.

This removes the CFE coverage-specific version, and changes all
references to use the equivalent UtAssert macro.
@jphickey jphickey added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Aug 2, 2021
@jphickey
Copy link
Contributor Author

jphickey commented Aug 2, 2021

Marking as ready for review, although the CI test is reporting as failing now, it should work just fine once nasa/osal#1125 is in.

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.

cFE_FTAssert_VOIDCALL from cfe_test.h can be replaced by the new UtAssert_VOIDCALL

@astrogeco astrogeco changed the base branch from main to integration-candidate August 4, 2021 15:15
@astrogeco astrogeco removed the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Aug 4, 2021
@astrogeco
Copy link
Contributor

astrogeco commented Aug 4, 2021

CCB:2021-08-04 Wait until nasa/osal#1125 is in bundle-main

@astrogeco
Copy link
Contributor

cFE_FTAssert_VOIDCALL from cfe_test.h can be replaced by the new UtAssert_VOIDCALL

Opening new issue for this

@astrogeco astrogeco dismissed zanzaben’s stale review August 9, 2021 14:48

Opening new issue

@astrogeco astrogeco merged commit 95349ed into nasa:integration-candidate Aug 9, 2021
@astrogeco astrogeco added the CCB:Approved Indicates code review and approval by community CCB label Aug 11, 2021
@jphickey jphickey deleted the fix-1743-utassert-macros branch August 11, 2021 19:06
@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.

Transition CFE tests to use UtAssert macros (moved from CFE)
4 participants