diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml new file mode 100644 index 0000000..4142b77 --- /dev/null +++ b/.github/workflows/add-to-project.yml @@ -0,0 +1,13 @@ +name: Add Issue or PR to Project + +on: + issues: + types: [opened] + pull_request_target: + types: [opened, ready_for_review, converted_to_draft] + +jobs: + add-to-project: + name: Add issue or pull request to project + uses: nasa/cFS/.github/workflows/add-to-project-reusable.yml@dev + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml index c69056a..c0468d3 100644 --- a/.github/workflows/build-documentation.yml +++ b/.github/workflows/build-documentation.yml @@ -1,4 +1,4 @@ -name: Build and Deploy Documentation +name: Build Documentation on: push: @@ -15,9 +15,8 @@ on: jobs: build-documentation: name: Build and deploy cFS documents - uses: nasa/cFS/.github/workflows/build-deploy-doc.yml@main + uses: nasa/cFS/.github/workflows/build-doc-reusable.yml@dev with: target: "[\"cs-usersguide\"]" app-name: cs - buildpdf: ${{ github.event_name == 'push' && contains(github.ref, 'main')}} - deploy: ${{ github.event_name == 'push' && contains(github.ref, 'main')}} + buildpdf: ${{ github.event_name == 'push' && (contains(github.ref, 'main') || contains(github.ref, 'dev')) }} \ No newline at end of file diff --git a/.github/workflows/build-run-app.yml b/.github/workflows/build-run-app.yml index b780d37..a3b6a58 100644 --- a/.github/workflows/build-run-app.yml +++ b/.github/workflows/build-run-app.yml @@ -11,8 +11,11 @@ on: - reopened - synchronize workflow_dispatch: + schedule: + # 9:35 PM UTC every Sunday + - cron: '35 21 * * 0' jobs: build-run: name: Build and run with startup msg verification - uses: nasa/cFS/.github/workflows/build-run-app.yml@main + uses: nasa/cFS/.github/workflows/build-run-app-reusable.yml@dev diff --git a/.github/workflows/codeql-build.yml b/.github/workflows/codeql-build.yml index d02f93a..e4fa8a5 100644 --- a/.github/workflows/codeql-build.yml +++ b/.github/workflows/codeql-build.yml @@ -15,11 +15,8 @@ on: jobs: codeql: name: Codeql Analysis - uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main + uses: nasa/cFS/.github/workflows/codeql-reusable.yml@dev with: component-path: apps/cs prep: 'make prep; make -C build/tools/elf2cfetbl' - make: 'make -C build/native/default_cpu1/apps/cs' - setup: | - cp ./cfe/cmake/Makefile.sample Makefile && cp -r ./cfe/cmake/sample_defs sample_defs - sed -i "/list(APPEND MISSION_GLOBAL_APPLIST/a list(APPEND MISSION_GLOBAL_APPLIST cs)" sample_defs/targets.cmake + make: 'make -C build/native/default_cpu1/apps/cs' \ No newline at end of file diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index 441199a..a47839d 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -2,13 +2,18 @@ name: Format Check # Run on all push and pull requests on: + push: + branches: + - dev + - main pull_request: types: - opened - reopened - synchronize + workflow_dispatch: jobs: format-check: name: Run format check - uses: nasa/cFS/.github/workflows/format-check.yml@main + uses: nasa/cFS/.github/workflows/format-check.yml@dev diff --git a/.github/workflows/mcdc.yml b/.github/workflows/mcdc.yml new file mode 100644 index 0000000..2a59a85 --- /dev/null +++ b/.github/workflows/mcdc.yml @@ -0,0 +1,20 @@ +name: MCDC Analysis + +on: + push: + branches: + - dev + - main + pull_request: + types: + - opened + - reopened + - synchronize + workflow_dispatch: + +jobs: + mcdc: + name: Run MCDC Analysis + uses: nasa/cFS/.github/workflows/mcdc-reusable.yml@dev + with: + app-name: 'cs' \ No newline at end of file diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 800c300..9c279a0 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -15,7 +15,5 @@ on: jobs: static-analysis: - name: Run cppcheck - uses: nasa/cFS/.github/workflows/static-analysis.yml@main - with: - strict-dir-list: './fsw' + name: Static Analysis + uses: nasa/cFS/.github/workflows/app-static-analysis-reusable.yml@dev \ No newline at end of file diff --git a/.github/workflows/unit-test-coverage.yml b/.github/workflows/unit-test-coverage.yml index 5056711..6172d6b 100644 --- a/.github/workflows/unit-test-coverage.yml +++ b/.github/workflows/unit-test-coverage.yml @@ -11,8 +11,11 @@ on: - reopened - synchronize workflow_dispatch: + schedule: + # 9:25 PM UTC every Sunday + - cron: '25 21 * * 0' jobs: unit-test-coverage: name: Run unit test and coverage - uses: nasa/cFS/.github/workflows/unit-test-coverage.yml@main + uses: nasa/cFS/.github/workflows/unit-test-coverage-reusable.yml@dev diff --git a/config/default_cs_fcncode_values.h b/config/default_cs_fcncode_values.h index e7edbb1..48453de 100644 --- a/config/default_cs_fcncode_values.h +++ b/config/default_cs_fcncode_values.h @@ -29,7 +29,7 @@ enum CS_FunctionCode { CS_FunctionCode_NOOP = 0, - CS_FunctionCode_RESET = 1, + CS_FunctionCode_RESET_COUNTERS = 1, CS_FunctionCode_ONE_SHOT = 2, CS_FunctionCode_CANCEL_ONE_SHOT = 3, CS_FunctionCode_ENABLE_ALL_CS = 4, diff --git a/config/default_cs_msgdefs.h b/config/default_cs_msgdefs.h index ef07361..17851b7 100644 --- a/config/default_cs_msgdefs.h +++ b/config/default_cs_msgdefs.h @@ -39,8 +39,8 @@ */ typedef struct { - uint8 CmdCounter; /**< \brief CS Application Command Counter */ - uint8 CmdErrCounter; /**< \brief CS Application Command Error Counter */ + uint8 CommandCounter; /**< \brief CS Application Command Counter */ + uint8 CommandErrorCounter; /**< \brief CS Application Command Error Counter */ uint8 ChecksumState; /**< \brief CS Application global checksum state */ uint8 EepromCSState; /**< \brief CS EEPROM table checksum state */ diff --git a/config/default_cs_msgstruct.h b/config/default_cs_msgstruct.h index 868290a..6e87dca 100644 --- a/config/default_cs_msgstruct.h +++ b/config/default_cs_msgstruct.h @@ -56,7 +56,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -70,7 +70,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -79,12 +79,12 @@ typedef struct typedef struct { CFE_MSG_CommandHeader_t CommandHeader; -} CS_ResetCmd_t; +} CS_ResetCountersCmd_t; /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -98,7 +98,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -112,7 +112,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -126,7 +126,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -140,7 +140,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -154,7 +154,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -168,7 +168,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -182,7 +182,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -196,7 +196,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -210,7 +210,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -224,7 +224,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -238,7 +238,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -252,7 +252,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -266,7 +266,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -280,7 +280,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -294,7 +294,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -308,7 +308,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -322,7 +322,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -336,7 +336,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC @@ -350,7 +350,7 @@ typedef struct /** * \brief No arguments command data type * - * For command details see #CS_NOOP_CC #CS_RESET_CC, #CS_ENABLE_ALL_CS_CC, + * For command details see #CS_NOOP_CC #CS_RESET_COUNTERS_CC, #CS_ENABLE_ALL_CS_CC, * #CS_DISABLE_ALL_CS_CC, #CS_ENABLE_CFE_CORE_CC, #CS_DISABLE_CFE_CORE_CC, #CS_ENABLE_OS_CC, * #CS_DISABLE_OS_CC, #CS_ENABLE_EEPROM_CC, #CS_DISABLE_EEPROM_CC, #CS_ENABLE_MEMORY_CC, * #CS_DISABLE_MEMORY_CC, #CS_ENABLE_TABLES_CC, #CS_DISABLE_TABLES_CC diff --git a/eds/cs.xml b/eds/cs.xml index 0d22295..9d83c97 100644 --- a/eds/cs.xml +++ b/eds/cs.xml @@ -54,8 +54,8 @@ - - + + @@ -238,7 +238,7 @@ - + diff --git a/fsw/inc/cs_fcncodes.h b/fsw/inc/cs_fcncodes.h index 82a4843..7673f71 100644 --- a/fsw/inc/cs_fcncodes.h +++ b/fsw/inc/cs_fcncodes.h @@ -43,7 +43,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_NOOP_INF_EID informational event message will be * generated when the command is received * @@ -52,13 +52,13 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality * None * - * \sa #CS_RESET_CC + * \sa #CS_RESET_COUNTERS_CC */ #define CS_NOOP_CC CS_CCVAL(NOOP) @@ -69,13 +69,13 @@ * Resets the CS housekeeping counters * * \par Command Structure - * #CS_ResetCmd_t + * #CS_ResetCountersCmd_t * * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will be cleared - * - #CS_HkPacket_Payload_t.CmdErrCounter will be cleared + * - #CS_HkPacket_Payload_t.CommandCounter will be cleared + * - #CS_HkPacket_Payload_t.CommandErrorCounter will be cleared * - The #CS_RESET_INF_EID informational event message will be * generated when the command is executed * @@ -84,7 +84,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -92,7 +92,7 @@ * * \sa #CS_NOOP_CC */ -#define CS_RESET_CC CS_CCVAL(RESET) +#define CS_RESET_COUNTERS_CC CS_CCVAL(RESET_COUNTERS) /** * \brief Start One shot calculation @@ -109,7 +109,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ONESHOT_STARTED_DBG_EID debug event message will be * generated when the command is received * - The CS_ONESHOT_FINISHED_INF_EID informational message will @@ -126,7 +126,7 @@ * - The child task failed to be created * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_ONESHOT_MEMVALIDATE_ERR_EID * - Error specific event message #CS_ONESHOT_CHDTASK_ERR_EID @@ -157,7 +157,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ONESHOT_CANCELLED_INF_EID informational event message will be * generated when the command is received * @@ -168,7 +168,7 @@ * - The child task could not be deleted * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_ONESHOT_CANCEL_NO_CHDTASK_ERR_EID * - Error specific event message #CS_ONESHOT_CANCEL_DELETE_CHDTASK_ERR_EID @@ -192,7 +192,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ENABLE_ALL_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.ChecksumState set to #CS_ChecksumState_ENABLED @@ -202,7 +202,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -224,7 +224,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_DISABLE_ALL_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.ChecksumState set to #CS_ChecksumState_DISABLED @@ -234,7 +234,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -256,7 +256,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ENABLE_CFECORE_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.CfeCoreCSState set to #CS_ChecksumState_ENABLED @@ -266,7 +266,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -288,7 +288,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_DISABLE_CFECORE_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.CfeCoreCSState set to #CS_ChecksumState_DISABLED @@ -298,7 +298,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -321,7 +321,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_BASELINE_CFECORE_INF_EID informational event message will be * generated when the command is received, or * - The #CS_NO_BASELINE_CFECORE_INF_EID informational event message will be @@ -332,7 +332,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -354,7 +354,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_RECOMPUTE_CFECORE_STARTED_DBG_EID debug event message will be * generated when the command is received * @@ -367,7 +367,7 @@ * - The child task failed to be created by Executive Services (ES) * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_RECOMPUTE_CFECORE_CREATE_CHDTASK_ERR_EID * - Error specific event message #CS_RECOMPUTE_CFECORE_CHDTASK_ERR_EID @@ -396,7 +396,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ENABLE_OS_INF_EID informational event message will be * generated when the command is received * @@ -405,7 +405,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - #CS_HkPacket_Payload_t.OSCSState set to #CS_ChecksumState_ENABLED * @@ -428,7 +428,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_DISABLE_OS_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.OSCSState set to #CS_ChecksumState_DISABLED @@ -438,7 +438,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -461,7 +461,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_BASELINE_OS_INF_EID informational event message will be * generated when the command is received, or * - The #CS_NO_BASELINE_OS_INF_EID informational event message will be @@ -472,7 +472,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -493,7 +493,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_RECOMPUTE_OS_STARTED_DBG_EID debug event message will be * generated when the command is received * @@ -506,7 +506,7 @@ * - The child task failed to be created by Executive Services (ES) * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_RECOMPUTE_OS_CREATE_CHDTASK_ERR_EID * - Error specific event message #CS_RECOMPUTE_OS_CHDTASK_ERR_EID @@ -534,7 +534,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ENABLE_EEPROM_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.EepromCSState set to #CS_ChecksumState_ENABLED @@ -544,7 +544,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -566,7 +566,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_DISABLE_EEPROM_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.EepromCSState set to #CS_ChecksumState_DISABLED @@ -576,7 +576,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -599,7 +599,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_BASELINE_EEPROM_INF_EID informational event message will be * generated when the command is received, or * - The #CS_NO_BASELINE_EEPROM_INF_EID informational event message will be @@ -611,7 +611,7 @@ * - The command specified Entry ID is invalid * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_BASELINE_INVALID_ENTRY_EEPROM_ERR_EID * @@ -635,7 +635,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_RECOMPUTE_EEPROM_STARTED_DBG_EID debug event * message will be generated when the command is received * - The #CS_RECOMPUTE_FINISH_EEPROM_MEMORY_INF_EID informational event @@ -651,7 +651,7 @@ * - The child task failed to be created by Executive Services (ES) * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_RECOMPUTE_INVALID_ENTRY_EEPROM_ERR_EID * - Error specific event message #CS_RECOMPUTE_EEPROM_CREATE_CHDTASK_ERR_EID @@ -681,7 +681,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ENABLE_EEPROM_ENTRY_INF_EID informational event message will be * generated when the command is received * @@ -691,7 +691,7 @@ * - Command specified entry was invalid * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_ENABLE_EEPROM_INVALID_ENTRY_ERR_EID * @@ -714,7 +714,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_DISABLE_EEPROM_ENTRY_INF_EID informational event message will be * generated when the command is received * @@ -724,7 +724,7 @@ * - Command specified entry was invalid * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_DISABLE_EEPROM_INVALID_ENTRY_ERR_EID * @@ -748,7 +748,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_GET_ENTRY_ID_EEPROM_INF_EID informational event message will be * generated when the command is received * @@ -758,7 +758,7 @@ * - Command specified address was not found in the table * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_GET_ENTRY_ID_EEPROM_NOT_FOUND_INF_EID * @@ -779,7 +779,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ENABLE_MEMORY_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.MemoryCSState set to #CS_ChecksumState_ENABLED @@ -789,7 +789,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -811,7 +811,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_DISABLE_MEMORY_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.MemoryCSState set to #CS_ChecksumState_DISABLED @@ -821,7 +821,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -844,7 +844,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_BASELINE_MEMORY_INF_EID informational event message will be * generated when the command is received, or * - The #CS_NO_BASELINE_MEMORY_INF_EID informational event message will be @@ -856,7 +856,7 @@ * - The command specified Entry ID is invalid * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_BASELINE_INVALID_ENTRY_MEMORY_ERR_EID * @@ -879,7 +879,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_RECOMPUTE_MEMORY_STARTED_DBG_EID debug event * message will be generated when the command is received * - The #CS_RECOMPUTE_FINISH_EEPROM_MEMORY_INF_EID informational event @@ -895,7 +895,7 @@ * - The child task failed to be created by Executive Services (ES) * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_RECOMPUTE_INVALID_ENTRY_MEMORY_ERR_EID * - Error specific event message #CS_RECOMPUTE_MEMORY_CREATE_CHDTASK_ERR_EID @@ -925,7 +925,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ENABLE_MEMORY_ENTRY_INF_EID informational event message will be * generated when the command is received * @@ -935,7 +935,7 @@ * - Command specified entry was invalid * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_ENABLE_MEMORY_INVALID_ENTRY_ERR_EID * @@ -958,7 +958,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_DISABLE_MEMORY_ENTRY_INF_EID informational event message will be * generated when the command is received * @@ -968,7 +968,7 @@ * - Command specified entry was invalid * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_DISABLE_MEMORY_INVALID_ENTRY_ERR_EID * @@ -992,7 +992,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_GET_ENTRY_ID_MEMORY_INF_EID informational event message will be * generated when the command is received * @@ -1002,7 +1002,7 @@ * - Command specified address was not found in the table * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_GET_ENTRY_ID_MEMORY_NOT_FOUND_INF_EID * @@ -1024,7 +1024,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ENABLE_TABLES_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.TablesCSState set to #CS_ChecksumState_ENABLED @@ -1034,7 +1034,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -1056,7 +1056,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_DISABLE_TABLES_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.TablesCSState set to #CS_ChecksumState_DISABLED @@ -1066,7 +1066,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -1089,7 +1089,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_BASELINE_TABLE_INF_EID informational event message will be * generated when the command is received, or * - The #CS_NO_BASELINE_TABLE_INF_EID informational event message will be @@ -1101,7 +1101,7 @@ * - The command specified able name is invalid * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_BASELINE_INVALID_NAME_TABLES_ERR_EID * @@ -1124,7 +1124,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_RECOMPUTE_TABLES_STARTED_DBG_EID debug event * message will be generated when the command is received * - The #CS_RECOMPUTE_FINISH_TABLES_INF_EID informational event @@ -1146,7 +1146,7 @@ * - The child task failed to be created by Executive Services (ES) * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_RECOMPUTE_UNKNOWN_NAME_TABLES_ERR_EID * - Error specific event message #CS_RECOMPUTE_TABLES_CREATE_CHDTASK_ERR_EID @@ -1176,7 +1176,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ENABLE_TABLES_NAME_INF_EID informational event message will be * generated when the command is received * @@ -1186,7 +1186,7 @@ * - Command specified table name was invalid * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_ENABLE_TABLES_UNKNOWN_NAME_ERR_EID * @@ -1209,7 +1209,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_DISABLE_TABLES_NAME_INF_EID informational event message will be * generated when the command is received * @@ -1219,7 +1219,7 @@ * - Command specified table name was invalid * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_DISABLE_TABLES_NAME_INF_EID * - Error specific event message #CS_DISABLE_TABLES_UNKNOWN_NAME_ERR_EID * @@ -1242,7 +1242,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ENABLE_APP_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.AppCSState set to #CS_ChecksumState_ENABLED @@ -1252,7 +1252,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -1274,7 +1274,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_DISABLE_APP_INF_EID informational event message will be * generated when the command is received * - #CS_HkPacket_Payload_t.AppCSState set to #CS_ChecksumState_DISABLED @@ -1284,7 +1284,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * * \par Criticality @@ -1307,7 +1307,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_BASELINE_APP_INF_EID informational event message will be * generated when the command is received, or * - The #CS_NO_BASELINE_APP_INF_EID informational event message will be @@ -1319,7 +1319,7 @@ * - The command specified able name is invalid * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_BASELINE_INVALID_NAME_APP_ERR_EID * @@ -1342,7 +1342,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_RECOMPUTE_APP_STARTED_DBG_EID debug event * message will be generated when the command is received * - The #CS_RECOMPUTE_FINISH_APP_INF_EID informational event @@ -1358,7 +1358,7 @@ * - The child task failed to be created by Executive Services (ES) * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_RECOMPUTE_UNKNOWN_NAME_APP_ERR_EID * - Error specific event message #CS_RECOMPUTE_APP_CREATE_CHDTASK_ERR_EID @@ -1388,7 +1388,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_ENABLE_APP_NAME_INF_EID informational event message will be * generated when the command is received * @@ -1398,7 +1398,7 @@ * - Command specified app name was invalid * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_CMD_LEN_ERR_EID * - Error specific event message #CS_ENABLE_APP_UNKNOWN_NAME_ERR_EID * @@ -1421,7 +1421,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #CS_HkPacket_Payload_t.CmdCounter will increment + * - #CS_HkPacket_Payload_t.CommandCounter will increment * - The #CS_DISABLE_APP_NAME_INF_EID informational event message will be * generated when the command is received * @@ -1431,7 +1431,7 @@ * - Command specified app name was invalid * * \par Evidence of failure may be found in the following telemetry: - * - #CS_HkPacket_Payload_t.CmdErrCounter will increment + * - #CS_HkPacket_Payload_t.CommandErrorCounter will increment * - Error specific event message #CS_DISABLE_APP_NAME_INF_EID * - Error specific event message #CS_DISABLE_APP_UNKNOWN_NAME_ERR_EID * diff --git a/fsw/src/cs_app.c b/fsw/src/cs_app.c index 6cb3fed..d4429ff 100644 --- a/fsw/src/cs_app.c +++ b/fsw/src/cs_app.c @@ -119,18 +119,24 @@ void CS_AppMain(void) if (CS_AppData.RunStatus == CFE_ES_RunStatus_APP_ERROR || CS_AppData.RunStatus == CFE_ES_RunStatus_SYS_EXCEPTION) { /* Send an error event with run status and result */ - CFE_EVS_SendEvent(CS_EXIT_ERR_EID, CFE_EVS_EventType_ERROR, "App terminating, RunStatus:0x%08X, RC:0x%08X", - (unsigned int)CS_AppData.RunStatus, (unsigned int)Result); + CFE_EVS_SendEvent(CS_EXIT_ERR_EID, + CFE_EVS_EventType_ERROR, + "App terminating, RunStatus:0x%08X, RC:0x%08X", + (unsigned int)CS_AppData.RunStatus, + (unsigned int)Result); } else { /* Send an informational event describing the reason for the termination */ - CFE_EVS_SendEvent(CS_EXIT_INF_EID, CFE_EVS_EventType_INFORMATION, "App terminating, RunStatus:0x%08X", + CFE_EVS_SendEvent(CS_EXIT_INF_EID, + CFE_EVS_EventType_INFORMATION, + "App terminating, RunStatus:0x%08X", (unsigned int)CS_AppData.RunStatus); } /* In case cFE Event Services is not working */ - CFE_ES_WriteToSysLog("CS App terminating, RunStatus:0x%08X, RC:0x%08X\n", (unsigned int)CS_AppData.RunStatus, + CFE_ES_WriteToSysLog("CS App terminating, RunStatus:0x%08X, RC:0x%08X\n", + (unsigned int)CS_AppData.RunStatus, (unsigned int)Result); /* Performance Log (stop time counter) */ @@ -207,9 +213,13 @@ CFE_Status_t CS_AppInit(void) CS_AppData.MaxBytesPerCycle = CS_DEFAULT_BYTES_PER_CYCLE; /* Application startup event message */ - Result = - CFE_EVS_SendEvent(CS_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "CS Initialized. Version %d.%d.%d.%d", - CS_MAJOR_VERSION, CS_MINOR_VERSION, CS_REVISION, CS_MISSION_REV); + Result = CFE_EVS_SendEvent(CS_INIT_INF_EID, + CFE_EVS_EventType_INFORMATION, + "CS Initialized. Version %d.%d.%d.%d", + CS_MAJOR_VERSION, + CS_MINOR_VERSION, + CS_REVISION, + CS_MISSION_REV); } return Result; } @@ -299,7 +309,9 @@ CFE_Status_t CS_CreateRestoreStatesFromCDS(void) CS_AppData.HkPacket.Payload.OSCSState = CS_OSCS_CHECKSUM_STATE; CS_AppData.HkPacket.Payload.CfeCoreCSState = CS_CFECORE_CHECKSUM_STATE; - CFE_EVS_SendEvent(EventId, CFE_EVS_EventType_ERROR, "Critical Data Store access error = 0x%08X", + CFE_EVS_SendEvent(EventId, + CFE_EVS_EventType_ERROR, + "Critical Data Store access error = 0x%08X", (unsigned int)Result); /* ** CDS errors are not fatal - CS can still run... @@ -345,8 +357,10 @@ void CS_UpdateCDS(void) if (Result != CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_UPDATE_CDS_ERR_EID, CFE_EVS_EventType_ERROR, - "Critical Data Store access error = 0x%08X", (unsigned int)Result); + CFE_EVS_SendEvent(CS_UPDATE_CDS_ERR_EID, + CFE_EVS_EventType_ERROR, + "Critical Data Store access error = 0x%08X", + (unsigned int)Result); /* ** CDS is broken - prevent further errors... */ diff --git a/fsw/src/cs_app.h b/fsw/src/cs_app.h index 0e0e1b5..f5ee410 100644 --- a/fsw/src/cs_app.h +++ b/fsw/src/cs_app.h @@ -103,14 +103,14 @@ typedef struct CFE_ES_TaskId_t ChildTaskID; /**< \brief Task ID for the child task */ size_t MaxBytesPerCycle; /**< \brief Max number of bytes to process in a cycle */ - - uint32 RunStatus; /**< \brief Application run status */ + uint32 RunStatus; /**< \brief Application run status */ CS_Res_EepromMemory_Table_Entry_t *RecomputeEepromMemoryEntryPtr; /**< \brief Pointer to an entry to recompute in the EEPROM or Memory table */ - CS_Res_App_Table_Entry_t *RecomputeAppEntryPtr; /**< \brief Pointer to an entry to recompute in the - Application table */ + CS_Res_App_Table_Entry_t *RecomputeAppEntryPtr; /**< \brief Pointer to an entry to recompute in the + Application table */ + CS_Res_Tables_Table_Entry_t *RecomputeTablesEntryPtr; /**< \brief Pointer to an entry to recompute in the Tables table */ diff --git a/fsw/src/cs_app_cmds.c b/fsw/src/cs_app_cmds.c index ec1188a..a2d00b7 100644 --- a/fsw/src/cs_app_cmds.c +++ b/fsw/src/cs_app_cmds.c @@ -55,7 +55,7 @@ CFE_Status_t CS_DisableAppsCmd(const CS_DisableAppsCmd_t *CmdPtr) #endif CFE_EVS_SendEvent(CS_DISABLE_APP_INF_EID, CFE_EVS_EventType_INFORMATION, "Checksumming of App is Disabled"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } return CFE_SUCCESS; @@ -77,7 +77,7 @@ CFE_Status_t CS_EnableAppsCmd(const CS_EnableAppsCmd_t *CmdPtr) #endif CFE_EVS_SendEvent(CS_ENABLE_APP_INF_EID, CFE_EVS_EventType_INFORMATION, "Checksumming of App is Enabled"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } return CFE_SUCCESS; @@ -103,21 +103,28 @@ CFE_Status_t CS_ReportBaselineAppCmd(const CS_ReportBaselineAppCmd_t *CmdPtr) if (ResultsEntry->ComputedYet == true) { Baseline = ResultsEntry->ComparisonValue; - CFE_EVS_SendEvent(CS_BASELINE_APP_INF_EID, CFE_EVS_EventType_INFORMATION, - "Report baseline of app %s is 0x%08X", Name, (unsigned int)Baseline); + CFE_EVS_SendEvent(CS_BASELINE_APP_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Report baseline of app %s is 0x%08X", + Name, + (unsigned int)Baseline); } else { - CFE_EVS_SendEvent(CS_NO_BASELINE_APP_INF_EID, CFE_EVS_EventType_INFORMATION, - "Report baseline of app %s has not been computed yet", Name); + CFE_EVS_SendEvent(CS_NO_BASELINE_APP_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Report baseline of app %s has not been computed yet", + Name); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else { - CFE_EVS_SendEvent(CS_BASELINE_INVALID_NAME_APP_ERR_EID, CFE_EVS_EventType_ERROR, - "App report baseline failed, app %s not found", Name); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_BASELINE_INVALID_NAME_APP_ERR_EID, + CFE_EVS_EventType_ERROR, + "App report baseline failed, app %s not found", + Name); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; @@ -136,8 +143,8 @@ CFE_Status_t CS_RecomputeBaselineAppCmd(const CS_RecomputeBaselineAppCmd_t *CmdP CS_Res_App_Table_Entry_t *ResultsEntry; char Name[OS_MAX_API_NAME]; - if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false && - CS_AppData.HkPacket.Payload.OneShotInProgress == false) + if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false + && CS_AppData.HkPacket.Payload.OneShotInProgress == false) { strncpy(Name, CmdPtr->Payload.Name, sizeof(Name) - 1); Name[sizeof(Name) - 1] = '\0'; @@ -153,36 +160,49 @@ CFE_Status_t CS_RecomputeBaselineAppCmd(const CS_RecomputeBaselineAppCmd_t *CmdP CS_AppData.RecomputeAppEntryPtr = ResultsEntry; - Status = CFE_ES_CreateChildTask(&ChildTaskID, CS_RECOMP_APP_TASK_NAME, CS_RecomputeAppChildTask, NULL, - CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, CS_CHILD_TASK_PRIORITY, 0); + Status = CFE_ES_CreateChildTask(&ChildTaskID, + CS_RECOMP_APP_TASK_NAME, + CS_RecomputeAppChildTask, + NULL, + CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, + CS_CHILD_TASK_PRIORITY, + 0); if (Status == CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_RECOMPUTE_APP_STARTED_DBG_EID, CFE_EVS_EventType_DEBUG, - "Recompute baseline of app %s started", Name); - CS_AppData.HkPacket.Payload.CmdCounter++; + CFE_EVS_SendEvent(CS_RECOMPUTE_APP_STARTED_DBG_EID, + CFE_EVS_EventType_DEBUG, + "Recompute baseline of app %s started", + Name); + CS_AppData.HkPacket.Payload.CommandCounter++; } else /* child task creation failed */ { - CFE_EVS_SendEvent(CS_RECOMPUTE_APP_CREATE_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, - "Recompute baseline of app %s failed, CFE_ES_CreateChildTask returned: 0x%08X", Name, + CFE_EVS_SendEvent(CS_RECOMPUTE_APP_CREATE_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, + "Recompute baseline of app %s failed, CFE_ES_CreateChildTask returned: 0x%08X", + Name, (unsigned int)Status); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; CS_AppData.HkPacket.Payload.RecomputeInProgress = false; } } else { - CFE_EVS_SendEvent(CS_RECOMPUTE_UNKNOWN_NAME_APP_ERR_EID, CFE_EVS_EventType_ERROR, - "App recompute baseline failed, app %s not found", Name); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_RECOMPUTE_UNKNOWN_NAME_APP_ERR_EID, + CFE_EVS_EventType_ERROR, + "App recompute baseline failed, app %s not found", + Name); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } else { /*send event that we can't start another task right now */ - CFE_EVS_SendEvent(CS_RECOMPUTE_APP_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, - "App recompute baseline for app %s failed: child task in use", Name); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_RECOMPUTE_APP_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, + "App recompute baseline for app %s failed: child task in use", + Name); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; @@ -198,7 +218,7 @@ CFE_Status_t CS_DisableNameAppCmd(const CS_DisableNameAppCmd_t *CmdPtr) /* command verification variables */ CS_Res_App_Table_Entry_t *ResultsEntry; CS_Def_App_Table_Entry_t *DefinitionEntry; - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; char Name[OS_MAX_API_NAME]; if (CS_CheckRecomputeOneshot() == false) @@ -212,8 +232,10 @@ CFE_Status_t CS_DisableNameAppCmd(const CS_DisableNameAppCmd_t *CmdPtr) ResultsEntry->TempChecksumValue = 0; ResultsEntry->ByteOffset = 0; - CFE_EVS_SendEvent(CS_DISABLE_APP_NAME_INF_EID, CFE_EVS_EventType_INFORMATION, - "Checksumming of app %s is Disabled", Name); + CFE_EVS_SendEvent(CS_DISABLE_APP_NAME_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Checksumming of app %s is Disabled", + Name); if (CS_GetAppDefTblEntryByName(&DefinitionEntry, Name)) { @@ -221,18 +243,22 @@ CFE_Status_t CS_DisableNameAppCmd(const CS_DisableNameAppCmd_t *CmdPtr) } else { - CFE_EVS_SendEvent(CS_DISABLE_APP_DEF_NOT_FOUND_DBG_EID, CFE_EVS_EventType_DEBUG, - "CS unable to update apps definition table for entry %s", Name); + CFE_EVS_SendEvent(CS_DISABLE_APP_DEF_NOT_FOUND_DBG_EID, + CFE_EVS_EventType_DEBUG, + "CS unable to update apps definition table for entry %s", + Name); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else { - CFE_EVS_SendEvent(CS_DISABLE_APP_UNKNOWN_NAME_ERR_EID, CFE_EVS_EventType_ERROR, - "App disable app command failed, app %s not found", Name); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_DISABLE_APP_UNKNOWN_NAME_ERR_EID, + CFE_EVS_EventType_ERROR, + "App disable app command failed, app %s not found", + Name); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } /* end InProgress if */ @@ -249,7 +275,7 @@ CFE_Status_t CS_EnableNameAppCmd(const CS_EnableNameAppCmd_t *CmdPtr) /* command verification variables */ CS_Res_App_Table_Entry_t *ResultsEntry; CS_Def_App_Table_Entry_t *DefinitionEntry; - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; char Name[OS_MAX_API_NAME]; if (CS_CheckRecomputeOneshot() == false) @@ -261,8 +287,10 @@ CFE_Status_t CS_EnableNameAppCmd(const CS_EnableNameAppCmd_t *CmdPtr) { ResultsEntry->State = CS_ChecksumState_ENABLED; - CFE_EVS_SendEvent(CS_ENABLE_APP_NAME_INF_EID, CFE_EVS_EventType_INFORMATION, - "Checksumming of app %s is Enabled", Name); + CFE_EVS_SendEvent(CS_ENABLE_APP_NAME_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Checksumming of app %s is Enabled", + Name); if (CS_GetAppDefTblEntryByName(&DefinitionEntry, Name)) { @@ -270,17 +298,21 @@ CFE_Status_t CS_EnableNameAppCmd(const CS_EnableNameAppCmd_t *CmdPtr) } else { - CFE_EVS_SendEvent(CS_ENABLE_APP_DEF_NOT_FOUND_DBG_EID, CFE_EVS_EventType_DEBUG, - "CS unable to update apps definition table for entry %s", Name); + CFE_EVS_SendEvent(CS_ENABLE_APP_DEF_NOT_FOUND_DBG_EID, + CFE_EVS_EventType_DEBUG, + "CS unable to update apps definition table for entry %s", + Name); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else { - CFE_EVS_SendEvent(CS_ENABLE_APP_UNKNOWN_NAME_ERR_EID, CFE_EVS_EventType_ERROR, - "App enable app command failed, app %s not found", Name); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_ENABLE_APP_UNKNOWN_NAME_ERR_EID, + CFE_EVS_EventType_ERROR, + "App enable app command failed, app %s not found", + Name); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } /* end InProgress if */ diff --git a/fsw/src/cs_cmds.c b/fsw/src/cs_cmds.c index 2434b98..0439255 100644 --- a/fsw/src/cs_cmds.c +++ b/fsw/src/cs_cmds.c @@ -64,10 +64,15 @@ CFE_Status_t CS_SendHkCmd(const CS_SendHkCmd_t *CmdPtr) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ CFE_Status_t CS_NoopCmd(const CS_NoopCmd_t *CmdPtr) { - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; - CFE_EVS_SendEvent(CS_NOOP_INF_EID, CFE_EVS_EventType_INFORMATION, "No-op command. Version %d.%d.%d.%d", - CS_MAJOR_VERSION, CS_MINOR_VERSION, CS_REVISION, CS_MISSION_REV); + CFE_EVS_SendEvent(CS_NOOP_INF_EID, + CFE_EVS_EventType_INFORMATION, + "No-op command. Version %d.%d.%d.%d", + CS_MAJOR_VERSION, + CS_MINOR_VERSION, + CS_REVISION, + CS_MISSION_REV); return CFE_SUCCESS; } @@ -77,10 +82,10 @@ CFE_Status_t CS_NoopCmd(const CS_NoopCmd_t *CmdPtr) /* CS Reset Application counters command */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -CFE_Status_t CS_ResetCmd(const CS_ResetCmd_t *CmdPtr) +CFE_Status_t CS_ResetCountersCmd(const CS_ResetCountersCmd_t *CmdPtr) { - CS_AppData.HkPacket.Payload.CmdCounter = 0; - CS_AppData.HkPacket.Payload.CmdErrCounter = 0; + CS_AppData.HkPacket.Payload.CommandCounter = 0; + CS_AppData.HkPacket.Payload.CommandErrorCounter = 0; CS_AppData.HkPacket.Payload.EepromCSErrCounter = 0; CS_AppData.HkPacket.Payload.MemoryCSErrCounter = 0; @@ -113,10 +118,11 @@ CFE_Status_t CS_BackgroundCheckCycleCmd(const CS_BackgroundCheckCycleCmd_t *CmdP /* Skip this background cycle if there's a recompute or one shot in * progress */ - if (CS_AppData.HkPacket.Payload.RecomputeInProgress == true || - CS_AppData.HkPacket.Payload.OneShotInProgress == true) + if (CS_AppData.HkPacket.Payload.RecomputeInProgress == true + || CS_AppData.HkPacket.Payload.OneShotInProgress == true) { - CFE_EVS_SendEvent(CS_BKGND_COMPUTE_PROG_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_BKGND_COMPUTE_PROG_INF_EID, + CFE_EVS_EventType_INFORMATION, "Skipping background cycle. Recompute or oneshot in progress."); DoneWithCycle = true; } @@ -176,7 +182,7 @@ CFE_Status_t CS_BackgroundCheckCycleCmd(const CS_BackgroundCheckCycleCmd_t *CmdP break; } /* end switch */ - } /* end while */ + } /* end while */ } return CFE_SUCCESS; @@ -201,7 +207,7 @@ CFE_Status_t CS_DisableAllCSCmd(const CS_DisableAllCSCmd_t *CmdPtr) CS_ZeroCfeCoreTempValues(); CS_ZeroOSTempValues(); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; CFE_EVS_SendEvent(CS_DISABLE_ALL_INF_EID, CFE_EVS_EventType_INFORMATION, "Background Checksumming Disabled"); @@ -217,7 +223,7 @@ CFE_Status_t CS_EnableAllCSCmd(const CS_EnableAllCSCmd_t *CmdPtr) { CS_AppData.HkPacket.Payload.ChecksumState = CS_ChecksumState_ENABLED; - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; CFE_EVS_SendEvent(CS_ENABLE_ALL_INF_EID, CFE_EVS_EventType_INFORMATION, "Background Checksumming Enabled"); @@ -238,10 +244,11 @@ CFE_Status_t CS_DisableCfeCoreCmd(const CS_DisableCfeCoreCmd_t *CmdPtr) CS_UpdateCDS(); #endif - CFE_EVS_SendEvent(CS_DISABLE_CFECORE_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_DISABLE_CFECORE_INF_EID, + CFE_EVS_EventType_INFORMATION, "Checksumming of cFE Core is Disabled"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; return CFE_SUCCESS; } @@ -261,7 +268,7 @@ CFE_Status_t CS_EnableCfeCoreCmd(const CS_EnableCfeCoreCmd_t *CmdPtr) CFE_EVS_SendEvent(CS_ENABLE_CFECORE_INF_EID, CFE_EVS_EventType_INFORMATION, "Checksumming of cFE Core is Enabled"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; return CFE_SUCCESS; } @@ -280,10 +287,11 @@ CFE_Status_t CS_DisableOSCmd(const CS_DisableOSCmd_t *CmdPtr) CS_UpdateCDS(); #endif - CFE_EVS_SendEvent(CS_DISABLE_OS_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_DISABLE_OS_INF_EID, + CFE_EVS_EventType_INFORMATION, "Checksumming of OS code segment is Disabled"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; return CFE_SUCCESS; } @@ -301,10 +309,11 @@ CFE_Status_t CS_EnableOSCmd(const CS_EnableOSCmd_t *CmdPtr) CS_UpdateCDS(); #endif - CFE_EVS_SendEvent(CS_ENABLE_OS_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_ENABLE_OS_INF_EID, + CFE_EVS_EventType_INFORMATION, "Checksumming of OS code segment is Enabled"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; return CFE_SUCCESS; } @@ -320,15 +329,18 @@ CFE_Status_t CS_ReportBaselineCfeCoreCmd(const CS_ReportBaselineCfeCoreCmd_t *Cm if (CfeCoreCodeSeg->ComputedYet == true) { - CFE_EVS_SendEvent(CS_BASELINE_CFECORE_INF_EID, CFE_EVS_EventType_INFORMATION, "Baseline of cFE Core is 0x%08X", + CFE_EVS_SendEvent(CS_BASELINE_CFECORE_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Baseline of cFE Core is 0x%08X", (unsigned int)CfeCoreCodeSeg->ComparisonValue); } else { - CFE_EVS_SendEvent(CS_NO_BASELINE_CFECORE_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_NO_BASELINE_CFECORE_INF_EID, + CFE_EVS_EventType_INFORMATION, "Baseline of cFE Core has not been computed yet"); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; return CFE_SUCCESS; } @@ -344,15 +356,18 @@ CFE_Status_t CS_ReportBaselineOSCmd(const CS_ReportBaselineOSCmd_t *CmdPtr) if (OSCodeSeg->ComputedYet == true) { - CFE_EVS_SendEvent(CS_BASELINE_OS_INF_EID, CFE_EVS_EventType_INFORMATION, - "Baseline of OS code segment is 0x%08X", (unsigned int)OSCodeSeg->ComparisonValue); + CFE_EVS_SendEvent(CS_BASELINE_OS_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Baseline of OS code segment is 0x%08X", + (unsigned int)OSCodeSeg->ComparisonValue); } else { - CFE_EVS_SendEvent(CS_NO_BASELINE_OS_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_NO_BASELINE_OS_INF_EID, + CFE_EVS_EventType_INFORMATION, "Baseline of OS code segment has not been computed yet"); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; return CFE_SUCCESS; } @@ -368,8 +383,8 @@ CFE_Status_t CS_RecomputeBaselineCfeCoreCmd(const CS_RecomputeBaselineCfeCoreCmd CFE_ES_TaskId_t ChildTaskID; CFE_Status_t Status; - if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false && - CS_AppData.HkPacket.Payload.OneShotInProgress == false) + if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false + && CS_AppData.HkPacket.Payload.OneShotInProgress == false) { /* There is no child task running right now, we can use it*/ CS_AppData.HkPacket.Payload.RecomputeInProgress = true; @@ -379,30 +394,38 @@ CFE_Status_t CS_RecomputeBaselineCfeCoreCmd(const CS_RecomputeBaselineCfeCoreCmd CS_AppData.ChildTaskEntryID = 0; CS_AppData.RecomputeEepromMemoryEntryPtr = CS_GetCfeCoreCodeSegResTable(); - Status = CFE_ES_CreateChildTask(&ChildTaskID, CS_RECOMP_CFECORE_TASK_NAME, CS_RecomputeEepromMemoryChildTask, - NULL, CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, CS_CHILD_TASK_PRIORITY, 0); + Status = CFE_ES_CreateChildTask(&ChildTaskID, + CS_RECOMP_CFECORE_TASK_NAME, + CS_RecomputeEepromMemoryChildTask, + NULL, + CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, + CS_CHILD_TASK_PRIORITY, + 0); if (Status == CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_RECOMPUTE_CFECORE_STARTED_DBG_EID, CFE_EVS_EventType_DEBUG, + CFE_EVS_SendEvent(CS_RECOMPUTE_CFECORE_STARTED_DBG_EID, + CFE_EVS_EventType_DEBUG, "Recompute of cFE core started"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else /* child task creation failed */ { - CFE_EVS_SendEvent(CS_RECOMPUTE_CFECORE_CREATE_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_RECOMPUTE_CFECORE_CREATE_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, "Recompute cFE core failed, CFE_ES_CreateChildTask returned: 0x%08X", (unsigned int)Status); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; CS_AppData.HkPacket.Payload.RecomputeInProgress = false; } } else { /*send event that we can't start another task right now */ - CFE_EVS_SendEvent(CS_RECOMPUTE_CFECORE_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_RECOMPUTE_CFECORE_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, "Recompute cFE core failed: child task in use"); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; @@ -419,8 +442,8 @@ CFE_Status_t CS_RecomputeBaselineOSCmd(const CS_RecomputeBaselineOSCmd_t *CmdPtr CFE_ES_TaskId_t ChildTaskID; CFE_Status_t Status; - if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false && - CS_AppData.HkPacket.Payload.OneShotInProgress == false) + if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false + && CS_AppData.HkPacket.Payload.OneShotInProgress == false) { /* There is no child task running right now, we can use it*/ CS_AppData.HkPacket.Payload.RecomputeInProgress = true; @@ -430,29 +453,37 @@ CFE_Status_t CS_RecomputeBaselineOSCmd(const CS_RecomputeBaselineOSCmd_t *CmdPtr CS_AppData.ChildTaskEntryID = 0; CS_AppData.RecomputeEepromMemoryEntryPtr = CS_GetOSCodeSegResTable(); - Status = CFE_ES_CreateChildTask(&ChildTaskID, CS_RECOMP_OS_TASK_NAME, CS_RecomputeEepromMemoryChildTask, NULL, - CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, CS_CHILD_TASK_PRIORITY, 0); + Status = CFE_ES_CreateChildTask(&ChildTaskID, + CS_RECOMP_OS_TASK_NAME, + CS_RecomputeEepromMemoryChildTask, + NULL, + CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, + CS_CHILD_TASK_PRIORITY, + 0); if (Status == CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_RECOMPUTE_OS_STARTED_DBG_EID, CFE_EVS_EventType_DEBUG, + CFE_EVS_SendEvent(CS_RECOMPUTE_OS_STARTED_DBG_EID, + CFE_EVS_EventType_DEBUG, "Recompute of OS code segment started"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else /* child task creation failed */ { - CFE_EVS_SendEvent(CS_RECOMPUTE_OS_CREATE_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_RECOMPUTE_OS_CREATE_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, "Recompute OS code segment failed, CFE_ES_CreateChildTask returned: 0x%08X", (unsigned int)Status); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; CS_AppData.HkPacket.Payload.RecomputeInProgress = false; } } else { /*send event that we can't start another task right now */ - CFE_EVS_SendEvent(CS_RECOMPUTE_OS_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_RECOMPUTE_OS_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, "Recompute OS code segment failed: child task in use"); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; @@ -474,8 +505,8 @@ CFE_Status_t CS_OneShotCmd(const CS_OneShotCmd_t *CmdPtr) if (Status == CFE_SUCCESS) { - if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false && - CS_AppData.HkPacket.Payload.OneShotInProgress == false) + if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false + && CS_AppData.HkPacket.Payload.OneShotInProgress == false) { /* There is no child task running right now, we can use it*/ CS_AppData.HkPacket.Payload.RecomputeInProgress = false; @@ -494,24 +525,32 @@ CFE_Status_t CS_OneShotCmd(const CS_OneShotCmd_t *CmdPtr) CS_AppData.HkPacket.Payload.LastOneShotChecksum = 0; - Status = CFE_ES_CreateChildTask(&ChildTaskID, CS_ONESHOT_TASK_NAME, CS_OneShotChildTask, NULL, - CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, CS_CHILD_TASK_PRIORITY, 0); + Status = CFE_ES_CreateChildTask(&ChildTaskID, + CS_ONESHOT_TASK_NAME, + CS_OneShotChildTask, + NULL, + CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, + CS_CHILD_TASK_PRIORITY, + 0); if (Status == CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_ONESHOT_STARTED_DBG_EID, CFE_EVS_EventType_DEBUG, + CFE_EVS_SendEvent(CS_ONESHOT_STARTED_DBG_EID, + CFE_EVS_EventType_DEBUG, "OneShot checksum started on address: 0x%08X, size: %d", - (unsigned int)(CmdPtr->Payload.Address), (int)(CmdPtr->Payload.Size)); + (unsigned int)(CmdPtr->Payload.Address), + (int)(CmdPtr->Payload.Size)); CS_AppData.ChildTaskID = ChildTaskID; - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else /* child task creation failed */ { - CFE_EVS_SendEvent(CS_ONESHOT_CREATE_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_ONESHOT_CREATE_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, "OneShot checkum failed, CFE_ES_CreateChildTask returned: 0x%08X", (unsigned int)Status); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; CS_AppData.HkPacket.Payload.RecomputeInProgress = false; CS_AppData.HkPacket.Payload.OneShotInProgress = false; } @@ -519,18 +558,21 @@ CFE_Status_t CS_OneShotCmd(const CS_OneShotCmd_t *CmdPtr) else { /*send event that we can't start another task right now */ - CFE_EVS_SendEvent(CS_ONESHOT_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_ONESHOT_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, "OneShot checksum failed: child task in use"); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } /* end if CFE_PSP_MemValidateRange */ else { - CFE_EVS_SendEvent(CS_ONESHOT_MEMVALIDATE_ERR_EID, CFE_EVS_EventType_ERROR, - "OneShot checksum failed, CFE_PSP_MemValidateRange returned: 0x%08X", (unsigned int)Status); + CFE_EVS_SendEvent(CS_ONESHOT_MEMVALIDATE_ERR_EID, + CFE_EVS_EventType_ERROR, + "OneShot checksum failed, CFE_PSP_MemValidateRange returned: 0x%08X", + (unsigned int)Status); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; @@ -547,8 +589,8 @@ CFE_Status_t CS_CancelOneShotCmd(const CS_CancelOneShotCmd_t *CmdPtr) CFE_Status_t Status; /* Make sure there is a OneShot command in use */ - if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false && - CS_AppData.HkPacket.Payload.OneShotInProgress == true) + if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false + && CS_AppData.HkPacket.Payload.OneShotInProgress == true) { Status = CFE_ES_DeleteChildTask(CS_AppData.ChildTaskID); @@ -557,23 +599,26 @@ CFE_Status_t CS_CancelOneShotCmd(const CS_CancelOneShotCmd_t *CmdPtr) CS_AppData.ChildTaskID = CFE_ES_TASKID_UNDEFINED; CS_AppData.HkPacket.Payload.RecomputeInProgress = false; CS_AppData.HkPacket.Payload.OneShotInProgress = false; - CS_AppData.HkPacket.Payload.CmdCounter++; - CFE_EVS_SendEvent(CS_ONESHOT_CANCELLED_INF_EID, CFE_EVS_EventType_INFORMATION, + CS_AppData.HkPacket.Payload.CommandCounter++; + CFE_EVS_SendEvent(CS_ONESHOT_CANCELLED_INF_EID, + CFE_EVS_EventType_INFORMATION, "OneShot checksum calculation has been cancelled"); } else { - CFE_EVS_SendEvent(CS_ONESHOT_CANCEL_DELETE_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_ONESHOT_CANCEL_DELETE_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, "Cancel OneShot checksum failed, CFE_ES_DeleteChildTask returned: 0x%08X", (unsigned int)Status); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } else { - CFE_EVS_SendEvent(CS_ONESHOT_CANCEL_NO_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_ONESHOT_CANCEL_NO_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, "Cancel OneShot checksum failed. No OneShot active"); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; diff --git a/fsw/src/cs_cmds.h b/fsw/src/cs_cmds.h index db294c2..2f39076 100644 --- a/fsw/src/cs_cmds.h +++ b/fsw/src/cs_cmds.h @@ -73,9 +73,9 @@ CFE_Status_t CS_NoopCmd(const CS_NoopCmd_t *CmdPtr); * * \param[in] CmdPtr Command pointer, verified non-null in CS_AppMain * - * \sa #CS_RESET_CC + * \sa #CS_RESET_COUNTERS_CC */ -CFE_Status_t CS_ResetCmd(const CS_ResetCmd_t *CmdPtr); +CFE_Status_t CS_ResetCountersCmd(const CS_ResetCountersCmd_t *CmdPtr); /** * \brief process a background checking cycle diff --git a/fsw/src/cs_compute.c b/fsw/src/cs_compute.c index 677be8c..71b05f6 100644 --- a/fsw/src/cs_compute.c +++ b/fsw/src/cs_compute.c @@ -87,8 +87,10 @@ void CS_DoChecksumChunk(CS_LocalChecksumState_t *State) NumBytesThisCycle = CS_AppData.MaxBytesPerCycle; } - NewChecksumValue = CFE_ES_CalculateCRC(State->BufferAddr + State->CurrOffset, NumBytesThisCycle, - State->ResultBuffer, CS_DEFAULT_ALGORITHM); + NewChecksumValue = CFE_ES_CalculateCRC(State->BufferAddr + State->CurrOffset, + NumBytesThisCycle, + State->ResultBuffer, + CS_DEFAULT_ALGORITHM); /* Export all data */ State->CurrOffset = State->CurrOffset + NumBytesThisCycle; @@ -136,7 +138,7 @@ CFE_Status_t CS_CheckOrUpdateReference(CS_LocalChecksumState_t *State, uint16 *R CFE_Status_t CS_GetTableAddr(CS_LocalChecksumState_t *State, CFE_TBL_Handle_t LocalHandle) { CFE_Status_t Status; - void * Addr; + void *Addr; Status = CFE_TBL_GetAddress(&Addr, LocalHandle); @@ -167,8 +169,10 @@ void CS_ReleaseTableAddr(CFE_TBL_HandleId_t LocalId, const char *Name) Result = CFE_TBL_ReleaseAddress(LocalHandle); if (Result != CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_COMPUTE_TABLES_RELEASE_ERR_EID, CFE_EVS_EventType_ERROR, - "CS Tables: Could not release addresss for table %s, returned: 0x%08X", Name, + CFE_EVS_SendEvent(CS_COMPUTE_TABLES_RELEASE_ERR_EID, + CFE_EVS_EventType_ERROR, + "CS Tables: Could not release addresss for table %s, returned: 0x%08X", + Name, (unsigned int)Result); } } @@ -204,8 +208,8 @@ CFE_Status_t CS_RefreshTableSize(CS_LocalChecksumState_t *State, const char *Nam * Local helper function * *-----------------------------------------------------------------*/ -CFE_Status_t CS_RefreshTableHandleAndAddress(CS_LocalChecksumState_t *State, CFE_TBL_Handle_t *LocalHandle, - const char *Name) +CFE_Status_t +CS_RefreshTableHandleAndAddress(CS_LocalChecksumState_t *State, CFE_TBL_Handle_t *LocalHandle, const char *Name) { CFE_Status_t Result; @@ -315,8 +319,10 @@ CFE_Status_t CS_RefreshAppSizeAndAddr(CS_LocalChecksumState_t *State, const char /* We got a valid ResourceID and good App info, so check the for valid addresses */ if (Result == CFE_SUCCESS && !AppInfo.AddressesAreValid) { - CFE_EVS_SendEvent(CS_COMPUTE_APP_PLATFORM_DBG_EID, CFE_EVS_EventType_DEBUG, - "CS cannot get a valid address for %s, due to the platform", AppName); + CFE_EVS_SendEvent(CS_COMPUTE_APP_PLATFORM_DBG_EID, + CFE_EVS_EventType_DEBUG, + "CS cannot get a valid address for %s, due to the platform", + AppName); Result = CS_ERROR; } @@ -332,9 +338,12 @@ CFE_Status_t CS_RefreshAppSizeAndAddr(CS_LocalChecksumState_t *State, const char else { /* Something failed -- either invalid ResourceID, bad App info, or invalid addresses, so notify ground */ - CFE_EVS_SendEvent(CS_COMPUTE_APP_ERR_EID, CFE_EVS_EventType_ERROR, - "CS Apps: Problems getting module %s info, Result: 0x%08X, AddressValid: %d", AppName, - (unsigned int)Result, (unsigned int)AppInfo.AddressesAreValid); + CFE_EVS_SendEvent(CS_COMPUTE_APP_ERR_EID, + CFE_EVS_EventType_ERROR, + "CS Apps: Problems getting module %s info, Result: 0x%08X, AddressValid: %d", + AppName, + (unsigned int)Result, + (unsigned int)AppInfo.AddressesAreValid); Result = CS_ERR_NOT_FOUND; } @@ -348,8 +357,8 @@ CFE_Status_t CS_RefreshAppSizeAndAddr(CS_LocalChecksumState_t *State, const char /* and cFE core code segments */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -CFE_Status_t CS_ComputeEepromMemory(CS_Res_EepromMemory_Table_Entry_t *ResultsEntry, uint32 *ComputedCSValue, - bool *DoneWithEntry) +CFE_Status_t +CS_ComputeEepromMemory(CS_Res_EepromMemory_Table_Entry_t *ResultsEntry, uint32 *ComputedCSValue, bool *DoneWithEntry) { CFE_Status_t Status; CS_LocalChecksumState_t State; @@ -409,8 +418,10 @@ CFE_Status_t CS_ComputeTables(CS_Res_Tables_Table_Entry_t *ResultsEntry, uint32 if (Status != CFE_SUCCESS || State.BufferAddr == NULL) { - CFE_EVS_SendEvent(CS_COMPUTE_TABLES_ERR_EID, CFE_EVS_EventType_ERROR, - "CS Tables: Problem Getting table %s: Status=0x%08X", ResultsEntry->Name, + CFE_EVS_SendEvent(CS_COMPUTE_TABLES_ERR_EID, + CFE_EVS_EventType_ERROR, + "CS Tables: Problem Getting table %s: Status=0x%08X", + ResultsEntry->Name, (unsigned int)Status); memset(&State, 0, sizeof(State)); @@ -421,8 +432,8 @@ CFE_Status_t CS_ComputeTables(CS_Res_Tables_Table_Entry_t *ResultsEntry, uint32 else { /* If the address and size has NOT changed since our last visit, resume checksumming */ - if (ResultsEntry->StartAddress == (cpuaddr)State.BufferAddr && - ResultsEntry->NumBytesToChecksum == State.TotalSize) + if (ResultsEntry->StartAddress == (cpuaddr)State.BufferAddr + && ResultsEntry->NumBytesToChecksum == State.TotalSize) { State.CurrOffset = ResultsEntry->ByteOffset; State.ResultBuffer = ResultsEntry->TempChecksumValue; @@ -520,7 +531,7 @@ void CS_RecomputeEepromMemoryChildTask(void) bool DoneWithEntry = false; CS_ChecksumState_Enum_t PreviousDefState = CS_ChecksumState_EMPTY; CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL; - CS_TableWrapper_t * tw; + CS_TableWrapper_t *tw; tw = &CS_AppData.Tbl[CS_AppData.ChildTaskTable]; EntryID = CS_AppData.ChildTaskEntryID; @@ -579,8 +590,11 @@ void CS_RecomputeEepromMemoryChildTask(void) } /* send event message */ - CFE_EVS_SendEvent(CS_RECOMPUTE_FINISH_EEPROM_MEMORY_INF_EID, CFE_EVS_EventType_INFORMATION, - "%s entry %d recompute finished. New baseline is 0X%08X", CS_GetTableTypeAsString(tw), EntryID, + CFE_EVS_SendEvent(CS_RECOMPUTE_FINISH_EEPROM_MEMORY_INF_EID, + CFE_EVS_EventType_INFORMATION, + "%s entry %d recompute finished. New baseline is 0X%08X", + CS_GetTableTypeAsString(tw), + EntryID, (unsigned int)NewChecksumValue); CS_AppData.HkPacket.Payload.RecomputeInProgress = false; @@ -654,14 +668,18 @@ void CS_RecomputeAppChildTask(void) if (Status == CS_ERR_NOT_FOUND) { - CFE_EVS_SendEvent(CS_RECOMPUTE_ERROR_APP_ERR_EID, CFE_EVS_EventType_ERROR, - "App %s recompute failed. Could not get address", ResultsEntry->Name); + CFE_EVS_SendEvent(CS_RECOMPUTE_ERROR_APP_ERR_EID, + CFE_EVS_EventType_ERROR, + "App %s recompute failed. Could not get address", + ResultsEntry->Name); } else { /* send event message */ - CFE_EVS_SendEvent(CS_RECOMPUTE_FINISH_APP_INF_EID, CFE_EVS_EventType_INFORMATION, - "App %s recompute finished. New baseline is 0x%08X", ResultsEntry->Name, + CFE_EVS_SendEvent(CS_RECOMPUTE_FINISH_APP_INF_EID, + CFE_EVS_EventType_INFORMATION, + "App %s recompute finished. New baseline is 0x%08X", + ResultsEntry->Name, (unsigned int)NewChecksumValue); } @@ -725,14 +743,18 @@ void CS_RecomputeTablesChildTask(void) /* The new checksum value is stored in the table by the above functions */ if (Status == CS_ERR_NOT_FOUND) { - CFE_EVS_SendEvent(CS_RECOMPUTE_ERROR_TABLES_ERR_EID, CFE_EVS_EventType_ERROR, - "Table %s recompute failed. Could not get address", ResultsEntry->Name); + CFE_EVS_SendEvent(CS_RECOMPUTE_ERROR_TABLES_ERR_EID, + CFE_EVS_EventType_ERROR, + "Table %s recompute failed. Could not get address", + ResultsEntry->Name); } else { /* send event message */ - CFE_EVS_SendEvent(CS_RECOMPUTE_FINISH_TABLES_INF_EID, CFE_EVS_EventType_INFORMATION, - "Table %s recompute finished. New baseline is 0x%08X", ResultsEntry->Name, + CFE_EVS_SendEvent(CS_RECOMPUTE_FINISH_TABLES_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Table %s recompute finished. New baseline is 0x%08X", + ResultsEntry->Name, (unsigned int)NewChecksumValue); } @@ -771,11 +793,13 @@ void CS_OneShotChildTask(void) { NumBytesThisCycle = ((MaxBytesPerCycle < NumBytesRemainingCycles) ? MaxBytesPerCycle : NumBytesRemainingCycles); - NewChecksumValue = CFE_ES_CalculateCRC((void *)(FirstAddrThisCycle), NumBytesThisCycle, NewChecksumValue, + NewChecksumValue = CFE_ES_CalculateCRC((void *)(FirstAddrThisCycle), + NumBytesThisCycle, + NewChecksumValue, CS_DEFAULT_ALGORITHM); /* Update the remainders for the next cycle */ - FirstAddrThisCycle += NumBytesThisCycle; + FirstAddrThisCycle += NumBytesThisCycle; NumBytesRemainingCycles -= NumBytesThisCycle; OS_TaskDelay(CS_CHILD_TASK_DELAY); @@ -787,7 +811,8 @@ void CS_OneShotChildTask(void) CS_AppData.HkPacket.Payload.LastOneShotChecksum = NewChecksumValue; /* send event message */ - CFE_EVS_SendEvent(CS_ONESHOT_FINISHED_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_ONESHOT_FINISHED_INF_EID, + CFE_EVS_EventType_INFORMATION, "OneShot checksum on Address: 0x%08X, size %d completed. Checksum = 0x%08X", (unsigned int)(CS_AppData.HkPacket.Payload.LastOneShotAddress), (unsigned int)(CS_AppData.HkPacket.Payload.LastOneShotSize), diff --git a/fsw/src/cs_compute.h b/fsw/src/cs_compute.h index db8ebdf..834cec7 100644 --- a/fsw/src/cs_compute.h +++ b/fsw/src/cs_compute.h @@ -59,8 +59,8 @@ * \retval #CFE_SUCCESS \copybrief CFE_SUCCESS * \retval #CS_ERROR \copybrief CS_ERROR */ -CFE_Status_t CS_ComputeEepromMemory(CS_Res_EepromMemory_Table_Entry_t *ResultsEntry, uint32 *ComputedCSValue, - bool *DoneWithEntry); +CFE_Status_t +CS_ComputeEepromMemory(CS_Res_EepromMemory_Table_Entry_t *ResultsEntry, uint32 *ComputedCSValue, bool *DoneWithEntry); /** * \brief Computes checksums on tables diff --git a/fsw/src/cs_dispatch.c b/fsw/src/cs_dispatch.c index fc30a31..4b7b688 100644 --- a/fsw/src/cs_dispatch.c +++ b/fsw/src/cs_dispatch.c @@ -55,12 +55,15 @@ bool CS_VerifyCmdLength(const CFE_MSG_Message_t *msg, size_t ExpectedLength) CFE_MSG_GetMsgId(msg, &MessageID); CFE_MSG_GetFcnCode(msg, &CommandCode); - CFE_EVS_SendEvent(CS_CMD_LEN_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_CMD_LEN_ERR_EID, + CFE_EVS_EventType_ERROR, "Invalid msg length: ID = 0x%08lX, CC = %d, Len = %lu, Expected = %lu", - (unsigned long)CFE_SB_MsgIdToValue(MessageID), CommandCode, (unsigned long)ActualLength, + (unsigned long)CFE_SB_MsgIdToValue(MessageID), + CommandCode, + (unsigned long)ActualLength, (unsigned long)ExpectedLength); Result = false; - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return Result; } @@ -112,10 +115,12 @@ CFE_Status_t CS_AppPipe(const CFE_SB_Buffer_t *BufPtr) else { /* Unknown command */ - CFE_EVS_SendEvent(CS_MID_ERR_EID, CFE_EVS_EventType_ERROR, "Invalid command pipe message ID: 0x%08lX", + CFE_EVS_SendEvent(CS_MID_ERR_EID, + CFE_EVS_EventType_ERROR, + "Invalid command pipe message ID: 0x%08lX", (unsigned long)CFE_SB_MsgIdToValue(MessageID)); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; @@ -144,10 +149,10 @@ void CS_ProcessCmd(const CFE_SB_Buffer_t *BufPtr) } break; - case CS_RESET_CC: - if (CS_VerifyCmdLength(&BufPtr->Msg, sizeof(CS_ResetCmd_t))) + case CS_RESET_COUNTERS_CC: + if (CS_VerifyCmdLength(&BufPtr->Msg, sizeof(CS_ResetCountersCmd_t))) { - CS_ResetCmd((const CS_ResetCmd_t *)BufPtr); + CS_ResetCountersCmd((const CS_ResetCountersCmd_t *)BufPtr); } break; @@ -425,11 +430,13 @@ void CS_ProcessCmd(const CFE_SB_Buffer_t *BufPtr) default: CFE_MSG_GetMsgId(&BufPtr->Msg, &MessageID); - CFE_EVS_SendEvent(CS_CC_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_CC_ERR_EID, + CFE_EVS_EventType_ERROR, "Invalid ground command code: ID = 0x%08lX, CC = %d", - (unsigned long)CFE_SB_MsgIdToValue(MessageID), CommandCode); + (unsigned long)CFE_SB_MsgIdToValue(MessageID), + CommandCode); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; break; } /* end switch */ } diff --git a/fsw/src/cs_eds_dispatch.c b/fsw/src/cs_eds_dispatch.c index aa485ce..c851f0b 100644 --- a/fsw/src/cs_eds_dispatch.c +++ b/fsw/src/cs_eds_dispatch.c @@ -79,7 +79,7 @@ static const EdsDispatchTable_EdsComponent_CS_Application_CFE_SB_Telecommand_t C .ReportBaselineEntryIDMemoryCmd_indication = CS_ReportBaselineEntryIDMemoryCmd, .ReportBaselineOSCmd_indication = CS_ReportBaselineOSCmd, .ReportBaselineTableCmd_indication = CS_ReportBaselineTableCmd, - .ResetCmd_indication = CS_ResetCmd, + .ResetCountersCmd_indication = CS_ResetCountersCmd, }, .SEND_HK = {.indication = CS_SendHkCmd}, .BACKGROUND_CYCLE = {.indication = CS_BackgroundCheckCycleCmd}}; @@ -102,11 +102,13 @@ CFE_Status_t CS_AppPipe(const CFE_SB_Buffer_t *BufPtr) { CFE_MSG_GetMsgId(&BufPtr->Msg, &MsgId); - ++CS_AppData.HkPacket.Payload.CmdErrCounter; + ++CS_AppData.HkPacket.Payload.CommandErrorCounter; if (status == CFE_STATUS_UNKNOWN_MSG_ID) { - CFE_EVS_SendEvent(CS_MID_ERR_EID, CFE_EVS_EventType_ERROR, "Invalid command pipe message ID: 0x%08lX", + CFE_EVS_SendEvent(CS_MID_ERR_EID, + CFE_EVS_EventType_ERROR, + "Invalid command pipe message ID: 0x%08lX", (unsigned long)CFE_SB_MsgIdToValue(MsgId)); } else @@ -115,15 +117,20 @@ CFE_Status_t CS_AppPipe(const CFE_SB_Buffer_t *BufPtr) if (status == CFE_STATUS_WRONG_MSG_LENGTH) { CFE_MSG_GetSize(&BufPtr->Msg, &MsgSize); - CFE_EVS_SendEvent(CS_CMD_LEN_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_CMD_LEN_ERR_EID, + CFE_EVS_EventType_ERROR, "Invalid msg length: ID = 0x%08lX, CC = %d, Len = %lu", - (unsigned long)CFE_SB_MsgIdToValue(MsgId), MsgFc, (unsigned long)MsgSize); + (unsigned long)CFE_SB_MsgIdToValue(MsgId), + MsgFc, + (unsigned long)MsgSize); } else { - CFE_EVS_SendEvent(CS_CC_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_CC_ERR_EID, + CFE_EVS_EventType_ERROR, "Invalid ground command code: ID = 0x%08lX, CC = %d", - (unsigned long)CFE_SB_MsgIdToValue(MsgId), MsgFc); + (unsigned long)CFE_SB_MsgIdToValue(MsgId), + MsgFc); } } diff --git a/fsw/src/cs_eeprom_cmds.c b/fsw/src/cs_eeprom_cmds.c index defefbd..96a55f4 100644 --- a/fsw/src/cs_eeprom_cmds.c +++ b/fsw/src/cs_eeprom_cmds.c @@ -56,10 +56,11 @@ CFE_Status_t CS_DisableEepromCmd(const CS_DisableEepromCmd_t *CmdPtr) CS_UpdateCDS(); #endif - CFE_EVS_SendEvent(CS_DISABLE_EEPROM_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_DISABLE_EEPROM_INF_EID, + CFE_EVS_EventType_INFORMATION, "Checksumming of EEPROM is Disabled"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } return CFE_SUCCESS; @@ -82,7 +83,7 @@ CFE_Status_t CS_EnableEepromCmd(const CS_EnableEepromCmd_t *CmdPtr) CFE_EVS_SendEvent(CS_ENABLE_EEPROM_INF_EID, CFE_EVS_EventType_INFORMATION, "Checksumming of EEPROM is Enabled"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } return CFE_SUCCESS; @@ -121,22 +122,30 @@ CFE_Status_t CS_ReportBaselineEntryIDEepromCmd(const CS_ReportBaselineEntryIDEep { Baseline = ResultsEntry->ComparisonValue; - CFE_EVS_SendEvent(CS_BASELINE_EEPROM_INF_EID, CFE_EVS_EventType_INFORMATION, - "Report baseline of EEPROM Entry %d is 0x%08X", EntryID, (unsigned int)Baseline); + CFE_EVS_SendEvent(CS_BASELINE_EEPROM_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Report baseline of EEPROM Entry %d is 0x%08X", + EntryID, + (unsigned int)Baseline); } else { - CFE_EVS_SendEvent(CS_NO_BASELINE_EEPROM_INF_EID, CFE_EVS_EventType_INFORMATION, - "Report baseline of EEPROM Entry %d has not been computed yet", EntryID); + CFE_EVS_SendEvent(CS_NO_BASELINE_EEPROM_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Report baseline of EEPROM Entry %d has not been computed yet", + EntryID); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else { - CFE_EVS_SendEvent(CS_BASELINE_INVALID_ENTRY_EEPROM_ERR_EID, CFE_EVS_EventType_ERROR, - "EEPROM report baseline failed, Entry ID invalid: %d, State: %d Max ID: %d", EntryID, State, + CFE_EVS_SendEvent(CS_BASELINE_INVALID_ENTRY_EEPROM_ERR_EID, + CFE_EVS_EventType_ERROR, + "EEPROM report baseline failed, Entry ID invalid: %d, State: %d Max ID: %d", + EntryID, + State, (CS_MAX_NUM_EEPROM_TABLE_ENTRIES - 1)); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; @@ -156,8 +165,8 @@ CFE_Status_t CS_RecomputeBaselineEepromCmd(const CS_RecomputeBaselineEepromCmd_t CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; - if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false && - CS_AppData.HkPacket.Payload.OneShotInProgress == false) + if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false + && CS_AppData.HkPacket.Payload.OneShotInProgress == false) { EntryID = CmdPtr->Payload.EntryID; ResultsEntry = CS_GetEepromResEntry(EntryID); @@ -182,39 +191,53 @@ CFE_Status_t CS_RecomputeBaselineEepromCmd(const CS_RecomputeBaselineEepromCmd_t CS_AppData.RecomputeEepromMemoryEntryPtr = ResultsEntry; - Status = CFE_ES_CreateChildTask(&ChildTaskID, CS_RECOMP_EEPROM_TASK_NAME, CS_RecomputeEepromMemoryChildTask, - NULL, CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, CS_CHILD_TASK_PRIORITY, 0); + Status = CFE_ES_CreateChildTask(&ChildTaskID, + CS_RECOMP_EEPROM_TASK_NAME, + CS_RecomputeEepromMemoryChildTask, + NULL, + CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, + CS_CHILD_TASK_PRIORITY, + 0); if (Status == CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_RECOMPUTE_EEPROM_STARTED_DBG_EID, CFE_EVS_EventType_DEBUG, - "Recompute baseline of EEPROM Entry ID %d started", EntryID); - CS_AppData.HkPacket.Payload.CmdCounter++; + CFE_EVS_SendEvent(CS_RECOMPUTE_EEPROM_STARTED_DBG_EID, + CFE_EVS_EventType_DEBUG, + "Recompute baseline of EEPROM Entry ID %d started", + EntryID); + CS_AppData.HkPacket.Payload.CommandCounter++; } else /* child task creation failed */ { CFE_EVS_SendEvent( - CS_RECOMPUTE_EEPROM_CREATE_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, + CS_RECOMPUTE_EEPROM_CREATE_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, "Recompute baseline of EEPROM Entry ID %d failed, CFE_ES_CreateChildTask returned: 0x%08X", - EntryID, (unsigned int)Status); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + EntryID, + (unsigned int)Status); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; CS_AppData.HkPacket.Payload.RecomputeInProgress = false; } } else { - CFE_EVS_SendEvent(CS_RECOMPUTE_INVALID_ENTRY_EEPROM_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_RECOMPUTE_INVALID_ENTRY_EEPROM_ERR_EID, + CFE_EVS_EventType_ERROR, "EEPROM recompute baseline of entry failed, Entry ID invalid: %d, State: %d, Max ID: %d", - EntryID, State, (CS_MAX_NUM_EEPROM_TABLE_ENTRIES - 1)); + EntryID, + State, + (CS_MAX_NUM_EEPROM_TABLE_ENTRIES - 1)); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } else { /*send event that we can't start another task right now */ - CFE_EVS_SendEvent(CS_RECOMPUTE_EEPROM_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, - "Recompute baseline of EEPROM Entry ID %d failed: child task in use", EntryID); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_RECOMPUTE_EEPROM_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, + "Recompute baseline of EEPROM Entry ID %d failed: child task in use", + EntryID); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; @@ -230,7 +253,7 @@ CFE_Status_t CS_EnableEntryIDEepromCmd(const CS_EnableEntryIDEepromCmd_t *CmdPtr /* command verification variables */ CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL; - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE]; uint16 EntryID = 0; CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; @@ -254,25 +277,32 @@ CFE_Status_t CS_EnableEntryIDEepromCmd(const CS_EnableEntryIDEepromCmd_t *CmdPtr ResultsEntry->State = CS_ChecksumState_ENABLED; - CFE_EVS_SendEvent(CS_ENABLE_EEPROM_ENTRY_INF_EID, CFE_EVS_EventType_INFORMATION, - "Checksumming of EEPROM Entry ID %d is Enabled", EntryID); + CFE_EVS_SendEvent(CS_ENABLE_EEPROM_ENTRY_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Checksumming of EEPROM Entry ID %d is Enabled", + EntryID); State = CS_SetDefEntryState(tw, DefEntry, CS_ChecksumState_ENABLED); if (!CS_StateValid(State)) { - CFE_EVS_SendEvent(CS_ENABLE_EEPROM_DEF_EMPTY_DBG_EID, CFE_EVS_EventType_DEBUG, - "CS unable to update EEPROM definition table for entry %d, State: %d", EntryID, + CFE_EVS_SendEvent(CS_ENABLE_EEPROM_DEF_EMPTY_DBG_EID, + CFE_EVS_EventType_DEBUG, + "CS unable to update EEPROM definition table for entry %d, State: %d", + EntryID, State); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else { - CFE_EVS_SendEvent(CS_ENABLE_EEPROM_INVALID_ENTRY_ERR_EID, CFE_EVS_EventType_ERROR, - "Enable EEPROM entry failed, invalid Entry ID: %d, State: %d, Max ID: %d", EntryID, - State, (CS_MAX_NUM_EEPROM_TABLE_ENTRIES - 1)); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_ENABLE_EEPROM_INVALID_ENTRY_ERR_EID, + CFE_EVS_EventType_ERROR, + "Enable EEPROM entry failed, invalid Entry ID: %d, State: %d, Max ID: %d", + EntryID, + State, + (CS_MAX_NUM_EEPROM_TABLE_ENTRIES - 1)); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } /* end InProgress if */ @@ -289,7 +319,7 @@ CFE_Status_t CS_DisableEntryIDEepromCmd(const CS_DisableEntryIDEepromCmd_t *CmdP /* command verification variables */ CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL; - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE]; uint16 EntryID = 0; CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; @@ -315,26 +345,33 @@ CFE_Status_t CS_DisableEntryIDEepromCmd(const CS_DisableEntryIDEepromCmd_t *CmdP ResultsEntry->TempChecksumValue = 0; ResultsEntry->ByteOffset = 0; - CFE_EVS_SendEvent(CS_DISABLE_EEPROM_ENTRY_INF_EID, CFE_EVS_EventType_INFORMATION, - "Checksumming of EEPROM Entry ID %d is Disabled", EntryID); + CFE_EVS_SendEvent(CS_DISABLE_EEPROM_ENTRY_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Checksumming of EEPROM Entry ID %d is Disabled", + EntryID); State = CS_SetDefEntryState(tw, DefEntry, CS_ChecksumState_DISABLED); if (!CS_StateValid(State)) { - CFE_EVS_SendEvent(CS_DISABLE_EEPROM_DEF_EMPTY_DBG_EID, CFE_EVS_EventType_DEBUG, - "CS unable to update EEPROM definition table for entry %d, State: %d", EntryID, + CFE_EVS_SendEvent(CS_DISABLE_EEPROM_DEF_EMPTY_DBG_EID, + CFE_EVS_EventType_DEBUG, + "CS unable to update EEPROM definition table for entry %d, State: %d", + EntryID, State); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else { - CFE_EVS_SendEvent(CS_DISABLE_EEPROM_INVALID_ENTRY_ERR_EID, CFE_EVS_EventType_ERROR, - "Disable EEPROM entry failed, invalid Entry ID: %d, State: %d, Max ID: %d", EntryID, - State, (CS_MAX_NUM_EEPROM_TABLE_ENTRIES - 1)); - - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_DISABLE_EEPROM_INVALID_ENTRY_ERR_EID, + CFE_EVS_EventType_ERROR, + "Disable EEPROM entry failed, invalid Entry ID: %d, State: %d, Max ID: %d", + EntryID, + State, + (CS_MAX_NUM_EEPROM_TABLE_ENTRIES - 1)); + + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } /* end InProgress if */ @@ -362,11 +399,13 @@ CFE_Status_t CS_GetEntryIDEepromCmd(const CS_GetEntryIDEepromCmd_t *CmdPtr) break; } - if (ResultsEntry->State != CS_ChecksumState_EMPTY && ResultsEntry->StartAddress <= CmdPtr->Payload.Address && - CmdPtr->Payload.Address < (ResultsEntry->StartAddress + ResultsEntry->NumBytesToChecksum)) + if (ResultsEntry->State != CS_ChecksumState_EMPTY && ResultsEntry->StartAddress <= CmdPtr->Payload.Address + && CmdPtr->Payload.Address < (ResultsEntry->StartAddress + ResultsEntry->NumBytesToChecksum)) { - CFE_EVS_SendEvent(CS_GET_ENTRY_ID_EEPROM_INF_EID, CFE_EVS_EventType_INFORMATION, - "EEPROM Found Address 0x%08X in Entry ID %d", (unsigned int)(CmdPtr->Payload.Address), + CFE_EVS_SendEvent(CS_GET_ENTRY_ID_EEPROM_INF_EID, + CFE_EVS_EventType_INFORMATION, + "EEPROM Found Address 0x%08X in Entry ID %d", + (unsigned int)(CmdPtr->Payload.Address), Loop); EntryFound = true; } @@ -375,10 +414,12 @@ CFE_Status_t CS_GetEntryIDEepromCmd(const CS_GetEntryIDEepromCmd_t *CmdPtr) if (EntryFound == false) { - CFE_EVS_SendEvent(CS_GET_ENTRY_ID_EEPROM_NOT_FOUND_INF_EID, CFE_EVS_EventType_INFORMATION, - "Address 0x%08X was not found in EEPROM table", (unsigned int)(CmdPtr->Payload.Address)); + CFE_EVS_SendEvent(CS_GET_ENTRY_ID_EEPROM_NOT_FOUND_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Address 0x%08X was not found in EEPROM table", + (unsigned int)(CmdPtr->Payload.Address)); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; return CFE_SUCCESS; } diff --git a/fsw/src/cs_init.c b/fsw/src/cs_init.c index f22bfcd..8045c5a 100644 --- a/fsw/src/cs_init.c +++ b/fsw/src/cs_init.c @@ -42,15 +42,18 @@ CFE_Status_t CS_SbInit(void) CFE_Status_t Result = CFE_SUCCESS; /* Initialize housekeeping packet */ - CFE_MSG_Init(CFE_MSG_PTR(CS_AppData.HkPacket.TelemetryHeader), CFE_SB_ValueToMsgId(CS_HK_TLM_MID), + CFE_MSG_Init(CFE_MSG_PTR(CS_AppData.HkPacket.TelemetryHeader), + CFE_SB_ValueToMsgId(CS_HK_TLM_MID), sizeof(CS_HkPacket_t)); /* Create Software Bus message pipe */ Result = CFE_SB_CreatePipe(&CS_AppData.CmdPipe, CS_PIPE_DEPTH, CS_CMD_PIPE_NAME); if (Result != CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_CR_PIPE_ERR_EID, CFE_EVS_EventType_ERROR, - "Software Bus Create Pipe for command returned: 0x%08X", (unsigned int)Result); + CFE_EVS_SendEvent(CS_CR_PIPE_ERR_EID, + CFE_EVS_EventType_ERROR, + "Software Bus Create Pipe for command returned: 0x%08X", + (unsigned int)Result); } else { @@ -59,8 +62,10 @@ CFE_Status_t CS_SbInit(void) if (Result != CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_INIT_SB_SUBSCRIBE_HK_ERR_EID, CFE_EVS_EventType_ERROR, - "Software Bus subscribe to housekeeping returned: 0x%08X", (unsigned int)Result); + CFE_EVS_SendEvent(CS_INIT_SB_SUBSCRIBE_HK_ERR_EID, + CFE_EVS_EventType_ERROR, + "Software Bus subscribe to housekeeping returned: 0x%08X", + (unsigned int)Result); } else { @@ -69,8 +74,10 @@ CFE_Status_t CS_SbInit(void) if (Result != CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_INIT_SB_SUBSCRIBE_BACK_ERR_EID, CFE_EVS_EventType_ERROR, - "Software Bus subscribe to background cycle returned: 0x%08X", (unsigned int)Result); + CFE_EVS_SendEvent(CS_INIT_SB_SUBSCRIBE_BACK_ERR_EID, + CFE_EVS_EventType_ERROR, + "Software Bus subscribe to background cycle returned: 0x%08X", + (unsigned int)Result); } } @@ -80,8 +87,10 @@ CFE_Status_t CS_SbInit(void) Result = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(CS_CMD_MID), CS_AppData.CmdPipe); if (Result != CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_INIT_SB_SUBSCRIBE_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Software Bus subscribe to command returned: 0x%08X", (unsigned int)Result); + CFE_EVS_SendEvent(CS_INIT_SB_SUBSCRIBE_CMD_ERR_EID, + CFE_EVS_EventType_ERROR, + "Software Bus subscribe to command returned: 0x%08X", + (unsigned int)Result); } } } @@ -162,24 +171,26 @@ CFE_Status_t CS_InitAllTables(void) [CS_ChecksumType_EEPROM_TABLE] = CS_DEF_EEPROM_TABLE_FILENAME, [CS_ChecksumType_MEMORY_TABLE] = CS_DEF_MEMORY_TABLE_FILENAME, [CS_ChecksumType_TABLES_TABLE] = CS_DEF_TABLES_TABLE_FILENAME, - [CS_ChecksumType_APP_TABLE] = CS_DEF_APP_TABLE_FILENAME}; + [CS_ChecksumType_APP_TABLE] = CS_DEF_APP_TABLE_FILENAME + }; static const CFE_TBL_CallbackFuncPtr_t TABLE_CALLBACK_MAP[CS_NUM_TABLES] = { [CS_ChecksumType_EEPROM_TABLE] = CS_ValidateEepromChecksumDefinitionTable, [CS_ChecksumType_MEMORY_TABLE] = CS_ValidateMemoryChecksumDefinitionTable, [CS_ChecksumType_TABLES_TABLE] = CS_ValidateTablesChecksumDefinitionTable, - [CS_ChecksumType_APP_TABLE] = CS_ValidateAppChecksumDefinitionTable}; + [CS_ChecksumType_APP_TABLE] = CS_ValidateAppChecksumDefinitionTable + }; - static const uint16 TABLE_EVENTID_MAP[CS_NUM_TABLES] = {[CS_ChecksumType_EEPROM_TABLE] = CS_INIT_EEPROM_ERR_EID, - [CS_ChecksumType_MEMORY_TABLE] = CS_INIT_MEMORY_ERR_EID, - [CS_ChecksumType_TABLES_TABLE] = CS_INIT_TABLES_ERR_EID, - [CS_ChecksumType_APP_TABLE] = CS_INIT_APP_ERR_EID}; + static const uint16 TABLE_EVENTID_MAP[CS_NUM_TABLES] = { [CS_ChecksumType_EEPROM_TABLE] = CS_INIT_EEPROM_ERR_EID, + [CS_ChecksumType_MEMORY_TABLE] = CS_INIT_MEMORY_ERR_EID, + [CS_ChecksumType_TABLES_TABLE] = CS_INIT_TABLES_ERR_EID, + [CS_ChecksumType_APP_TABLE] = CS_INIT_APP_ERR_EID }; CFE_Status_t ResultAll; CFE_Status_t Result; - const char * LoadFilename; + const char *LoadFilename; CFE_TBL_CallbackFuncPtr_t ValidationFunc; - CS_TableWrapper_t * tw; + CS_TableWrapper_t *tw; CS_ChecksumType_Enum_t TableId; uint16 ErrorEventID; @@ -205,8 +216,11 @@ CFE_Status_t CS_InitAllTables(void) if (ErrorEventID != 0) { - CFE_EVS_SendEvent(ErrorEventID, CFE_EVS_EventType_ERROR, "Table initialization failed for %s: 0x%08X", - CS_GetTableTypeAsString(tw), (unsigned int)Result); + CFE_EVS_SendEvent(ErrorEventID, + CFE_EVS_EventType_ERROR, + "Table initialization failed for %s: 0x%08X", + CS_GetTableTypeAsString(tw), + (unsigned int)Result); } ResultAll = Result; @@ -275,7 +289,8 @@ void CS_InitSegments(void) CodeSeg->TempChecksumValue = 0; CodeSeg->State = CS_ChecksumState_DISABLED; - CFE_EVS_SendEvent(CS_OS_TEXT_SEG_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_OS_TEXT_SEG_INF_EID, + CFE_EVS_EventType_INFORMATION, "OS Text Segment disabled due to platform"); } else diff --git a/fsw/src/cs_memory_cmds.c b/fsw/src/cs_memory_cmds.c index 107c363..f509c76 100644 --- a/fsw/src/cs_memory_cmds.c +++ b/fsw/src/cs_memory_cmds.c @@ -56,10 +56,11 @@ CFE_Status_t CS_DisableMemoryCmd(const CS_DisableMemoryCmd_t *CmdPtr) CS_UpdateCDS(); #endif - CFE_EVS_SendEvent(CS_DISABLE_MEMORY_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_DISABLE_MEMORY_INF_EID, + CFE_EVS_EventType_INFORMATION, "Checksumming of Memory is Disabled"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } return CFE_SUCCESS; @@ -82,7 +83,7 @@ CFE_Status_t CS_EnableMemoryCmd(const CS_EnableMemoryCmd_t *CmdPtr) CFE_EVS_SendEvent(CS_ENABLE_MEMORY_INF_EID, CFE_EVS_EventType_INFORMATION, "Checksumming of Memory is Enabled"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } return CFE_SUCCESS; @@ -119,22 +120,30 @@ CFE_Status_t CS_ReportBaselineEntryIDMemoryCmd(const CS_ReportBaselineEntryIDMem { Baseline = ResultsEntry->ComparisonValue; - CFE_EVS_SendEvent(CS_BASELINE_MEMORY_INF_EID, CFE_EVS_EventType_INFORMATION, - "Report baseline of Memory Entry %d is 0x%08X", EntryID, (unsigned int)Baseline); + CFE_EVS_SendEvent(CS_BASELINE_MEMORY_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Report baseline of Memory Entry %d is 0x%08X", + EntryID, + (unsigned int)Baseline); } else { - CFE_EVS_SendEvent(CS_NO_BASELINE_MEMORY_INF_EID, CFE_EVS_EventType_INFORMATION, - "Report baseline of Memory Entry %d has not been computed yet", EntryID); + CFE_EVS_SendEvent(CS_NO_BASELINE_MEMORY_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Report baseline of Memory Entry %d has not been computed yet", + EntryID); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else { - CFE_EVS_SendEvent(CS_BASELINE_INVALID_ENTRY_MEMORY_ERR_EID, CFE_EVS_EventType_ERROR, - "Memory report baseline failed, Entry ID invalid: %d, State: %d Max ID: %d", EntryID, State, + CFE_EVS_SendEvent(CS_BASELINE_INVALID_ENTRY_MEMORY_ERR_EID, + CFE_EVS_EventType_ERROR, + "Memory report baseline failed, Entry ID invalid: %d, State: %d Max ID: %d", + EntryID, + State, (CS_MAX_NUM_MEMORY_TABLE_ENTRIES - 1)); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; @@ -156,8 +165,8 @@ CFE_Status_t CS_RecomputeBaselineMemoryCmd(const CS_RecomputeBaselineMemoryCmd_t EntryID = CmdPtr->Payload.EntryID; - if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false && - CS_AppData.HkPacket.Payload.OneShotInProgress == false) + if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false + && CS_AppData.HkPacket.Payload.OneShotInProgress == false) { ResultsEntry = CS_GetMemoryResEntry(EntryID); @@ -181,39 +190,53 @@ CFE_Status_t CS_RecomputeBaselineMemoryCmd(const CS_RecomputeBaselineMemoryCmd_t CS_AppData.RecomputeEepromMemoryEntryPtr = ResultsEntry; - Status = CFE_ES_CreateChildTask(&ChildTaskID, CS_RECOMP_MEMORY_TASK_NAME, CS_RecomputeEepromMemoryChildTask, - NULL, CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, CS_CHILD_TASK_PRIORITY, 0); + Status = CFE_ES_CreateChildTask(&ChildTaskID, + CS_RECOMP_MEMORY_TASK_NAME, + CS_RecomputeEepromMemoryChildTask, + NULL, + CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, + CS_CHILD_TASK_PRIORITY, + 0); if (Status == CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_RECOMPUTE_MEMORY_STARTED_DBG_EID, CFE_EVS_EventType_DEBUG, - "Recompute baseline of Memory Entry ID %d started", EntryID); - CS_AppData.HkPacket.Payload.CmdCounter++; + CFE_EVS_SendEvent(CS_RECOMPUTE_MEMORY_STARTED_DBG_EID, + CFE_EVS_EventType_DEBUG, + "Recompute baseline of Memory Entry ID %d started", + EntryID); + CS_AppData.HkPacket.Payload.CommandCounter++; } else /* child task creation failed */ { CFE_EVS_SendEvent( - CS_RECOMPUTE_MEMORY_CREATE_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, - "Recompute baseline of Memory Entry ID %d failed, ES_CreateChildTask returned: 0x%08X", EntryID, + CS_RECOMPUTE_MEMORY_CREATE_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, + "Recompute baseline of Memory Entry ID %d failed, ES_CreateChildTask returned: 0x%08X", + EntryID, (unsigned int)Status); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; CS_AppData.HkPacket.Payload.RecomputeInProgress = false; } } else { - CFE_EVS_SendEvent(CS_RECOMPUTE_INVALID_ENTRY_MEMORY_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_RECOMPUTE_INVALID_ENTRY_MEMORY_ERR_EID, + CFE_EVS_EventType_ERROR, "Memory recompute baseline of entry failed, Entry ID invalid: %d, State: %d, Max ID: %d", - EntryID, State, (CS_MAX_NUM_MEMORY_TABLE_ENTRIES - 1)); + EntryID, + State, + (CS_MAX_NUM_MEMORY_TABLE_ENTRIES - 1)); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } else { /*send event that we can't start another task right now */ - CFE_EVS_SendEvent(CS_RECOMPUTE_MEMORY_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, - "Recompute baseline of Memory Entry ID %d failed: child task in use", EntryID); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_RECOMPUTE_MEMORY_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, + "Recompute baseline of Memory Entry ID %d failed: child task in use", + EntryID); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; @@ -229,7 +252,7 @@ CFE_Status_t CS_EnableEntryIDMemoryCmd(const CS_EnableEntryIDMemoryCmd_t *CmdPtr /* command verification variables */ CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL; - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; uint16 EntryID = 0; CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; @@ -252,25 +275,32 @@ CFE_Status_t CS_EnableEntryIDMemoryCmd(const CS_EnableEntryIDMemoryCmd_t *CmdPtr DefEntry = CS_GetMemoryDefEntry(EntryID); ResultsEntry->State = CS_ChecksumState_ENABLED; - CFE_EVS_SendEvent(CS_ENABLE_MEMORY_ENTRY_INF_EID, CFE_EVS_EventType_INFORMATION, - "Checksumming of Memory Entry ID %d is Enabled", EntryID); + CFE_EVS_SendEvent(CS_ENABLE_MEMORY_ENTRY_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Checksumming of Memory Entry ID %d is Enabled", + EntryID); State = CS_SetDefEntryState(tw, DefEntry, CS_ChecksumState_ENABLED); if (!CS_StateValid(State)) { - CFE_EVS_SendEvent(CS_ENABLE_MEMORY_DEF_EMPTY_DBG_EID, CFE_EVS_EventType_DEBUG, - "CS unable to update memory definition table for entry %d, State: %d", EntryID, + CFE_EVS_SendEvent(CS_ENABLE_MEMORY_DEF_EMPTY_DBG_EID, + CFE_EVS_EventType_DEBUG, + "CS unable to update memory definition table for entry %d, State: %d", + EntryID, State); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else { - CFE_EVS_SendEvent(CS_ENABLE_MEMORY_INVALID_ENTRY_ERR_EID, CFE_EVS_EventType_ERROR, - "Enable Memory entry failed, invalid Entry ID: %d, State: %d, Max ID: %d", EntryID, - State, (CS_MAX_NUM_MEMORY_TABLE_ENTRIES - 1)); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_ENABLE_MEMORY_INVALID_ENTRY_ERR_EID, + CFE_EVS_EventType_ERROR, + "Enable Memory entry failed, invalid Entry ID: %d, State: %d, Max ID: %d", + EntryID, + State, + (CS_MAX_NUM_MEMORY_TABLE_ENTRIES - 1)); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } /* end InProgress if */ @@ -287,7 +317,7 @@ CFE_Status_t CS_DisableEntryIDMemoryCmd(const CS_DisableEntryIDMemoryCmd_t *CmdP /* command verification variables */ CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL; - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; uint16 EntryID = 0; CS_ChecksumState_Enum_t State = CS_ChecksumState_EMPTY; @@ -313,26 +343,33 @@ CFE_Status_t CS_DisableEntryIDMemoryCmd(const CS_DisableEntryIDMemoryCmd_t *CmdP ResultsEntry->TempChecksumValue = 0; ResultsEntry->ByteOffset = 0; - CFE_EVS_SendEvent(CS_DISABLE_MEMORY_ENTRY_INF_EID, CFE_EVS_EventType_INFORMATION, - "Checksumming of Memory Entry ID %d is Disabled", EntryID); + CFE_EVS_SendEvent(CS_DISABLE_MEMORY_ENTRY_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Checksumming of Memory Entry ID %d is Disabled", + EntryID); State = CS_SetDefEntryState(tw, DefEntry, CS_ChecksumState_DISABLED); if (!CS_StateValid(State)) { - CFE_EVS_SendEvent(CS_DISABLE_MEMORY_DEF_EMPTY_DBG_EID, CFE_EVS_EventType_DEBUG, - "CS unable to update memory definition table for entry %d, State: %d", EntryID, + CFE_EVS_SendEvent(CS_DISABLE_MEMORY_DEF_EMPTY_DBG_EID, + CFE_EVS_EventType_DEBUG, + "CS unable to update memory definition table for entry %d, State: %d", + EntryID, State); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else { - CFE_EVS_SendEvent(CS_DISABLE_MEMORY_INVALID_ENTRY_ERR_EID, CFE_EVS_EventType_ERROR, - "Disable Memory entry failed, invalid Entry ID: %d, State: %d, Max ID: %d", EntryID, - State, (CS_MAX_NUM_MEMORY_TABLE_ENTRIES - 1)); - - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_DISABLE_MEMORY_INVALID_ENTRY_ERR_EID, + CFE_EVS_EventType_ERROR, + "Disable Memory entry failed, invalid Entry ID: %d, State: %d, Max ID: %d", + EntryID, + State, + (CS_MAX_NUM_MEMORY_TABLE_ENTRIES - 1)); + + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } /* end InProgress if */ @@ -360,11 +397,13 @@ CFE_Status_t CS_GetEntryIDMemoryCmd(const CS_GetEntryIDMemoryCmd_t *CmdPtr) break; } - if (ResultsEntry->State != CS_ChecksumState_EMPTY && ResultsEntry->StartAddress <= CmdPtr->Payload.Address && - CmdPtr->Payload.Address < (ResultsEntry->StartAddress + ResultsEntry->NumBytesToChecksum)) + if (ResultsEntry->State != CS_ChecksumState_EMPTY && ResultsEntry->StartAddress <= CmdPtr->Payload.Address + && CmdPtr->Payload.Address < (ResultsEntry->StartAddress + ResultsEntry->NumBytesToChecksum)) { - CFE_EVS_SendEvent(CS_GET_ENTRY_ID_MEMORY_INF_EID, CFE_EVS_EventType_INFORMATION, - "Memory Found Address 0x%08X in Entry ID %d", (unsigned int)(CmdPtr->Payload.Address), + CFE_EVS_SendEvent(CS_GET_ENTRY_ID_MEMORY_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Memory Found Address 0x%08X in Entry ID %d", + (unsigned int)(CmdPtr->Payload.Address), Loop); EntryFound = true; } @@ -374,10 +413,12 @@ CFE_Status_t CS_GetEntryIDMemoryCmd(const CS_GetEntryIDMemoryCmd_t *CmdPtr) if (EntryFound == false) { - CFE_EVS_SendEvent(CS_GET_ENTRY_ID_MEMORY_NOT_FOUND_INF_EID, CFE_EVS_EventType_INFORMATION, - "Address 0x%08X was not found in Memory table", (unsigned int)(CmdPtr->Payload.Address)); + CFE_EVS_SendEvent(CS_GET_ENTRY_ID_MEMORY_NOT_FOUND_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Address 0x%08X was not found in Memory table", + (unsigned int)(CmdPtr->Payload.Address)); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; return CFE_SUCCESS; } diff --git a/fsw/src/cs_table_cmds.c b/fsw/src/cs_table_cmds.c index 3666f80..43bc2b4 100644 --- a/fsw/src/cs_table_cmds.c +++ b/fsw/src/cs_table_cmds.c @@ -54,9 +54,10 @@ CFE_Status_t CS_DisableTablesCmd(const CS_DisableTablesCmd_t *CmdPtr) CS_UpdateCDS(); #endif - CFE_EVS_SendEvent(CS_DISABLE_TABLES_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_DISABLE_TABLES_INF_EID, + CFE_EVS_EventType_INFORMATION, "Checksumming of Tables is Disabled"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } return CFE_SUCCESS; @@ -78,7 +79,7 @@ CFE_Status_t CS_EnableTablesCmd(const CS_EnableTablesCmd_t *CmdPtr) #endif CFE_EVS_SendEvent(CS_ENABLE_TABLES_INF_EID, CFE_EVS_EventType_INFORMATION, "Checksumming of Tables is Enabled"); - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } return CFE_SUCCESS; @@ -103,21 +104,28 @@ CFE_Status_t CS_ReportBaselineTableCmd(const CS_ReportBaselineTableCmd_t *CmdPtr if (ResultsEntry->ComputedYet == true) { Baseline = ResultsEntry->ComparisonValue; - CFE_EVS_SendEvent(CS_BASELINE_TABLE_INF_EID, CFE_EVS_EventType_INFORMATION, - "Report baseline of table %s is 0x%08X", Name, (unsigned int)Baseline); + CFE_EVS_SendEvent(CS_BASELINE_TABLE_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Report baseline of table %s is 0x%08X", + Name, + (unsigned int)Baseline); } else { - CFE_EVS_SendEvent(CS_NO_BASELINE_TABLE_INF_EID, CFE_EVS_EventType_INFORMATION, - "Report baseline of table %s has not been computed yet", Name); + CFE_EVS_SendEvent(CS_NO_BASELINE_TABLE_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Report baseline of table %s has not been computed yet", + Name); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else { - CFE_EVS_SendEvent(CS_BASELINE_INVALID_NAME_TABLES_ERR_EID, CFE_EVS_EventType_ERROR, - "Tables report baseline failed, table %s not found", Name); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_BASELINE_INVALID_NAME_TABLES_ERR_EID, + CFE_EVS_EventType_ERROR, + "Tables report baseline failed, table %s not found", + Name); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; @@ -135,8 +143,8 @@ CFE_Status_t CS_RecomputeBaselineTableCmd(const CS_RecomputeBaselineTableCmd_t * CS_Res_Tables_Table_Entry_t *ResultsEntry; char Name[CFE_TBL_MAX_FULL_NAME_LEN]; - if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false && - CS_AppData.HkPacket.Payload.OneShotInProgress == false) + if (CS_AppData.HkPacket.Payload.RecomputeInProgress == false + && CS_AppData.HkPacket.Payload.OneShotInProgress == false) { strncpy(Name, CmdPtr->Payload.Name, sizeof(Name) - 1); Name[sizeof(Name) - 1] = '\0'; @@ -152,36 +160,49 @@ CFE_Status_t CS_RecomputeBaselineTableCmd(const CS_RecomputeBaselineTableCmd_t * CS_AppData.RecomputeTablesEntryPtr = ResultsEntry; - Status = CFE_ES_CreateChildTask(&ChildTaskID, CS_RECOMP_TABLES_TASK_NAME, CS_RecomputeTablesChildTask, NULL, - CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, CS_CHILD_TASK_PRIORITY, 0); + Status = CFE_ES_CreateChildTask(&ChildTaskID, + CS_RECOMP_TABLES_TASK_NAME, + CS_RecomputeTablesChildTask, + NULL, + CFE_PLATFORM_ES_DEFAULT_STACK_SIZE, + CS_CHILD_TASK_PRIORITY, + 0); if (Status == CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_RECOMPUTE_TABLES_STARTED_DBG_EID, CFE_EVS_EventType_DEBUG, - "Recompute baseline of table %s started", Name); - CS_AppData.HkPacket.Payload.CmdCounter++; + CFE_EVS_SendEvent(CS_RECOMPUTE_TABLES_STARTED_DBG_EID, + CFE_EVS_EventType_DEBUG, + "Recompute baseline of table %s started", + Name); + CS_AppData.HkPacket.Payload.CommandCounter++; } else /* child task creation failed */ { - CFE_EVS_SendEvent(CS_RECOMPUTE_TABLES_CREATE_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_RECOMPUTE_TABLES_CREATE_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, "Recompute baseline of table %s failed, CFE_ES_CreateChildTask returned: 0x%08X", - Name, (unsigned int)Status); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + Name, + (unsigned int)Status); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; CS_AppData.HkPacket.Payload.RecomputeInProgress = false; } } else { - CFE_EVS_SendEvent(CS_RECOMPUTE_UNKNOWN_NAME_TABLES_ERR_EID, CFE_EVS_EventType_ERROR, - "Tables recompute baseline failed, table %s not found", Name); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_RECOMPUTE_UNKNOWN_NAME_TABLES_ERR_EID, + CFE_EVS_EventType_ERROR, + "Tables recompute baseline failed, table %s not found", + Name); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } else { /*send event that we can't start another task right now */ - CFE_EVS_SendEvent(CS_RECOMPUTE_TABLES_CHDTASK_ERR_EID, CFE_EVS_EventType_ERROR, - "Tables recompute baseline for table %s failed: child task in use", Name); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_RECOMPUTE_TABLES_CHDTASK_ERR_EID, + CFE_EVS_EventType_ERROR, + "Tables recompute baseline for table %s failed: child task in use", + Name); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } return CFE_SUCCESS; @@ -196,7 +217,7 @@ CFE_Status_t CS_DisableNameTableCmd(const CS_DisableNameTableCmd_t *CmdPtr) { CS_Res_Tables_Table_Entry_t *ResultsEntry; CS_Def_Tables_Table_Entry_t *DefinitionEntry; - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; char Name[CFE_TBL_MAX_FULL_NAME_LEN]; if (CS_CheckRecomputeOneshot() == false) @@ -210,8 +231,10 @@ CFE_Status_t CS_DisableNameTableCmd(const CS_DisableNameTableCmd_t *CmdPtr) ResultsEntry->TempChecksumValue = 0; ResultsEntry->ByteOffset = 0; - CFE_EVS_SendEvent(CS_DISABLE_TABLES_NAME_INF_EID, CFE_EVS_EventType_INFORMATION, - "Checksumming of table %s is Disabled", Name); + CFE_EVS_SendEvent(CS_DISABLE_TABLES_NAME_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Checksumming of table %s is Disabled", + Name); if (CS_GetTableDefTblEntryByName(&DefinitionEntry, Name)) { @@ -219,17 +242,21 @@ CFE_Status_t CS_DisableNameTableCmd(const CS_DisableNameTableCmd_t *CmdPtr) } else { - CFE_EVS_SendEvent(CS_DISABLE_TABLE_DEF_NOT_FOUND_DBG_EID, CFE_EVS_EventType_DEBUG, - "CS unable to update tables definition table for entry %s", Name); + CFE_EVS_SendEvent(CS_DISABLE_TABLE_DEF_NOT_FOUND_DBG_EID, + CFE_EVS_EventType_DEBUG, + "CS unable to update tables definition table for entry %s", + Name); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else { - CFE_EVS_SendEvent(CS_DISABLE_TABLES_UNKNOWN_NAME_ERR_EID, CFE_EVS_EventType_ERROR, - "Tables disable table command failed, table %s not found", Name); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_DISABLE_TABLES_UNKNOWN_NAME_ERR_EID, + CFE_EVS_EventType_ERROR, + "Tables disable table command failed, table %s not found", + Name); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } /* end InProgress if */ @@ -245,7 +272,7 @@ CFE_Status_t CS_EnableNameTableCmd(const CS_EnableNameTableCmd_t *CmdPtr) { CS_Res_Tables_Table_Entry_t *ResultsEntry; CS_Def_Tables_Table_Entry_t *DefinitionEntry; - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; char Name[CFE_TBL_MAX_FULL_NAME_LEN]; if (CS_CheckRecomputeOneshot() == false) @@ -257,8 +284,10 @@ CFE_Status_t CS_EnableNameTableCmd(const CS_EnableNameTableCmd_t *CmdPtr) { ResultsEntry->State = CS_ChecksumState_ENABLED; - CFE_EVS_SendEvent(CS_ENABLE_TABLES_NAME_INF_EID, CFE_EVS_EventType_INFORMATION, - "Checksumming of table %s is Enabled", Name); + CFE_EVS_SendEvent(CS_ENABLE_TABLES_NAME_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Checksumming of table %s is Enabled", + Name); if (CS_GetTableDefTblEntryByName(&DefinitionEntry, Name)) { @@ -266,17 +295,21 @@ CFE_Status_t CS_EnableNameTableCmd(const CS_EnableNameTableCmd_t *CmdPtr) } else { - CFE_EVS_SendEvent(CS_ENABLE_TABLE_DEF_NOT_FOUND_DBG_EID, CFE_EVS_EventType_DEBUG, - "CS unable to update tables definition table for entry %s", Name); + CFE_EVS_SendEvent(CS_ENABLE_TABLE_DEF_NOT_FOUND_DBG_EID, + CFE_EVS_EventType_DEBUG, + "CS unable to update tables definition table for entry %s", + Name); } - CS_AppData.HkPacket.Payload.CmdCounter++; + CS_AppData.HkPacket.Payload.CommandCounter++; } else { - CFE_EVS_SendEvent(CS_ENABLE_TABLES_UNKNOWN_NAME_ERR_EID, CFE_EVS_EventType_ERROR, - "Tables enable table command failed, table %s not found", Name); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CFE_EVS_SendEvent(CS_ENABLE_TABLES_UNKNOWN_NAME_ERR_EID, + CFE_EVS_EventType_ERROR, + "Tables enable table command failed, table %s not found", + Name); + CS_AppData.HkPacket.Payload.CommandErrorCounter++; } } /* end InProgress if */ diff --git a/fsw/src/cs_table_processing.c b/fsw/src/cs_table_processing.c index e021a3a..e0f651a 100644 --- a/fsw/src/cs_table_processing.c +++ b/fsw/src/cs_table_processing.c @@ -57,7 +57,7 @@ typedef enum CS_ValidationError */ typedef struct CS_ValidationMetrics { - const char * TableName; + const char *TableName; const uint16 *EventMap; uint16 Position; @@ -136,34 +136,48 @@ void CS_ValidationMetrics_ReportEvent(CS_ValidationMetrics_t *Metrics) { case CS_ValidationError_STATE: default: - CFE_EVS_SendEvent(PendingEventId, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(PendingEventId, + CFE_EVS_EventType_ERROR, "%s Table Validate: Illegal State Field (0x%04X) found in Entry ID %d", - Metrics->TableName, (unsigned short)Metrics->StateField, (int)Metrics->Position); + Metrics->TableName, + (unsigned short)Metrics->StateField, + (int)Metrics->Position); break; case CS_ValidationError_LONG_NAME: - CFE_EVS_SendEvent(PendingEventId, CFE_EVS_EventType_ERROR, - "%s Table Validate: Unterminated Name found at entry %d", Metrics->TableName, + CFE_EVS_SendEvent(PendingEventId, + CFE_EVS_EventType_ERROR, + "%s Table Validate: Unterminated Name found at entry %d", + Metrics->TableName, (int)Metrics->Position); break; case CS_ValidationError_ZERO_NAME: - CFE_EVS_SendEvent(PendingEventId, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(PendingEventId, + CFE_EVS_EventType_ERROR, "%s Table Validate: Illegal State (0x%04X) with empty name at entry %d", - Metrics->TableName, (unsigned short)Metrics->StateField, (int)Metrics->Position); + Metrics->TableName, + (unsigned short)Metrics->StateField, + (int)Metrics->Position); break; case CS_ValidationError_DUPLICATE: - CFE_EVS_SendEvent(PendingEventId, CFE_EVS_EventType_ERROR, - "%s Table Validate: Duplicate Name (%s) found at entry %d", Metrics->TableName, - Metrics->ErrorMessage, (int)Metrics->Position); + CFE_EVS_SendEvent(PendingEventId, + CFE_EVS_EventType_ERROR, + "%s Table Validate: Duplicate Name (%s) found at entry %d", + Metrics->TableName, + Metrics->ErrorMessage, + (int)Metrics->Position); break; case CS_ValidationError_MEM_RANGE: - CFE_EVS_SendEvent(PendingEventId, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(PendingEventId, + CFE_EVS_EventType_ERROR, "%s Table Validate: Illegal MemRange in Entry ID %d, " "CFE_PSP_MemValidateRange: %s", - Metrics->TableName, (int)Metrics->Position, Metrics->ErrorMessage); + Metrics->TableName, + (int)Metrics->Position, + Metrics->ErrorMessage); break; } } @@ -207,9 +221,13 @@ void CS_ValidationMetrics_Accumulate(CS_ValidationMetrics_t *Metrics) *-----------------------------------------------------------------*/ int32 CS_ValidationMetrics_GetFinalStatus(const CS_ValidationMetrics_t *Metrics) { - CFE_EVS_SendEvent(Metrics->EventMap[0], CFE_EVS_EventType_INFORMATION, - "CS %s Table verification results: good = %d, bad = %d, unused = %d", Metrics->TableName, - (int)Metrics->GoodCount, (int)Metrics->BadCount, (int)Metrics->EmptyCount); + CFE_EVS_SendEvent(Metrics->EventMap[0], + CFE_EVS_EventType_INFORMATION, + "CS %s Table verification results: good = %d, bad = %d, unused = %d", + Metrics->TableName, + (int)Metrics->GoodCount, + (int)Metrics->BadCount, + (int)Metrics->EmptyCount); if (CS_ValidationMetrics_IsAllOK(Metrics)) { @@ -480,7 +498,7 @@ CFE_Status_t CS_ValidateAppChecksumDefinitionTable(void *TblPtr) void CS_ProcessNewEepromMemoryDefinitionTable(CS_TableWrapper_t *tw) { const CS_Def_EepromMemory_Table_Entry_t *DefEntry = NULL; - CS_Res_EepromMemory_Table_Entry_t * ResultsEntry = NULL; + CS_Res_EepromMemory_Table_Entry_t *ResultsEntry = NULL; uint16 Loop = 0; uint16 NumRegionsInTable = 0; CS_ChecksumState_Enum_t PreviousState = CS_ChecksumState_EMPTY; @@ -530,8 +548,10 @@ void CS_ProcessNewEepromMemoryDefinitionTable(CS_TableWrapper_t *tw) if (NumRegionsInTable == 0) { - CFE_EVS_SendEvent(CS_PROCESS_EEPROM_MEMORY_NO_ENTRIES_INF_EID, CFE_EVS_EventType_INFORMATION, - "CS %s Table: No valid entries in the table", CS_GetTableTypeAsString(tw)); + CFE_EVS_SendEvent(CS_PROCESS_EEPROM_MEMORY_NO_ENTRIES_INF_EID, + CFE_EVS_EventType_INFORMATION, + "CS %s Table: No valid entries in the table", + CS_GetTableTypeAsString(tw)); } } @@ -540,8 +560,11 @@ void CS_ProcessNewEepromMemoryDefinitionTable(CS_TableWrapper_t *tw) /* Helper function to split the App.Table name pattern */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void CS_ExtractNames(const CS_Def_Tables_Table_Entry_t *DefEntry, char *AppBuf, size_t AppSz, char *TableBuf, - size_t TableSz) +void CS_ExtractNames(const CS_Def_Tables_Table_Entry_t *DefEntry, + char *AppBuf, + size_t AppSz, + char *TableBuf, + size_t TableSz) { const char *Sep; size_t TableNameLen; @@ -565,13 +588,13 @@ void CS_ExtractNames(const CS_Def_Tables_Table_Entry_t *DefEntry, char *AppBuf, TableNameLen -= AppNameLen; - if (AppNameLen > AppSz) + if (AppNameLen >= AppSz) { - AppNameLen = AppSz; + AppNameLen = AppSz - 1; } - if (TableNameLen > TableSz) + if (TableNameLen >= TableSz) { - TableNameLen = TableSz; + TableNameLen = TableSz - 1; } memcpy(AppBuf, DefEntry->Name, AppNameLen); @@ -588,7 +611,7 @@ void CS_ExtractNames(const CS_Def_Tables_Table_Entry_t *DefEntry, char *AppBuf, void CS_ProcessNewTablesDefinitionTable(CS_TableWrapper_t *tw) { const CS_Def_Tables_Table_Entry_t *DefEntry = NULL; - CS_Res_Tables_Table_Entry_t * ResultsEntry = NULL; + CS_Res_Tables_Table_Entry_t *ResultsEntry = NULL; uint16 Loop = 0; uint16 NumRegionsInTable = 0; CS_ChecksumState_Enum_t PreviousState = CS_ChecksumState_EMPTY; @@ -666,7 +689,10 @@ void CS_ProcessNewTablesDefinitionTable(CS_TableWrapper_t *tw) ResultsEntry->TblHandleID = CFE_TBL_HandleToID(TableHandle); ResultsEntry->IsCSOwner = Owned; - CFE_SB_MessageStringGet(ResultsEntry->Name, DefEntry->Name, NULL, sizeof(ResultsEntry->Name), + CFE_SB_MessageStringGet(ResultsEntry->Name, + DefEntry->Name, + NULL, + sizeof(ResultsEntry->Name), sizeof(DefEntry->Name)); } @@ -679,7 +705,8 @@ void CS_ProcessNewTablesDefinitionTable(CS_TableWrapper_t *tw) if (NumRegionsInTable == 0) { - CFE_EVS_SendEvent(CS_PROCESS_TABLES_NO_ENTRIES_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_PROCESS_TABLES_NO_ENTRIES_INF_EID, + CFE_EVS_EventType_INFORMATION, "CS Tables Table: No valid entries in the table"); } } @@ -692,7 +719,7 @@ void CS_ProcessNewTablesDefinitionTable(CS_TableWrapper_t *tw) void CS_ProcessNewAppDefinitionTable(CS_TableWrapper_t *tw) { const CS_Def_App_Table_Entry_t *DefEntry = NULL; - CS_Res_App_Table_Entry_t * ResultsEntry = NULL; + CS_Res_App_Table_Entry_t *ResultsEntry = NULL; uint16 Loop = 0; uint16 NumRegionsInTable = 0; CS_ChecksumState_Enum_t PreviousState = CS_ChecksumState_EMPTY; @@ -723,7 +750,10 @@ void CS_ProcessNewAppDefinitionTable(CS_TableWrapper_t *tw) NumRegionsInTable++; ResultsEntry->State = DefEntry->State; - CFE_SB_MessageStringGet(ResultsEntry->Name, DefEntry->Name, NULL, sizeof(ResultsEntry->Name), + CFE_SB_MessageStringGet(ResultsEntry->Name, + DefEntry->Name, + NULL, + sizeof(ResultsEntry->Name), sizeof(DefEntry->Name)); } @@ -737,7 +767,8 @@ void CS_ProcessNewAppDefinitionTable(CS_TableWrapper_t *tw) if (NumRegionsInTable == 0) { - CFE_EVS_SendEvent(CS_PROCESS_APP_NO_ENTRIES_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(CS_PROCESS_APP_NO_ENTRIES_INF_EID, + CFE_EVS_EventType_INFORMATION, "CS Apps Table: No valid entries in the table"); } } @@ -752,8 +783,11 @@ CFE_Status_t CS_RegisterResultTable(CS_TableWrapper_t *tw) { CFE_Status_t Result; - Result = CFE_TBL_Register(&tw->ResHandle, tw->ResTableName, tw->NumEntries * tw->ResEntrySize, - CFE_TBL_OPT_SNGL_BUFFER | CFE_TBL_OPT_DUMP_ONLY, NULL); + Result = CFE_TBL_Register(&tw->ResHandle, + tw->ResTableName, + tw->NumEntries * tw->ResEntrySize, + CFE_TBL_OPT_SNGL_BUFFER | CFE_TBL_OPT_DUMP_ONLY, + NULL); if (Result >= CFE_SUCCESS) { @@ -775,14 +809,18 @@ CFE_Status_t CS_RegisterResultTable(CS_TableWrapper_t *tw) * table, and obtain the address. * *-----------------------------------------------------------------*/ -CFE_Status_t CS_RegisterDefinitionTable(CS_TableWrapper_t *tw, const char *DefinitionTableFileName, +CFE_Status_t CS_RegisterDefinitionTable(CS_TableWrapper_t *tw, + const char *DefinitionTableFileName, CFE_TBL_CallbackFuncPtr_t CallBackFunction) { bool LoadedFromMemory = false; CFE_Status_t Result; - Result = CFE_TBL_Register(&tw->DefHandle, tw->DefTableName, tw->NumEntries * tw->DefEntrySize, - CFE_TBL_OPT_SNGL_BUFFER | CFE_TBL_OPT_LOAD_DUMP, CallBackFunction); + Result = CFE_TBL_Register(&tw->DefHandle, + tw->DefTableName, + tw->NumEntries * tw->DefEntrySize, + CFE_TBL_OPT_SNGL_BUFFER | CFE_TBL_OPT_LOAD_DUMP, + CallBackFunction); if (Result >= CFE_SUCCESS) { @@ -822,8 +860,8 @@ CFE_Status_t CS_RegisterDefinitionTable(CS_TableWrapper_t *tw, const char *Defin /* CS function for initializing new tables */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -CFE_Status_t CS_TableInit(CS_TableWrapper_t *tw, const char *DefinitionTableFileName, - CFE_TBL_CallbackFuncPtr_t CallBackFunction) +CFE_Status_t +CS_TableInit(CS_TableWrapper_t *tw, const char *DefinitionTableFileName, CFE_TBL_CallbackFuncPtr_t CallBackFunction) { CFE_Status_t Result; @@ -842,8 +880,10 @@ CFE_Status_t CS_TableInit(CS_TableWrapper_t *tw, const char *DefinitionTableFile if (Result != CFE_SUCCESS) { - CFE_EVS_SendEvent(CS_TBL_INIT_ERR_EID, CFE_EVS_EventType_ERROR, - "CS received error 0x%08X initializing tables for %s", (unsigned int)Result, + CFE_EVS_SendEvent(CS_TBL_INIT_ERR_EID, + CFE_EVS_EventType_ERROR, + "CS received error 0x%08X initializing tables for %s", + (unsigned int)Result, CS_GetTableTypeAsString(tw)); } } @@ -928,11 +968,16 @@ CFE_Status_t CS_HandleTableUpdate(CS_TableWrapper_t *tw) if (Result < CFE_SUCCESS) { /* There was a problem somewhere, generate an event */ - CFE_EVS_SendEvent(CS_TBL_UPDATE_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_TBL_UPDATE_ERR_EID, + CFE_EVS_EventType_ERROR, "CS had problems updating table. Res Release: 0x%08X Def Release:0x%08X Res " "Manage:0x%08X Def Manage: 0x%08X Get:0x%08X for table %s", - (unsigned int)ReleaseResult1, (unsigned int)ReleaseResult2, (unsigned int)ManageResult1, - (unsigned int)ManageResult2, (unsigned int)GetResult2, CS_GetTableTypeAsString(tw)); + (unsigned int)ReleaseResult1, + (unsigned int)ReleaseResult2, + (unsigned int)ManageResult1, + (unsigned int)ManageResult2, + (unsigned int)GetResult2, + CS_GetTableTypeAsString(tw)); } } return Result; diff --git a/fsw/src/cs_table_processing.h b/fsw/src/cs_table_processing.h index 19bbab5..86c8ec2 100644 --- a/fsw/src/cs_table_processing.h +++ b/fsw/src/cs_table_processing.h @@ -53,11 +53,11 @@ typedef struct CS_TableWrapper size_t NumEntries; /**< \brief Number of entries in table (applies to both def and res) */ - void * DefAddr; /**< \brief Pointer to definition table */ + void *DefAddr; /**< \brief Pointer to definition table */ size_t DefEntrySize; /**< \brief Size of each entry in definition table */ size_t DefStateOffset; /**< \brief Offset of "State" member within definition entry */ - void * ResAddr; /**< \brief Pointer to results table */ + void *ResAddr; /**< \brief Pointer to results table */ size_t ResEntrySize; /**< \brief Size of each entry in result table */ const void *DefaultDefinitionPtr; /**< Pointer to default definition, if applicable */ @@ -65,7 +65,7 @@ typedef struct CS_TableWrapper void (*UpdateHandler)(struct CS_TableWrapper *); /**< Function to handle table updates */ uint32 *BaselineValue; /**< \brief pointer to HK TLM entry containing baseline value */ - uint8 * GlobalState; /**< \brief pointer to HK TLM entry containing global enable/disable */ + uint8 *GlobalState; /**< \brief pointer to HK TLM entry containing global enable/disable */ CS_Res_Tables_Table_Entry_t *ResTblPtr; /**< \brief CS results entry for this table */ @@ -226,8 +226,8 @@ void CS_ProcessNewAppDefinitionTable(CS_TableWrapper_t *tw); * \return Execution status, see \ref CFEReturnCodes * \retval #CFE_SUCCESS \copybrief CFE_SUCCESS */ -CFE_Status_t CS_TableInit(CS_TableWrapper_t *tw, const char *DefinitionTableFileName, - CFE_TBL_CallbackFuncPtr_t CallBackFunction); +CFE_Status_t +CS_TableInit(CS_TableWrapper_t *tw, const char *DefinitionTableFileName, CFE_TBL_CallbackFuncPtr_t CallBackFunction); /** * \brief Handles table updates for all CS tables diff --git a/fsw/src/cs_utils.c b/fsw/src/cs_utils.c index 9eeb084..d5ff96f 100644 --- a/fsw/src/cs_utils.c +++ b/fsw/src/cs_utils.c @@ -91,7 +91,7 @@ void *CS_GetDefEntryAddr(CS_TableWrapper_t *tw, uint16 EntryId) if (tw->DefAddr != NULL && EntryId < tw->NumEntries) { - EntryAddr = tw->DefAddr; + EntryAddr = tw->DefAddr; EntryAddr += (tw->DefEntrySize * EntryId); } else @@ -114,7 +114,7 @@ void *CS_GetResEntryAddr(CS_TableWrapper_t *tw, uint16 EntryId) if (tw->ResAddr != NULL && EntryId < tw->NumEntries) { - EntryAddr = tw->ResAddr; + EntryAddr = tw->ResAddr; EntryAddr += (tw->ResEntrySize * EntryId); } else @@ -133,9 +133,9 @@ void *CS_GetResEntryAddr(CS_TableWrapper_t *tw, uint16 EntryId) *-----------------------------------------------------------------*/ CS_ChecksumState_Enum_t CS_SetGenericEntryState(void *EntryPtr, size_t Offset, CS_ChecksumState_Enum_t NewState) { - uint8 * StateAddr; + uint8 *StateAddr; CS_ChecksumState_Enum_t PreviousDefState; - uint16 * StatePtr; + uint16 *StatePtr; PreviousDefState = CS_ChecksumState_UNDEFINED; if (CS_StateValid(NewState)) @@ -150,7 +150,7 @@ CS_ChecksumState_Enum_t CS_SetGenericEntryState(void *EntryPtr, size_t Offset, C if (StateAddr != NULL) { StateAddr += Offset; - StatePtr = (uint16 *)(void *)StateAddr; + StatePtr = (uint16 *)(void *)StateAddr; PreviousDefState = *StatePtr; if (CS_StateValid(PreviousDefState)) @@ -433,8 +433,8 @@ bool CS_GetTableResTblEntryByName(CS_Res_Tables_Table_Entry_t **EntryPtr, const break; } - if (ResultsEntry->State != CS_ChecksumState_EMPTY && - strncmp(ResultsEntry->Name, Name, CFE_TBL_MAX_FULL_NAME_LEN) == 0) + if (ResultsEntry->State != CS_ChecksumState_EMPTY + && strncmp(ResultsEntry->Name, Name, CFE_TBL_MAX_FULL_NAME_LEN) == 0) { Status = true; *EntryPtr = ResultsEntry; @@ -466,8 +466,8 @@ bool CS_GetTableDefTblEntryByName(CS_Def_Tables_Table_Entry_t **EntryPtr, const break; } - if (CS_StateValid(DefinitionEntry->State) && - strncmp(DefinitionEntry->Name, Name, CFE_TBL_MAX_FULL_NAME_LEN) == 0) + if (CS_StateValid(DefinitionEntry->State) + && strncmp(DefinitionEntry->Name, Name, CFE_TBL_MAX_FULL_NAME_LEN) == 0) { Status = true; *EntryPtr = DefinitionEntry; @@ -669,9 +669,11 @@ bool CS_BackgroundCfeCore(void) CS_AppData.HkPacket.Payload.CfeCoreCSErrCounter++; - CFE_EVS_SendEvent(CS_CFECORE_MISCOMPARE_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_CFECORE_MISCOMPARE_ERR_EID, + CFE_EVS_EventType_ERROR, "Checksum Failure: cFE Core, Expected: 0x%08X, Calculated: 0x%08X", - (unsigned int)(ResultsEntry->ComparisonValue), (unsigned int)ComputedCSValue); + (unsigned int)(ResultsEntry->ComparisonValue), + (unsigned int)ComputedCSValue); } if (DoneWithEntry == true) @@ -735,9 +737,11 @@ bool CS_BackgroundOS(void) /* we had a miscompare */ CS_AppData.HkPacket.Payload.OSCSErrCounter++; - CFE_EVS_SendEvent(CS_OS_MISCOMPARE_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_OS_MISCOMPARE_ERR_EID, + CFE_EVS_EventType_ERROR, "Checksum Failure: OS code segment, Expected: 0x%08X, Calculated: 0x%08X", - (unsigned int)(ResultsEntry->ComparisonValue), (unsigned int)ComputedCSValue); + (unsigned int)(ResultsEntry->ComparisonValue), + (unsigned int)ComputedCSValue); } if (DoneWithEntry == true) @@ -808,9 +812,11 @@ bool CS_BackgroundEeprom(void) CS_AppData.HkPacket.Payload.EepromCSErrCounter++; - CFE_EVS_SendEvent(CS_EEPROM_MISCOMPARE_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_EEPROM_MISCOMPARE_ERR_EID, + CFE_EVS_EventType_ERROR, "Checksum Failure: Address 0x%lx in EEPROM Table, Expected: 0x%08X, Calculated: 0x%08X", - (unsigned long)ResultsEntry->StartAddress, (unsigned int)(ResultsEntry->ComparisonValue), + (unsigned long)ResultsEntry->StartAddress, + (unsigned int)(ResultsEntry->ComparisonValue), (unsigned int)ComputedCSValue); } @@ -890,9 +896,11 @@ bool CS_BackgroundMemory(void) CS_AppData.HkPacket.Payload.MemoryCSErrCounter++; - CFE_EVS_SendEvent(CS_MEMORY_MISCOMPARE_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_MEMORY_MISCOMPARE_ERR_EID, + CFE_EVS_EventType_ERROR, "Checksum Failure: Address 0x%lx in Memory Table, Expected: 0x%08X, Calculated: 0x%08X", - (unsigned long)ResultsEntry->StartAddress, (unsigned int)(ResultsEntry->ComparisonValue), + (unsigned long)ResultsEntry->StartAddress, + (unsigned int)(ResultsEntry->ComparisonValue), (unsigned int)ComputedCSValue); } @@ -949,15 +957,18 @@ bool CS_BackgroundTables(void) /* we had a miscompare */ CS_AppData.HkPacket.Payload.TablesCSErrCounter++; - CFE_EVS_SendEvent(CS_TABLES_MISCOMPARE_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_TABLES_MISCOMPARE_ERR_EID, + CFE_EVS_EventType_ERROR, "Checksum Failure: Table %s, Expected: 0x%08X, Calculated: 0x%08X", - TablesResultsEntry->Name, (unsigned int)(TablesResultsEntry->ComparisonValue), + TablesResultsEntry->Name, + (unsigned int)(TablesResultsEntry->ComparisonValue), (unsigned int)ComputedCSValue); } if (Status == CS_ERR_NOT_FOUND) { - CFE_EVS_SendEvent(CS_COMPUTE_TABLES_NOT_FOUND_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_COMPUTE_TABLES_NOT_FOUND_ERR_EID, + CFE_EVS_EventType_ERROR, "Tables table computing: Table %s could not be found, skipping", TablesResultsEntry->Name); @@ -970,8 +981,8 @@ bool CS_BackgroundTables(void) } } - if (TablesResultsEntry == NULL || - CS_AppData.HkPacket.Payload.CurrentEntryInTable >= CS_MAX_NUM_TABLES_TABLE_ENTRIES) + if (TablesResultsEntry == NULL + || CS_AppData.HkPacket.Payload.CurrentEntryInTable >= CS_MAX_NUM_TABLES_TABLE_ENTRIES) { /* We are done with this table */ CS_GoToNextTable(); @@ -1018,16 +1029,20 @@ bool CS_BackgroundApp(void) /* we had a miscompare */ CS_AppData.HkPacket.Payload.AppCSErrCounter++; - CFE_EVS_SendEvent(CS_APP_MISCOMPARE_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_APP_MISCOMPARE_ERR_EID, + CFE_EVS_EventType_ERROR, "Checksum Failure: Application %s, Expected: 0x%08X, Calculated: 0x%08X", - AppResultsEntry->Name, (unsigned int)(AppResultsEntry->ComparisonValue), + AppResultsEntry->Name, + (unsigned int)(AppResultsEntry->ComparisonValue), (unsigned int)ComputedCSValue); } if (Status == CS_ERR_NOT_FOUND) { - CFE_EVS_SendEvent(CS_COMPUTE_APP_NOT_FOUND_ERR_EID, CFE_EVS_EventType_ERROR, - "App table computing: App %s could not be found, skipping", AppResultsEntry->Name); + CFE_EVS_SendEvent(CS_COMPUTE_APP_NOT_FOUND_ERR_EID, + CFE_EVS_EventType_ERROR, + "App table computing: App %s could not be found, skipping", + AppResultsEntry->Name); DoneWithEntry = true; } @@ -1113,9 +1128,11 @@ CFE_Status_t CS_HandleRoutineTableUpdates(void) if (Result != CFE_SUCCESS) { - CFE_EVS_SendEvent(EventIdMap[TableId], CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(EventIdMap[TableId], + CFE_EVS_EventType_ERROR, "Table update failed for %s: 0x%08X, checksumming is disabled", - CS_GetTableTypeAsString(tw), (unsigned int)Result); + CS_GetTableTypeAsString(tw), + (unsigned int)Result); if (tw->GlobalState) { @@ -1136,13 +1153,14 @@ bool CS_CheckRecomputeOneshot(void) { bool Result = false; - if (CS_AppData.HkPacket.Payload.RecomputeInProgress == true || - CS_AppData.HkPacket.Payload.OneShotInProgress == true) + if (CS_AppData.HkPacket.Payload.RecomputeInProgress == true + || CS_AppData.HkPacket.Payload.OneShotInProgress == true) { - CFE_EVS_SendEvent(CS_CMD_COMPUTE_PROG_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(CS_CMD_COMPUTE_PROG_ERR_EID, + CFE_EVS_EventType_ERROR, "Cannot perform command. Recompute or oneshot in progress."); - CS_AppData.HkPacket.Payload.CmdErrCounter++; + CS_AppData.HkPacket.Payload.CommandErrorCounter++; Result = true; } diff --git a/fsw/src/cs_version.h b/fsw/src/cs_version.h index df40326..0476ae9 100644 --- a/fsw/src/cs_version.h +++ b/fsw/src/cs_version.h @@ -29,8 +29,8 @@ * \{ */ -#define CS_MAJOR_VERSION 7 /**< \brief Major version number */ -#define CS_MINOR_VERSION 0 /**< \brief Minor version number */ +#define CS_MAJOR_VERSION 7 /**< \brief Major version number */ +#define CS_MINOR_VERSION 0 /**< \brief Minor version number */ #define CS_REVISION 0 /**< \brief Revision number */ /**\}*/ diff --git a/fsw/tables/cs_apptbl.c b/fsw/tables/cs_apptbl.c index 2ad8130..2b8e864 100644 --- a/fsw/tables/cs_apptbl.c +++ b/fsw/tables/cs_apptbl.c @@ -32,30 +32,54 @@ CS_Def_App_Table_Entry_t CS_AppTable[CS_MAX_NUM_APP_TABLE_ENTRIES] = { /* State Name */ - /* 0 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 1 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 2 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 3 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 4 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 5 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 6 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 7 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 8 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 9 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 10 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 11 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 12 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 13 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 14 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 15 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 16 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 17 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 18 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 19 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 20 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 21 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 22 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 23 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}}; + /* 0 */ { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 1 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 2 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 3 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 4 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 5 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 6 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 7 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 8 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 9 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 10 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 11 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 12 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 13 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 14 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 15 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 16 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 17 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 18 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 19 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 20 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 21 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 22 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 23 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" } +}; /* ** Table file header diff --git a/fsw/tables/cs_eepromtbl.c b/fsw/tables/cs_eepromtbl.c index 81357dc..42a6de2 100644 --- a/fsw/tables/cs_eepromtbl.c +++ b/fsw/tables/cs_eepromtbl.c @@ -33,40 +33,86 @@ CS_Def_EepromMemory_Table_Entry_t CS_EepromTable[CS_MAX_NUM_EEPROM_TABLE_ENTRIES] = { /* State Filler StartAddress NumBytes */ /* 0 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 1 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 2 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 3 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 4 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 5 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 6 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 7 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 8 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 9 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 10 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 11 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 12 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 13 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 14 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 15 */ - {.State = CS_ChecksumState_EMPTY, + { .State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, - .NumBytesToChecksum = 0x00000000}}; + .NumBytesToChecksum = 0x00000000 } +}; /* ** Table file header diff --git a/fsw/tables/cs_memorytbl.c b/fsw/tables/cs_memorytbl.c index e67436e..fb0b8db 100644 --- a/fsw/tables/cs_memorytbl.c +++ b/fsw/tables/cs_memorytbl.c @@ -33,40 +33,86 @@ CS_Def_EepromMemory_Table_Entry_t CS_MemoryTable[CS_MAX_NUM_MEMORY_TABLE_ENTRIES] = { /* State Filler StartAddress NumBytes */ /* 0 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 1 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 2 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 3 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 4 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 5 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 6 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 7 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 8 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 9 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 10 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 11 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 12 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 13 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 14 */ - {.State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, .NumBytesToChecksum = 0x00000000}, + { .State = CS_ChecksumState_EMPTY, + .Filler16 = 0x1234, + .StartAddress = 0x00000000, + .NumBytesToChecksum = 0x00000000 }, /* 15 */ - {.State = CS_ChecksumState_EMPTY, + { .State = CS_ChecksumState_EMPTY, .Filler16 = 0x1234, .StartAddress = 0x00000000, - .NumBytesToChecksum = 0x00000000}}; + .NumBytesToChecksum = 0x00000000 } +}; /* ** Table file header diff --git a/fsw/tables/cs_tablestbl.c b/fsw/tables/cs_tablestbl.c index e5b8e57..35e9af1 100644 --- a/fsw/tables/cs_tablestbl.c +++ b/fsw/tables/cs_tablestbl.c @@ -33,30 +33,54 @@ CS_Def_Tables_Table_Entry_t CS_TablesTable[CS_MAX_NUM_TABLES_TABLE_ENTRIES] = { /* State Name */ - /* 0 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 1 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 2 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 3 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 4 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 5 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 6 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 7 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 8 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 9 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 10 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 11 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 12 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 13 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 14 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 15 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 16 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 17 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 18 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 19 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 20 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 21 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 22 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}, - /* 23 */ {.State = CS_ChecksumState_EMPTY, .Name = ""}}; + /* 0 */ { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 1 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 2 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 3 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 4 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 5 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 6 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 7 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 8 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 9 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 10 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 11 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 12 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 13 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 14 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 15 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 16 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 17 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 18 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 19 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 20 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 21 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 22 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" }, + /* 23 */ + { .State = CS_ChecksumState_EMPTY, .Name = "" } +}; /* ** Table file header diff --git a/unit-test/cs_app_cmds_tests.c b/unit-test/cs_app_cmds_tests.c index 22cb567..4df4424 100644 --- a/unit-test/cs_app_cmds_tests.c +++ b/unit-test/cs_app_cmds_tests.c @@ -42,7 +42,8 @@ uint8 call_count_CFE_EVS_SendEvent; * Function Definitions */ -void CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1(void *UserObj, UT_EntryKey_t FuncKey, +void CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1(void *UserObj, + UT_EntryKey_t FuncKey, const UT_StubContext_t *Context) { CS_Res_App_Table_Entry_t **EntryPtr = @@ -54,7 +55,8 @@ void CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1(void *UserObj, UT_Entry ResAppTblPtr->ComputedYet = true; } -void CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler2(void *UserObj, UT_EntryKey_t FuncKey, +void CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler2(void *UserObj, + UT_EntryKey_t FuncKey, const UT_StubContext_t *Context) { CS_Res_App_Table_Entry_t **EntryPtr = @@ -66,7 +68,8 @@ void CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler2(void *UserObj, UT_Entry ResAppTblPtr->ComputedYet = false; } -void CS_APP_CMDS_TEST_CS_GetAppDefTblEntryByNameHandler1(void *UserObj, UT_EntryKey_t FuncKey, +void CS_APP_CMDS_TEST_CS_GetAppDefTblEntryByNameHandler1(void *UserObj, + UT_EntryKey_t FuncKey, const UT_StubContext_t *Context) { CS_Def_Tables_Table_Entry_t **EntryPtr = @@ -99,11 +102,12 @@ void CS_DisableAppsCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -118,11 +122,12 @@ void CS_DisableAppsCmd_Test_OneShot(void) CS_DisableAppsCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -149,13 +154,14 @@ void CS_EnableAppsCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -170,11 +176,12 @@ void CS_EnableAppsCmd_Test_OneShot(void) CS_EnableAppsCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -197,7 +204,8 @@ void CS_ReportBaselineAppCmd_Test_Baseline(void) ResAppTblPtr->ComparisonValue = 1; UT_SetDeferredRetcode(UT_KEY(CS_GetAppResTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, NULL); /* Execute the function being tested */ @@ -211,11 +219,12 @@ void CS_ReportBaselineAppCmd_Test_Baseline(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -227,7 +236,8 @@ void CS_ReportBaselineAppCmd_Test_NoBaseline(void) CS_Res_App_Table_Entry_t *ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Report baseline of app %%s has not been computed yet"); strncpy(CmdPacket.Payload.Name, "App1", OS_MAX_API_NAME); @@ -238,7 +248,8 @@ void CS_ReportBaselineAppCmd_Test_NoBaseline(void) ResAppTblPtr->ComputedYet = false; UT_SetDeferredRetcode(UT_KEY(CS_GetAppResTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler2, + UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler2, NULL); /* Execute the function being tested */ @@ -252,13 +263,14 @@ void CS_ReportBaselineAppCmd_Test_NoBaseline(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -291,11 +303,13 @@ void CS_ReportBaselineAppCmd_Test_BaselineInvalidName(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -304,10 +318,11 @@ void CS_RecomputeBaselineAppCmd_Test_OneShot(void) CS_RecomputeBaselineAppCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_App_Table_Entry_t * ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; + CS_Res_App_Table_Entry_t *ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App recompute baseline for app %%s failed: child task in use"); strncpy(CmdPacket.Payload.Name, "App1", OS_MAX_API_NAME); @@ -319,7 +334,8 @@ void CS_RecomputeBaselineAppCmd_Test_OneShot(void) /* Execute the function being tested */ CS_RecomputeBaselineAppCmd(&CmdPacket); UT_SetDeferredRetcode(UT_KEY(CS_GetAppResTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, NULL); /* Verify results */ @@ -330,11 +346,13 @@ void CS_RecomputeBaselineAppCmd_Test_OneShot(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -343,7 +361,7 @@ void CS_RecomputeBaselineAppCmd_Test_Nominal(void) CS_RecomputeBaselineAppCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_App_Table_Entry_t * ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; + CS_Res_App_Table_Entry_t *ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute baseline of app %%s started"); @@ -360,7 +378,8 @@ void CS_RecomputeBaselineAppCmd_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(CFE_ES_CreateChildTask), 1, CFE_SUCCESS); UT_SetDeferredRetcode(UT_KEY(CS_GetAppResTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, NULL); /* Execute the function being tested */ @@ -376,13 +395,14 @@ void CS_RecomputeBaselineAppCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -391,10 +411,11 @@ void CS_RecomputeBaselineAppCmd_Test_CreateChildTaskError(void) CS_RecomputeBaselineAppCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_App_Table_Entry_t * ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; + CS_Res_App_Table_Entry_t *ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute baseline of app %%s failed, CFE_ES_CreateChildTask returned: 0x%%08X"); strncpy(CmdPacket.Payload.Name, "App1", OS_MAX_API_NAME); @@ -409,7 +430,8 @@ void CS_RecomputeBaselineAppCmd_Test_CreateChildTaskError(void) UT_SetDeferredRetcode(UT_KEY(CFE_ES_CreateChildTask), 1, -1); UT_SetDeferredRetcode(UT_KEY(CS_GetAppResTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, NULL); /* Execute the function being tested */ @@ -425,11 +447,13 @@ void CS_RecomputeBaselineAppCmd_Test_CreateChildTaskError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -438,10 +462,11 @@ void CS_RecomputeBaselineAppCmd_Test_UnknownNameError(void) CS_RecomputeBaselineAppCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_App_Table_Entry_t * ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; + CS_Res_App_Table_Entry_t *ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App recompute baseline failed, app %%s not found"); strncpy(CmdPacket.Payload.Name, "App1", OS_MAX_API_NAME); @@ -465,11 +490,13 @@ void CS_RecomputeBaselineAppCmd_Test_UnknownNameError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -478,10 +505,11 @@ void CS_RecomputeBaselineAppCmd_Test_RecomputeInProgress(void) CS_RecomputeBaselineAppCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_App_Table_Entry_t * ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; + CS_Res_App_Table_Entry_t *ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App recompute baseline for app %%s failed: child task in use"); strncpy(CmdPacket.Payload.Name, "App1", OS_MAX_API_NAME); @@ -492,7 +520,8 @@ void CS_RecomputeBaselineAppCmd_Test_RecomputeInProgress(void) /* Execute the function being tested */ CS_RecomputeBaselineAppCmd(&CmdPacket); UT_SetDeferredRetcode(UT_KEY(CS_GetAppResTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, NULL); /* Verify results */ @@ -503,11 +532,13 @@ void CS_RecomputeBaselineAppCmd_Test_RecomputeInProgress(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -534,10 +565,12 @@ void CS_DisableNameAppCmd_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(CS_CheckRecomputeOneshot), 1, false); UT_SetDeferredRetcode(UT_KEY(CS_GetAppResTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, NULL); UT_SetDeferredRetcode(UT_KEY(CS_GetAppDefTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetAppDefTblEntryByName), CS_APP_CMDS_TEST_CS_GetAppDefTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetAppDefTblEntryByName), + CS_APP_CMDS_TEST_CS_GetAppDefTblEntryByNameHandler1, NULL); /* Execute the function being tested */ @@ -551,13 +584,14 @@ void CS_DisableNameAppCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -572,7 +606,8 @@ void CS_DisableNameAppCmd_Test_UpdateAppsDefinitionTableError(void) memset(&CmdPacket, 0, sizeof(CmdPacket)); snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Checksumming of app %%s is Disabled"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS unable to update apps definition table for entry %%s"); strncpy(CmdPacket.Payload.Name, "App1", OS_MAX_API_NAME); @@ -586,7 +621,8 @@ void CS_DisableNameAppCmd_Test_UpdateAppsDefinitionTableError(void) DefAppTblPtr->State = CS_ChecksumState_EMPTY; UT_SetDeferredRetcode(UT_KEY(CS_GetAppResTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, NULL); /* Execute the function being tested */ @@ -609,13 +645,14 @@ void CS_DisableNameAppCmd_Test_UpdateAppsDefinitionTableError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -628,7 +665,8 @@ void CS_DisableNameAppCmd_Test_UnknownNameError(void) CS_Res_App_Table_Entry_t *ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App disable app command failed, app %%s not found"); strncpy(CmdPacket.Payload.Name, "App1", OS_MAX_API_NAME); @@ -651,11 +689,13 @@ void CS_DisableNameAppCmd_Test_UnknownNameError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -670,11 +710,12 @@ void CS_DisableNameAppCmd_Test_OneShot(void) CS_DisableNameAppCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -701,10 +742,12 @@ void CS_EnableNameAppCmd_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(CS_CheckRecomputeOneshot), 1, false); UT_SetDeferredRetcode(UT_KEY(CS_GetAppResTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, NULL); UT_SetDeferredRetcode(UT_KEY(CS_GetAppDefTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetAppDefTblEntryByName), CS_APP_CMDS_TEST_CS_GetAppDefTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetAppDefTblEntryByName), + CS_APP_CMDS_TEST_CS_GetAppDefTblEntryByNameHandler1, NULL); /* Execute the function being tested */ @@ -718,13 +761,14 @@ void CS_EnableNameAppCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -739,7 +783,8 @@ void CS_EnableNameAppCmd_Test_UpdateAppsDefinitionTableError(void) memset(&CmdPacket, 0, sizeof(CmdPacket)); snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Checksumming of app %%s is Enabled"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS unable to update apps definition table for entry %%s"); strncpy(CmdPacket.Payload.Name, "App1", OS_MAX_API_NAME); @@ -753,7 +798,8 @@ void CS_EnableNameAppCmd_Test_UpdateAppsDefinitionTableError(void) DefAppTblPtr->State = CS_ChecksumState_EMPTY; UT_SetDeferredRetcode(UT_KEY(CS_GetAppResTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetAppResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetAppResTblEntryByNameHandler1, NULL); /* Execute the function being tested */ @@ -776,13 +822,14 @@ void CS_EnableNameAppCmd_Test_UpdateAppsDefinitionTableError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -795,7 +842,8 @@ void CS_EnableNameAppCmd_Test_UnknownNameError(void) CS_Res_App_Table_Entry_t *ResAppTblPtr = CS_AppData.Tbl[CS_ChecksumType_APP_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App enable app command failed, app %%s not found"); strncpy(CmdPacket.Payload.Name, "App1", OS_MAX_API_NAME); @@ -812,7 +860,8 @@ void CS_EnableNameAppCmd_Test_UnknownNameError(void) CS_EnableNameAppCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_ENABLE_APP_UNKNOWN_NAME_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -823,7 +872,8 @@ void CS_EnableNameAppCmd_Test_UnknownNameError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -838,11 +888,12 @@ void CS_EnableNameAppCmd_Test_OneShot(void) CS_EnableNameAppCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -854,35 +905,59 @@ void UtTest_Setup(void) UtTest_Add(CS_EnableAppsCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_EnableAppsCmd_Test"); UtTest_Add(CS_EnableAppsCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, "CS_EnableAppsCmd_Test_OneShot"); - UtTest_Add(CS_ReportBaselineAppCmd_Test_Baseline, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineAppCmd_Test_Baseline, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineAppCmd_Test_Baseline"); - UtTest_Add(CS_ReportBaselineAppCmd_Test_NoBaseline, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineAppCmd_Test_NoBaseline, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineAppCmd_Test_NoBaseline"); - UtTest_Add(CS_ReportBaselineAppCmd_Test_BaselineInvalidName, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineAppCmd_Test_BaselineInvalidName, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineAppCmd_Test_BaselineInvalidName"); - UtTest_Add(CS_RecomputeBaselineAppCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineAppCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineAppCmd_Test_OneShot"); - UtTest_Add(CS_RecomputeBaselineAppCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineAppCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineAppCmd_Test_Nominal"); - UtTest_Add(CS_RecomputeBaselineAppCmd_Test_CreateChildTaskError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineAppCmd_Test_CreateChildTaskError, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineAppCmd_Test_CreateChildTaskError"); - UtTest_Add(CS_RecomputeBaselineAppCmd_Test_UnknownNameError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineAppCmd_Test_UnknownNameError, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineAppCmd_Test_UnknownNameError"); - UtTest_Add(CS_RecomputeBaselineAppCmd_Test_RecomputeInProgress, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineAppCmd_Test_RecomputeInProgress, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineAppCmd_Test_RecomputeInProgress"); UtTest_Add(CS_DisableNameAppCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, "CS_DisableNameAppCmd_Test_Nominal"); - UtTest_Add(CS_DisableNameAppCmd_Test_UpdateAppsDefinitionTableError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableNameAppCmd_Test_UpdateAppsDefinitionTableError, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableNameAppCmd_Test_UpdateAppsDefinitionTableError"); - UtTest_Add(CS_DisableNameAppCmd_Test_UnknownNameError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableNameAppCmd_Test_UnknownNameError, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableNameAppCmd_Test_UnknownNameError"); UtTest_Add(CS_DisableNameAppCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, "CS_DisableNameAppCmd_Test_OneShot"); UtTest_Add(CS_EnableNameAppCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, "CS_EnableNameAppCmd_Test_Nominal"); - UtTest_Add(CS_EnableNameAppCmd_Test_UpdateAppsDefinitionTableError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableNameAppCmd_Test_UpdateAppsDefinitionTableError, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableNameAppCmd_Test_UpdateAppsDefinitionTableError"); - UtTest_Add(CS_EnableNameAppCmd_Test_UnknownNameError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableNameAppCmd_Test_UnknownNameError, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableNameAppCmd_Test_UnknownNameError"); UtTest_Add(CS_EnableNameAppCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, "CS_EnableNameAppCmd_Test_OneShot"); } diff --git a/unit-test/cs_app_tests.c b/unit-test/cs_app_tests.c index 2a4edda..11aab0e 100644 --- a/unit-test/cs_app_tests.c +++ b/unit-test/cs_app_tests.c @@ -54,7 +54,7 @@ typedef union CS_SendHkCmd_t SendHkCmd; CS_NoopCmd_t NoopCmd; - CS_ResetCmd_t ResetCmd; + CS_ResetCountersCmd_t ResetCountersCmd; CS_BackgroundCheckCycleCmd_t BackgroundCheckCycle; CS_DisableAllCSCmd_t DisableAllCSCmd; CS_EnableAllCSCmd_t EnableAllCSCmd; @@ -104,8 +104,8 @@ uint8 call_count_CFE_EVS_SendEvent; * Function Definitions */ -CFE_Status_t CS_APP_TEST_CFE_ES_RunLoop_Hook(void *UserObj, int32 StubRetcode, uint32 CallCount, - const UT_StubContext_t *Context) +CFE_Status_t +CS_APP_TEST_CFE_ES_RunLoop_Hook(void *UserObj, int32 StubRetcode, uint32 CallCount, const UT_StubContext_t *Context) { CS_AppData.RunStatus = CFE_ES_RunStatus_SYS_EXCEPTION; @@ -134,7 +134,7 @@ void CS_App_TestCmdTlmAlign(void) UtAssert_True(TLM_STRUCT_DATA_IS_32_ALIGNED(CS_HkPacket_t), "CS_HkPacket_t is 32-bit aligned"); UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(CS_SendHkCmd_t), "CS_SendHkCmd_t is 32-bit aligned"); UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(CS_NoopCmd_t), "CS_NoopCmd_t is 32-bit aligned"); - UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(CS_ResetCmd_t), "CS_ResetCmd_t is 32-bit aligned"); + UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(CS_ResetCountersCmd_t), "CS_ResetCountersCmd_t is 32-bit aligned"); UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(CS_BackgroundCheckCycleCmd_t), "CS_BackgroundCheckCycleCmd_t is 32-bit aligned"); UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(CS_DisableAllCSCmd_t), "CS_DisableAllCSCmd_t is 32-bit aligned"); @@ -204,7 +204,8 @@ void CS_AppMain_Test_Nominal(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App terminating, RunStatus:0x%%08X"); - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS App terminating, RunStatus:0x%%08X, RC:0x%%08X\n"); /* Set to prevent segmentation fault */ @@ -237,7 +238,8 @@ void CS_AppMain_Test_Nominal(void) /* 2 Messages Tested elsewhere so we can ignore them here. INFO:CS Initialized and ERROR:Invalid Command pipe */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); /* Generates 2 event messages we don't care about in this test */ @@ -251,7 +253,8 @@ void CS_AppMain_Test_AppInitError(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App terminating, RunStatus:0x%%08X, RC:0x%%08X"); - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS App terminating, RunStatus:0x%%08X, RC:0x%%08X\n"); /* Set to make subfunction CS_AppInit return -1 */ @@ -277,7 +280,8 @@ void CS_AppMain_Test_AppInitError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -289,7 +293,8 @@ void CS_AppMain_Test_SysException(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App terminating, RunStatus:0x%%08X, RC:0x%%08X"); - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS App terminating, RunStatus:0x%%08X, RC:0x%%08X\n"); /* Set to make loop not execute */ @@ -324,7 +329,8 @@ void CS_AppMain_Test_SysException(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); /* Generates 1 event message we don't care about in this test */ } @@ -337,7 +343,8 @@ void CS_AppMain_Test_RcvMsgError(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App terminating, RunStatus:0x%%08X, RC:0x%%08X"); - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS App terminating, RunStatus:0x%%08X, RC:0x%%08X\n"); /* Set to make loop execute exactly once */ @@ -369,7 +376,8 @@ void CS_AppMain_Test_RcvMsgError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); /* Generates 1 event message we don't care about in this test */ } @@ -385,7 +393,8 @@ void CS_AppMain_Test_RcvMsgTimeout(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App terminating, RunStatus:0x%%08X, RC:0x%%08X"); - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS App terminating, RunStatus:0x%%08X, RC:0x%%08X\n"); /* Set to make loop execute exactly once */ @@ -421,7 +430,8 @@ void CS_AppMain_Test_RcvMsgTimeout(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); /* Generates 3 event messages we don't care about in this test */ @@ -438,7 +448,8 @@ void CS_AppMain_Test_RcvNoMsg(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App terminating, RunStatus:0x%%08X"); - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS App terminating, RunStatus:0x%%08X, RC:0x%%08X\n"); /* Set to prevent segmentation fault */ @@ -472,7 +483,8 @@ void CS_AppMain_Test_RcvNoMsg(void) /* 2 Messages Tested elsewhere so we can ignore them here. INFO:CS Initialized and ERROR:Invalid Command pipe */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); /* Generates 2 event messages we don't care about in this test */ @@ -485,11 +497,12 @@ void CS_AppMain_Test_RcvNullBufPtr(void) int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; char ExpectedSysLogString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_NoopCmd_t * PacketPtr = NULL; + CS_NoopCmd_t *PacketPtr = NULL; snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App terminating, RunStatus:0x%%08X, RC:0x%%08X"); - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS App terminating, RunStatus:0x%%08X, RC:0x%%08X\n"); /* Set to make loop execute exactly once */ @@ -515,7 +528,8 @@ void CS_AppMain_Test_RcvNullBufPtr(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); /* Generates 1 event messages we don't care about in this test */ @@ -534,7 +548,8 @@ void CS_AppMain_Test_AppPipeError(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App terminating, RunStatus:0x%%08X, RC:0x%%08X"); - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS App terminating, RunStatus:0x%%08X, RC:0x%%08X\n"); /* Set to make loop execute exactly once */ @@ -564,7 +579,8 @@ void CS_AppMain_Test_AppPipeError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); /* Generates 3 event messages we don't care about in this test */ @@ -603,7 +619,8 @@ void CS_AppInit_Test_Nominal(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -656,7 +673,8 @@ void CS_AppInit_Test_NominalPowerOnReset(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -718,7 +736,8 @@ void CS_CreateRestoreStatesFromCDS_Test_NoExistingCDS(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -760,7 +779,8 @@ void CS_CreateRestoreStatesFromCDS_Test_CDSSuccess(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -815,7 +835,8 @@ void CS_CreateRestoreStatesFromCDS_Test_CDSFail(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -872,7 +893,8 @@ void CS_CreateRestoreStatesFromCDS_Test_CopyToCDSFail(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -929,7 +951,8 @@ void CS_CreateRestoreStatesFromCDS_Test_RegisterCDSFail(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -941,7 +964,8 @@ void CS_AppInit_Test_EVSRegisterError(void) int32 strCmpResult; char ExpectedSysLogString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS App: Error Registering For Event Services, RC = 0x%%08X\n"); /* Set CFE_EVS_Register to return -1 in order to reach call to CFE_ES_WriteToSysLog */ @@ -955,7 +979,8 @@ void CS_AppInit_Test_EVSRegisterError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -978,7 +1003,8 @@ void CS_UpdateCDS_Test_Nominal(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1008,7 +1034,8 @@ void CS_UpdateCDS_Test_CopyToCDSFail(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1022,7 +1049,8 @@ void CS_UpdateCDS_Test_NullCDSHandle(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } #endif /* #if (CS_PRESERVE_STATES_ON_PROCESSOR_RESET == true) */ @@ -1042,21 +1070,33 @@ void UtTest_Setup(void) UtTest_Add(CS_AppInit_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, "CS_AppInit_Test_Nominal"); UtTest_Add(CS_AppInit_Test_EVSRegisterError, CS_Test_Setup, CS_Test_TearDown, "CS_AppInit_Test_EVSRegisterError"); - UtTest_Add(CS_AppInit_Test_NominalPowerOnReset, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppInit_Test_NominalPowerOnReset, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppInit_Test_NominalPowerOnReset"); #if (CS_PRESERVE_STATES_ON_PROCESSOR_RESET == true) UtTest_Add(CS_AppInit_Test_NominalProcReset, CS_Test_Setup, CS_Test_TearDown, "CS_AppInit_Test_NominalProcReset"); - UtTest_Add(CS_CreateRestoreStatesFromCDS_Test_NoExistingCDS, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_CreateRestoreStatesFromCDS_Test_NoExistingCDS, + CS_Test_Setup, + CS_Test_TearDown, "CS_CreateRestoreStatesFromCDS_Test_NoExistingCDS"); - UtTest_Add(CS_CreateRestoreStatesFromCDS_Test_CDSSuccess, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_CreateRestoreStatesFromCDS_Test_CDSSuccess, + CS_Test_Setup, + CS_Test_TearDown, "CS_CreateRestoreStatesFromCDS_Test_CDSSuccess"); - UtTest_Add(CS_CreateRestoreStatesFromCDS_Test_CDSFail, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_CreateRestoreStatesFromCDS_Test_CDSFail, + CS_Test_Setup, + CS_Test_TearDown, "CS_CreateRestoreStatesFromCDS_Test_CDSFail"); - UtTest_Add(CS_CreateRestoreStatesFromCDS_Test_CopyToCDSFail, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_CreateRestoreStatesFromCDS_Test_CopyToCDSFail, + CS_Test_Setup, + CS_Test_TearDown, "CS_CreateRestoreStatesFromCDS_Test_CopyToCDSFail"); - UtTest_Add(CS_CreateRestoreStatesFromCDS_Test_RegisterCDSFail, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_CreateRestoreStatesFromCDS_Test_RegisterCDSFail, + CS_Test_Setup, + CS_Test_TearDown, "CS_CreateRestoreStatesFromCDS_Test_RegisterCDSFail"); UtTest_Add(CS_UpdateCDS_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, "CS_UpdateCDS_Test_Nominal"); diff --git a/unit-test/cs_cmds_tests.c b/unit-test/cs_cmds_tests.c index bc29c19..56a8ad9 100644 --- a/unit-test/cs_cmds_tests.c +++ b/unit-test/cs_cmds_tests.c @@ -42,9 +42,13 @@ uint8 call_count_CFE_EVS_SendEvent; * Function Definitions */ -CFE_Status_t CS_CMDS_TEST_CFE_ES_CreateChildTaskHook(uint32 *TaskIdPtr, const char *TaskName, - CFE_ES_ChildTaskMainFuncPtr_t FunctionPtr, uint32 *StackPtr, - uint32 StackSize, uint32 Priority, uint32 Flags) +CFE_Status_t CS_CMDS_TEST_CFE_ES_CreateChildTaskHook(uint32 *TaskIdPtr, + const char *TaskName, + CFE_ES_ChildTaskMainFuncPtr_t FunctionPtr, + uint32 *StackPtr, + uint32 StackSize, + uint32 Priority, + uint32 Flags) { *TaskIdPtr = 5; @@ -68,8 +72,8 @@ void CS_SendHkCmd_Test_Nominal(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); - CS_AppData.HkPacket.Payload.CmdCounter = 1; - CS_AppData.HkPacket.Payload.CmdErrCounter = 2; + CS_AppData.HkPacket.Payload.CommandCounter = 1; + CS_AppData.HkPacket.Payload.CommandErrorCounter = 2; CS_AppData.HkPacket.Payload.ChecksumState = 3; CS_AppData.HkPacket.Payload.EepromCSState = 4; CS_AppData.HkPacket.Payload.MemoryCSState = 5; @@ -99,8 +103,9 @@ void CS_SendHkCmd_Test_Nominal(void) CS_SendHkCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 2, "CS_AppData.HkPacket.Payload.CmdErrCounter == 2"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 2, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 2"); UtAssert_True(CS_AppData.HkPacket.Payload.ChecksumState == 3, "CS_AppData.HkPacket.Payload.ChecksumState == 3"); UtAssert_True(CS_AppData.HkPacket.Payload.EepromCSState == 4, "CS_AppData.HkPacket.Payload.EepromCSState == 4"); UtAssert_True(CS_AppData.HkPacket.Payload.MemoryCSState == 5, "CS_AppData.HkPacket.Payload.MemoryCSState == 5"); @@ -140,7 +145,8 @@ void CS_SendHkCmd_Test_Nominal(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -165,21 +171,22 @@ void CS_NoopCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } -void CS_ResetCmd_Test(void) +void CS_ResetCountersCmd_Test(void) { - CS_ResetCmd_t CmdPacket; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; + CS_ResetCountersCmd_t CmdPacket; + int32 strCmpResult; + char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Reset Counters command recieved"); - CS_AppData.HkPacket.Payload.CmdCounter = 1; - CS_AppData.HkPacket.Payload.CmdErrCounter = 2; + CS_AppData.HkPacket.Payload.CommandCounter = 1; + CS_AppData.HkPacket.Payload.CommandErrorCounter = 2; CS_AppData.HkPacket.Payload.EepromCSErrCounter = 3; CS_AppData.HkPacket.Payload.MemoryCSErrCounter = 4; CS_AppData.HkPacket.Payload.TablesCSErrCounter = 5; @@ -189,11 +196,12 @@ void CS_ResetCmd_Test(void) CS_AppData.HkPacket.Payload.PassCounter = 9; /* Execute the function being tested */ - CS_ResetCmd(&CmdPacket); + CS_ResetCountersCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 0, "CS_AppData.HkPacket.Payload.CmdErrCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 0, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 0"); UtAssert_True(CS_AppData.HkPacket.Payload.EepromCSErrCounter == 0, "CS_AppData.HkPacket.Payload.EepromCSErrCounter == 0"); UtAssert_True(CS_AppData.HkPacket.Payload.MemoryCSErrCounter == 0, @@ -215,7 +223,8 @@ void CS_ResetCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -229,7 +238,8 @@ void CS_BackgroundCheckCycleCmd_Test_BackgroundInProgress(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Skipping background cycle. Recompute or oneshot in progress."); TestMsgId = CFE_SB_ValueToMsgId(CS_CMD_MID); @@ -262,7 +272,8 @@ void CS_BackgroundCheckCycleCmd_Test_BackgroundInProgress(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -295,7 +306,8 @@ void CS_BackgroundCheckCycleCmd_Test_BackgroundCfeCore(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -328,7 +340,8 @@ void CS_BackgroundCheckCycleCmd_Test_BackgroundOS(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -360,7 +373,8 @@ void CS_BackgroundCheckCycleCmd_Test_BackgroundEeprom(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -392,7 +406,8 @@ void CS_BackgroundCheckCycleCmd_Test_BackgroundMemory(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -424,7 +439,8 @@ void CS_BackgroundCheckCycleCmd_Test_BackgroundTables(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -456,7 +472,8 @@ void CS_BackgroundCheckCycleCmd_Test_BackgroundApp(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -490,7 +507,8 @@ void CS_BackgroundCheckCycleCmd_Test_Default(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -520,7 +538,8 @@ void CS_BackgroundCheckCycleCmd_Test_Disabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -534,7 +553,8 @@ void CS_BackgroundCheckCycleCmd_Test_OneShot(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Skipping background cycle. Recompute or oneshot in progress."); TestMsgId = CFE_SB_ValueToMsgId(CS_CMD_MID); @@ -568,7 +588,8 @@ void CS_BackgroundCheckCycleCmd_Test_OneShot(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -604,7 +625,8 @@ void CS_BackgroundCheckCycleCmd_Test_EndOfList(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -623,7 +645,7 @@ void CS_DisableAllCSCmd_Test(void) /* Verify results */ UtAssert_True(CS_AppData.HkPacket.Payload.ChecksumState == CS_ChecksumState_DISABLED, "CS_AppData.HkPacket.Payload.ChecksumState == CS_ChecksumState_DISABLED"); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_DISABLE_ALL_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -634,7 +656,8 @@ void CS_DisableAllCSCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -653,7 +676,7 @@ void CS_EnableAllCSCmd_Test(void) /* Verify results */ UtAssert_True(CS_AppData.HkPacket.Payload.ChecksumState == CS_ChecksumState_ENABLED, "CS_AppData.HkPacket.Payload.ChecksumState == CS_ChecksumState_ENABLED"); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_ENABLE_ALL_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -664,7 +687,8 @@ void CS_EnableAllCSCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -691,11 +715,12 @@ void CS_DisableCfeCoreCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -722,11 +747,12 @@ void CS_EnableCfeCoreCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -753,11 +779,12 @@ void CS_DisableOSCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -784,11 +811,12 @@ void CS_EnableOSCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -815,11 +843,12 @@ void CS_ReportBaselineCfeCoreCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -845,11 +874,12 @@ void CS_ReportBaselineCfeCoreCmd_Test_NotComputedYet(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -876,11 +906,12 @@ void CS_ReportBaselineOSCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -891,7 +922,8 @@ void CS_ReportBaselineOSCmd_Test_NotComputedYet(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Baseline of OS code segment has not been computed yet"); CS_AppData.OSCodeSeg.ComputedYet = false; @@ -907,11 +939,12 @@ void CS_ReportBaselineOSCmd_Test_NotComputedYet(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -947,11 +980,12 @@ void CS_RecomputeBaselineCfeCoreCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -962,7 +996,8 @@ void CS_RecomputeBaselineCfeCoreCmd_Test_CreateChildTaskError(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute cFE core failed, CFE_ES_CreateChildTask returned: 0x%%08X"); CS_AppData.HkPacket.Payload.RecomputeInProgress = false; @@ -989,13 +1024,15 @@ void CS_RecomputeBaselineCfeCoreCmd_Test_CreateChildTaskError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); UtAssert_True(CS_AppData.HkPacket.Payload.RecomputeInProgress == false, "CS_AppData.HkPacket.Payload.RecomputeInProgress == false"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1021,11 +1058,13 @@ void CS_RecomputeBaselineCfeCoreCmd_Test_ChildTaskError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1053,11 +1092,13 @@ void CS_RecomputeBaselineCfeCoreCmd_Test_OneShot(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1093,11 +1134,12 @@ void CS_RecomputeBaselineOSCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1108,7 +1150,8 @@ void CS_RecomputeBaselineOSCmd_Test_CreateChildTaskError(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute OS code segment failed, CFE_ES_CreateChildTask returned: 0x%%08X"); CS_AppData.HkPacket.Payload.RecomputeInProgress = false; @@ -1135,13 +1178,15 @@ void CS_RecomputeBaselineOSCmd_Test_CreateChildTaskError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); UtAssert_True(CS_AppData.HkPacket.Payload.RecomputeInProgress == false, "CS_AppData.HkPacket.Payload.RecomputeInProgress == false"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1152,7 +1197,8 @@ void CS_RecomputeBaselineOSCmd_Test_ChildTaskError(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute OS code segment failed: child task in use"); CS_AppData.HkPacket.Payload.RecomputeInProgress = true; @@ -1168,11 +1214,13 @@ void CS_RecomputeBaselineOSCmd_Test_ChildTaskError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1183,7 +1231,8 @@ void CS_RecomputeBaselineOSCmd_Test_OneShot(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute OS code segment failed: child task in use"); CS_AppData.HkPacket.Payload.RecomputeInProgress = false; @@ -1201,11 +1250,13 @@ void CS_RecomputeBaselineOSCmd_Test_OneShot(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1216,7 +1267,8 @@ void CS_OneShotCmd_Test_Nominal(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "OneShot checksum started on address: 0x%%08X, size: %%d"); CmdPacket.Payload.Address = 0x00000001; @@ -1252,11 +1304,12 @@ void CS_OneShotCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); UtAssert_BOOL_TRUE(CFE_RESOURCEID_TEST_DEFINED(CS_AppData.ChildTaskID)); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1267,7 +1320,8 @@ void CS_OneShotCmd_Test_MaxBytesPerCycleNonZero(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "OneShot checksum started on address: 0x%%08X, size: %%d"); CmdPacket.Payload.Address = 0x00000001; @@ -1303,11 +1357,12 @@ void CS_OneShotCmd_Test_MaxBytesPerCycleNonZero(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); UtAssert_BOOL_TRUE(CFE_RESOURCEID_TEST_DEFINED(CS_AppData.ChildTaskID)); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1319,7 +1374,8 @@ void CS_OneShotCmd_Test_CreateChildTaskError(void) memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "OneShot checkum failed, CFE_ES_CreateChildTask returned: 0x%%08X"); CS_AppData.HkPacket.Payload.RecomputeInProgress = false; @@ -1345,7 +1401,8 @@ void CS_OneShotCmd_Test_CreateChildTaskError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); UtAssert_True(CS_AppData.HkPacket.Payload.RecomputeInProgress == false, "CS_AppData.HkPacket.Payload.RecomputeInProgress == false"); UtAssert_True(CS_AppData.HkPacket.Payload.OneShotInProgress == false, @@ -1353,7 +1410,8 @@ void CS_OneShotCmd_Test_CreateChildTaskError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1379,11 +1437,13 @@ void CS_OneShotCmd_Test_ChildTaskError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1394,7 +1454,8 @@ void CS_OneShotCmd_Test_MemValidateRangeError(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "OneShot checksum failed, CFE_PSP_MemValidateRange returned: 0x%%08X"); CS_AppData.HkPacket.Payload.RecomputeInProgress = true; @@ -1413,11 +1474,13 @@ void CS_OneShotCmd_Test_MemValidateRangeError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1445,11 +1508,13 @@ void CS_OneShotCmd_Test_OneShot(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1460,7 +1525,8 @@ void CS_CancelOneShotCmd_Test_Nominal(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "OneShot checksum calculation has been cancelled"); CS_AppData.HkPacket.Payload.RecomputeInProgress = false; @@ -1475,7 +1541,7 @@ void CS_CancelOneShotCmd_Test_Nominal(void) "CS_AppData.HkPacket.Payload.RecomputeInProgress == false"); UtAssert_True(CS_AppData.HkPacket.Payload.OneShotInProgress == false, "CS_AppData.HkPacket.Payload.OneShotInProgress == false"); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_ONESHOT_CANCELLED_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -1486,7 +1552,8 @@ void CS_CancelOneShotCmd_Test_Nominal(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1497,7 +1564,8 @@ void CS_CancelOneShotCmd_Test_DeleteChildTaskError(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Cancel OneShot checksum failed, CFE_ES_DeleteChildTask returned: 0x%%08X"); CS_AppData.HkPacket.Payload.RecomputeInProgress = false; @@ -1517,11 +1585,13 @@ void CS_CancelOneShotCmd_Test_DeleteChildTaskError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1532,7 +1602,8 @@ void CS_CancelOneShotCmd_Test_NoChildTaskError(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Cancel OneShot checksum failed. No OneShot active"); CS_AppData.HkPacket.Payload.RecomputeInProgress = true; @@ -1552,11 +1623,13 @@ void CS_CancelOneShotCmd_Test_NoChildTaskError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1567,7 +1640,8 @@ void CS_CancelOneShotCmd_Test_OneShot(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Cancel OneShot checksum failed. No OneShot active"); CS_AppData.HkPacket.Payload.RecomputeInProgress = false; @@ -1587,11 +1661,13 @@ void CS_CancelOneShotCmd_Test_OneShot(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1601,29 +1677,51 @@ void UtTest_Setup(void) UtTest_Add(CS_NoopCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_NoopCmd_Test"); - UtTest_Add(CS_ResetCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_ResetCmd_Test"); + UtTest_Add(CS_ResetCountersCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_ResetCountersCmd_Test"); - UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundInProgress, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundInProgress, + CS_Test_Setup, + CS_Test_TearDown, "CS_BackgroundCheckCycleCmd_Test_BackgroundInProgress"); - UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundCfeCore, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundCfeCore, + CS_Test_Setup, + CS_Test_TearDown, "CS_BackgroundCheckCycleCmd_Test_BackgroundCfeCore"); - UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundOS, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundOS, + CS_Test_Setup, + CS_Test_TearDown, "CS_BackgroundCheckCycleCmd_Test_BackgroundOS"); - UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundEeprom, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundEeprom, + CS_Test_Setup, + CS_Test_TearDown, "CS_BackgroundCheckCycleCmd_Test_BackgroundEeprom"); - UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundMemory, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundMemory, + CS_Test_Setup, + CS_Test_TearDown, "CS_BackgroundCheckCycleCmd_Test_BackgroundMemory"); - UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundTables, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundTables, + CS_Test_Setup, + CS_Test_TearDown, "CS_BackgroundCheckCycleCmd_Test_BackgroundTables"); - UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundApp, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_BackgroundCheckCycleCmd_Test_BackgroundApp, + CS_Test_Setup, + CS_Test_TearDown, "CS_BackgroundCheckCycleCmd_Test_BackgroundApp"); - UtTest_Add(CS_BackgroundCheckCycleCmd_Test_Default, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_BackgroundCheckCycleCmd_Test_Default, + CS_Test_Setup, + CS_Test_TearDown, "CS_BackgroundCheckCycleCmd_Test_Default"); - UtTest_Add(CS_BackgroundCheckCycleCmd_Test_Disabled, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_BackgroundCheckCycleCmd_Test_Disabled, + CS_Test_Setup, + CS_Test_TearDown, "CS_BackgroundCheckCycleCmd_Test_Disabled"); - UtTest_Add(CS_BackgroundCheckCycleCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_BackgroundCheckCycleCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_BackgroundCheckCycleCmd_Test_OneShot"); - UtTest_Add(CS_BackgroundCheckCycleCmd_Test_EndOfList, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_BackgroundCheckCycleCmd_Test_EndOfList, + CS_Test_Setup, + CS_Test_TearDown, "CS_BackgroundCheckCycleCmd_Test_EndOfList"); UtTest_Add(CS_DisableAllCSCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_DisableAllCSCmd_Test"); @@ -1638,48 +1736,82 @@ void UtTest_Setup(void) UtTest_Add(CS_EnableOSCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_EnableOSCmd_Test"); - UtTest_Add(CS_ReportBaselineCfeCoreCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineCfeCoreCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineCfeCoreCmd_Test_Nominal"); - UtTest_Add(CS_ReportBaselineCfeCoreCmd_Test_NotComputedYet, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineCfeCoreCmd_Test_NotComputedYet, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineCfeCoreCmd_Test_NotComputedYet"); - UtTest_Add(CS_ReportBaselineOSCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineOSCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineOSCmd_Test_Nominal"); - UtTest_Add(CS_ReportBaselineOSCmd_Test_NotComputedYet, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineOSCmd_Test_NotComputedYet, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineOSCmd_Test_NotComputedYet"); - UtTest_Add(CS_RecomputeBaselineCfeCoreCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineCfeCoreCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineCfeCoreCmd_Test_Nominal"); - UtTest_Add(CS_RecomputeBaselineCfeCoreCmd_Test_CreateChildTaskError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineCfeCoreCmd_Test_CreateChildTaskError, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineCfeCoreCmd_Test_CreateChildTaskError"); - UtTest_Add(CS_RecomputeBaselineCfeCoreCmd_Test_ChildTaskError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineCfeCoreCmd_Test_ChildTaskError, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineCfeCoreCmd_Test_ChildTaskError"); - UtTest_Add(CS_RecomputeBaselineCfeCoreCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineCfeCoreCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineCfeCoreCmd_Test_OneShot"); - UtTest_Add(CS_RecomputeBaselineOSCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineOSCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineOSCmd_Test_Nominal"); - UtTest_Add(CS_RecomputeBaselineOSCmd_Test_CreateChildTaskError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineOSCmd_Test_CreateChildTaskError, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineOSCmd_Test_CreateChildTaskError"); - UtTest_Add(CS_RecomputeBaselineOSCmd_Test_ChildTaskError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineOSCmd_Test_ChildTaskError, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineOSCmd_Test_ChildTaskError"); - UtTest_Add(CS_RecomputeBaselineOSCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineOSCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineOSCmd_Test_OneShot"); UtTest_Add(CS_OneShotCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, "CS_OneShotCmd_Test_Nominal"); - UtTest_Add(CS_OneShotCmd_Test_MaxBytesPerCycleNonZero, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_OneShotCmd_Test_MaxBytesPerCycleNonZero, + CS_Test_Setup, + CS_Test_TearDown, "CS_OneShotCmd_Test_MaxBytesPerCycleNonZero"); - UtTest_Add(CS_OneShotCmd_Test_CreateChildTaskError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_OneShotCmd_Test_CreateChildTaskError, + CS_Test_Setup, + CS_Test_TearDown, "CS_OneShotCmd_Test_CreateChildTaskError"); UtTest_Add(CS_OneShotCmd_Test_ChildTaskError, CS_Test_Setup, CS_Test_TearDown, "CS_OneShotCmd_Test_ChildTaskError"); - UtTest_Add(CS_OneShotCmd_Test_MemValidateRangeError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_OneShotCmd_Test_MemValidateRangeError, + CS_Test_Setup, + CS_Test_TearDown, "CS_OneShotCmd_Test_MemValidateRangeError"); UtTest_Add(CS_OneShotCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, "CS_OneShotCmd_Test_OneShot"); UtTest_Add(CS_CancelOneShotCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, "CS_CancelOneShotCmd_Test_Nominal"); - UtTest_Add(CS_CancelOneShotCmd_Test_DeleteChildTaskError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_CancelOneShotCmd_Test_DeleteChildTaskError, + CS_Test_Setup, + CS_Test_TearDown, "CS_CancelOneShotCmd_Test_DeleteChildTaskError"); - UtTest_Add(CS_CancelOneShotCmd_Test_NoChildTaskError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_CancelOneShotCmd_Test_NoChildTaskError, + CS_Test_Setup, + CS_Test_TearDown, "CS_CancelOneShotCmd_Test_NoChildTaskError"); UtTest_Add(CS_CancelOneShotCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, "CS_CancelOneShotCmd_Test_OneShot"); } diff --git a/unit-test/cs_compute_tests.c b/unit-test/cs_compute_tests.c index f1b375d..ec1cdd7 100644 --- a/unit-test/cs_compute_tests.c +++ b/unit-test/cs_compute_tests.c @@ -42,7 +42,9 @@ uint8 call_count_CFE_EVS_SendEvent; * Function Definitions */ -CFE_Status_t CS_COMPUTE_TEST_CFE_TBL_GetAddressHook(void *UserObj, int32 StubRetcode, uint32 CallCount, +CFE_Status_t CS_COMPUTE_TEST_CFE_TBL_GetAddressHook(void *UserObj, + int32 StubRetcode, + uint32 CallCount, const UT_StubContext_t *Context) { /* This function exists so that one return code can be set for the 1st run and a different for the 2nd run */ @@ -50,7 +52,9 @@ CFE_Status_t CS_COMPUTE_TEST_CFE_TBL_GetAddressHook(void *UserObj, int32 StubRet return CFE_TBL_ERR_UNREGISTERED; } -CFE_Status_t CS_COMPUTE_TEST_CFE_TBL_GetInfoHook1(void *UserObj, int32 StubRetcode, uint32 CallCount, +CFE_Status_t CS_COMPUTE_TEST_CFE_TBL_GetInfoHook1(void *UserObj, + int32 StubRetcode, + uint32 CallCount, const UT_StubContext_t *Context) { CFE_TBL_Info_t *TblInfoPtr = (CFE_TBL_Info_t *)Context->ArgPtr[0]; @@ -245,7 +249,7 @@ void CS_ComputeTables_Test_TableNeverLoaded(void) bool DoneWithEntry = true; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; uint8 TblData[5]; - void * TblAddr; + void *TblAddr; memset(&ResultsEntry, 0, sizeof(ResultsEntry)); @@ -255,7 +259,8 @@ void CS_ComputeTables_Test_TableNeverLoaded(void) ResultsEntry.NumBytesToChecksum = sizeof(TblData); ResultsEntry.StartAddress = CFE_ES_MEMADDRESS_C(TblAddr); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS Tables: Problem Getting table %%s: Status=0x%%08X"); strncpy(ResultsEntry.Name, "name", 10); @@ -271,7 +276,9 @@ void CS_ComputeTables_Test_TableNeverLoaded(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_COMPUTE_TABLES_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -284,7 +291,7 @@ void CS_ComputeTables_Test_TableAddressChange(void) uint32 ComputedCSValue = 0; bool DoneWithEntry = true; uint8 TblData[6]; - void * TblAddr; + void *TblAddr; memset(&ResultsEntry, 0, sizeof(ResultsEntry)); @@ -325,7 +332,7 @@ void CS_ComputeTables_Test_TableResume(void) uint32 ComputedCSValue = 0; bool DoneWithEntry = true; uint8 TblData[6]; - void * TblAddr; + void *TblAddr; memset(&ResultsEntry, 0, sizeof(ResultsEntry)); @@ -364,7 +371,7 @@ void CS_ComputeTables_Test_TableAddressNULL(void) uint32 ComputedCSValue = 0; bool DoneWithEntry = true; uint8 TblData[6]; - void * TblAddr; + void *TblAddr; memset(&ResultsEntry, 0, sizeof(ResultsEntry)); @@ -408,7 +415,8 @@ void CS_ComputeTables_Test_TableUnregisteredAndNeverLoaded(void) memset(&ResultsEntry, 0, sizeof(ResultsEntry)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS Tables: Problem Getting table %%s: Status=0x%%08X"); ResultsEntry.TblHandleID = CFE_TBL_HANDLEID_C(CFE_ResourceId_FromInteger(99)); @@ -436,7 +444,9 @@ void CS_ComputeTables_Test_TableUnregisteredAndNeverLoaded(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_COMPUTE_TABLES_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -451,7 +461,8 @@ void CS_ComputeTables_Test_ResultShareNotSuccess(void) memset(&ResultsEntry, 0, sizeof(ResultsEntry)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS Tables: Problem Getting table %%s: Status=0x%%08X"); ResultsEntry.TblHandleID = CFE_TBL_HANDLEID_UNDEFINED; @@ -476,7 +487,9 @@ void CS_ComputeTables_Test_ResultShareNotSuccess(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_COMPUTE_TABLES_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -489,7 +502,7 @@ void CS_ComputeTables_Test_TblInfoUpdated(void) bool DoneWithEntry = true; CFE_TBL_Info_t TblInfo; uint8 TblData[6]; - void * TblAddr; + void *TblAddr; memset(&ResultsEntry, 0, sizeof(ResultsEntry)); memset(&TblInfo, 0, sizeof(TblInfo)); @@ -536,7 +549,7 @@ void CS_ComputeTables_Test_GetInfoResult(void) bool DoneWithEntry = true; CFE_TBL_Info_t TblInfo; uint8 TblData[5]; - void * TblAddr; + void *TblAddr; memset(&ResultsEntry, 0, sizeof(ResultsEntry)); memset(&TblInfo, 0, sizeof(TblInfo)); @@ -583,7 +596,7 @@ void CS_ComputeTables_Test_CSError(void) bool DoneWithEntry = false; CFE_TBL_Info_t TblInfo; uint8 TblData[5]; - void * TblAddr; + void *TblAddr; memset(&ResultsEntry, 0, sizeof(ResultsEntry)); memset(&TblInfo, 0, sizeof(TblInfo)); @@ -632,7 +645,7 @@ void CS_ComputeTables_Test_NominalBadTableHandle(void) bool DoneWithEntry = false; CFE_TBL_Info_t TblInfo; uint8 TblData[5]; - void * TblAddr; + void *TblAddr; memset(&ResultsEntry, 0, sizeof(ResultsEntry)); memset(&TblInfo, 0, sizeof(TblInfo)); @@ -684,7 +697,7 @@ void CS_ComputeTables_Test_FirstTimeThrough(void) bool DoneWithEntry = false; CFE_TBL_Info_t TblInfo; uint8 TblData[5]; - void * TblAddr; + void *TblAddr; memset(&ResultsEntry, 0, sizeof(ResultsEntry)); memset(&TblInfo, 0, sizeof(TblInfo)); @@ -740,7 +753,7 @@ void CS_ComputeTables_Test_EntryNotFinished(void) bool DoneWithEntry = true; CFE_TBL_Info_t TblInfo; uint8 TblData[5]; - void * TblAddr; + void *TblAddr; memset(&ResultsEntry, 0, sizeof(ResultsEntry)); memset(&TblInfo, 0, sizeof(TblInfo)); @@ -793,12 +806,13 @@ void CS_ComputeTables_Test_ComputeTablesReleaseError(void) CFE_TBL_Info_t TblInfo; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; uint8 TblData[5]; - void * TblAddr; + void *TblAddr; memset(&ResultsEntry, 0, sizeof(ResultsEntry)); memset(&TblInfo, 0, sizeof(TblInfo)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS Tables: Could not release addresss for table %%s, returned: 0x%%08X"); ResultsEntry.TblHandleID = CFE_TBL_HANDLEID_UNDEFINED; @@ -846,7 +860,9 @@ void CS_ComputeTables_Test_ComputeTablesReleaseError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_COMPUTE_TABLES_RELEASE_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -863,7 +879,8 @@ void CS_ComputeTables_Test_ComputeTablesError(void) memset(&ResultsEntry, 0, sizeof(ResultsEntry)); memset(&TblInfo, 0, sizeof(TblInfo)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS Tables: Problem Getting table %%s: Status=0x%%08X"); ResultsEntry.TblHandleID = CFE_TBL_HANDLEID_UNDEFINED; @@ -890,7 +907,9 @@ void CS_ComputeTables_Test_ComputeTablesError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_COMPUTE_TABLES_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -903,7 +922,7 @@ void CS_ComputeTables_Test_OffsetlargerThanBytesCheck(void) bool DoneWithEntry = false; CFE_TBL_Info_t TblInfo; uint8 TblData[5]; - void * TblAddr; + void *TblAddr; memset(&TblInfo, 0, sizeof(TblInfo)); memset(&ResultsEntry, 0, sizeof(ResultsEntry)); @@ -1018,7 +1037,8 @@ void CS_ComputeApp_Test_GetAppAndLibIDByNameError(void) memset(&ResultsEntry, 0, sizeof(ResultsEntry)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS Apps: Problems getting module %%s info, Result: 0x%%08X, AddressValid: %%d"); strncpy(ResultsEntry.Name, "name", 10); @@ -1038,7 +1058,9 @@ void CS_ComputeApp_Test_GetAppAndLibIDByNameError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_COMPUTE_APP_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -1053,7 +1075,8 @@ void CS_ComputeApp_Test_GetModuleInfoError(void) memset(&ResultsEntry, 0, sizeof(ResultsEntry)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS Apps: Problems getting module %%s info, Result: 0x%%08X, AddressValid: %%d"); strncpy(ResultsEntry.Name, "name", 10); @@ -1070,7 +1093,9 @@ void CS_ComputeApp_Test_GetModuleInfoError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_COMPUTE_APP_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -1085,10 +1110,12 @@ void CS_ComputeApp_Test_ComputeAppPlatformError(void) memset(&ResultsEntry, 0, sizeof(ResultsEntry)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS cannot get a valid address for %%s, due to the platform"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS Apps: Problems getting module %%s info, Result: 0x%%08X, AddressValid: %%d"); strncpy(ResultsEntry.Name, "name", 10); @@ -1105,13 +1132,17 @@ void CS_ComputeApp_Test_ComputeAppPlatformError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_COMPUTE_APP_PLATFORM_DBG_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - UtAssert_STRINGBUF_EQ(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, CS_COMPUTE_APP_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_ERROR); - UtAssert_STRINGBUF_EQ(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[1].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); @@ -1296,7 +1327,8 @@ void CS_RecomputeEepromMemoryChildTask_Test_EEPROMTable(void) memset(&RecomputeEepromMemoryEntry, 0, sizeof(RecomputeEepromMemoryEntry)); memset(DefEepromTbl, 0, sizeof(DefEepromTbl)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s entry %%d recompute finished. New baseline is 0X%%08X"); CS_AppData.RecomputeEepromMemoryEntryPtr = &RecomputeEepromMemoryEntry; @@ -1335,7 +1367,9 @@ void CS_RecomputeEepromMemoryChildTask_Test_EEPROMTable(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_RECOMPUTE_FINISH_EEPROM_MEMORY_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -1350,7 +1384,8 @@ void CS_RecomputeEepromMemoryChildTask_Test_MemoryTable(void) memset(&RecomputeEepromMemoryEntry, 0, sizeof(RecomputeEepromMemoryEntry)); memset(DefMemoryTbl, 0, sizeof(DefMemoryTbl)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s entry %%d recompute finished. New baseline is 0X%%08X"); CS_AppData.RecomputeEepromMemoryEntryPtr = &RecomputeEepromMemoryEntry; @@ -1389,7 +1424,9 @@ void CS_RecomputeEepromMemoryChildTask_Test_MemoryTable(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_RECOMPUTE_FINISH_EEPROM_MEMORY_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -1404,7 +1441,8 @@ void CS_RecomputeEepromMemoryChildTask_Test_CFECore(void) memset(&RecomputeEepromMemoryEntry, 0, sizeof(RecomputeEepromMemoryEntry)); memset(DefMemoryTbl, 0, sizeof(DefMemoryTbl)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s entry %%d recompute finished. New baseline is 0X%%08X"); CS_AppData.RecomputeEepromMemoryEntryPtr = &RecomputeEepromMemoryEntry; @@ -1443,7 +1481,9 @@ void CS_RecomputeEepromMemoryChildTask_Test_CFECore(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_RECOMPUTE_FINISH_EEPROM_MEMORY_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_UINT32_EQ(CS_AppData.HkPacket.Payload.CfeCoreBaseline, 1); @@ -1460,7 +1500,8 @@ void CS_RecomputeEepromMemoryChildTask_Test_OSCore(void) memset(&RecomputeEepromMemoryEntry, 0, sizeof(RecomputeEepromMemoryEntry)); memset(DefMemoryTbl, 0, sizeof(DefMemoryTbl)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s entry %%d recompute finished. New baseline is 0X%%08X"); CS_AppData.RecomputeEepromMemoryEntryPtr = &RecomputeEepromMemoryEntry; @@ -1499,7 +1540,9 @@ void CS_RecomputeEepromMemoryChildTask_Test_OSCore(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_RECOMPUTE_FINISH_EEPROM_MEMORY_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_UINT32_EQ(CS_AppData.HkPacket.Payload.OSBaseline, 1); @@ -1516,7 +1559,8 @@ void CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableEntryID(void) memset(&RecomputeEepromMemoryEntry, 0, sizeof(RecomputeEepromMemoryEntry)); memset(DefEepromTbl, 0, sizeof(DefEepromTbl)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s entry %%d recompute finished. New baseline is 0X%%08X"); CS_AppData.RecomputeEepromMemoryEntryPtr = &RecomputeEepromMemoryEntry; @@ -1554,7 +1598,9 @@ void CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableEntryID(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_RECOMPUTE_FINISH_EEPROM_MEMORY_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -1569,7 +1615,8 @@ void CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableStartAddress(void) memset(&RecomputeEepromMemoryEntry, 0, sizeof(RecomputeEepromMemoryEntry)); memset(DefEepromTbl, 0, sizeof(DefEepromTbl)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s entry %%d recompute finished. New baseline is 0X%%08X"); CS_AppData.RecomputeEepromMemoryEntryPtr = &RecomputeEepromMemoryEntry; @@ -1608,7 +1655,9 @@ void CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableStartAddress(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_RECOMPUTE_FINISH_EEPROM_MEMORY_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -1623,7 +1672,8 @@ void CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableState(void) memset(&RecomputeEepromMemoryEntry, 0, sizeof(RecomputeEepromMemoryEntry)); memset(DefEepromTbl, 0, sizeof(DefEepromTbl)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s entry %%d recompute finished. New baseline is 0X%%08X"); CS_AppData.RecomputeEepromMemoryEntryPtr = &RecomputeEepromMemoryEntry; @@ -1662,7 +1712,9 @@ void CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableState(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_RECOMPUTE_FINISH_EEPROM_MEMORY_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -1677,7 +1729,8 @@ void CS_RecomputeAppChildTask_Test_Nominal(void) memset(&RecomputeAppEntry, 0, sizeof(RecomputeAppEntry)); memset(&DefAppTbl, 0, sizeof(DefAppTbl)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App %%s recompute finished. New baseline is 0x%%08X"); CS_AppData.RecomputeAppEntryPtr = &RecomputeAppEntry; @@ -1715,7 +1768,9 @@ void CS_RecomputeAppChildTask_Test_Nominal(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_RECOMPUTE_FINISH_APP_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_BOOL_FALSE(CS_AppData.HkPacket.Payload.RecomputeInProgress); @@ -1783,7 +1838,8 @@ void CS_RecomputeAppChildTask_Test_DefEntryId(void) memset(&RecomputeAppEntry, 0, sizeof(RecomputeAppEntry)); memset(&DefAppTbl, 0, sizeof(DefAppTbl)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App %%s recompute finished. New baseline is 0x%%08X"); CS_AppData.RecomputeAppEntryPtr = &RecomputeAppEntry; @@ -1822,7 +1878,9 @@ void CS_RecomputeAppChildTask_Test_DefEntryId(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_RECOMPUTE_FINISH_APP_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_BOOL_FALSE(CS_AppData.HkPacket.Payload.RecomputeInProgress); @@ -1837,12 +1895,13 @@ void CS_RecomputeTablesChildTask_Test_Nominal(void) CFE_TBL_Info_t TblInfo; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; uint8 TblData[5]; - void * TblAddr; + void *TblAddr; memset(&RecomputeTablesEntry, 0, sizeof(RecomputeTablesEntry)); memset(&DefTablesTbl, 0, sizeof(DefTablesTbl)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Table %%s recompute finished. New baseline is 0x%%08X"); CS_AppData.RecomputeTablesEntryPtr = &RecomputeTablesEntry; @@ -1876,7 +1935,8 @@ void CS_RecomputeTablesChildTask_Test_Nominal(void) /* Sets ResultsEntry->TblHandle to 99 and returns CFE_SUCCESS */ UT_SetHandlerFunction(UT_KEY(CFE_TBL_Share), CS_COMPUTE_TEST_CFE_TBL_ShareHandler, NULL); - UT_SetHandlerFunction(UT_KEY(CS_GetTableDefTblEntryByName), CS_COMPUTE_TEST_CS_GetDefTblEntryByName, + UT_SetHandlerFunction(UT_KEY(CS_GetTableDefTblEntryByName), + CS_COMPUTE_TEST_CS_GetDefTblEntryByName, &DefTablesTbl[1]); /* Sets TblInfo.Size = 5 and returns CFE_SUCCESS */ @@ -1903,7 +1963,9 @@ void CS_RecomputeTablesChildTask_Test_Nominal(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_RECOMPUTE_FINISH_TABLES_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_BOOL_FALSE(CS_AppData.HkPacket.Payload.RecomputeInProgress); @@ -1965,12 +2027,13 @@ void CS_RecomputeTablesChildTask_Test_DefEntryId(void) CFE_TBL_Info_t TblInfo; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; uint8 TblData[5]; - void * TblAddr; + void *TblAddr; memset(&RecomputeTablesEntry, 0, sizeof(RecomputeTablesEntry)); memset(&DefTablesTbl, 0, sizeof(DefTablesTbl)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Table %%s recompute finished. New baseline is 0x%%08X"); CS_AppData.RecomputeTablesEntryPtr = &RecomputeTablesEntry; @@ -2028,7 +2091,9 @@ void CS_RecomputeTablesChildTask_Test_DefEntryId(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_RECOMPUTE_FINISH_TABLES_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_BOOL_FALSE(CS_AppData.HkPacket.Payload.RecomputeInProgress); @@ -2040,7 +2105,8 @@ void CS_OneShotChildTask_Test_Nominal(void) { char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "OneShot checksum on Address: 0x%%08X, size %%d completed. Checksum = 0x%%08X"); /* NewChecksumValue will be set to value returned by this function */ @@ -2060,7 +2126,9 @@ void CS_OneShotChildTask_Test_Nominal(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_ONESHOT_FINISHED_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - UtAssert_STRINGBUF_EQ(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, context_CFE_EVS_SendEvent[0].Spec, + UtAssert_STRINGBUF_EQ(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_BOOL_FALSE(CS_AppData.HkPacket.Payload.RecomputeInProgress); @@ -2072,90 +2140,164 @@ void CS_OneShotChildTask_Test_Nominal(void) void UtTest_Setup(void) { - UtTest_Add(CS_ComputeEepromMemory_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeEepromMemory_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeEepromMemory_Test_Nominal"); UtTest_Add(CS_ComputeEepromMemory_Test_Error, CS_Test_Setup, CS_Test_TearDown, "CS_ComputeEepromMemory_Test_Error"); - UtTest_Add(CS_ComputeEepromMemory_Test_FirstTimeThrough, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeEepromMemory_Test_FirstTimeThrough, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeEepromMemory_Test_FirstTimeThrough"); - UtTest_Add(CS_ComputeEepromMemory_Test_NotFinished, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeEepromMemory_Test_NotFinished, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeEepromMemory_Test_NotFinished"); - UtTest_Add(CS_ComputeEepromMemory_Test_OffsetlargerThanBytesCheck, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeEepromMemory_Test_OffsetlargerThanBytesCheck, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeEepromMemory_Test_OffsetlargerThanBytesCheck"); - UtTest_Add(CS_ComputeTables_Test_TableNeverLoaded, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_TableNeverLoaded, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_TableNeverLoaded"); - UtTest_Add(CS_ComputeTables_Test_TableAddressChange, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_TableAddressChange, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_TableAddressChange"); UtTest_Add(CS_ComputeTables_Test_TableResume, CS_Test_Setup, CS_Test_TearDown, "CS_ComputeTables_Test_TableResume"); - UtTest_Add(CS_ComputeTables_Test_TableAddressNULL, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_TableAddressNULL, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_TableAddressNULL"); - UtTest_Add(CS_ComputeTables_Test_TableUnregisteredAndNeverLoaded, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_TableUnregisteredAndNeverLoaded, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_TableUnregisteredAndNeverLoaded"); - UtTest_Add(CS_ComputeTables_Test_ResultShareNotSuccess, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_ResultShareNotSuccess, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_ResultShareNotSuccess"); - UtTest_Add(CS_ComputeTables_Test_TblInfoUpdated, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_TblInfoUpdated, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_TblInfoUpdated"); - UtTest_Add(CS_ComputeTables_Test_GetInfoResult, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_GetInfoResult, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_GetInfoResult"); UtTest_Add(CS_ComputeTables_Test_CSError, CS_Test_Setup, CS_Test_TearDown, "CS_ComputeTables_Test_CSError"); - UtTest_Add(CS_ComputeTables_Test_NominalBadTableHandle, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_NominalBadTableHandle, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_NominalBadTableHandle"); - UtTest_Add(CS_ComputeTables_Test_FirstTimeThrough, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_FirstTimeThrough, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_FirstTimeThrough"); - UtTest_Add(CS_ComputeTables_Test_EntryNotFinished, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_EntryNotFinished, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_EntryNotFinished"); - UtTest_Add(CS_ComputeTables_Test_ComputeTablesReleaseError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_ComputeTablesReleaseError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_ComputeTablesReleaseError"); - UtTest_Add(CS_ComputeTables_Test_ComputeTablesError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_ComputeTablesError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_ComputeTablesError"); - UtTest_Add(CS_ComputeTables_Test_OffsetlargerThanBytesCheck, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeTables_Test_OffsetlargerThanBytesCheck, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeTables_Test_OffsetlargerThanBytesCheck"); UtTest_Add(CS_ComputeApp_Test_NominalApp, CS_Test_Setup, CS_Test_TearDown, "CS_ComputeApp_Test_NominalApp"); UtTest_Add(CS_ComputeApp_Test_NominalLib, CS_Test_Setup, CS_Test_TearDown, "CS_ComputeApp_Test_NominalLib"); - UtTest_Add(CS_ComputeApp_Test_GetAppAndLibIDByNameError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeApp_Test_GetAppAndLibIDByNameError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeApp_Test_GetAppAndLibIDByNameError"); - UtTest_Add(CS_ComputeApp_Test_GetModuleInfoError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeApp_Test_GetModuleInfoError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeApp_Test_GetModuleInfoError"); - UtTest_Add(CS_ComputeApp_Test_ComputeAppPlatformError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeApp_Test_ComputeAppPlatformError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeApp_Test_ComputeAppPlatformError"); - UtTest_Add(CS_ComputeApp_Test_DifferFromSavedValue, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeApp_Test_DifferFromSavedValue, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeApp_Test_DifferFromSavedValue"); - UtTest_Add(CS_ComputeApp_Test_FirstTimeThrough, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeApp_Test_FirstTimeThrough, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeApp_Test_FirstTimeThrough"); - UtTest_Add(CS_ComputeApp_Test_EntryNotFinished, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeApp_Test_EntryNotFinished, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeApp_Test_EntryNotFinished"); UtTest_Add(CS_ComputeApp_Test_EntryFinished, CS_Test_Setup, CS_Test_TearDown, "CS_ComputeApp_Test_EntryFinished"); - UtTest_Add(CS_ComputeApp_Test_OffsetlargerThanBytesCheck, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ComputeApp_Test_OffsetlargerThanBytesCheck, + CS_Test_Setup, + CS_Test_TearDown, "CS_ComputeApp_Test_OffsetlargerThanBytesCheck"); - UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_EEPROMTable, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_EEPROMTable, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeEepromMemoryChildTask_Test_EEPROMTable"); - UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_MemoryTable, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_MemoryTable, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeEepromMemoryChildTask_Test_MemoryTable"); - UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_CFECore, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_CFECore, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeEepromMemoryChildTask_Test_CFECore"); - UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_OSCore, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_OSCore, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeEepromMemoryChildTask_Test_OSCore"); - UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableEntryID, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableEntryID, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableEntryID"); - UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableStartAddress, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableStartAddress, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableStartAddress"); - UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableState, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableState, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeEepromMemoryChildTask_Test_EEPROMTableState"); - UtTest_Add(CS_RecomputeAppChildTask_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeAppChildTask_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeAppChildTask_Test_Nominal"); - UtTest_Add(CS_RecomputeAppChildTask_Test_CouldNotGetAddress, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeAppChildTask_Test_CouldNotGetAddress, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeAppChildTask_Test_CouldNotGetAddress"); - UtTest_Add(CS_RecomputeAppChildTask_Test_DefEntryId, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeAppChildTask_Test_DefEntryId, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeAppChildTask_Test_DefEntryId"); - UtTest_Add(CS_RecomputeTablesChildTask_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeTablesChildTask_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeTablesChildTask_Test_Nominal"); - UtTest_Add(CS_RecomputeTablesChildTask_Test_CouldNotGetAddress, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeTablesChildTask_Test_CouldNotGetAddress, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeTablesChildTask_Test_CouldNotGetAddress"); - UtTest_Add(CS_RecomputeTablesChildTask_Test_DefEntryId, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeTablesChildTask_Test_DefEntryId, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeTablesChildTask_Test_DefEntryId"); UtTest_Add(CS_OneShotChildTask_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, "CS_OneShotChildTask_Test_Nominal"); diff --git a/unit-test/cs_dispatch_tests.c b/unit-test/cs_dispatch_tests.c index 74e9d41..324199d 100644 --- a/unit-test/cs_dispatch_tests.c +++ b/unit-test/cs_dispatch_tests.c @@ -54,7 +54,7 @@ typedef union CS_SendHkCmd_t SendHkCmd; CS_NoopCmd_t NoopCmd; - CS_ResetCmd_t ResetCmd; + CS_ResetCountersCmd_t ResetCountersCmd; CS_BackgroundCheckCycleCmd_t BackgroundCheckCycle; CS_DisableAllCSCmd_t DisableAllCSCmd; CS_EnableAllCSCmd_t EnableAllCSCmd; @@ -99,7 +99,7 @@ typedef union const size_t UT_CMD_SIZE[] = { [CS_NOOP_CC] = sizeof(CS_NoopCmd_t), - [CS_RESET_CC] = sizeof(CS_ResetCmd_t), + [CS_RESET_COUNTERS_CC] = sizeof(CS_ResetCountersCmd_t), [CS_ONE_SHOT_CC] = sizeof(CS_OneShotCmd_t), [CS_CANCEL_ONE_SHOT_CC] = sizeof(CS_CancelOneShotCmd_t), [CS_ENABLE_ALL_CS_CC] = sizeof(CS_EnableAllCSCmd_t), @@ -214,7 +214,8 @@ void CS_AppPipe_Test_TableUpdateErrors(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); /* Generates 5 event messages we don't care about in this test */ } @@ -240,7 +241,8 @@ void CS_AppPipe_Test_BackgroundCycle(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -267,11 +269,12 @@ void CS_AppPipe_Test_NoopCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } -void CS_AppPipe_Test_ResetCmd(void) +void CS_AppPipe_Test_ResetCountersCmd(void) { CFE_Status_t Result; UT_CmdBuf_t CmdBuf; @@ -283,7 +286,7 @@ void CS_AppPipe_Test_ResetCmd(void) CS_AppData.ChildTaskTable = -1; TestMsgId = CFE_SB_ValueToMsgId(CS_CMD_MID); - FcnCode = CS_RESET_CC; + FcnCode = CS_RESET_COUNTERS_CC; UT_CS_SetupDispatchCheck(TestMsgId, FcnCode, true); /* Execute the function being tested */ @@ -294,7 +297,8 @@ void CS_AppPipe_Test_ResetCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -321,7 +325,8 @@ void CS_AppPipe_Test_OneShotCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -348,7 +353,8 @@ void CS_AppPipe_Test_CancelOneShotCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -375,7 +381,8 @@ void CS_AppPipe_Test_EnableAllCSCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -402,7 +409,8 @@ void CS_AppPipe_Test_DisableAllCSCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -429,7 +437,8 @@ void CS_AppPipe_Test_EnableCfeCoreCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -456,7 +465,8 @@ void CS_AppPipe_Test_DisableCfeCoreCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -483,7 +493,8 @@ void CS_AppPipe_Test_ReportBaselineCfeCoreCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -510,7 +521,8 @@ void CS_AppPipe_Test_RecomputeBaselineCfeCoreCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -537,7 +549,8 @@ void CS_AppPipe_Test_EnableOSCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -564,7 +577,8 @@ void CS_AppPipe_Test_DisableOSCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -591,7 +605,8 @@ void CS_AppPipe_Test_ReportBaselineOSCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -618,7 +633,8 @@ void CS_AppPipe_Test_RecomputeBaselineOSCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -645,7 +661,8 @@ void CS_AppPipe_Test_EnableEepromCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -672,7 +689,8 @@ void CS_AppPipe_Test_DisableEepromCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -699,7 +717,8 @@ void CS_AppPipe_Test_ReportBaselineEntryIDEepromCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -726,7 +745,8 @@ void CS_AppPipe_Test_RecomputeBaselineEepromCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -753,7 +773,8 @@ void CS_AppPipe_Test_EnableEntryIDEepromCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -780,7 +801,8 @@ void CS_AppPipe_Test_DisableEntryIDEepromCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -807,7 +829,8 @@ void CS_AppPipe_Test_GetEntryIDEepromCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -834,7 +857,8 @@ void CS_AppPipe_Test_EnableMemoryCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -861,7 +885,8 @@ void CS_AppPipe_Test_DisableMemoryCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -888,7 +913,8 @@ void CS_AppPipe_Test_ReportBaselineEntryIDMemoryCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -915,7 +941,8 @@ void CS_AppPipe_Test_RecomputeBaselineMemoryCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -942,7 +969,8 @@ void CS_AppPipe_Test_EnableEntryIDMemoryCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -969,7 +997,8 @@ void CS_AppPipe_Test_DisableEntryIDMemoryCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -996,7 +1025,8 @@ void CS_AppPipe_Test_GetEntryIDMemoryCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1023,7 +1053,8 @@ void CS_AppPipe_Test_EnableTablesCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1050,7 +1081,8 @@ void CS_AppPipe_Test_DisableTablesCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1077,7 +1109,8 @@ void CS_AppPipe_Test_ReportBaselineTableCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1104,7 +1137,8 @@ void CS_AppPipe_Test_RecomputeBaselineTableCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1131,7 +1165,8 @@ void CS_AppPipe_Test_EnableNameTableCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1158,7 +1193,8 @@ void CS_AppPipe_Test_DisableNameTableCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1185,7 +1221,8 @@ void CS_AppPipe_Test_EnableAppsCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1212,7 +1249,8 @@ void CS_AppPipe_Test_DisableAppsCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1239,7 +1277,8 @@ void CS_AppPipe_Test_ReportBaselineAppCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1266,7 +1305,8 @@ void CS_AppPipe_Test_RecomputeBaselineAppCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1293,7 +1333,8 @@ void CS_AppPipe_Test_EnableNameAppCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1320,7 +1361,8 @@ void CS_AppPipe_Test_DisableNameAppCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1335,7 +1377,8 @@ void CS_AppPipe_Test_InvalidCCError(void) memset(&CmdBuf, 0, sizeof(CmdBuf)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Invalid ground command code: ID = 0x%%08lX, CC = %%d"); CS_AppData.ChildTaskTable = -1; @@ -1359,7 +1402,8 @@ void CS_AppPipe_Test_InvalidCCError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1396,7 +1440,8 @@ void CS_AppPipe_Test_InvalidMIDError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1486,18 +1531,18 @@ void CS_ProcessCmd_NoopCmd_Test(void) UtAssert_STUB_COUNT(CS_NoopCmd, 1); } -void CS_ProcessCmd_ResetCmd_Test(void) +void CS_ProcessCmd_ResetCountersCmd_Test(void) { UT_CmdBuf_t CmdBuf; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(CS_CMD_MID); - CFE_MSG_FcnCode_t FcnCode = CS_RESET_CC; + CFE_MSG_FcnCode_t FcnCode = CS_RESET_COUNTERS_CC; UT_CS_SetupDispatchCheck(TestMsgId, FcnCode, true); /* Execute the function being tested */ CS_ProcessCmd(&CmdBuf.Buf); /* Verify results */ - UtAssert_STUB_COUNT(CS_ResetCmd, 1); + UtAssert_STUB_COUNT(CS_ResetCountersCmd, 1); } void CS_ProcessCmd_DisableAllCSCmd_Test(void) @@ -2046,18 +2091,18 @@ void CS_ProcessCmd_NoopCmd_Test_VerifyError(void) UtAssert_STUB_COUNT(CS_NoopCmd, 0); } -void CS_ProcessCmd_ResetCmd_Test_VerifyError(void) +void CS_ProcessCmd_ResetCountersCmd_Test_VerifyError(void) { UT_CmdBuf_t CmdBuf; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(CS_CMD_MID); - CFE_MSG_FcnCode_t FcnCode = CS_RESET_CC; + CFE_MSG_FcnCode_t FcnCode = CS_RESET_COUNTERS_CC; UT_CS_SetupDispatchCheck(TestMsgId, FcnCode, false); /* Execute the function being tested */ CS_ProcessCmd(&CmdBuf.Buf); /* Verify results */ - UtAssert_STUB_COUNT(CS_ResetCmd, 0); + UtAssert_STUB_COUNT(CS_ResetCountersCmd, 0); } void CS_ProcessCmd_DisableAllCSCmd_Test_VerifyError(void) @@ -2597,62 +2642,102 @@ void UtTest_Setup(void) UtTest_Add(CS_AppPipe_Test_TableUpdateErrors, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_TableUpdateErrors"); UtTest_Add(CS_AppPipe_Test_BackgroundCycle, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_BackgroundCycle"); UtTest_Add(CS_AppPipe_Test_NoopCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_NoopCmd"); - UtTest_Add(CS_AppPipe_Test_ResetCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_ResetCmd"); + UtTest_Add(CS_AppPipe_Test_ResetCountersCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_ResetCountersCmd"); UtTest_Add(CS_AppPipe_Test_OneShotCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_OneShotCmd"); UtTest_Add(CS_AppPipe_Test_CancelOneShotCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_CancelOneShotCmd"); UtTest_Add(CS_AppPipe_Test_EnableAllCSCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_EnableAllCSCmd"); UtTest_Add(CS_AppPipe_Test_DisableAllCSCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_DisableAllCSCmd"); UtTest_Add(CS_AppPipe_Test_EnableCfeCoreCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_EnableCfeCoreCmd"); UtTest_Add(CS_AppPipe_Test_DisableCfeCoreCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_DisableCfeCoreCmd"); - UtTest_Add(CS_AppPipe_Test_ReportBaselineCfeCoreCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_ReportBaselineCfeCoreCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_ReportBaselineCfeCoreCmd"); - UtTest_Add(CS_AppPipe_Test_RecomputeBaselineCfeCoreCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_RecomputeBaselineCfeCoreCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_RecomputeBaselineCfeCoreCmd"); UtTest_Add(CS_AppPipe_Test_EnableOSCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_EnableOSCmd"); UtTest_Add(CS_AppPipe_Test_DisableOSCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_DisableOSCmd"); - UtTest_Add(CS_AppPipe_Test_ReportBaselineOSCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_ReportBaselineOSCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_ReportBaselineOSCmd"); - UtTest_Add(CS_AppPipe_Test_RecomputeBaselineOSCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_RecomputeBaselineOSCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_RecomputeBaselineOSCmd"); UtTest_Add(CS_AppPipe_Test_EnableEepromCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_EnableEepromCmd"); UtTest_Add(CS_AppPipe_Test_DisableEepromCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_DisableEepromCmd"); - UtTest_Add(CS_AppPipe_Test_ReportBaselineEntryIDEepromCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_ReportBaselineEntryIDEepromCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_ReportBaselineEntryIDEepromCmd"); - UtTest_Add(CS_AppPipe_Test_RecomputeBaselineEepromCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_RecomputeBaselineEepromCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_RecomputeBaselineEepromCmd"); - UtTest_Add(CS_AppPipe_Test_EnableEntryIDEepromCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_EnableEntryIDEepromCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_EnableEntryIDEepromCmd"); - UtTest_Add(CS_AppPipe_Test_DisableEntryIDEepromCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_DisableEntryIDEepromCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_DisableEntryIDEepromCmd"); - UtTest_Add(CS_AppPipe_Test_GetEntryIDEepromCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_GetEntryIDEepromCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_GetEntryIDEepromCmd"); UtTest_Add(CS_AppPipe_Test_EnableMemoryCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_EnableMemoryCmd"); UtTest_Add(CS_AppPipe_Test_DisableMemoryCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_DisableMemoryCmd"); - UtTest_Add(CS_AppPipe_Test_ReportBaselineEntryIDMemoryCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_ReportBaselineEntryIDMemoryCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_ReportBaselineEntryIDMemoryCmd"); - UtTest_Add(CS_AppPipe_Test_RecomputeBaselineMemoryCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_RecomputeBaselineMemoryCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_RecomputeBaselineMemoryCmd"); - UtTest_Add(CS_AppPipe_Test_EnableEntryIDMemoryCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_EnableEntryIDMemoryCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_EnableEntryIDMemoryCmd"); - UtTest_Add(CS_AppPipe_Test_DisableEntryIDMemoryCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_DisableEntryIDMemoryCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_DisableEntryIDMemoryCmd"); - UtTest_Add(CS_AppPipe_Test_GetEntryIDMemoryCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_GetEntryIDMemoryCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_GetEntryIDMemoryCmd"); UtTest_Add(CS_AppPipe_Test_EnableTablesCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_EnableTablesCmd"); UtTest_Add(CS_AppPipe_Test_DisableTablesCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_DisableTablesCmd"); - UtTest_Add(CS_AppPipe_Test_ReportBaselineTableCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_ReportBaselineTableCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_ReportBaselineTableCmd"); - UtTest_Add(CS_AppPipe_Test_RecomputeBaselineTableCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_RecomputeBaselineTableCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_RecomputeBaselineTableCmd"); - UtTest_Add(CS_AppPipe_Test_EnableNameTableCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_EnableNameTableCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_EnableNameTableCmd"); - UtTest_Add(CS_AppPipe_Test_DisableNameTableCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_DisableNameTableCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_DisableNameTableCmd"); UtTest_Add(CS_AppPipe_Test_EnableAppsCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_EnableAppsCmd"); UtTest_Add(CS_AppPipe_Test_DisableAppsCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_DisableAppsCmd"); - UtTest_Add(CS_AppPipe_Test_ReportBaselineAppCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_ReportBaselineAppCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_ReportBaselineAppCmd"); - UtTest_Add(CS_AppPipe_Test_RecomputeBaselineAppCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_RecomputeBaselineAppCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_RecomputeBaselineAppCmd"); UtTest_Add(CS_AppPipe_Test_EnableNameAppCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_EnableNameAppCmd"); UtTest_Add(CS_AppPipe_Test_DisableNameAppCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_DisableNameAppCmd"); @@ -2661,162 +2746,313 @@ void UtTest_Setup(void) UtTest_Add(CS_AppPipe_Test_SendHkCmd, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_SendHkVerifyError"); UtTest_Add(CS_AppPipe_Test_SendHkVerifyError, CS_Test_Setup, CS_Test_TearDown, "CS_AppPipe_Test_SendHkVerifyError"); - UtTest_Add(CS_AppPipe_Test_BackgroundCheckCycleCmd, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_BackgroundCheckCycleCmd, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_BackgroundCheckCycleCmd"); - UtTest_Add(CS_AppPipe_Test_BackgroundCheckCycleVerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_AppPipe_Test_BackgroundCheckCycleVerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_AppPipe_Test_BackgroundCheckCycleVerifyError"); UtTest_Add(CS_ProcessCmd_NoopCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_ProcessCmd_NoopCmd_Test"); - UtTest_Add(CS_ProcessCmd_ResetCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_ProcessCmd_ResetCmd_Test"); - UtTest_Add(CS_ProcessCmd_DisableAllCSCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ResetCountersCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, + "CS_ProcessCmd_ResetCountersCmd_Test"); + UtTest_Add(CS_ProcessCmd_DisableAllCSCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableAllCSCmd_Test"); UtTest_Add(CS_ProcessCmd_EnableAllCSCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_ProcessCmd_EnableAllCSCmd_Test"); - UtTest_Add(CS_ProcessCmd_DisableCfeCoreCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableCfeCoreCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableCfeCoreCmd_Test"); - UtTest_Add(CS_ProcessCMD_EnableCfeCoreCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCMD_EnableCfeCoreCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCMD_EnableCfeCoreCmd_Test"); UtTest_Add(CS_ProcessCmd_DisableOSCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_ProcessCmd_DisableOSCmd_Test"); UtTest_Add(CS_ProcessCmd_EnableOSCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_ProcessCmd_EnableOSCmd_Test"); - UtTest_Add(CS_ProcessCmd_ReportBaselineCfeCoreCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ReportBaselineCfeCoreCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_ReportBaselineCfeCoreCmd_Test"); - UtTest_Add(CS_ProcessCmd_ReportBaselineOSCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ReportBaselineOSCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_ReportBaselineOSCmd_Test"); - UtTest_Add(CS_ProcessCmd_RecomputeBaselineCfeCoreCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_RecomputeBaselineCfeCoreCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_RecomputeBaselineCfeCoreCmd_Test"); - UtTest_Add(CS_ProcessCmd_RecomputeBaselineOSCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_RecomputeBaselineOSCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_RecomputeBaselineOSCmd_Test"); UtTest_Add(CS_ProcessCmd_OneShotCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_ProcessCmd_OneShotCmd_Test"); - UtTest_Add(CS_ProcessCmd_CancelOneShotCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_CancelOneShotCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_CancelOneShotCmd_Test"); - UtTest_Add(CS_ProcessCmd_DisableTablesCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableTablesCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableTablesCmd_Test"); - UtTest_Add(CS_ProcessCmd_EnableTablesCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableTablesCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableTablesCmd_Test"); - UtTest_Add(CS_ProcessCmd_ReportBaselineTableCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ReportBaselineTableCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_ReportBaselineTableCmd_Test"); - UtTest_Add(CS_ProcessCmd_RecomputeBaselineTableCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_RecomputeBaselineTableCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_RecomputeBaselineTableCmd_Test"); - UtTest_Add(CS_ProcessCmd_DisableNameTableCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableNameTableCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableNameTableCmd_Test"); - UtTest_Add(CS_ProcessCmd_EnableNameTableCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableNameTableCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableNameTableCmd_Test"); UtTest_Add(CS_ProcessCmd_DisableAppsCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_ProcessCmd_DisableAppsCmd_Test"); UtTest_Add(CS_ProcessCmd_EnableAppsCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_ProcessCmd_EnableAppsCmd_Test"); - UtTest_Add(CS_ProcessCmd_ReportBaselineAppCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ReportBaselineAppCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_ReportBaselineAppCmd_Test"); - UtTest_Add(CS_ProcessCmd_RecomputeBaselineAppCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_RecomputeBaselineAppCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_RecomputeBaselineAppCmd_Test"); - UtTest_Add(CS_ProcessCmd_DisableNameAppCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableNameAppCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableNameAppCmd_Test"); - UtTest_Add(CS_ProcessCmd_EnableNameAppCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableNameAppCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableNameAppCmd_Test"); - UtTest_Add(CS_ProcessCmd_DisableMemoryCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableMemoryCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableMemoryCmd_Test"); - UtTest_Add(CS_ProcessCmd_EnableMemoryCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableMemoryCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableMemoryCmd_Test"); - UtTest_Add(CS_ProcessCmd_ReportBaselineEntryIDMemoryCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ReportBaselineEntryIDMemoryCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_ReportBaselineEntryIDMemoryCmd_Test"); - UtTest_Add(CS_ProcessCmd_RecomputeBaselineMemoryCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_RecomputeBaselineMemoryCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_RecomputeBaselineMemoryCmd_Test"); - UtTest_Add(CS_ProcessCmd_EnableEntryIDMemoryCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableEntryIDMemoryCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableEntryIDMemoryCmd_Test"); - UtTest_Add(CS_ProcessCmd_DisableEntryIDMemoryCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableEntryIDMemoryCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableEntryIDMemoryCmd_Test"); - UtTest_Add(CS_ProcessCmd_GetEntryIDMemoryCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_GetEntryIDMemoryCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_GetEntryIDMemoryCmd_Test"); - UtTest_Add(CS_ProcessCmd_DisableEepromCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableEepromCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableEepromCmd_Test"); - UtTest_Add(CS_ProcessCmd_EnableEepromCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableEepromCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableEepromCmd_Test"); - UtTest_Add(CS_ProcessCmd_ReportBaselineEntryIDEepromCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ReportBaselineEntryIDEepromCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_ReportBaselineEntryIDEepromCmd_Test"); - UtTest_Add(CS_ProcessCmd_RecomputeBaselineEepromCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_RecomputeBaselineEepromCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_RecomputeBaselineEepromCmd_Test"); - UtTest_Add(CS_ProcessCmd_EnableEntryIDEepromCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableEntryIDEepromCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableEntryIDEepromCmd_Test"); - UtTest_Add(CS_ProcessCmd_DisableEntryIDEepromCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableEntryIDEepromCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableEntryIDEepromCmd_Test"); - UtTest_Add(CS_ProcessCmd_GetEntryIDEepromCmd_Test, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_GetEntryIDEepromCmd_Test, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_GetEntryIDEepromCmd_Test"); - UtTest_Add(CS_ProcessCmd_NoopCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_NoopCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_NoopCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_ResetCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, - "CS_ProcessCmd_ResetCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_DisableAllCSCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ResetCountersCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, + "CS_ProcessCmd_ResetCountersCmd_Test_VerifyError"); + UtTest_Add(CS_ProcessCmd_DisableAllCSCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableAllCSCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_EnableAllCSCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableAllCSCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableAllCSCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_DisableCfeCoreCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableCfeCoreCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableCfeCoreCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCMD_EnableCfeCoreCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCMD_EnableCfeCoreCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCMD_EnableCfeCoreCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_DisableOSCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableOSCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableOSCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_EnableOSCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableOSCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableOSCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_ReportBaselineCfeCoreCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ReportBaselineCfeCoreCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_ReportBaselineCfeCoreCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_ReportBaselineOSCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ReportBaselineOSCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_ReportBaselineOSCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_RecomputeBaselineCfeCoreCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_RecomputeBaselineCfeCoreCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_RecomputeBaselineCfeCoreCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_RecomputeBaselineOSCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_RecomputeBaselineOSCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_RecomputeBaselineOSCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_OneShotCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_OneShotCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_OneShotCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_CancelOneShotCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_CancelOneShotCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_CancelOneShotCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_DisableTablesCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableTablesCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableTablesCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_EnableTablesCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableTablesCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableTablesCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_ReportBaselineTableCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ReportBaselineTableCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_ReportBaselineTableCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_RecomputeBaselineTableCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_RecomputeBaselineTableCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_RecomputeBaselineTableCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_DisableNameTableCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableNameTableCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableNameTableCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_EnableNameTableCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableNameTableCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableNameTableCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_DisableAppsCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableAppsCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableAppsCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_EnableAppsCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableAppsCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableAppsCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_ReportBaselineAppCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ReportBaselineAppCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_ReportBaselineAppCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_RecomputeBaselineAppCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_RecomputeBaselineAppCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_RecomputeBaselineAppCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_DisableNameAppCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableNameAppCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableNameAppCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_EnableNameAppCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableNameAppCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableNameAppCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_DisableMemoryCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableMemoryCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableMemoryCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_EnableMemoryCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableMemoryCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableMemoryCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_ReportBaselineEntryIDMemoryCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ReportBaselineEntryIDMemoryCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_ReportBaselineEntryIDMemoryCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_RecomputeBaselineMemoryCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_RecomputeBaselineMemoryCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_RecomputeBaselineMemoryCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_EnableEntryIDMemoryCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableEntryIDMemoryCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableEntryIDMemoryCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_DisableEntryIDMemoryCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableEntryIDMemoryCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableEntryIDMemoryCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_GetEntryIDMemoryCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_GetEntryIDMemoryCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_GetEntryIDMemoryCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_DisableEepromCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableEepromCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableEepromCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_EnableEepromCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableEepromCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableEepromCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_ReportBaselineEntryIDEepromCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_ReportBaselineEntryIDEepromCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_ReportBaselineEntryIDEepromCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_RecomputeBaselineEepromCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_RecomputeBaselineEepromCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_RecomputeBaselineEepromCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_EnableEntryIDEepromCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_EnableEntryIDEepromCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_EnableEntryIDEepromCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_DisableEntryIDEepromCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_DisableEntryIDEepromCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_DisableEntryIDEepromCmd_Test_VerifyError"); - UtTest_Add(CS_ProcessCmd_GetEntryIDEepromCmd_Test_VerifyError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ProcessCmd_GetEntryIDEepromCmd_Test_VerifyError, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessCmd_GetEntryIDEepromCmd_Test_VerifyError"); } diff --git a/unit-test/cs_eeprom_cmds_tests.c b/unit-test/cs_eeprom_cmds_tests.c index a294a7a..a87c785 100644 --- a/unit-test/cs_eeprom_cmds_tests.c +++ b/unit-test/cs_eeprom_cmds_tests.c @@ -65,11 +65,12 @@ void CS_DisableEepromCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -84,11 +85,12 @@ void CS_DisableEepromCmd_Test_OneShot(void) CS_DisableEepromCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -115,11 +117,12 @@ void CS_EnableEepromCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -134,11 +137,12 @@ void CS_EnableEepromCmd_Test_OneShot(void) CS_EnableEepromCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -147,7 +151,7 @@ void CS_ReportBaselineEntryIDEepromCmd_Test_Computed(void) CS_ReportBaselineEntryIDEepromCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_EepromMemory_Table_Entry_t * ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; + CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Report baseline of EEPROM Entry %%d is 0x%%08X"); @@ -169,11 +173,12 @@ void CS_ReportBaselineEntryIDEepromCmd_Test_Computed(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -182,10 +187,11 @@ void CS_ReportBaselineEntryIDEepromCmd_Test_NotYetComputed(void) CS_ReportBaselineEntryIDEepromCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_EepromMemory_Table_Entry_t * ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; + CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Report baseline of EEPROM Entry %%d has not been computed yet"); CmdPacket.Payload.EntryID = 1; @@ -205,11 +211,12 @@ void CS_ReportBaselineEntryIDEepromCmd_Test_NotYetComputed(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -220,7 +227,8 @@ void CS_ReportBaselineEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh(void char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "EEPROM report baseline failed, Entry ID invalid: %%d, State: %%d Max ID: %%d"); CmdPacket.Payload.EntryID = CS_MAX_NUM_EEPROM_TABLE_ENTRIES; @@ -237,11 +245,13 @@ void CS_ReportBaselineEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh(void UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -250,10 +260,11 @@ void CS_ReportBaselineEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty(void) CS_ReportBaselineEntryIDEepromCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_EepromMemory_Table_Entry_t * ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; + CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "EEPROM report baseline failed, Entry ID invalid: %%d, State: %%d Max ID: %%d"); CmdPacket.Payload.EntryID = 1; @@ -271,11 +282,13 @@ void CS_ReportBaselineEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -287,7 +300,8 @@ void CS_RecomputeBaselineEepromCmd_Test_Nominal(void) CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute baseline of EEPROM Entry ID %%d started"); CmdPacket.Payload.EntryID = 1; @@ -317,11 +331,12 @@ void CS_RecomputeBaselineEepromCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -333,7 +348,8 @@ void CS_RecomputeBaselineEepromCmd_Test_CreateChildTaskError(void) CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute baseline of EEPROM Entry ID %%d failed, CFE_ES_CreateChildTask returned: 0x%%08X"); CmdPacket.Payload.EntryID = 1; @@ -364,13 +380,15 @@ void CS_RecomputeBaselineEepromCmd_Test_CreateChildTaskError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); UtAssert_True(CS_AppData.HkPacket.Payload.RecomputeInProgress == false, "CS_AppData.HkPacket.Payload.RecomputeInProgress == false"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -381,7 +399,8 @@ void CS_RecomputeBaselineEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "EEPROM recompute baseline of entry failed, Entry ID invalid: %%d, State: %%d, Max ID: %%d"); CmdPacket.Payload.EntryID = CS_MAX_NUM_EEPROM_TABLE_ENTRIES; @@ -398,11 +417,13 @@ void CS_RecomputeBaselineEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -414,7 +435,8 @@ void CS_RecomputeBaselineEepromCmd_Test_InvalidEntryErrorStateEmpty(void) CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "EEPROM recompute baseline of entry failed, Entry ID invalid: %%d, State: %%d, Max ID: %%d"); CmdPacket.Payload.EntryID = 1; @@ -432,11 +454,13 @@ void CS_RecomputeBaselineEepromCmd_Test_InvalidEntryErrorStateEmpty(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -447,7 +471,8 @@ void CS_RecomputeBaselineEepromCmd_Test_RecomputeInProgress(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute baseline of EEPROM Entry ID %%d failed: child task in use"); CmdPacket.Payload.EntryID = 1; @@ -465,11 +490,13 @@ void CS_RecomputeBaselineEepromCmd_Test_RecomputeInProgress(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -480,7 +507,8 @@ void CS_RecomputeBaselineEepromCmd_Test_OneShot(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute baseline of EEPROM Entry ID %%d failed: child task in use"); CmdPacket.Payload.EntryID = 1; @@ -499,11 +527,13 @@ void CS_RecomputeBaselineEepromCmd_Test_OneShot(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -540,11 +570,12 @@ void CS_EnableEntryIDEepromCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); CS_Test_Check_SetDefEntryState(&DefEepromTblPtr[CmdPacket.Payload.EntryID], CS_ChecksumState_ENABLED); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -557,10 +588,12 @@ void CS_EnableEntryIDEepromCmd_Test_DefEepromTblPtrStateEmpty(void) CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Checksumming of EEPROM Entry ID %%d is Enabled"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS unable to update EEPROM definition table for entry %%d, State: %%d"); CmdPacket.Payload.EntryID = 1; @@ -595,11 +628,12 @@ void CS_EnableEntryIDEepromCmd_Test_DefEepromTblPtrStateEmpty(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -610,7 +644,8 @@ void CS_EnableEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Enable EEPROM entry failed, invalid Entry ID: %%d, State: %%d, Max ID: %%d"); CmdPacket.Payload.EntryID = CS_MAX_NUM_EEPROM_TABLE_ENTRIES; @@ -627,11 +662,13 @@ void CS_EnableEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -643,7 +680,8 @@ void CS_EnableEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty(void) CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Enable EEPROM entry failed, invalid Entry ID: %%d, State: %%d, Max ID: %%d"); CmdPacket.Payload.EntryID = 1; @@ -661,11 +699,13 @@ void CS_EnableEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -680,11 +720,12 @@ void CS_EnableEntryIDEepromCmd_Test_OneShot(void) CS_EnableEntryIDEepromCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -697,7 +738,8 @@ void CS_DisableEntryIDEepromCmd_Test_Nominal(void) CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Checksumming of EEPROM Entry ID %%d is Disabled"); CmdPacket.Payload.EntryID = 1; @@ -728,11 +770,12 @@ void CS_DisableEntryIDEepromCmd_Test_Nominal(void) CS_Test_Check_SetDefEntryState(&DefEepromTblPtr[CmdPacket.Payload.EntryID], CS_ChecksumState_DISABLED); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -745,10 +788,12 @@ void CS_DisableEntryIDEepromCmd_Test_DefEepromTblPtrStateEmpty(void) CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Checksumming of EEPROM Entry ID %%d is Disabled"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS unable to update EEPROM definition table for entry %%d, State: %%d"); CmdPacket.Payload.EntryID = 1; @@ -787,11 +832,12 @@ void CS_DisableEntryIDEepromCmd_Test_DefEepromTblPtrStateEmpty(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -802,7 +848,8 @@ void CS_DisableEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Disable EEPROM entry failed, invalid Entry ID: %%d, State: %%d, Max ID: %%d"); CmdPacket.Payload.EntryID = CS_MAX_NUM_EEPROM_TABLE_ENTRIES; @@ -818,11 +865,13 @@ void CS_DisableEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -834,7 +883,8 @@ void CS_DisableEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty(void) CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Disable EEPROM entry failed, invalid Entry ID: %%d, State: %%d, Max ID: %%d"); CmdPacket.Payload.EntryID = 1; @@ -852,11 +902,13 @@ void CS_DisableEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -871,11 +923,12 @@ void CS_DisableEntryIDEepromCmd_Test_OneShot(void) CS_DisableEntryIDEepromCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -907,11 +960,12 @@ void CS_GetEntryIDEepromCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -941,11 +995,12 @@ void CS_GetEntryIDEepromCmd_Test_AddressNotFound(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -977,11 +1032,12 @@ void CS_GetEntryIDEepromCmd_Test_AddressPtr(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1013,11 +1069,12 @@ void CS_GetEntryIDEepromCmd_Test_State(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1029,55 +1086,101 @@ void UtTest_Setup(void) UtTest_Add(CS_EnableEepromCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_EnableEepromCmd_Test"); UtTest_Add(CS_EnableEepromCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, "CS_EnableEepromCmd_Test_OneShot"); - UtTest_Add(CS_ReportBaselineEntryIDEepromCmd_Test_Computed, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineEntryIDEepromCmd_Test_Computed, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineEntryIDEepromCmd_Test_Computed"); - UtTest_Add(CS_ReportBaselineEntryIDEepromCmd_Test_NotYetComputed, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineEntryIDEepromCmd_Test_NotYetComputed, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineEntryIDEepromCmd_Test_NotYetComputed"); - UtTest_Add(CS_ReportBaselineEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh"); - UtTest_Add(CS_ReportBaselineEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty"); - UtTest_Add(CS_RecomputeBaselineEepromCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineEepromCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineEepromCmd_Test_Nominal"); - UtTest_Add(CS_RecomputeBaselineEepromCmd_Test_CreateChildTaskError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineEepromCmd_Test_CreateChildTaskError, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineEepromCmd_Test_CreateChildTaskError"); - UtTest_Add(CS_RecomputeBaselineEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh"); - UtTest_Add(CS_RecomputeBaselineEepromCmd_Test_InvalidEntryErrorStateEmpty, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineEepromCmd_Test_InvalidEntryErrorStateEmpty, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineEepromCmd_Test_InvalidEntryErrorStateEmpty"); - UtTest_Add(CS_RecomputeBaselineEepromCmd_Test_RecomputeInProgress, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineEepromCmd_Test_RecomputeInProgress, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineEepromCmd_Test_RecomputeInProgress"); - UtTest_Add(CS_RecomputeBaselineEepromCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineEepromCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineEepromCmd_Test_OneShot"); - UtTest_Add(CS_EnableEntryIDEepromCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableEntryIDEepromCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableEntryIDEepromCmd_Test_Nominal"); - UtTest_Add(CS_EnableEntryIDEepromCmd_Test_DefEepromTblPtrStateEmpty, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableEntryIDEepromCmd_Test_DefEepromTblPtrStateEmpty, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableEntryIDEepromCmd_Test_DefEepromTblPtrStateEmpty"); - UtTest_Add(CS_EnableEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh"); - UtTest_Add(CS_EnableEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty"); - UtTest_Add(CS_EnableEntryIDEepromCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableEntryIDEepromCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableEntryIDEepromCmd_Test_OneShot"); - UtTest_Add(CS_DisableEntryIDEepromCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableEntryIDEepromCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableEntryIDEepromCmd_Test_Nominal"); - UtTest_Add(CS_DisableEntryIDEepromCmd_Test_DefEepromTblPtrStateEmpty, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableEntryIDEepromCmd_Test_DefEepromTblPtrStateEmpty, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableEntryIDEepromCmd_Test_DefEepromTblPtrStateEmpty"); - UtTest_Add(CS_DisableEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableEntryIDEepromCmd_Test_InvalidEntryErrorEntryIDTooHigh"); - UtTest_Add(CS_DisableEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableEntryIDEepromCmd_Test_InvalidEntryErrorStateEmpty"); - UtTest_Add(CS_DisableEntryIDEepromCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableEntryIDEepromCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableEntryIDEepromCmd_Test_OneShot"); - UtTest_Add(CS_GetEntryIDEepromCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_GetEntryIDEepromCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_GetEntryIDEepromCmd_Test_Nominal"); - UtTest_Add(CS_GetEntryIDEepromCmd_Test_AddressNotFound, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_GetEntryIDEepromCmd_Test_AddressNotFound, + CS_Test_Setup, + CS_Test_TearDown, "CS_GetEntryIDEepromCmd_Test_AddressNotFound"); - UtTest_Add(CS_GetEntryIDEepromCmd_Test_AddressPtr, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_GetEntryIDEepromCmd_Test_AddressPtr, + CS_Test_Setup, + CS_Test_TearDown, "CS_GetEntryIDEepromCmd_Test_AddressPtr"); UtTest_Add(CS_GetEntryIDEepromCmd_Test_State, CS_Test_Setup, CS_Test_TearDown, "CS_GetEntryIDEepromCmd_Test_State"); } diff --git a/unit-test/cs_init_tests.c b/unit-test/cs_init_tests.c index cda06a3..54a9def 100644 --- a/unit-test/cs_init_tests.c +++ b/unit-test/cs_init_tests.c @@ -44,7 +44,8 @@ void CS_Init_Test_SBCreatePipeError(void) int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Software Bus Create Pipe for command returned: 0x%%08X"); /* Set to generate error message CS_CR_PIPE_ERR_EID */ @@ -66,7 +67,8 @@ void CS_Init_Test_SBCreatePipeError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -82,7 +84,8 @@ void CS_Init_Test_SBSubscribeHKNominal(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -92,7 +95,8 @@ void CS_Init_Test_SBSubscribeHKError(void) int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Software Bus subscribe to housekeeping returned: 0x%%08X"); /* Set to generate error message CS_INIT_SB_SUBSCRIBE_HK_ERR_EID */ @@ -114,7 +118,8 @@ void CS_Init_Test_SBSubscribeHKError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -124,7 +129,8 @@ void CS_Init_Test_SBSubscribeBackgroundCycleError(void) int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Software Bus subscribe to background cycle returned: 0x%%08X"); /* Set to generate error message CS_INIT_SB_SUBSCRIBE_BACK_ERR_EID */ @@ -145,7 +151,8 @@ void CS_Init_Test_SBSubscribeBackgroundCycleError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -155,7 +162,8 @@ void CS_Init_Test_SBSubscribeCmdError(void) int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Software Bus subscribe to command returned: 0x%%08X"); /* Set to generate error message CS_INIT_SB_SUBSCRIBE_CMD_ERR_EID */ @@ -176,7 +184,8 @@ void CS_Init_Test_SBSubscribeCmdError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -198,7 +207,8 @@ void CS_Init_Test_TableInitNominal(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); UtAssert_UINT8_EQ(CS_AppData.HkPacket.Payload.EepromCSState, CS_ChecksumState_ENABLED); @@ -237,7 +247,8 @@ void CS_Init_Test_TableInitErrorEEPROM(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); /* Generates 1 event message we don't care about in this test */ - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); UtAssert_UINT8_EQ(CS_AppData.HkPacket.Payload.EepromCSState, CS_ChecksumState_DISABLED); } @@ -276,7 +287,8 @@ void CS_Init_Test_TableInitErrorMemory(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); /* Generates 1 event message we don't care about in this test */ UtAssert_UINT8_EQ(CS_AppData.HkPacket.Payload.MemoryCSState, CS_ChecksumState_DISABLED); @@ -314,7 +326,8 @@ void CS_Init_Test_TableInitErrorApps(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); /* Generates 1 event message we don't care about in this test */ UtAssert_UINT8_EQ(CS_AppData.HkPacket.Payload.AppCSState, CS_ChecksumState_DISABLED); @@ -352,7 +365,8 @@ void CS_Init_Test_TableInitErrorTables(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); /* Generates 1 event message we don't care about in this test */ UtAssert_UINT8_EQ(CS_AppData.HkPacket.Payload.TablesCSState, CS_ChecksumState_DISABLED); @@ -396,7 +410,8 @@ void CS_Init_Test_CFETextSegmentInfoError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -428,7 +443,8 @@ void CS_Init_Test_KernelTextSegmentInfoError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -437,7 +453,9 @@ void UtTest_Setup(void) UtTest_Add(CS_Init_Test_SBCreatePipeError, CS_Test_Setup, CS_Test_TearDown, "CS_Init_Test_SBCreatePipeError"); UtTest_Add(CS_Init_Test_SBSubscribeHKNominal, CS_Test_Setup, CS_Test_TearDown, "CS_Init_Test_SBSubscribeHKNominal"); UtTest_Add(CS_Init_Test_SBSubscribeHKError, CS_Test_Setup, CS_Test_TearDown, "CS_Init_Test_SBSubscribeHKError"); - UtTest_Add(CS_Init_Test_SBSubscribeBackgroundCycleError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_Init_Test_SBSubscribeBackgroundCycleError, + CS_Test_Setup, + CS_Test_TearDown, "CS_Init_Test_SBSubscribeBackgroundCycleError"); UtTest_Add(CS_Init_Test_SBSubscribeCmdError, CS_Test_Setup, CS_Test_TearDown, "CS_Init_Test_SBSubscribeCmdError"); UtTest_Add(CS_Init_Test_TableInitNominal, CS_Test_Setup, CS_Test_TearDown, "CS_Init_Test_TableInitNominal"); @@ -446,8 +464,12 @@ void UtTest_Setup(void) UtTest_Add(CS_Init_Test_TableInitErrorApps, CS_Test_Setup, CS_Test_TearDown, "CS_Init_Test_TableInitErrorApps"); UtTest_Add(CS_Init_Test_TableInitErrorTables, CS_Test_Setup, CS_Test_TearDown, "CS_Init_Test_TableInitErrorTables"); UtTest_Add(CS_Init_Test_TableInitErrorOther, CS_Test_Setup, CS_Test_TearDown, "CS_Init_Test_TableInitErrorOther"); - UtTest_Add(CS_Init_Test_CFETextSegmentInfoError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_Init_Test_CFETextSegmentInfoError, + CS_Test_Setup, + CS_Test_TearDown, "CS_Init_Test_CFETextSegmentInfoError"); - UtTest_Add(CS_Init_Test_KernelTextSegmentInfoError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_Init_Test_KernelTextSegmentInfoError, + CS_Test_Setup, + CS_Test_TearDown, "CS_Init_Test_KernelTextSegmentInfoError"); } diff --git a/unit-test/cs_memory_cmds_tests.c b/unit-test/cs_memory_cmds_tests.c index 72554d5..5987dee 100644 --- a/unit-test/cs_memory_cmds_tests.c +++ b/unit-test/cs_memory_cmds_tests.c @@ -16,9 +16,9 @@ * limitations under the License. ************************************************************************/ -/* - * Includes - */ +/* ======== */ +/* Includes */ +/* ======== */ #include "cs_memory_cmds.h" #include "cs_msg.h" @@ -65,11 +65,12 @@ void CS_DisableMemoryCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -84,11 +85,12 @@ void CS_DisableMemoryCmd_Test_OneShot(void) CS_DisableMemoryCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -115,11 +117,12 @@ void CS_EnableMemoryCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -134,11 +137,12 @@ void CS_EnableMemoryCmd_Test_OneShot(void) CS_EnableMemoryCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -147,7 +151,7 @@ void CS_ReportBaselineEntryIDMemoryCmd_Test_Computed(void) CS_ReportBaselineEntryIDMemoryCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_EepromMemory_Table_Entry_t * ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; + CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Report baseline of Memory Entry %%d is 0x%%08X"); @@ -169,11 +173,12 @@ void CS_ReportBaselineEntryIDMemoryCmd_Test_Computed(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -182,10 +187,11 @@ void CS_ReportBaselineEntryIDMemoryCmd_Test_NotYetComputed(void) CS_ReportBaselineEntryIDMemoryCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_EepromMemory_Table_Entry_t * ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; + CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Report baseline of Memory Entry %%d has not been computed yet"); CmdPacket.Payload.EntryID = 1; @@ -205,11 +211,12 @@ void CS_ReportBaselineEntryIDMemoryCmd_Test_NotYetComputed(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -220,7 +227,8 @@ void CS_ReportBaselineEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh(void char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Memory report baseline failed, Entry ID invalid: %%d, State: %%d Max ID: %%d"); CmdPacket.Payload.EntryID = CS_MAX_NUM_MEMORY_TABLE_ENTRIES; @@ -236,11 +244,13 @@ void CS_ReportBaselineEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh(void UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -249,10 +259,11 @@ void CS_ReportBaselineEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty(void) CS_ReportBaselineEntryIDMemoryCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_EepromMemory_Table_Entry_t * ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; + CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Memory report baseline failed, Entry ID invalid: %%d, State: %%d Max ID: %%d"); CmdPacket.Payload.EntryID = 1; @@ -270,11 +281,13 @@ void CS_ReportBaselineEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -286,7 +299,8 @@ void CS_RecomputeBaselineMemoryCmd_Test_Nominal(void) CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute baseline of Memory Entry ID %%d started"); CmdPacket.Payload.EntryID = 1; @@ -316,11 +330,12 @@ void CS_RecomputeBaselineMemoryCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -332,7 +347,8 @@ void CS_RecomputeBaselineMemoryCmd_Test_CreateChildTaskError(void) CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute baseline of Memory Entry ID %%d failed, ES_CreateChildTask returned: 0x%%08X"); CmdPacket.Payload.EntryID = 1; @@ -363,13 +379,15 @@ void CS_RecomputeBaselineMemoryCmd_Test_CreateChildTaskError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); UtAssert_True(CS_AppData.HkPacket.Payload.RecomputeInProgress == false, "CS_AppData.HkPacket.Payload.RecomputeInProgress == false"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -380,7 +398,8 @@ void CS_RecomputeBaselineMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Memory recompute baseline of entry failed, Entry ID invalid: %%d, State: %%d, Max ID: %%d"); CmdPacket.Payload.EntryID = CS_MAX_NUM_MEMORY_TABLE_ENTRIES; @@ -396,11 +415,13 @@ void CS_RecomputeBaselineMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -412,7 +433,8 @@ void CS_RecomputeBaselineMemoryCmd_Test_InvalidEntryErrorStateEmpty(void) CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Memory recompute baseline of entry failed, Entry ID invalid: %%d, State: %%d, Max ID: %%d"); CmdPacket.Payload.EntryID = 1; @@ -430,11 +452,13 @@ void CS_RecomputeBaselineMemoryCmd_Test_InvalidEntryErrorStateEmpty(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -445,7 +469,8 @@ void CS_RecomputeBaselineMemoryCmd_Test_RecomputeInProgress(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute baseline of Memory Entry ID %%d failed: child task in use"); CmdPacket.Payload.EntryID = 1; @@ -463,11 +488,13 @@ void CS_RecomputeBaselineMemoryCmd_Test_RecomputeInProgress(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -478,7 +505,8 @@ void CS_RecomputeBaselineMemoryCmd_Test_OneShot(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute baseline of Memory Entry ID %%d failed: child task in use"); CmdPacket.Payload.EntryID = 1; @@ -497,11 +525,13 @@ void CS_RecomputeBaselineMemoryCmd_Test_OneShot(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -539,11 +569,12 @@ void CS_EnableEntryIDMemoryCmd_Test_Nominal(void) CS_Test_Check_SetDefEntryState(&DefMemoryTblPtr[CmdPacket.Payload.EntryID], CS_ChecksumState_ENABLED); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -556,10 +587,12 @@ void CS_EnableEntryIDMemoryCmd_Test_DefMemoryTblPtrStateEmpty(void) CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Checksumming of Memory Entry ID %%d is Enabled"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS unable to update memory definition table for entry %%d, State: %%d"); CmdPacket.Payload.EntryID = 1; @@ -594,11 +627,12 @@ void CS_EnableEntryIDMemoryCmd_Test_DefMemoryTblPtrStateEmpty(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -609,7 +643,8 @@ void CS_EnableEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Enable Memory entry failed, invalid Entry ID: %%d, State: %%d, Max ID: %%d"); CmdPacket.Payload.EntryID = CS_MAX_NUM_MEMORY_TABLE_ENTRIES; @@ -625,11 +660,13 @@ void CS_EnableEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -641,7 +678,8 @@ void CS_EnableEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty(void) CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Enable Memory entry failed, invalid Entry ID: %%d, State: %%d, Max ID: %%d"); CmdPacket.Payload.EntryID = 1; @@ -659,11 +697,13 @@ void CS_EnableEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -678,11 +718,12 @@ void CS_EnableEntryIDMemoryCmd_Test_OneShot(void) CS_EnableEntryIDMemoryCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -695,7 +736,8 @@ void CS_DisableEntryIDMemoryCmd_Test_Nominal(void) CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Checksumming of Memory Entry ID %%d is Disabled"); CmdPacket.Payload.EntryID = 1; @@ -725,11 +767,12 @@ void CS_DisableEntryIDMemoryCmd_Test_Nominal(void) CS_Test_Check_SetDefEntryState(&DefMemoryTblPtr[CmdPacket.Payload.EntryID], CS_ChecksumState_DISABLED); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -742,10 +785,12 @@ void CS_DisableEntryIDMemoryCmd_Test_DefMemoryTblPtrStateEmpty(void) CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Checksumming of Memory Entry ID %%d is Disabled"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS unable to update memory definition table for entry %%d, State: %%d"); CmdPacket.Payload.EntryID = 1; @@ -782,11 +827,12 @@ void CS_DisableEntryIDMemoryCmd_Test_DefMemoryTblPtrStateEmpty(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -797,7 +843,8 @@ void CS_DisableEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Disable Memory entry failed, invalid Entry ID: %%d, State: %%d, Max ID: %%d"); CmdPacket.Payload.EntryID = CS_MAX_NUM_MEMORY_TABLE_ENTRIES; @@ -813,11 +860,13 @@ void CS_DisableEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -829,7 +878,8 @@ void CS_DisableEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty(void) CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE].ResAddr; memset(&CmdPacket, 0, sizeof(CmdPacket)); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Disable Memory entry failed, invalid Entry ID: %%d, State: %%d, Max ID: %%d"); CmdPacket.Payload.EntryID = 1; @@ -847,11 +897,13 @@ void CS_DisableEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -866,11 +918,12 @@ void CS_DisableEntryIDMemoryCmd_Test_OneShot(void) CS_DisableEntryIDMemoryCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -901,11 +954,12 @@ void CS_GetEntryIDMemoryCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -935,11 +989,12 @@ void CS_GetEntryIDMemoryCmd_Test_AddressNotFound(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -971,11 +1026,12 @@ void CS_GetEntryIDMemoryCmd_Test_AddressPtr(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1007,11 +1063,12 @@ void CS_GetEntryIDMemoryCmd_Test_State(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1023,55 +1080,101 @@ void UtTest_Setup(void) UtTest_Add(CS_EnableMemoryCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_EnableMemoryCmd_Test"); UtTest_Add(CS_EnableMemoryCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, "CS_EnableMemoryCmd_Test_OneShot"); - UtTest_Add(CS_ReportBaselineEntryIDMemoryCmd_Test_Computed, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineEntryIDMemoryCmd_Test_Computed, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineEntryIDMemoryCmd_Test_Computed"); - UtTest_Add(CS_ReportBaselineEntryIDMemoryCmd_Test_NotYetComputed, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineEntryIDMemoryCmd_Test_NotYetComputed, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineEntryIDMemoryCmd_Test_NotYetComputed"); - UtTest_Add(CS_ReportBaselineEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh"); - UtTest_Add(CS_ReportBaselineEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty"); - UtTest_Add(CS_RecomputeBaselineMemoryCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineMemoryCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineMemoryCmd_Test_Nominal"); - UtTest_Add(CS_RecomputeBaselineMemoryCmd_Test_CreateChildTaskError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineMemoryCmd_Test_CreateChildTaskError, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineMemoryCmd_Test_CreateChildTaskError"); - UtTest_Add(CS_RecomputeBaselineMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh"); - UtTest_Add(CS_RecomputeBaselineMemoryCmd_Test_InvalidEntryErrorStateEmpty, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineMemoryCmd_Test_InvalidEntryErrorStateEmpty, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineMemoryCmd_Test_InvalidEntryErrorStateEmpty"); - UtTest_Add(CS_RecomputeBaselineMemoryCmd_Test_RecomputeInProgress, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineMemoryCmd_Test_RecomputeInProgress, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineMemoryCmd_Test_RecomputeInProgress"); - UtTest_Add(CS_RecomputeBaselineMemoryCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineMemoryCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineMemoryCmd_Test_OneShot"); - UtTest_Add(CS_EnableEntryIDMemoryCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableEntryIDMemoryCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableEntryIDMemoryCmd_Test_Nominal"); - UtTest_Add(CS_EnableEntryIDMemoryCmd_Test_DefMemoryTblPtrStateEmpty, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableEntryIDMemoryCmd_Test_DefMemoryTblPtrStateEmpty, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableEntryIDMemoryCmd_Test_DefMemoryTblPtrStateEmpty"); - UtTest_Add(CS_EnableEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh"); - UtTest_Add(CS_EnableEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty"); - UtTest_Add(CS_EnableEntryIDMemoryCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableEntryIDMemoryCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableEntryIDMemoryCmd_Test_OneShots"); - UtTest_Add(CS_DisableEntryIDMemoryCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableEntryIDMemoryCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableEntryIDMemoryCmd_Test_Nominal"); - UtTest_Add(CS_DisableEntryIDMemoryCmd_Test_DefMemoryTblPtrStateEmpty, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableEntryIDMemoryCmd_Test_DefMemoryTblPtrStateEmpty, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableEntryIDMemoryCmd_Test_DefMemoryTblPtrStateEmpty"); - UtTest_Add(CS_DisableEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableEntryIDMemoryCmd_Test_InvalidEntryErrorEntryIDTooHigh"); - UtTest_Add(CS_DisableEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableEntryIDMemoryCmd_Test_InvalidEntryErrorStateEmpty"); - UtTest_Add(CS_DisableEntryIDMemoryCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableEntryIDMemoryCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableEntryIDMemoryCmd_Test_OneShot"); - UtTest_Add(CS_GetEntryIDMemoryCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_GetEntryIDMemoryCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_GetEntryIDMemoryCmd_Test_Nominal"); - UtTest_Add(CS_GetEntryIDMemoryCmd_Test_AddressNotFound, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_GetEntryIDMemoryCmd_Test_AddressNotFound, + CS_Test_Setup, + CS_Test_TearDown, "CS_GetEntryIDMemoryCmd_Test_AddressNotFound"); - UtTest_Add(CS_GetEntryIDMemoryCmd_Test_AddressPtr, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_GetEntryIDMemoryCmd_Test_AddressPtr, + CS_Test_Setup, + CS_Test_TearDown, "CS_GetEntryIDMemoryCmd_Test_AddressPtr"); UtTest_Add(CS_GetEntryIDMemoryCmd_Test_State, CS_Test_Setup, CS_Test_TearDown, "CS_GetEntryIDMemoryCmd_Test_State"); } diff --git a/unit-test/cs_table_cmds_tests.c b/unit-test/cs_table_cmds_tests.c index 835ff14..6b32ee0 100644 --- a/unit-test/cs_table_cmds_tests.c +++ b/unit-test/cs_table_cmds_tests.c @@ -44,8 +44,9 @@ CS_Def_Tables_Table_Entry_t DefTblEntryDummy; /* * Function Definitions */ -void CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1(void *UserObj, UT_EntryKey_t FuncKey, - const UT_StubContext_t *Context) +void CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1(void *UserObj, + UT_EntryKey_t FuncKey, + const UT_StubContext_t *Context) { CS_Res_Tables_Table_Entry_t **EntryPtr = (CS_Res_Tables_Table_Entry_t **)UT_Hook_GetArgValueByName(Context, "EntryPtr", CS_Res_Tables_Table_Entry_t **); @@ -55,7 +56,8 @@ void CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1(void *UserObj, UT_Ent ResTblEntryDummy.ComputedYet = true; } -void CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler2(void *UserObj, UT_EntryKey_t FuncKey, +void CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler2(void *UserObj, + UT_EntryKey_t FuncKey, const UT_StubContext_t *Context) { CS_Res_Tables_Table_Entry_t **EntryPtr = @@ -66,7 +68,8 @@ void CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler2(void *UserObj, UT_Ent ResTblEntryDummy.ComputedYet = false; } -void CS_APP_CMDS_TEST_CS_GetTableDefTblEntryByNameHandler1(void *UserObj, UT_EntryKey_t FuncKey, +void CS_APP_CMDS_TEST_CS_GetTableDefTblEntryByNameHandler1(void *UserObj, + UT_EntryKey_t FuncKey, const UT_StubContext_t *Context) { CS_Def_Tables_Table_Entry_t **EntryPtr = @@ -99,11 +102,12 @@ void CS_DisableTablesCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -117,11 +121,12 @@ void CS_DisableTablesCmd_Test_OneShot(void) CS_DisableTablesCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -149,11 +154,12 @@ void CS_EnableTablesCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -167,11 +173,12 @@ void CS_EnableTablesCmd_Test_OneShot(void) CS_EnableTablesCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -192,7 +199,8 @@ void CS_ReportBaselineTableCmd_Test_Computed(void) ResTablesTblPtr[0].State = 99; /* Needed to make CS_GetTableResTblEntryByName return correct results */ - UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, NULL); UT_SetDeferredRetcode(UT_KEY(CS_GetTableResTblEntryByName), 1, true); @@ -208,11 +216,12 @@ void CS_ReportBaselineTableCmd_Test_Computed(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -223,7 +232,8 @@ void CS_ReportBaselineTableCmd_Test_NotYetComputed(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; CS_Res_Tables_Table_Entry_t *ResTablesTblPtr = CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE].ResAddr; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Report baseline of table %%s has not been computed yet"); ResTablesTblPtr[0].ComputedYet = false; @@ -233,7 +243,8 @@ void CS_ReportBaselineTableCmd_Test_NotYetComputed(void) ResTablesTblPtr[0].State = 99; /* Needed to make CS_GetTableResTblEntryByName return correct results */ - UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler2, + UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler2, NULL); UT_SetDeferredRetcode(UT_KEY(CS_GetTableResTblEntryByName), 1, true); @@ -249,11 +260,12 @@ void CS_ReportBaselineTableCmd_Test_NotYetComputed(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -264,7 +276,8 @@ void CS_ReportBaselineTableCmd_Test_TableNotFound(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; CS_Res_Tables_Table_Entry_t *ResTablesTblPtr = CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE].ResAddr; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Tables report baseline failed, table %%s not found"); strncpy(ResTablesTblPtr[0].Name, "name1", 10); @@ -284,11 +297,13 @@ void CS_ReportBaselineTableCmd_Test_TableNotFound(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -297,7 +312,7 @@ void CS_RecomputeBaselineTableCmd_Test_Nominal(void) CS_RecomputeBaselineTableCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_Tables_Table_Entry_t * ResTablesTblPtr = CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE].ResAddr; + CS_Res_Tables_Table_Entry_t *ResTablesTblPtr = CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE].ResAddr; snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute baseline of table %%s started"); @@ -307,7 +322,8 @@ void CS_RecomputeBaselineTableCmd_Test_Nominal(void) ResTablesTblPtr[0].State = 99; /* Needed to make CS_GetTableResTblEntryByName return correct results */ UT_SetDeferredRetcode(UT_KEY(CS_CheckRecomputeOneshot), 1, false); - UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, NULL); UT_SetDeferredRetcode(UT_KEY(CS_GetTableResTblEntryByName), 1, true); @@ -330,11 +346,12 @@ void CS_RecomputeBaselineTableCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -343,9 +360,10 @@ void CS_RecomputeBaselineTableCmd_Test_CreateChildTaskError(void) CS_RecomputeBaselineTableCmd_t CmdPacket; int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - CS_Res_Tables_Table_Entry_t * ResTablesTblPtr = CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE].ResAddr; + CS_Res_Tables_Table_Entry_t *ResTablesTblPtr = CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE].ResAddr; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Recompute baseline of table %%s failed, CFE_ES_CreateChildTask returned: 0x%%08X"); strncpy(ResTablesTblPtr[0].Name, "name", 10); @@ -357,7 +375,8 @@ void CS_RecomputeBaselineTableCmd_Test_CreateChildTaskError(void) UT_SetDeferredRetcode(UT_KEY(CFE_ES_CreateChildTask), 1, -1); UT_SetDeferredRetcode(UT_KEY(CS_CheckRecomputeOneshot), 1, false); - UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, NULL); UT_SetDeferredRetcode(UT_KEY(CS_GetTableResTblEntryByName), 1, true); @@ -378,14 +397,16 @@ void CS_RecomputeBaselineTableCmd_Test_CreateChildTaskError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); UtAssert_True(CS_AppData.HkPacket.Payload.RecomputeInProgress == false, "CS_AppData.HkPacket.Payload.RecomputeInProgress == false"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -395,7 +416,8 @@ void CS_RecomputeBaselineTableCmd_Test_TableNotFound(void) int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Tables recompute baseline failed, table %%s not found"); strncpy(CmdPacket.Payload.Name, "name", 10); @@ -414,11 +436,13 @@ void CS_RecomputeBaselineTableCmd_Test_TableNotFound(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -428,7 +452,8 @@ void CS_RecomputeBaselineTableCmd_Test_RecomputeInProgress(void) int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Tables recompute baseline for table %%s failed: child task in use"); strncpy(CmdPacket.Payload.Name, "name", 10); @@ -449,11 +474,13 @@ void CS_RecomputeBaselineTableCmd_Test_RecomputeInProgress(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -463,7 +490,8 @@ void CS_RecomputeBaselineTableCmd_Test_OneShot(void) int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Tables recompute baseline for table %%s failed: child task in use"); strncpy(CmdPacket.Payload.Name, "name", 10); @@ -484,11 +512,13 @@ void CS_RecomputeBaselineTableCmd_Test_OneShot(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -512,10 +542,12 @@ void CS_DisableNameTableCmd_Test_Nominal(void) DefTablesTblPtr[0].State = 99; /* Needed to make CS_GetTableDefTblEntryByName return correct results */ UT_SetDeferredRetcode(UT_KEY(CS_CheckRecomputeOneshot), 1, false); - UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, NULL); UT_SetDeferredRetcode(UT_KEY(CS_GetTableResTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetTableDefTblEntryByName), CS_APP_CMDS_TEST_CS_GetTableDefTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetTableDefTblEntryByName), + CS_APP_CMDS_TEST_CS_GetTableDefTblEntryByNameHandler1, NULL); UT_SetDeferredRetcode(UT_KEY(CS_GetTableDefTblEntryByName), 1, true); @@ -533,11 +565,12 @@ void CS_DisableNameTableCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -550,7 +583,8 @@ void CS_DisableNameTableCmd_Test_TableDefNotFound(void) snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Checksumming of table %%s is Disabled"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS unable to update tables definition table for entry %%s"); strncpy(ResTablesTblPtr[0].Name, "name", 10); @@ -559,7 +593,8 @@ void CS_DisableNameTableCmd_Test_TableDefNotFound(void) ResTablesTblPtr[0].State = 99; /* Needed to make CS_GetTableResTblEntryByName return correct results */ UT_SetDeferredRetcode(UT_KEY(CS_CheckRecomputeOneshot), 1, false); - UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, NULL); UT_SetDeferredRetcode(UT_KEY(CS_GetTableResTblEntryByName), 1, true); UT_SetDeferredRetcode(UT_KEY(CS_GetTableDefTblEntryByName), 1, false); @@ -587,11 +622,12 @@ void CS_DisableNameTableCmd_Test_TableDefNotFound(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -601,7 +637,8 @@ void CS_DisableNameTableCmd_Test_TableNotFound(void) int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Tables disable table command failed, table %%s not found"); strncpy(CmdPacket.Payload.Name, "name", 10); @@ -621,11 +658,13 @@ void CS_DisableNameTableCmd_Test_TableNotFound(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -639,11 +678,12 @@ void CS_DisableNameTableCmd_Test_OneShot(void) CS_DisableNameTableCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -667,10 +707,12 @@ void CS_EnableNameTableCmd_Test_Nominal(void) DefTablesTblPtr[0].State = 99; /* Needed to make CS_GetTableDefTblEntryByName return correct results */ UT_SetDeferredRetcode(UT_KEY(CS_CheckRecomputeOneshot), 1, false); - UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, NULL); UT_SetDeferredRetcode(UT_KEY(CS_GetTableResTblEntryByName), 1, true); - UT_SetHandlerFunction(UT_KEY(CS_GetTableDefTblEntryByName), CS_APP_CMDS_TEST_CS_GetTableDefTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetTableDefTblEntryByName), + CS_APP_CMDS_TEST_CS_GetTableDefTblEntryByNameHandler1, NULL); UT_SetDeferredRetcode(UT_KEY(CS_GetTableDefTblEntryByName), 1, true); @@ -686,11 +728,12 @@ void CS_EnableNameTableCmd_Test_Nominal(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -703,7 +746,8 @@ void CS_EnableNameTableCmd_Test_TableDefNotFound(void) snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Checksumming of table %%s is Enabled"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "CS unable to update tables definition table for entry %%s"); strncpy(ResTablesTblPtr[0].Name, "name", 10); @@ -712,7 +756,8 @@ void CS_EnableNameTableCmd_Test_TableDefNotFound(void) ResTablesTblPtr[0].State = 99; /* Needed to make CS_GetTableResTblEntryByName return correct results */ UT_SetDeferredRetcode(UT_KEY(CS_CheckRecomputeOneshot), 1, false); - UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, + UT_SetHandlerFunction(UT_KEY(CS_GetTableResTblEntryByName), + CS_APP_CMDS_TEST_CS_GetTableResTblEntryByNameHandler1, NULL); UT_SetDeferredRetcode(UT_KEY(CS_GetTableResTblEntryByName), 1, true); UT_SetDeferredRetcode(UT_KEY(CS_GetTableDefTblEntryByName), 1, false); @@ -738,11 +783,12 @@ void CS_EnableNameTableCmd_Test_TableDefNotFound(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 1, "CS_AppData.HkPacket.Payload.CmdCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 1, "CS_AppData.HkPacket.Payload.CommandCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -752,7 +798,8 @@ void CS_EnableNameTableCmd_Test_TableNotFound(void) int32 strCmpResult; char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Tables enable table command failed, table %%s not found"); strncpy(CmdPacket.Payload.Name, "name", 10); @@ -772,11 +819,13 @@ void CS_EnableNameTableCmd_Test_TableNotFound(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_True(CS_AppData.HkPacket.Payload.CmdErrCounter == 1, "CS_AppData.HkPacket.Payload.CmdErrCounter == 1"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandErrorCounter == 1, + "CS_AppData.HkPacket.Payload.CommandErrorCounter == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -790,11 +839,12 @@ void CS_EnableNameTableCmd_Test_OneShot(void) CS_EnableNameTableCmd(&CmdPacket); /* Verify results */ - UtAssert_True(CS_AppData.HkPacket.Payload.CmdCounter == 0, "CS_AppData.HkPacket.Payload.CmdCounter == 0"); + UtAssert_True(CS_AppData.HkPacket.Payload.CommandCounter == 0, "CS_AppData.HkPacket.Payload.CommandCounter == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -806,39 +856,71 @@ void UtTest_Setup(void) UtTest_Add(CS_EnableTablesCmd_Test, CS_Test_Setup, CS_Test_TearDown, "CS_EnableTablesCmd_Test"); UtTest_Add(CS_EnableTablesCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, "CS_EnableTablesCmd_Test_OneShot"); - UtTest_Add(CS_ReportBaselineTableCmd_Test_Computed, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineTableCmd_Test_Computed, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineTableCmd_Test_Computed"); - UtTest_Add(CS_ReportBaselineTableCmd_Test_NotYetComputed, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineTableCmd_Test_NotYetComputed, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineTableCmd_Test_NotYetComputed"); - UtTest_Add(CS_ReportBaselineTableCmd_Test_TableNotFound, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_ReportBaselineTableCmd_Test_TableNotFound, + CS_Test_Setup, + CS_Test_TearDown, "CS_ReportBaselineTableCmd_Test_TableNotFound"); - UtTest_Add(CS_RecomputeBaselineTableCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineTableCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineTableCmd_Test_Nominal"); - UtTest_Add(CS_RecomputeBaselineTableCmd_Test_CreateChildTaskError, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineTableCmd_Test_CreateChildTaskError, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineTableCmd_Test_CreateChildTaskError"); - UtTest_Add(CS_RecomputeBaselineTableCmd_Test_TableNotFound, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineTableCmd_Test_TableNotFound, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineTableCmd_Test_TableNotFound"); - UtTest_Add(CS_RecomputeBaselineTableCmd_Test_RecomputeInProgress, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineTableCmd_Test_RecomputeInProgress, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineTableCmd_Test_RecomputeInProgress"); - UtTest_Add(CS_RecomputeBaselineTableCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_RecomputeBaselineTableCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_RecomputeBaselineTableCmd_Test_OneShot"); - UtTest_Add(CS_DisableNameTableCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableNameTableCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableNameTableCmd_Test_Nominal"); - UtTest_Add(CS_DisableNameTableCmd_Test_TableDefNotFound, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableNameTableCmd_Test_TableDefNotFound, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableNameTableCmd_Test_TableDefNotFound"); - UtTest_Add(CS_DisableNameTableCmd_Test_TableNotFound, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableNameTableCmd_Test_TableNotFound, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableNameTableCmd_Test_TableNotFound"); - UtTest_Add(CS_DisableNameTableCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_DisableNameTableCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_DisableNameTableCmd_Test_OneShot"); - UtTest_Add(CS_EnableNameTableCmd_Test_Nominal, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableNameTableCmd_Test_Nominal, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableNameTableCmd_Test_Nominal"); - UtTest_Add(CS_EnableNameTableCmd_Test_TableDefNotFound, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableNameTableCmd_Test_TableDefNotFound, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableNameTableCmd_Test_TableDefNotFound"); - UtTest_Add(CS_EnableNameTableCmd_Test_TableNotFound, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableNameTableCmd_Test_TableNotFound, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableNameTableCmd_Test_TableNotFound"); - UtTest_Add(CS_EnableNameTableCmd_Test_OneShot, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(CS_EnableNameTableCmd_Test_OneShot, + CS_Test_Setup, + CS_Test_TearDown, "CS_EnableNameTableCmd_Test_OneShot"); } diff --git a/unit-test/cs_table_processing_tests.c b/unit-test/cs_table_processing_tests.c index dd95f92..837ee4b 100644 --- a/unit-test/cs_table_processing_tests.c +++ b/unit-test/cs_table_processing_tests.c @@ -43,7 +43,8 @@ uint8 call_count_CFE_EVS_SendEvent; * Function Definitions */ -void CS_TABLE_PROCESSING_TEST_CFE_ES_GetAppNameHandler1(void *UserObj, UT_EntryKey_t FuncKey, +void CS_TABLE_PROCESSING_TEST_CFE_ES_GetAppNameHandler1(void *UserObj, + UT_EntryKey_t FuncKey, const UT_StubContext_t *Context) { char *AppName = (char *)UT_Hook_GetArgValueByName(Context, "AppName", char *); @@ -51,13 +52,17 @@ void CS_TABLE_PROCESSING_TEST_CFE_ES_GetAppNameHandler1(void *UserObj, UT_EntryK strncpy((char *)AppName, "CS", 3); } -CFE_Status_t CS_TABLE_PROCESSING_TEST_CFE_TBL_GetAddressHook(void *UserObj, int32 StubRetcode, uint32 CallCount, +CFE_Status_t CS_TABLE_PROCESSING_TEST_CFE_TBL_GetAddressHook(void *UserObj, + int32 StubRetcode, + uint32 CallCount, const UT_StubContext_t *Context) { return CFE_SUCCESS; } -CFE_Status_t CS_TABLE_PROCESSING_TEST_CFE_TBL_LoadHook(void *UserObj, int32 StubRetcode, uint32 CallCount, +CFE_Status_t CS_TABLE_PROCESSING_TEST_CFE_TBL_LoadHook(void *UserObj, + int32 StubRetcode, + uint32 CallCount, const UT_StubContext_t *Context) { return CFE_SUCCESS; @@ -309,7 +314,7 @@ void Test_CS_ProcessNewTablesDefinitionTable(void) * void CS_ProcessNewTablesDefinitionTable(CS_TableWrapper_t *tw); */ - CS_TableWrapper_t * tw; + CS_TableWrapper_t *tw; CS_Res_Tables_Table_Entry_t *ResultsEntry; /* path where all entries are empty */ @@ -555,7 +560,7 @@ void Test_CS_HandleTableUpdate(void) * CFE_Status_t CS_HandleTableUpdate(CS_TableWrapper_t *tw); */ CS_Res_Tables_Table_Entry_t *ResultsEntry; - CS_TableWrapper_t * tw; + CS_TableWrapper_t *tw; tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; @@ -645,19 +650,33 @@ void Test_CS_CallTableUpdateHandler(void) void UtTest_Setup(void) { - UtTest_Add(Test_CS_ValidateEepromChecksumDefinitionTable, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(Test_CS_ValidateEepromChecksumDefinitionTable, + CS_Test_Setup, + CS_Test_TearDown, "CS_ValidateEepromChecksumDefinitionTable"); - UtTest_Add(Test_CS_ValidateMemoryChecksumDefinitionTable, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(Test_CS_ValidateMemoryChecksumDefinitionTable, + CS_Test_Setup, + CS_Test_TearDown, "CS_ValidateMemoryChecksumDefinitionTable"); - UtTest_Add(Test_CS_ValidateTablesChecksumDefinitionTable, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(Test_CS_ValidateTablesChecksumDefinitionTable, + CS_Test_Setup, + CS_Test_TearDown, "CS_ValidateTablesChecksumDefinitionTable"); - UtTest_Add(Test_CS_ValidateAppChecksumDefinitionTable, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(Test_CS_ValidateAppChecksumDefinitionTable, + CS_Test_Setup, + CS_Test_TearDown, "CS_ValidateAppChecksumDefinitionTable"); - UtTest_Add(Test_CS_ProcessNewEepromMemoryDefinitionTable, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(Test_CS_ProcessNewEepromMemoryDefinitionTable, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessNewEepromMemoryDefinitionTable"); - UtTest_Add(Test_CS_ProcessNewTablesDefinitionTable, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(Test_CS_ProcessNewTablesDefinitionTable, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessNewTablesDefinitionTable"); - UtTest_Add(Test_CS_ProcessNewAppDefinitionTable, CS_Test_Setup, CS_Test_TearDown, + UtTest_Add(Test_CS_ProcessNewAppDefinitionTable, + CS_Test_Setup, + CS_Test_TearDown, "CS_ProcessNewAppDefinitionTable"); UtTest_Add(Test_CS_TableInit, CS_Test_Setup, CS_Test_TearDown, "CS_TableInit"); UtTest_Add(Test_CS_HandleTableUpdate, CS_Test_Setup, CS_Test_TearDown, "CS_HandleTableUpdate"); diff --git a/unit-test/cs_utils_tests.c b/unit-test/cs_utils_tests.c index 075c4c3..3d4a5b1 100644 --- a/unit-test/cs_utils_tests.c +++ b/unit-test/cs_utils_tests.c @@ -113,7 +113,7 @@ void CS_GoToNextTable_Test(void) void CS_GetTableResTblEntryByName_Test(void) { CS_Res_Tables_Table_Entry_t *EntryPtr = NULL; - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; CS_Res_Tables_Table_Entry_t *ResTablesTblPtr = tw->ResAddr; /* Empty name, enabled state */ @@ -144,7 +144,7 @@ void CS_GetTableResTblEntryByName_Test(void) void CS_GetTableDefTblEntryByName_Test(void) { CS_Def_Tables_Table_Entry_t *EntryPtr = NULL; - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; CS_Def_Tables_Table_Entry_t *DefTablesTblPtr = tw->DefAddr; /* Empty name, enabled state */ @@ -175,7 +175,7 @@ void CS_GetTableDefTblEntryByName_Test(void) void CS_GetAppResTblEntryByName_Test(void) { CS_Res_App_Table_Entry_t *EntryPtr = NULL; - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; CS_Res_App_Table_Entry_t *ResAppTblPtr = tw->ResAddr; /* Empty name, enabled state */ @@ -206,7 +206,7 @@ void CS_GetAppResTblEntryByName_Test(void) void CS_GetAppDefTblEntryByName_Test(void) { CS_Def_App_Table_Entry_t *EntryPtr = NULL; - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; CS_Def_App_Table_Entry_t *DefAppTblPtr = tw->DefAddr; /* Empty name, enabled state */ @@ -236,7 +236,7 @@ void CS_GetAppDefTblEntryByName_Test(void) void CS_FindEnabledEepromEntry_Test(void) { - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE]; CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = tw->ResAddr; /* Call with zeros */ @@ -256,7 +256,7 @@ void CS_FindEnabledEepromEntry_Test(void) void CS_FindEnabledMemoryEntry_Test(void) { - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = tw->ResAddr; /* Call with zeros */ @@ -276,7 +276,7 @@ void CS_FindEnabledMemoryEntry_Test(void) void CS_FindEnabledTablesEntry_Test(void) { - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; CS_Res_Tables_Table_Entry_t *ResTablesTblPtr = tw->ResAddr; /* Call with zeros */ @@ -296,7 +296,7 @@ void CS_FindEnabledTablesEntry_Test(void) void CS_FindEnabledAppEntry_Test(void) { - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; CS_Res_App_Table_Entry_t *ResAppTblPtr = tw->ResAddr; /* Call with zeros */ @@ -388,7 +388,7 @@ void CS_BackgroundOS_Test(void) void CS_BackgroundEeprom_Test(void) { - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_EEPROM_TABLE]; CS_Res_EepromMemory_Table_Entry_t *ResEepromTblPtr = tw->ResAddr; /* Entirely disabled */ @@ -431,7 +431,7 @@ void CS_BackgroundEeprom_Test(void) void CS_BackgroundMemory_Test(void) { - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; CS_Res_EepromMemory_Table_Entry_t *ResMemoryTblPtr = tw->ResAddr; /* Entirely disabled */ @@ -469,7 +469,7 @@ void CS_BackgroundMemory_Test(void) void CS_BackgroundTables_Test(void) { - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_TABLES_TABLE]; CS_Res_Tables_Table_Entry_t *ResTablesTblPtr = tw->ResAddr; /* Entirely disabled */ @@ -516,7 +516,7 @@ void CS_BackgroundTables_Test(void) void CS_BackgroundApp_Test(void) { - CS_TableWrapper_t * tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; + CS_TableWrapper_t *tw = &CS_AppData.Tbl[CS_ChecksumType_APP_TABLE]; CS_Res_App_Table_Entry_t *ResAppTblPtr = tw->ResAddr; /* Entirely disabled */ @@ -580,8 +580,11 @@ void CS_ResetTablesTblResultEntry_Test(void) void CS_HandleRoutineTableUpdates_Test(void) { - uint16 ChildTaskTable[] = {CS_ChecksumType_CFECORE, CS_ChecksumType_EEPROM_TABLE, CS_ChecksumType_MEMORY_TABLE, - CS_ChecksumType_APP_TABLE, CS_ChecksumType_TABLES_TABLE}; + uint16 ChildTaskTable[] = { CS_ChecksumType_CFECORE, + CS_ChecksumType_EEPROM_TABLE, + CS_ChecksumType_MEMORY_TABLE, + CS_ChecksumType_APP_TABLE, + CS_ChecksumType_TABLES_TABLE }; uint16 TblMax = sizeof(ChildTaskTable) / sizeof(ChildTaskTable[0]); uint16 i; @@ -677,14 +680,14 @@ void CS_CheckRecomputeOneShot_Test(void) UtAssert_BOOL_FALSE(CS_CheckRecomputeOneshot()); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); - UtAssert_UINT8_EQ(CS_AppData.HkPacket.Payload.CmdErrCounter, 0); + UtAssert_UINT8_EQ(CS_AppData.HkPacket.Payload.CommandErrorCounter, 0); /* One shot in progress */ CS_AppData.HkPacket.Payload.OneShotInProgress = true; UtAssert_BOOL_TRUE(CS_CheckRecomputeOneshot()); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, CS_CMD_COMPUTE_PROG_ERR_EID); - UtAssert_UINT8_EQ(CS_AppData.HkPacket.Payload.CmdErrCounter, 1); + UtAssert_UINT8_EQ(CS_AppData.HkPacket.Payload.CommandErrorCounter, 1); /* Recompute in progress */ CS_AppData.HkPacket.Payload.RecomputeInProgress = true; @@ -692,7 +695,7 @@ void CS_CheckRecomputeOneShot_Test(void) UtAssert_BOOL_TRUE(CS_CheckRecomputeOneshot()); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, CS_CMD_COMPUTE_PROG_ERR_EID); - UtAssert_UINT8_EQ(CS_AppData.HkPacket.Payload.CmdErrCounter, 2); + UtAssert_UINT8_EQ(CS_AppData.HkPacket.Payload.CommandErrorCounter, 2); } void CS_GetTableTypeAsString_Test(void) @@ -711,7 +714,7 @@ void Test_CS_SetDefEntryState(void) /* Test case for: * uint16 CS_SetDefEntryState(CS_TableWrapper_t *tw, void *EntryPtr, uint16 NewState); */ - CS_TableWrapper_t * tw; + CS_TableWrapper_t *tw; CS_Def_EepromMemory_Table_Entry_t *DefEntry; tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; @@ -784,7 +787,7 @@ void Test_CS_GetDefEntryAddr(void) * void *CS_GetDefEntryAddr(CS_TableWrapper_t *tw, uint16 EntryIdx); */ - CS_TableWrapper_t * tw; + CS_TableWrapper_t *tw; CS_Def_EepromMemory_Table_Entry_t *DefEntry; tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; @@ -804,7 +807,7 @@ void Test_CS_GetResEntryAddr(void) * void *CS_GetResEntryAddr(CS_TableWrapper_t *tw, uint16 EntryIdx); */ - CS_TableWrapper_t * tw; + CS_TableWrapper_t *tw; CS_Res_EepromMemory_Table_Entry_t *ResEntry; tw = &CS_AppData.Tbl[CS_ChecksumType_MEMORY_TABLE]; diff --git a/unit-test/stubs/cs_app_stubs.c b/unit-test/stubs/cs_app_stubs.c index d4be065..a3074ba 100644 --- a/unit-test/stubs/cs_app_stubs.c +++ b/unit-test/stubs/cs_app_stubs.c @@ -46,7 +46,6 @@ CFE_Status_t CS_AppInit(void) */ void CS_AppMain(void) { - UT_GenStub_Execute(CS_AppMain, Basic, NULL); } @@ -71,6 +70,5 @@ CFE_Status_t CS_CreateRestoreStatesFromCDS(void) */ void CS_UpdateCDS(void) { - UT_GenStub_Execute(CS_UpdateCDS, Basic, NULL); } diff --git a/unit-test/stubs/cs_cmds_stubs.c b/unit-test/stubs/cs_cmds_stubs.c index 26ff0b9..782443a 100644 --- a/unit-test/stubs/cs_cmds_stubs.c +++ b/unit-test/stubs/cs_cmds_stubs.c @@ -251,18 +251,18 @@ CFE_Status_t CS_ReportBaselineOSCmd(const CS_ReportBaselineOSCmd_t *CmdPtr) /* * ---------------------------------------------------- - * Generated stub function for CS_ResetCmd() + * Generated stub function for CS_ResetCountersCmd() * ---------------------------------------------------- */ -CFE_Status_t CS_ResetCmd(const CS_ResetCmd_t *CmdPtr) +CFE_Status_t CS_ResetCountersCmd(const CS_ResetCountersCmd_t *CmdPtr) { - UT_GenStub_SetupReturnBuffer(CS_ResetCmd, CFE_Status_t); + UT_GenStub_SetupReturnBuffer(CS_ResetCountersCmd, CFE_Status_t); - UT_GenStub_AddParam(CS_ResetCmd, const CS_ResetCmd_t *, CmdPtr); + UT_GenStub_AddParam(CS_ResetCountersCmd, const CS_ResetCountersCmd_t *, CmdPtr); - UT_GenStub_Execute(CS_ResetCmd, Basic, NULL); + UT_GenStub_Execute(CS_ResetCountersCmd, Basic, NULL); - return UT_GenStub_GetReturnValue(CS_ResetCmd, CFE_Status_t); + return UT_GenStub_GetReturnValue(CS_ResetCountersCmd, CFE_Status_t); } /* diff --git a/unit-test/stubs/cs_compute_stubs.c b/unit-test/stubs/cs_compute_stubs.c index 24a1cc8..10e69a2 100644 --- a/unit-test/stubs/cs_compute_stubs.c +++ b/unit-test/stubs/cs_compute_stubs.c @@ -48,8 +48,8 @@ CFE_Status_t CS_ComputeApp(CS_Res_App_Table_Entry_t *ResultsEntry, uint32 *Compu * Generated stub function for CS_ComputeEepromMemory() * ---------------------------------------------------- */ -CFE_Status_t CS_ComputeEepromMemory(CS_Res_EepromMemory_Table_Entry_t *ResultsEntry, uint32 *ComputedCSValue, - bool *DoneWithEntry) +CFE_Status_t +CS_ComputeEepromMemory(CS_Res_EepromMemory_Table_Entry_t *ResultsEntry, uint32 *ComputedCSValue, bool *DoneWithEntry) { UT_GenStub_SetupReturnBuffer(CS_ComputeEepromMemory, CFE_Status_t); @@ -87,7 +87,6 @@ CFE_Status_t CS_ComputeTables(CS_Res_Tables_Table_Entry_t *ResultsEntry, uint32 */ void CS_OneShotChildTask(void) { - UT_GenStub_Execute(CS_OneShotChildTask, Basic, NULL); } @@ -98,7 +97,6 @@ void CS_OneShotChildTask(void) */ void CS_RecomputeAppChildTask(void) { - UT_GenStub_Execute(CS_RecomputeAppChildTask, Basic, NULL); } @@ -109,7 +107,6 @@ void CS_RecomputeAppChildTask(void) */ void CS_RecomputeEepromMemoryChildTask(void) { - UT_GenStub_Execute(CS_RecomputeEepromMemoryChildTask, Basic, NULL); } @@ -120,6 +117,5 @@ void CS_RecomputeEepromMemoryChildTask(void) */ void CS_RecomputeTablesChildTask(void) { - UT_GenStub_Execute(CS_RecomputeTablesChildTask, Basic, NULL); } diff --git a/unit-test/stubs/cs_init_stubs.c b/unit-test/stubs/cs_init_stubs.c index 8658924..4cf4756 100644 --- a/unit-test/stubs/cs_init_stubs.c +++ b/unit-test/stubs/cs_init_stubs.c @@ -46,7 +46,6 @@ CFE_Status_t CS_InitAllTables(void) */ void CS_InitSegments(void) { - UT_GenStub_Execute(CS_InitSegments, Basic, NULL); } diff --git a/unit-test/stubs/cs_table_processing_stubs.c b/unit-test/stubs/cs_table_processing_stubs.c index f9c828d..8474615 100644 --- a/unit-test/stubs/cs_table_processing_stubs.c +++ b/unit-test/stubs/cs_table_processing_stubs.c @@ -94,8 +94,8 @@ void CS_ProcessNewTablesDefinitionTable(CS_TableWrapper_t *tw) * Generated stub function for CS_TableInit() * ---------------------------------------------------- */ -CFE_Status_t CS_TableInit(CS_TableWrapper_t *tw, const char *DefinitionTableFileName, - CFE_TBL_CallbackFuncPtr_t CallBackFunction) +CFE_Status_t +CS_TableInit(CS_TableWrapper_t *tw, const char *DefinitionTableFileName, CFE_TBL_CallbackFuncPtr_t CallBackFunction) { UT_GenStub_SetupReturnBuffer(CS_TableInit, CFE_Status_t); diff --git a/unit-test/stubs/cs_utils_stubs.c b/unit-test/stubs/cs_utils_stubs.c index 5ab708b..2a0910f 100644 --- a/unit-test/stubs/cs_utils_stubs.c +++ b/unit-test/stubs/cs_utils_stubs.c @@ -338,7 +338,6 @@ const char *CS_GetTableTypeAsString(const CS_TableWrapper_t *Tbl) */ void CS_GoToNextTable(void) { - UT_GenStub_Execute(CS_GoToNextTable, Basic, NULL); } @@ -363,7 +362,6 @@ CFE_Status_t CS_HandleRoutineTableUpdates(void) */ void CS_InitializeDefaultTables(void) { - UT_GenStub_Execute(CS_InitializeDefaultTables, Basic, NULL); } @@ -404,7 +402,6 @@ CS_ChecksumState_Enum_t CS_SetDefEntryState(CS_TableWrapper_t *tw, void *EntryPt */ void CS_ZeroAppTempValues(void) { - UT_GenStub_Execute(CS_ZeroAppTempValues, Basic, NULL); } @@ -415,7 +412,6 @@ void CS_ZeroAppTempValues(void) */ void CS_ZeroCfeCoreTempValues(void) { - UT_GenStub_Execute(CS_ZeroCfeCoreTempValues, Basic, NULL); } @@ -426,7 +422,6 @@ void CS_ZeroCfeCoreTempValues(void) */ void CS_ZeroEepromTempValues(void) { - UT_GenStub_Execute(CS_ZeroEepromTempValues, Basic, NULL); } @@ -437,7 +432,6 @@ void CS_ZeroEepromTempValues(void) */ void CS_ZeroMemoryTempValues(void) { - UT_GenStub_Execute(CS_ZeroMemoryTempValues, Basic, NULL); } @@ -448,7 +442,6 @@ void CS_ZeroMemoryTempValues(void) */ void CS_ZeroOSTempValues(void) { - UT_GenStub_Execute(CS_ZeroOSTempValues, Basic, NULL); } @@ -459,6 +452,5 @@ void CS_ZeroOSTempValues(void) */ void CS_ZeroTablesTempValues(void) { - UT_GenStub_Execute(CS_ZeroTablesTempValues, Basic, NULL); } diff --git a/unit-test/utilities/cs_test_utils.c b/unit-test/utilities/cs_test_utils.c index 86eddbb..ccb3ada 100644 --- a/unit-test/utilities/cs_test_utils.c +++ b/unit-test/utilities/cs_test_utils.c @@ -44,7 +44,7 @@ CFE_ES_WriteToSysLog_context_t context_CFE_ES_WriteToSysLog; struct CS_SetDefEntryState_Context { - void * EntryPtr; + void *EntryPtr; CS_ChecksumState_Enum_t NewState; CS_ChecksumState_Enum_t OldState; }; @@ -61,7 +61,8 @@ void UT_Handler_CFE_EVS_SendEvent(void *UserObj, UT_EntryKey_t FuncKey, const UT if (CallCount > (sizeof(context_CFE_EVS_SendEvent) / sizeof(context_CFE_EVS_SendEvent[0]))) { UtAssert_Failed("CFE_EVS_SendEvent UT depth %u exceeded: %u, increase UT_MAX_SENDEVENT_DEPTH", - UT_MAX_SENDEVENT_DEPTH, CallCount); + UT_MAX_SENDEVENT_DEPTH, + CallCount); } else { @@ -69,7 +70,8 @@ void UT_Handler_CFE_EVS_SendEvent(void *UserObj, UT_EntryKey_t FuncKey, const UT context_CFE_EVS_SendEvent[idx].EventID = UT_Hook_GetArgValueByName(Context, "EventID", uint16); context_CFE_EVS_SendEvent[idx].EventType = UT_Hook_GetArgValueByName(Context, "EventType", uint16); - strncpy(context_CFE_EVS_SendEvent[idx].Spec, UT_Hook_GetArgValueByName(Context, "Spec", const char *), + strncpy(context_CFE_EVS_SendEvent[idx].Spec, + UT_Hook_GetArgValueByName(Context, "Spec", const char *), CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); context_CFE_EVS_SendEvent[idx].Spec[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH - 1] = '\0'; } @@ -77,7 +79,8 @@ void UT_Handler_CFE_EVS_SendEvent(void *UserObj, UT_EntryKey_t FuncKey, const UT void UT_Handler_CFE_ES_WriteToSysLog(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context, va_list va) { - strncpy(context_CFE_ES_WriteToSysLog.Spec, UT_Hook_GetArgValueByName(Context, "SpecStringPtr", const char *), + strncpy(context_CFE_ES_WriteToSysLog.Spec, + UT_Hook_GetArgValueByName(Context, "SpecStringPtr", const char *), CFE_MISSION_EVS_MAX_MESSAGE_LENGTH - 1); context_CFE_ES_WriteToSysLog.Spec[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH - 1] = '\0'; } @@ -86,7 +89,7 @@ void UT_Handler_CS_TableEntry(void *UserObj, UT_EntryKey_t FuncKey, const UT_Stu { CS_TableWrapper_t *tw = UT_Hook_GetArgValueByName(Context, "tw", CS_TableWrapper_t *); uint16 EntryIdx = UT_Hook_GetArgValueByName(Context, "EntryIdx", uint16); - uint8 * Base; + uint8 *Base; int32 Status; Base = NULL; @@ -96,12 +99,12 @@ void UT_Handler_CS_TableEntry(void *UserObj, UT_EntryKey_t FuncKey, const UT_Stu { if (FuncKey == UT_KEY(CS_GetDefEntryAddr)) { - Base = tw->DefAddr; + Base = tw->DefAddr; Base += (tw->DefEntrySize * EntryIdx); } else if (FuncKey == UT_KEY(CS_GetResEntryAddr)) { - Base = tw->ResAddr; + Base = tw->ResAddr; Base += (tw->ResEntrySize * EntryIdx); } }