Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #41, Remove unrequired internal delete command handling #46

Merged
merged 1 commit into from
Aug 10, 2022
Merged

Fix #41, Remove unrequired internal delete command handling #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions fsw/src/fm_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,6 @@ void FM_ProcessCmd(const CFE_SB_Buffer_t *BufPtr)
Result = FM_SetTableStateCmd(BufPtr);
break;

case FM_DELETE_INT_CC:
Result = FM_DeleteFileCmd(BufPtr);
break;

case FM_SET_FILE_PERM_CC:
Result = FM_SetPermissionsCmd(BufPtr);
break;
Expand All @@ -377,7 +373,7 @@ void FM_ProcessCmd(const CFE_SB_Buffer_t *BufPtr)
if (Result == true)
{
/* Increment command success counter */
if ((CommandCode != FM_RESET_CC) && (CommandCode != FM_DELETE_INT_CC))
if (CommandCode != FM_RESET_CC)
{
FM_GlobalData.CommandCounter++;
}
Expand Down
13 changes: 3 additions & 10 deletions fsw/src/fm_child.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,6 @@ void FM_ChildProcess(void)
FM_ChildDirListPktCmd(CmdArgs);
break;

case FM_DELETE_INT_CC:
FM_ChildDeleteCmd(CmdArgs);
break;

case FM_SET_FILE_PERM_CC:
FM_ChildSetPermissionsCmd(CmdArgs);
break;
Expand Down Expand Up @@ -446,12 +442,9 @@ void FM_ChildDeleteCmd(const FM_ChildQueueEntry_t *CmdArgs)
{
FM_GlobalData.ChildCmdCounter++;

if (CmdArgs->CommandCode != FM_DELETE_INT_CC)
{
/* Send command completion event (info) */
CFE_EVS_SendEvent(FM_DELETE_CMD_EID, CFE_EVS_EventType_DEBUG, "%s command: file = %s", CmdText,
CmdArgs->Source1);
}
/* Send command completion event (info) */
CFE_EVS_SendEvent(FM_DELETE_CMD_EID, CFE_EVS_EventType_DEBUG, "%s command: file = %s", CmdText,
CmdArgs->Source1);
}

/* Report previous child task activity */
Expand Down
17 changes: 0 additions & 17 deletions fsw/src/fm_msgdefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,23 +920,6 @@
*/
#define FM_SET_TABLE_STATE_CC 17

/**
* \brief Delete File (internal)
*
* \par Description
* This is a special version of the #FM_DELETE_CC command for
* use when the command is sent by another application, rather
* than from the ground. This version of the command will not
* generate a success event, nor will the command increment the
* command success counter. The intent is to avoid confusion
* resulting from telemetry representing the results of delete
* commands sent by other applications and those sent from the
* ground. Refer to #FM_DELETE_CC command for use details.
*
* \sa #FM_DELETE_CC
*/
#define FM_DELETE_INT_CC 18

/**
* \brief Set Permissions of a file
*
Expand Down
21 changes: 0 additions & 21 deletions unit-test/fm_app_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,24 +709,6 @@ void Test_FM_ProcessCmd_SetTableStateCCReturn(void)
UtAssert_INT32_EQ(FM_GlobalData.CommandErrCounter, 0);
}

void Test_FM_ProcessCmd_DeleteFileIntCCReturn(void)
{
// Arrange
CFE_MSG_FcnCode_t fcn_code = FM_DELETE_INT_CC;

UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &fcn_code, sizeof(fcn_code), false);
UT_SetDefaultReturnValue(UT_KEY(FM_DeleteFileCmd), true);

// Act
UtAssert_VOIDCALL(FM_ProcessCmd(NULL));

// Assert
UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0);
UtAssert_STUB_COUNT(FM_DeleteFileCmd, 1);
UtAssert_INT32_EQ(FM_GlobalData.CommandCounter, 0);
UtAssert_INT32_EQ(FM_GlobalData.CommandErrCounter, 0);
}

void Test_FM_ProcessCmd_SetPermissionsCCReturn(void)
{
// Arrange
Expand Down Expand Up @@ -869,9 +851,6 @@ void add_FM_ProcessCmd_tests(void)
UtTest_Add(Test_FM_ProcessCmd_SetTableStateCCReturn, FM_Test_Setup, FM_Test_Teardown,
"Test_FM_PRocessCmd_SetTableStateCCReturn");

UtTest_Add(Test_FM_ProcessCmd_DeleteFileIntCCReturn, FM_Test_Setup, FM_Test_Teardown,
"Test_FM_PRocessCmd_DeleteFileIntCCReturn");

UtTest_Add(Test_FM_ProcessCmd_SetPermissionsCCReturn, FM_Test_Setup, FM_Test_Teardown,
"Test_FM_PRocessCmd_SetPermissionsCCReturn");

Expand Down
41 changes: 0 additions & 41 deletions unit-test/fm_child_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,26 +399,6 @@ void Test_FM_ChildProcess_FMGetDirListsPktCC(void)
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, FM_GET_DIR_PKT_CMD_EID);
}

void Test_FM_ChildProcess_FMDeleteIntCC(void)
{
// Arrange
FM_GlobalData.ChildQueue[0].CommandCode = FM_DELETE_INT_CC;
FM_GlobalData.ChildCurrentCC = 1;

UT_SetDefaultReturnValue(UT_KEY(OS_remove), !OS_SUCCESS);

// Act
UtAssert_VOIDCALL(FM_ChildProcess());

// Assert
UT_FM_Child_Cmd_Assert(0, 1, 0, FM_GlobalData.ChildQueue[0].CommandCode);

UtAssert_STUB_COUNT(OS_remove, 1);
UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1);
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR);
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, FM_DELETE_OS_ERR_EID);
}

void Test_FM_ChildProcess_FMSetFilePermCC(void)
{
// Arrange
Expand Down Expand Up @@ -607,21 +587,6 @@ void Test_FM_ChildDeleteCmd_OSRemoveNotSuccess(void)
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, FM_DELETE_OS_ERR_EID);
}

void Test_FM_ChildDeleteCmd_CommandCodeIsDeleteIntCC(void)
{
// Arrange
FM_ChildQueueEntry_t queue_entry = {.CommandCode = FM_DELETE_INT_CC};

// Act
UtAssert_VOIDCALL(FM_ChildDeleteCmd(&queue_entry));

// Assert
UT_FM_Child_Cmd_Assert(1, 0, 0, queue_entry.CommandCode);

UtAssert_STUB_COUNT(OS_remove, 1);
UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0);
}

/* ****************
* ChildDeleteAllCmd Tests
* ***************/
Expand Down Expand Up @@ -2321,9 +2286,6 @@ void add_FM_ChildProcess_tests(void)
UtTest_Add(Test_FM_ChildProcess_FMGetDirListsPktCC, FM_Test_Setup, FM_Test_Teardown,
"Test_FM_ChildProcess_FMGetDirListsPktCC");

UtTest_Add(Test_FM_ChildProcess_FMDeleteIntCC, FM_Test_Setup, FM_Test_Teardown,
"Test_FM_ChildProcess_FMDeleteIntCC");

UtTest_Add(Test_FM_ChildProcess_FMSetFilePermCC, FM_Test_Setup, FM_Test_Teardown,
"Test_FM_ChildProcess_FMSetFilePermCC");

Expand Down Expand Up @@ -2362,9 +2324,6 @@ void add_FM_ChildRenameCmd_tests(void)

void add_FM_ChildDeleteCmd_tests(void)
{
UtTest_Add(Test_FM_ChildDeleteCmd_CommandCodeIsDeleteIntCC, FM_Test_Setup, FM_Test_Teardown,
"Test_FM_ChildDeleteCmd_CommandCodeIsDeleteIntCC");

UtTest_Add(Test_FM_ChildDeleteCmd_OSRemoveSuccess, FM_Test_Setup, FM_Test_Teardown,
"Test_FM_ChildDeleteCmd_OSRemoveSuccess");

Expand Down