Fix #808, ES API functional tests #1251

zanzaben · 2021-03-23T14:49:24Z

Describe the contribution
Fixes #808
New tests for the ES Info API's

Testing performed
This is the test

Expected behavior changes
none

Additional Context
Dependant on #1268

Addresses are only valid on VxWorks system so the tests for when that is true have not be run and verified.

System(s) tested on
Ubuntu 20.04

Contributor Info - All information REQUIRED for consideration of pull request
Alex Campbell GSFC

modules/cfe_testcase/src/es_info_test.c

astrogeco · 2021-03-31T16:21:01Z

CCB:2021-03-31 APPROVED

Is there a #define to use in es_info_test.c:50?
Assert on addresses, not sure if "zero" is invalid
need to test on vxworks
Note on file names: use the same name but append "coverage_test" as a prefix. See osal example
Add a comment in cmake to specify that there is a convention
Add an info line that specifies which API is being tested. There's a difference between using an API and testing it

jphickey

I pulled this to test it in conjunction with what I will propose for #1266, but found it does not build when using strict ID types.

CFE/CFS developers should ideally all set this option:

set(MISSION_RESOURCEID_MODE STRICT)

in your local global_build_options.cmake file. It isn't set that way by default in order to be compatible for external users that may have existing code, but all framework code should build with this strict option set.

jphickey · 2021-04-01T19:28:04Z

modules/cfe_assert/src/cfe_assert_io.c

@@ -87,6 +87,9 @@ void UT_BSP_DoText(uint8 MessageType, const char *OutputMessage)
                Prefix = "N/A";
                break;
            case UTASSERT_CASETYPE_BEGIN:
+                CFE_ES_WriteToSysLog("\n");
+                CFE_ES_WriteToSysLog("\n");
+                CFE_ES_WriteToSysLog("\n"); /* add a bit of extra whitespace between tests */


This should be left out of this PR ideally - we can do something better in #1266

modules/cfe_testcase/src/es_info_test.c

jphickey

I looked again, just a couple more minor updates ... it's close!

modules/cfe_testcase/src/cfe_test.h

modules/cfe_testcase/src/es_info_test.c

ES API functional tests

Combines: nasa/cFE#1284 nasa/osal#951 nasa/PSP#289 Including: nasa/cFE#1251 - ES Info API Functional test nasa/osal#931 - Scrub include guards nasa/osal#937 - Switch to use CLOCK_REALTIME nasa/osal#938 - specify shell name in ShellOutputToFile nasa/PSP#286 - use OSAL timebase for CFE timers nasa/PSP#282 - modularize the ram, port, and eenasa/psp#om access nasa/PSP#285 - add psp module to implement timebase

zanzaben force-pushed the fix808_ES_API_Functional_Tests branch 3 times, most recently from fba12f9 to d73363d Compare March 29, 2021 19:07

zanzaben marked this pull request as ready for review March 29, 2021 19:07

zanzaben changed the title ~~WIP Fix808 es api functional tests~~ Fix808 es api functional tests Mar 29, 2021

zanzaben changed the base branch from main to integration-candidate March 29, 2021 19:07

zanzaben force-pushed the fix808_ES_API_Functional_Tests branch 2 times, most recently from 40b86f9 to 8598638 Compare March 29, 2021 19:12

zanzaben added CCB:Ready Ready for discussion at the Configuration Control Board (CCB) dependency labels Mar 29, 2021

astrogeco changed the title ~~Fix808 es api functional tests~~ Fix #808, ES API functional tests Mar 29, 2021

skliper reviewed Mar 30, 2021

View reviewed changes

zanzaben force-pushed the fix808_ES_API_Functional_Tests branch 2 times, most recently from ee17610 to 241aa93 Compare March 31, 2021 12:53

astrogeco changed the base branch from integration-candidate to main March 31, 2021 13:16

zanzaben removed the dependency label Mar 31, 2021

