Fix #1784, add CFE assert macros to functional test #1790
Merged
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
jphickey
added
the
CCB:Ready
jphickey
force-pushed
the
fix-1784-cfeassert-macros
branch
from
4daa2f0
to
82d4843
Compare
jphickey
force-pushed
the
fix-1784-cfeassert-macros
branch
from
82d4843
to
97790b2
Compare
jphickey
force-pushed
the
fix-1784-cfeassert-macros
branch
from
d44b91c
to
59eed74
Compare
|
Updated per discussion in today's tag-up to remove SETUP and TEARDOWN macros. Side note / food for thought -- my preference has always been to err toward including too much information in test logs, as you can always ignore the extra detail if it isn't relevant to your goals. However, you can't go the other way, and use information you don't have in the log. Therefore, I still would prefer to keep SETUP/TEARDOWN macros, as it only affects the details in the log file - which can be ignored/discarded when the goal is to show system-level functionality. But I still do think there are cases where this detail can be useful in the log file, and you can't use it if its not there. |
|
Probably also worth noting that the OSAL functional tests also have UT_SETUP and UT_TEARDOWN macros for this same purpose, and this is the same type/level of functional test. So I still think it should be there for consistency with all of our other tests. |
skliper
approved these changes
Aug 11, 2021
zanzaben
previously requested changes
Aug 11, 2021
astrogeco
removed
the
CCB:Ready
|
jphickey
force-pushed
the
fix-1784-cfeassert-macros
branch
from
59eed74
to
5b02dc9
Compare
zanzaben
approved these changes
Aug 11, 2021
|
The latest update changes the name of the SUCCESS/NOT_SUCCESS asserts to CFE_UtAssert_STATUS_OK and CFE_UtAssert_STATUS_ERROR respectively. |
skliper
requested changes
Aug 11, 2021
jphickey
force-pushed
the
fix-1784-cfeassert-macros
branch
from
5b02dc9
to
4f9d3df
Compare
Adds the following macros to CFE assert library in cfe_assert.h: - CFE_UtAssert_STATUS_OK - CFE_UtAssert_STATUS_ERROR - CFE_UtAssert_RESOURCEID_EQ - CFE_UtAssert_RESOURCEID_UNDEFINED - CFE_UtAssert_MEMOFFSET_EQ - CFE_UtAssert_MSGID_EQ
Change cFE_FTAssert macros defined in cfe_testcase to use the macros now provided in cfe_assert.h instead.
jphickey
force-pushed
the
fix-1784-cfeassert-macros
branch
from
4f9d3df
to
c2d0ee7
Compare
skliper
approved these changes
Aug 11, 2021
|
Last push was for whitespace/clang-format fixup ... 7th time is the charm on this hopefully |
astrogeco
added
the
CCB:Approved
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Aug 13, 2021
*Combines* nasa/cFE#1808 *Includes* nasa/cFE#1790, Port "CFE_UtAssert_SuccessCheck" and related macros from coverage test to functional test #1784, add CFE assert macros to functional test nasa/cFE#1779, Adds invalid id syslog to for CFE_ES_DeleteApp and CFE_ES_ReloadApp and verifies required reporting Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored-by: Joseph Hickey <jphickey@users.noreply.github.com>
2 tasks
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Aug 17, 2021
**Combines** nasa/cFE#1808, v6.8.0-rc1+dev873 **Includes** - nasa/cFE#1790, Port "CFE_UtAssert_SuccessCheck" and related macros from coverage test to functional test #1784, add CFE assert macros to functional test - nasa/cFE#1779, Adds invalid id syslog to for CFE_ES_DeleteApp and CFE_ES_ReloadApp and verifies required reporting - nasa/cFE#1785, Stop memory leak & add cds size test. - nasa/cFE#1765, Mark read only inputs as const - nasa/cFE#1804, Check resource ID idx is less than max - nasa/cFE#1778, Add ES Application Behavior Functional Tests - nasa/cFE#1801, Update CFE_ES_RunLoop documentation - nasa/cFE#1745, Add Message Api Functional Test - nasa/cFE#1798, update in/out status and nonnull/nonzero tags - nasa/cFE#1783, Add External Time Source Functional Tests - nasa/cFE#1800, Add Perf API functional tests Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored-by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored-by: Alex Campbell <zanzaben@users.noreply.github.com> Co-authored-by: Niall Mullane <nmullane@users.noreply.github.com> Co-authored-by: Paul <pavll@users.noreply.github.com>
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Aug 17, 2021
**Combines** nasa/cFE#1808, v6.8.0-rc1+dev873 **Includes** - nasa/cFE#1790, Port "CFE_UtAssert_SuccessCheck" and related macros from coverage test to functional test #1784, add CFE assert macros to functional test - nasa/cFE#1779, Adds invalid id syslog to for CFE_ES_DeleteApp and CFE_ES_ReloadApp and verifies required reporting - nasa/cFE#1785, Stop memory leak & add cds size test. - nasa/cFE#1765, Mark read only inputs as const - nasa/cFE#1804, Check resource ID idx is less than max - nasa/cFE#1778, Add ES Application Behavior Functional Tests - nasa/cFE#1801, Update CFE_ES_RunLoop documentation - nasa/cFE#1745, Add Message Api Functional Test - nasa/cFE#1798, update in/out status and nonnull/nonzero tags - nasa/cFE#1783, Add External Time Source Functional Tests - nasa/cFE#1800, Add Perf API functional tests Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored-by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored-by: Alex Campbell <zanzaben@users.noreply.github.com> Co-authored-by: Niall Mullane <nmullane@users.noreply.github.com> Co-authored-by: Paul <pavll@users.noreply.github.com>
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
Adds the following macros to CFE assert library in cfe_assert.h:
Fixes #1784
Testing performed
Build and run all tests (including with some new test cases that use the new macros) and confirm all is working as expected.
Expected behavior changes
None right now, these are new macros that test cases are not using yet.
System(s) tested on
Ubuntu
Additional context
Provides improved feature parity with coverage test environment, gives a common macro to use for common tests/asserts, and more consistent naming convention.
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc