[nasa/nos3#176] Unit Tests #2

jlucas9 · 2024-07-31T18:50:05Z

No description provided.

Fix nasa#116, Removed command header from payload struct

Fix nasa#111: Use correct length filename for too large test

Any nonzero value will work

Fix nasa#119, remove dependency on MID_BASE defines

Fix nasa#121, correct casting on printf format strings

Fix nasa#115, Adds distinct identifiers from command name

Fix nasa#125, Adds utassert macro for logging function calls

…ional logic

Fix nasa#95, Replaces conditionally compiled code with runtime conditional logic

… snprintf This commit addresses issues flagged during static analysis by: - Adding JSC 2.1 disposition comments. - Replacing strncpy with snprintf to enhance safety and compliance. - Changes DS_TABLE_VERIFY_ERR from 0xFFFFFFFF to -1

Fix nasa#127, Adds static analysis comments and replace strncpy with snprintf

…ion;

fsw/src/ds_cmds.c

@@ -1145,7 +1145,7 @@
        CFE_EVS_SendEvent(DS_ADD_MID_CMD_ERR_EID, CFE_EVS_EventType_ERROR,
                          "Invalid ADD MID command: filter table is not loaded");
    }
-    else if ((FilterTableIndex = DS_TableFindMsgID(DS_AddMidCmd->MessageID)) != DS_INDEX_NONE)
+    else if ((FilterTableIndex = DS_TableFindMsgID(PayloadPtr->MessageID)) != DS_INDEX_NONE)


fsw/src/ds_file.c

