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

cFE Integration candidate: 2021-08-10 #1772

Merged
merged 33 commits into from
Aug 11, 2021
Merged

cFE Integration candidate: 2021-08-10 #1772

merged 33 commits into from
Aug 11, 2021

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Aug 6, 2021

Describe the contribution

PR #1737

PR #1722

PR #1753

PR #1744

PR #1734

PR #1716

PR #1764

PR #1728

PR #1767

PR #1749

PR #1796

PR #1781

Testing performed

cFE Checks https://github.com/nasa/cFE/pull/1772/checks
cFS Checks https://github.com/nasa/cFS/pull/333/checks

Expected behavior changes
See Included PRs

System(s) tested on
Ubuntu 18.04

Additional context
Part of nasa/cFS#333

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
@jphickey
@nmullane
@PavLL
@zanzaben

pavll and others added 13 commits July 29, 2021 11:21
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.
This commit also restructures header files to be used by all table functional tests
This commit also adds to the global test struct with constants used by
all table functional tests
Add tests for the following APIs:

CFE_ES_RegisterGenCounter
CFE_ES_CounterID_ToIndex
CFE_ES_GetGenCounterIDByName
CFE_ES_GetGenCounterName
CFE_ES_GetGenCount
CFE_ES_SetGenCount
CFE_ES_IncrementGenCounter
CFE_ES_DeleteGenCounter
The "MessageCheck_Impl" routine used for printf/syslog checks
was incorrectly truncating the last character of the log message.
Fix #1733, Move global count into test global struct.
@astrogeco
Copy link
Contributor Author

@zanzaben I noticed you reference #1730 in #1737, is that a typo?

@astrogeco astrogeco marked this pull request as draft August 6, 2021 22:31
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 6, 2021
**Combines**

- nasa/cFE#1772

**Includes**

*cFE*

- nasa/cFE#1737, Move global count into test global struct.
astrogeco and others added 5 commits August 6, 2021 18:40
…functional-tests

Fix #806, Add application control functional tests
Fix #1743, update coverage test to use UtAssert macros
At UtPrintf statements to indicate the APIs that the test
is focused on.
astrogeco and others added 8 commits August 10, 2021 09:37
…ests

Fix #1692, Add misc time api functional test
…_Test

Fix #1649, Add Functional Test for EVS Reset Filters API.
Use the generic UtAssert_VOIDCALL macro now provided from UtAssert,
rather than a local macro in cfe_testcase app.
- Removed multiple instantiations of CFE_FT_Global
- Moves the assignment of the TBL related elements of `CFE_FT_Global`
from 'cfe_test_table' to `cfe_test` to avoid duplicate definitions error
- Makes `cfe_test.c` first in CMakeLists dependency list

Co-authored-by: Niall Mullane <nmullane@users.noreply.github.com>
@astrogeco astrogeco marked this pull request as ready for review August 11, 2021 01:30
@astrogeco astrogeco merged commit eb9c523 into main Aug 11, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 11, 2021
**Combines**

- nasa/cFE#1772, v6.8.0-rc1+dev844
- nasa/osal#1127, v5.1.0-rc1+dev590

**Includes**

*cFE*

- nasa/cFE#1737, Move global count into test global struct.
- nasa/cFE#1722, Add ES application control API functional tests
- nasa/cFE#1743, Update coverage test to use UtAssert macros
- nasa/cFE#1734, Add table api functional tests
- nasa/cFE#1753, Add Generic Counter API test
- nasa/cFE#1766, finish ES misc API functional test
- nasa/cFE#1764, last char truncated in coverage log output
- nasa/cFE#1728, Mistakes in some copyright headers
- nasa/cFE#1767, Add misc time api functional test cFE
- nasa/cFE#1749, Add Functional Test for EVS Reset Filters API
- nasa/cFE#1781, RTEMS CFE_FT_Global build failure
- nasa/cFE#1796, replace VOIDCALL assert macro

*osal*

- nasa/osal#1117, Add absolute branch coverage check
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 11, 2021
**Combines**

- nasa/cFE#1772, v6.8.0-rc1+dev844
- nasa/osal#1127, v5.1.0-rc1+dev590

**Includes**

*cFE*

- nasa/cFE#1737, Move global count into test global struct.
- nasa/cFE#1722, Add ES application control API functional tests
- nasa/cFE#1743, Update coverage test to use UtAssert macros
- nasa/cFE#1734, Add table api functional tests
- nasa/cFE#1753, Add Generic Counter API test
- nasa/cFE#1766, finish ES misc API functional test
- nasa/cFE#1764, last char truncated in coverage log output
- nasa/cFE#1728, Mistakes in some copyright headers
- nasa/cFE#1767, Add misc time api functional test cFE
- nasa/cFE#1749, Add Functional Test for EVS Reset Filters API
- nasa/cFE#1781, RTEMS CFE_FT_Global build failure
- nasa/cFE#1796, replace VOIDCALL assert macro

*osal*

- nasa/osal#1117, Add absolute branch coverage check

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>
@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