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.

Sign up for GitHub

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

Jump to bottom

cFE Integration Candidate: Caelum-rc4+dev8 #2091

Merged
merged 12 commits into from
Apr 19, 2022
Merged

cFE Integration Candidate: Caelum-rc4+dev8 #2091

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dfc5d09
Fix #2076, Improve ES unit test coverage
skliper Apr 6, 2022
1195229
Fix #2067, Only increment SB InternalErrorCounter on errors
skliper Apr 7, 2022
d9f6b89
Fix #2079, Replace cFE CLA with bundle Bootes CLA forms
chillfig Mar 29, 2022
58a8780
Fix #2083, Consistent doxygen flow/naming for generation
skliper Apr 11, 2022
6786471
Fix #2086, Use doc build reusable workflow
skliper Apr 13, 2022
d732a95
Fix #2075, Add config module to coverage enforcement
skliper Apr 6, 2022
befe292
Fix #2086, Deploy cfe-userguide pdf within reusable workflow
skliper Apr 14, 2022
a974f94
Merge pull request #2077 from chillfig/cla_removal
astrogeco Apr 18, 2022
228c2a6
Merge pull request #2085 from skliper/fix2083-consistent_doxygen
astrogeco Apr 18, 2022
db2b466
Merge pull request #2080 from skliper/fix2075-add_config_coverage_enf…
astrogeco Apr 18, 2022
9d087e1
Merge pull request #2081 from skliper/fix2076-modsrcvercallback_coverage
astrogeco Apr 18, 2022
8be2d24
Merge pull request #2082 from skliper/fix2067-sb_internalerrorcounter
astrogeco Apr 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix #2076, Improve ES unit test coverage
  • Loading branch information
@skliper
skliper committed Apr 6, 2022
commit dfc5d097b232ef8897cd356192cb81a1fcfc3341
4 changes: 2 additions & 2 deletions .github/workflows/code-coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ jobs:

- name: Confirm Minimum Coverage
run: |
missed_branches=76
missed_lines=33
missed_branches=52
missed_lines=18
branch_nums=$(grep -A 3 "Overall coverage rate" lcov_out.txt | grep branches | grep -oP "[0-9]+[0-9]*")
line_nums=$(grep -A 3 "Overall coverage rate" lcov_out.txt | grep lines | grep -oP "[0-9]+[0-9]*")

Expand Down
15 changes: 14 additions & 1 deletion modules/es/ut-coverage/es_UT.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
*/
#include "es_UT.h"
#include "target_config.h"
#include "cfe_config.h"

#define ES_UT_CDS_BLOCK_SIZE 16

Expand Down Expand Up @@ -1123,6 +1124,14 @@ static void ES_UT_ForEachObjectFail(void *UserObj, UT_EntryKey_t FuncKey, const
(*callback_ptr)(id, callback_arg);
}

static void ES_UT_Config_IterateAll(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context)
{
CFE_Config_Callback_t Callback = UT_Hook_GetArgValueByName(Context, "Callback", CFE_Config_Callback_t);

(*Callback)(NULL, CFE_CONFIGID_UNDEFINED, "Test");
(*Callback)(NULL, CFE_CONFIGID_UNDEFINED, "MOD_SRCVER_test");
}

void TestApps(void)
{
int NumBytes;
Expand Down Expand Up @@ -3498,11 +3507,15 @@ void TestTask(void)
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.NoArgsCmd), UT_TPID_CFE_ES_CMD_NOOP_CC);
CFE_UtAssert_PRINTF("Error sending build info event");

/* Test CFE_ES_GenerateVersionEvents error when sending mission event */
/*
* Test CFE_ES_GenerateVersionEvents error when sending mission event and add hook
* to cover CFE_ES_ModSrcVerCallback
*/
ES_ResetUnitTest();
ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_RUNNING, NULL, NULL, NULL);
CFE_ES_Global.ResetDataPtr->ResetVars.ResetType = 1;
UT_SetDeferredRetcode(UT_KEY(CFE_EVS_SendEvent), 3, CFE_EVS_INVALID_PARAMETER);
UT_SetHandlerFunction(UT_KEY(CFE_Config_IterateAll), ES_UT_Config_IterateAll, NULL);
UtAssert_VOIDCALL(CFE_ES_TaskInit());
CFE_UtAssert_PRINTF("Error sending mission version event");

Expand Down