zanzaben force-pushed the fix808_ES_API_Functional_Tests branch from 241aa93 to 36498e2 Compare March 31, 2021 14:37

zanzaben changed the base branch from main to integration-candidate March 31, 2021 15:51

zanzaben force-pushed the fix808_ES_API_Functional_Tests branch 2 times, most recently from 3eec2b8 to f406692 Compare April 1, 2021 17:58

jphickey requested changes Apr 1, 2021

View reviewed changes

jphickey mentioned this pull request Apr 1, 2021

Fix #1266, use events for CFE test asserts #1276

Merged

zanzaben force-pushed the fix808_ES_API_Functional_Tests branch from f406692 to 3127a90 Compare April 1, 2021 20:51

astrogeco added IC:2021-04-06 and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Apr 2, 2021

zanzaben force-pushed the fix808_ES_API_Functional_Tests branch from 07127ad to 69c31d2 Compare April 5, 2021 15:59

jphickey added a commit to zanzaben/cFE that referenced this pull request Apr 6, 2021

Fix nasa#1251, updates for printf formats

a9d75b8

zanzaben added a commit to zanzaben/cFE that referenced this pull request Apr 6, 2021

Fix nasa#1251, updates for printf formats

d456d86

zanzaben force-pushed the fix808_ES_API_Functional_Tests branch from a9d75b8 to d456d86 Compare April 6, 2021 13:28

zanzaben force-pushed the fix808_ES_API_Functional_Tests branch from d456d86 to de26ba4 Compare April 6, 2021 17:04

astrogeco added the CCB:Approved Indicates code review and approval by community CCB label Apr 7, 2021

zanzaben force-pushed the fix808_ES_API_Functional_Tests branch from de26ba4 to bc963b8 Compare April 7, 2021 17:22

jphickey requested changes Apr 7, 2021

View reviewed changes

modules/cfe_testcase/src/cfe_test.h Show resolved Hide resolved

modules/cfe_testcase/src/es_info_test.c Outdated Show resolved Hide resolved

modules/cfe_testcase/src/es_info_test.c Outdated Show resolved Hide resolved

Fix nasa#808, ES Info API Functional test

e8a43be

zanzaben force-pushed the fix808_ES_API_Functional_Tests branch from bc963b8 to e8a43be Compare April 7, 2021 20:21

astrogeco merged commit 67ee18c into nasa:integration-candidate Apr 8, 2021

astrogeco added a commit to nasa/cFS that referenced this pull request Apr 8, 2021

IC:2021-04-06, Add nasa/cFE#1251

3cb3e3c

ES API functional tests

astrogeco mentioned this pull request Apr 8, 2021

cFE Integration candidate: 2021-04-06 #1284

Merged

jphickey mentioned this pull request Apr 9, 2021

Fix typo in test macro name: UtAssert_ResourceID_Undifeined #1291

Closed

zanzaben deleted the fix808_ES_API_Functional_Tests branch May 21, 2021 16:15

skliper mentioned this pull request Aug 6, 2021

Fix #808: Updated the initial test to include the ES Info API calls and renamed… #837

Closed

skliper added this to the 7.0.0 milestone Sep 24, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #808, ES API functional tests #1251

Fix #808, ES API functional tests #1251

zanzaben commented Mar 23, 2021 •

edited

Loading

astrogeco commented Mar 31, 2021

jphickey left a comment

jphickey Apr 1, 2021

jphickey left a comment

Fix #808, ES API functional tests #1251

Fix #808, ES API functional tests #1251

Conversation

zanzaben commented Mar 23, 2021 • edited Loading

astrogeco commented Mar 31, 2021

jphickey left a comment

Choose a reason for hiding this comment

jphickey Apr 1, 2021

Choose a reason for hiding this comment

jphickey left a comment

Choose a reason for hiding this comment

zanzaben commented Mar 23, 2021 •

edited

Loading