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 #1679, Add functional tests for resource misc #1782

Conversation

nmullane
Copy link
Contributor

Describe the contribution

  • Fixes Add functional tests for cFE Resource Misc APIs #1679
  • Adds functional tests for
    • CFE_ResourceId_ToInteger
    • CFE_ResourceId_FromInteger
    • CFE_ResourceId_Equal
    • CFE_ResourceId_IsDefined
    • CFE_ResourceId_GetBase
    • CFE_ResourceId_GetSerial
    • CFE_ResourceId_FindNext
    • CFE_ResourceId_ToIndex

Testing performed

  1. Build and run cfe functional tests

Expected behavior changes
No impact to behavior

System(s) tested on

  • Hardware: PC
  • OS: Ubuntu 20.04

Contributor Info - All information REQUIRED for consideration of pull request
Niall Mullane - GSFC 582 Intern

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! Just some minor fixups needed

modules/cfe_testcase/src/resource_id_misc_test.c Outdated Show resolved Hide resolved
modules/cfe_testcase/src/resource_id_misc_test.c Outdated Show resolved Hide resolved
@nmullane nmullane force-pushed the fix1679-resource-misc-functional-tests branch from 8eafd69 to f1b7720 Compare August 11, 2021 15:55
@nmullane
Copy link
Contributor Author

This PR depends on #1790

@nmullane nmullane force-pushed the fix1679-resource-misc-functional-tests branch from f1b7720 to a3801df Compare August 18, 2021 13:01
@zanzaben
Copy link
Contributor

This doesn't build with set(MISSION_RESOURCEID_MODE STRICT). @jphickey is that still an issue?

@jphickey
Copy link
Contributor

This doesn't build with set(MISSION_RESOURCEID_MODE STRICT). @jphickey is that still an issue?

Yes, thanks for catching - we need to fix that before merging! All new code should be consistent and use the correct typedef to store an ID (not a uint32!)

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.

Need to fix all the ID type inconsistencies in here, example case noted in separate comment but there are several similar issues throughout.

Need to enable the strict (type-safe) mode to see the issues. Just add:
set(MISSION_RESOURCEID_MODE STRICT)
to your sample_defs/global_build_options.cmake file to turn this mode on.

modules/cfe_testcase/src/resource_id_misc_test.c Outdated Show resolved Hide resolved
@astrogeco
Copy link
Contributor

astrogeco commented Aug 18, 2021

CCB:2021-08-18 APPROVED with CHANGES

@astrogeco astrogeco added the CCB:Approved Indicates code review and approval by community CCB label Aug 18, 2021
- Fixed test to work with strict resource id types
@nmullane nmullane force-pushed the fix1679-resource-misc-functional-tests branch from a3801df to d02ccd8 Compare August 20, 2021 19:12
@astrogeco astrogeco changed the base branch from main to integration-candidate August 20, 2021 23:07
@astrogeco
Copy link
Contributor

Tests pass in fork
https://github.com/astrogeco/cFE/runs/3386531625

@astrogeco astrogeco merged commit 95ec6d0 into nasa:integration-candidate Aug 20, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 20, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 21, 2021
**Combines**

nasa/cFE# v6.8.0-rc1+dev933
nasa/osal# v5.1.0-rc1+dev594

**Includes**

*osal*

nasa/osal#1131, add test case types similar to NA

*cFE*

nasa/cFE#1803, Add software bus tests
nasa/cFE#1756, separate variable for OSAL status
nasa/cFE#1809, increase SB pool max size bucket
nasa/cFE#1842, Add Null check for CFE_ResourceId_FindNext
nasa/cFE#1828, Improve TBL coverage tests
nasa/cFE#1833, Clean up Message ID Functional Test #1824, Add missing cases for msg id func tests
nasa/cFE#1832, Combine SB Set/Get message characteristics group #1831, Consolidate msg get/set doxygen group
nasa/cFE#1836, Adding coverage tests to cFE TIME
nasa/cFE#1848, enable strict resource id w/OMIT_DEPRECATED
nasa/cFE#1845, HOTFIX IC-20210819, type correction TBL coverage test
nasa/cFE#1806, Add test for ES BackgroundWakeup
nasa/cFE#1813, Success Test for CFE_ES_RestartApp
nasa/cFE#1814, Subscribe to Message Limit Greater Than CFE_PLATFORM_SB_DEFAULT_MSG_LIMIT
nasa/cFE#1811, Success Test for CFE_ES_GetMemPoolStats
nasa/cFE#1822, Group MSG APIs documentation by header type
nasa/cFE#1816, add retroactive CFE status asserts
nasa/cFE#1854, remove unused CFE_TBL_ERR_BAD_APP_ID
nasa/cFE#1855, correct syslog message in pool create
nasa/cFE#1853, remove unused CFE_ES_POOL_BOUNDS_ERROR
nasa/cFE#1859, remove unused CFE_TBL_ERR_FILE_NOT_FOUND
nasa/cFE#1856, Check error ctr to TransmitMsg test
nasa/cFE#1857, End Child Task requirement remove error code
nasa/cFE#1782, Add functional tests for resource misc

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: Ariel Adams             <ArielSAdamsNASA@users.noreply.github.com>
Co-authored-by: Jose F Martinez Pedraza <pepepr08@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
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add functional tests for cFE Resource Misc APIs
5 participants