Skip to content

Commit

Permalink
Fix nasa#2620, Correct cfe_testcase typos + minor bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
thnkslprpt committed Dec 17, 2024
1 parent 2f0e1a2 commit 06d64f9
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion modules/cfe_assert/src/cfe_assert_runner.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ bool CFE_Assert_Status_DeferredCheck(CFE_Status_t Status, UtAssert_CaseType_t Ca
}
else
{
/* if condition was false add an exta marker so user does not necessarily need to decode the string */
/* if condition was false, add an extra marker so user does not necessarily need to decode the string */
ExtraTag = " [false]";
}

Expand Down
2 changes: 1 addition & 1 deletion modules/cfe_testcase/src/cfe_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void CFE_TestMain(void)
* Register test cases in UtAssert
*/
ESApplicationControlTestSetup();
ESBehaviorestSetup();
ESBehaviorTestSetup();
ESCDSTestSetup();
ESCounterTestSetup();
ESErrorTestSetup();
Expand Down
2 changes: 1 addition & 1 deletion modules/cfe_testcase/src/cfe_test.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void TimeInRange(CFE_TIME_SysTime_t Start, CFE_TIME_SysTime_t Time, CFE_TIME_Sys

void CFE_TestMain(void);
void ESApplicationControlTestSetup(void);
void ESBehaviorestSetup(void);
void ESBehaviorTestSetup(void);
void ESCDSTestSetup(void);
void ESCounterTestSetup(void);
void ESErrorTestSetup(void);
Expand Down
2 changes: 1 addition & 1 deletion modules/cfe_testcase/src/es_behavior_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void TestWaitBehavior(void)
UtAssert_UINT32_EQ(CFE_TIME_Compare(TimePassed, TimeExpected), CFE_TIME_A_LT_B);
}

void ESBehaviorestSetup(void)
void ESBehaviorTestSetup(void)
{
UtTest_Add(TestRunCounter, NULL, NULL, "Test Run Counter");
UtTest_Add(TestWaitBehavior, NULL, NULL, "Test Wait Behavior");
Expand Down
2 changes: 1 addition & 1 deletion modules/cfe_testcase/src/es_mempool_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ void TestMemPoolPutBuf(void)

void TestMemPoolDelete(void)
{
CFE_ES_MemHandle_t PoolID = CFE_ES_MEMHANDLE_UNDEFINED; /* Poo1 1 handle, no mutex */
CFE_ES_MemHandle_t PoolID = CFE_ES_MEMHANDLE_UNDEFINED; /* Pool 1 handle, no mutex */
uint8 Buffer[1024];
CFE_ES_MemPoolStats_t Stats;

Expand Down
2 changes: 1 addition & 1 deletion modules/cfe_testcase/src/es_misc_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void TestCalculateCRC(void)
UtAssert_UINT32_EQ(CFE_ES_CalculateCRC(CRC_OTHER_INPUT, sizeof(CRC_OTHER_INPUT) - 1, 0, CFE_ES_CrcType_16_ARC),
0x11E3);

/* Test of nonzero initial value, this is used for checking CRC in across non-contiguous chunks or across multiple
/* Test of nonzero initial value, this is used for checking CRC across non-contiguous chunks or across multiple
* cycles */
UtAssert_UINT32_EQ(CFE_ES_CalculateCRC(CRC_CHECK_INPUT, sizeof(CRC_CHECK_INPUT) - 1, 345353, CFE_ES_CrcType_16_ARC),
0xE493);
Expand Down
2 changes: 1 addition & 1 deletion modules/cfe_testcase/src/sb_pipe_mang_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ void TestPipeOptions(void)

UtAssert_INT32_EQ(CFE_SB_SetPipeOpts(PipeId, Opts), CFE_SUCCESS);
UtAssert_INT32_EQ(CFE_SB_GetPipeOpts(PipeId, &OptsBuff), CFE_SUCCESS);
UtAssert_UINT32_EQ(Opts, OptsBuff);
UtAssert_UINT8_EQ(Opts, OptsBuff);

UtAssert_INT32_EQ(CFE_SB_SetPipeOpts(CFE_SB_INVALID_PIPE, Opts), CFE_SB_BAD_ARGUMENT);

Expand Down
2 changes: 1 addition & 1 deletion modules/cfe_testcase/src/tbl_content_access_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void TestGetAddress(void)

void TestReleaseAddress(void)
{
UtPrintf("Testing: CFE_TBL_GetAddress");
UtPrintf("Testing: CFE_TBL_ReleaseAddress");
void * TblPtr;
CFE_TEST_TestTable_t TestTable = {1, 2};
/* Never loaded */
Expand Down
2 changes: 1 addition & 1 deletion modules/cfe_testcase/src/tbl_content_mang_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ void TblTest_GenerateTblFiles(void)

/* write content, but make it identifiable/unique */
buf.Content.Int1 = 0x1111;
buf.Content.Int1 = 0x2222;
buf.Content.Int2 = 0x2222;
UtAssert_INT32_EQ(OS_write(fh2, &buf, sizeof(buf.Content)), sizeof(buf.Content));

/* Write extra byte at the end */
Expand Down

0 comments on commit 06d64f9

Please sign in to comment.