@@ -53,15 +53,15 @@
 /* Apply common filter algorithm to Software Bus packet            */
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-bool DS_IsPacketFiltered(CFE_MSG_Message_t *MessagePtr, uint16 FilterType, uint16 Algorithm_N, uint16 Algorithm_X,
+int32 DS_IsPacketFiltered(CFE_MSG_Message_t *MessagePtr, uint16 FilterType, uint16 Algorithm_N, uint16 Algorithm_X,


fsw/src/ds_dispatch.c

@@ -77,7 +77,7 @@

 #include <stdio.h>

-bool DS_VerifyLength(const CFE_SB_Buffer_t *BufPtr, size_t ExpectedLength, uint16 FailEventID, const char *CommandName)
+int32 DS_VerifyLength(const CFE_SB_Buffer_t *BufPtr, size_t ExpectedLength, uint16 FailEventID, const char *CommandName)


fsw/src/ds_table.c

@@ -681,9 +682,9 @@
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

-bool DS_TableVerifyParms(uint16 Algorithm_N, uint16 Algorithm_X, uint16 Algorithm_O)
+int32 DS_TableVerifyParms(uint16 Algorithm_N, uint16 Algorithm_X, uint16 Algorithm_O)


fsw/src/ds_table.c

@@ -639,10 +640,10 @@
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

-bool DS_TableEntryUnused(const void *TableEntry, int32 BufferSize)
+int32 DS_TableEntryUnused(const void *TableEntry, int32 BufferSize)


fsw/src/ds_table.c

@@ -562,11 +563,11 @@
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

-bool DS_TableVerifyFilterEntry(DS_PacketEntry_t *PacketEntry, int32 TableIndex, int32 ErrorCount)
+int32 DS_TableVerifyFilterEntry(DS_PacketEntry_t *PacketEntry, int32 TableIndex, int32 ErrorCount)


fsw/src/ds_table.c

@@ -440,10 +441,10 @@
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

-bool DS_TableVerifyDestFileEntry(DS_DestFileEntry_t *DestFileEntry, uint8 TableIndex, int32 ErrorCount)
+int32 DS_TableVerifyDestFileEntry(DS_DestFileEntry_t *DestFileEntry, uint8 TableIndex, int32 ErrorCount)


fsw/src/ds_file.c

@@ -53,15 +53,15 @@
 /* Apply common filter algorithm to Software Bus packet            */
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-bool DS_IsPacketFiltered(CFE_MSG_Message_t *MessagePtr, uint16 FilterType, uint16 Algorithm_N, uint16 Algorithm_X,
+int32 DS_IsPacketFiltered(CFE_MSG_Message_t *MessagePtr, uint16 FilterType, uint16 Algorithm_N, uint16 Algorithm_X,


fsw/src/ds_table.c

@@ -562,11 +563,11 @@
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

-bool DS_TableVerifyFilterEntry(DS_PacketEntry_t *PacketEntry, int32 TableIndex, int32 ErrorCount)
+int32 DS_TableVerifyFilterEntry(DS_PacketEntry_t *PacketEntry, int32 TableIndex, int32 ErrorCount)


fsw/src/ds_table.c

@@ -440,10 +441,10 @@
 /*                                                                 */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

-bool DS_TableVerifyDestFileEntry(DS_DestFileEntry_t *DestFileEntry, uint8 TableIndex, int32 ErrorCount)
+int32 DS_TableVerifyDestFileEntry(DS_DestFileEntry_t *DestFileEntry, uint8 TableIndex, int32 ErrorCount)


havencarlson and others added 18 commits September 20, 2023 11:06

Fix nasa#116, Removed command header from payload struct

5cb25f5

Merge pull request nasa#118 from havencarlson/fix#116

7b20419

Fix nasa#116, Removed command header from payload struct

Fix nasa#111: Use correct length filename for too large test

f600acd

Merge pull request nasa#112 from irowebbn/111-max_file-len-move-test

f04f6a0

Fix nasa#111: Use correct length filename for too large test

Fix nasa#119, remove dependency on MID_BASE defines

dc14784

Any nonzero value will work

Merge pull request nasa#120 from jphickey/fix-119-midbase

77b016d

Fix nasa#119, remove dependency on MID_BASE defines

Fix nasa#121, correct casting on printf format strings

9f6138a

Merge pull request nasa#122 from jphickey/fix-121-formats

b540e3b

Fix nasa#121, correct casting on printf format strings

Fix nasa#115, Adds distinct identifiers from command name

f2b9d11

Merge pull request nasa#123 from chillfig/nondistinct_id

fe2ea87

Fix nasa#115, Adds distinct identifiers from command name

Fix nasa#125, Adds utassert macro for logging function calls

20236a4

Merge pull request nasa#126 from chillfig/function_macros

ce8902c

Fix nasa#125, Adds utassert macro for logging function calls

Fix nasa#95, Replaces conditionally compiled code with runtime condit…

3f41af7

…ional logic

Merge pull request nasa#124 from chillfig/cond_comp_code

ec96b02

Fix nasa#95, Replaces conditionally compiled code with runtime conditional logic

Merge pull request nasa#130 from chillfig/SA_jsc2_1

c83933f

Fix nasa#127, Adds static analysis comments and replace strncpy with snprintf

Merge remote-tracking branch 'origin/main' into nos3#176-unit-tests

659e972

[nasa/nos3#176] Change from bools to int32 across the entire applicat…

1427a22

…ion;

jlucas9 self-assigned this Jul 31, 2024

github-advanced-security bot found potential problems Jul 31, 2024

View reviewed changes

jlucas9 mentioned this pull request Jul 31, 2024

[nasa/nos3#176] Basic unit tests nasa/nos3#347

Merged

jlucas9 merged commit d17e750 into nos3-dev Aug 6, 2024
29 of 30 checks passed

jlucas9 deleted the nos3#176-unit-tests branch August 6, 2024 21:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[nasa/nos3#176] Unit Tests #2

[nasa/nos3#176] Unit Tests #2

jlucas9 commented Jul 31, 2024

[nasa/nos3#176] Unit Tests #2

[nasa/nos3#176] Unit Tests #2

Conversation

jlucas9 commented Jul 31, 2024