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 #1030 change test_MSG to UT_DisplayPkt #1046

Merged
merged 1 commit into from
Dec 18, 2020
Merged

fix #1030 change test_MSG to UT_DisplayPkt #1046

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
1 change: 0 additions & 1 deletion modules/msg/unit-test-coverage/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ target_include_directories(ut_${DEP}_objs PRIVATE

set (ut_${DEP}_tests
msg_UT.c
test_msg_utils.c
test_msg_not.c
test_msg_pri_not.c
test_cfe_msg_init.c
Expand Down
24 changes: 12 additions & 12 deletions modules/msg/unit-test-coverage/test_cfe_msg_ccsdsext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void Test_MSG_Init_Ext(void)
memset(&msg, 0xFF, sizeof(msg));
msgidval_exp = 0;
ASSERT_EQ(CFE_MSG_Init(&msg, CFE_SB_ValueToMsgId(msgidval_exp), sizeof(msg)), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, 0);
UT_DisplayPkt(&msg, 0);

/* Default EDS version check */
ASSERT_EQ(CFE_MSG_GetEDSVersion(&msg, &edsver), CFE_SUCCESS);
Expand Down Expand Up @@ -104,7 +104,7 @@ void Test_MSG_Init_Ext(void)
memset(&msg, 0, sizeof(msg));
msgidval_exp = CFE_PLATFORM_SB_HIGHEST_VALID_MSGID;
ASSERT_EQ(CFE_MSG_Init(&msg, CFE_SB_ValueToMsgId(msgidval_exp), sizeof(msg)), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, 0);
UT_DisplayPkt(&msg, 0);

/* Default EDS version check */
ASSERT_EQ(CFE_MSG_GetEDSVersion(&msg, &edsver), CFE_SUCCESS);
Expand Down Expand Up @@ -160,7 +160,7 @@ void Test_MSG_EDSVersion(void)
ASSERT_EQ(CFE_MSG_GetEDSVersion(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, TEST_EDSVER_MAX);
ASSERT_EQ(CFE_MSG_SetEDSVersion(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetEDSVersion(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == TEST_EDSVER_MAX)
Expand All @@ -180,7 +180,7 @@ void Test_MSG_EDSVersion(void)
ASSERT_EQ(CFE_MSG_GetEDSVersion(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, 0);
ASSERT_EQ(CFE_MSG_SetEDSVersion(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetEDSVersion(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == 0)
Expand Down Expand Up @@ -220,7 +220,7 @@ void Test_MSG_Endian(void)
ASSERT_EQ(CFE_MSG_GetEndian(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, CFE_MSG_Endian_Little);
ASSERT_EQ(CFE_MSG_SetEndian(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetEndian(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == CFE_MSG_Endian_Little)
Expand All @@ -240,7 +240,7 @@ void Test_MSG_Endian(void)
ASSERT_EQ(CFE_MSG_GetEndian(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, CFE_MSG_Endian_Big);
ASSERT_EQ(CFE_MSG_SetEndian(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetEndian(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == CFE_MSG_Endian_Big)
Expand Down Expand Up @@ -280,7 +280,7 @@ void Test_MSG_PlaybackFlag(void)
ASSERT_EQ(CFE_MSG_GetPlaybackFlag(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, CFE_MSG_PlayFlag_Playback);
ASSERT_EQ(CFE_MSG_SetPlaybackFlag(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetPlaybackFlag(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == CFE_MSG_PlayFlag_Playback)
Expand All @@ -300,7 +300,7 @@ void Test_MSG_PlaybackFlag(void)
ASSERT_EQ(CFE_MSG_GetPlaybackFlag(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, CFE_MSG_PlayFlag_Original);
ASSERT_EQ(CFE_MSG_SetPlaybackFlag(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetPlaybackFlag(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == CFE_MSG_PlayFlag_Original)
Expand Down Expand Up @@ -340,7 +340,7 @@ void Test_MSG_Subsystem(void)
ASSERT_EQ(CFE_MSG_GetSubsystem(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, TEST_SUBSYS_MAX);
ASSERT_EQ(CFE_MSG_SetSubsystem(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetSubsystem(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == TEST_SUBSYS_MAX)
Expand All @@ -360,7 +360,7 @@ void Test_MSG_Subsystem(void)
ASSERT_EQ(CFE_MSG_GetSubsystem(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, 0);
ASSERT_EQ(CFE_MSG_SetSubsystem(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetSubsystem(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == 0)
Expand Down Expand Up @@ -397,7 +397,7 @@ void Test_MSG_System(void)
ASSERT_EQ(CFE_MSG_GetSystem(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, TEST_SYSTEM_MAX);
ASSERT_EQ(CFE_MSG_SetSystem(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetSystem(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == TEST_SYSTEM_MAX)
Expand All @@ -417,7 +417,7 @@ void Test_MSG_System(void)
ASSERT_EQ(CFE_MSG_GetSystem(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, 0);
ASSERT_EQ(CFE_MSG_SetSystem(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetSystem(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == 0)
Expand Down
32 changes: 16 additions & 16 deletions modules/msg/unit-test-coverage/test_cfe_msg_ccsdspri.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void Test_MSG_Size(void)
ASSERT_EQ(CFE_MSG_GetSize(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, 0xFFFF + TEST_MSG_SIZE_OFFSET);
ASSERT_EQ(CFE_MSG_SetSize(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetSize(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == 0xFFFF + TEST_MSG_SIZE_OFFSET)
Expand All @@ -91,7 +91,7 @@ void Test_MSG_Size(void)
ASSERT_EQ(CFE_MSG_GetSize(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, TEST_MSG_SIZE_OFFSET);
ASSERT_EQ(CFE_MSG_SetSize(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetSize(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == TEST_MSG_SIZE_OFFSET)
Expand Down Expand Up @@ -131,7 +131,7 @@ void Test_MSG_Type(void)
ASSERT_EQ(CFE_MSG_GetType(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, CFE_MSG_Type_Cmd);
ASSERT_EQ(CFE_MSG_SetType(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetType(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == CFE_MSG_Type_Cmd)
Expand All @@ -151,7 +151,7 @@ void Test_MSG_Type(void)
ASSERT_EQ(CFE_MSG_GetType(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, CFE_MSG_Type_Tlm);
ASSERT_EQ(CFE_MSG_SetType(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetType(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == CFE_MSG_Type_Tlm)
Expand Down Expand Up @@ -191,7 +191,7 @@ void Test_MSG_HeaderVersion(void)
ASSERT_EQ(CFE_MSG_GetHeaderVersion(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, TEST_CCSDSVER_MAX);
ASSERT_EQ(CFE_MSG_SetHeaderVersion(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetHeaderVersion(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == TEST_CCSDSVER_MAX)
Expand All @@ -211,7 +211,7 @@ void Test_MSG_HeaderVersion(void)
ASSERT_EQ(CFE_MSG_GetHeaderVersion(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, 0);
ASSERT_EQ(CFE_MSG_SetHeaderVersion(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetHeaderVersion(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == 0)
Expand Down Expand Up @@ -244,13 +244,13 @@ void Test_MSG_HasSecondaryHeader(void)
ASSERT_EQ(actual, true);

ASSERT_EQ(CFE_MSG_SetHasSecondaryHeader(&msg, true), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetHasSecondaryHeader(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, true);
ASSERT_EQ(Test_MSG_NotF(&msg), 0);

ASSERT_EQ(CFE_MSG_SetHasSecondaryHeader(&msg, false), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetHasSecondaryHeader(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, false);
ASSERT_EQ(Test_MSG_NotF(&msg), MSG_HASSEC_FLAG);
Expand All @@ -261,13 +261,13 @@ void Test_MSG_HasSecondaryHeader(void)
ASSERT_EQ(actual, false);

ASSERT_EQ(CFE_MSG_SetHasSecondaryHeader(&msg, false), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetHasSecondaryHeader(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, false);
ASSERT_EQ(Test_MSG_NotZero(&msg), 0);

ASSERT_EQ(CFE_MSG_SetHasSecondaryHeader(&msg, true), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetHasSecondaryHeader(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, true);
ASSERT_EQ(Test_MSG_NotZero(&msg), MSG_HASSEC_FLAG);
Expand Down Expand Up @@ -299,7 +299,7 @@ void Test_MSG_ApId(void)
ASSERT_EQ(CFE_MSG_GetApId(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, TEST_APID_MAX);
ASSERT_EQ(CFE_MSG_SetApId(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetApId(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == TEST_APID_MAX)
Expand All @@ -319,7 +319,7 @@ void Test_MSG_ApId(void)
ASSERT_EQ(CFE_MSG_GetApId(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, 0);
ASSERT_EQ(CFE_MSG_SetApId(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetApId(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == 0)
Expand Down Expand Up @@ -360,7 +360,7 @@ void Test_MSG_SegmentationFlag(void)
ASSERT_EQ(CFE_MSG_GetSegmentationFlag(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, CFE_MSG_SegFlag_Unsegmented);
ASSERT_EQ(CFE_MSG_SetSegmentationFlag(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetSegmentationFlag(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == CFE_MSG_SegFlag_Unsegmented)
Expand All @@ -380,7 +380,7 @@ void Test_MSG_SegmentationFlag(void)
ASSERT_EQ(CFE_MSG_GetSegmentationFlag(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, CFE_MSG_SegFlag_Continue);
ASSERT_EQ(CFE_MSG_SetSegmentationFlag(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetSegmentationFlag(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == CFE_MSG_SegFlag_Continue)
Expand Down Expand Up @@ -420,7 +420,7 @@ void Test_MSG_SequenceCount(void)
ASSERT_EQ(CFE_MSG_GetSequenceCount(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, TEST_SEQUENCE_MAX);
ASSERT_EQ(CFE_MSG_SetSequenceCount(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetSequenceCount(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == TEST_SEQUENCE_MAX)
Expand All @@ -440,7 +440,7 @@ void Test_MSG_SequenceCount(void)
ASSERT_EQ(CFE_MSG_GetSequenceCount(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, 0);
ASSERT_EQ(CFE_MSG_SetSequenceCount(&msg, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetSequenceCount(&msg, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
if (input[i] == 0)
Expand Down
4 changes: 2 additions & 2 deletions modules/msg/unit-test-coverage/test_cfe_msg_checksum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void Test_MSG_Checksum(void)
ASSERT_EQ(CFE_MSG_ValidateChecksum(msgptr, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, false);
ASSERT_EQ(CFE_MSG_GenerateChecksum(msgptr), CFE_SUCCESS);
Test_MSG_PrintMsg(msgptr, sizeof(cmd));
UT_DisplayPkt(msgptr, sizeof(cmd));
ASSERT_EQ(CFE_MSG_ValidateChecksum(msgptr, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, true);
ASSERT_EQ(Test_MSG_NotF(msgptr), MSG_LENGTH_FLAG);
Expand All @@ -83,7 +83,7 @@ void Test_MSG_Checksum(void)
ASSERT_EQ(CFE_MSG_ValidateChecksum(msgptr, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, false);
ASSERT_EQ(CFE_MSG_GenerateChecksum(msgptr), CFE_SUCCESS);
Test_MSG_PrintMsg(msgptr, sizeof(cmd));
UT_DisplayPkt(msgptr, sizeof(cmd));
ASSERT_EQ(CFE_MSG_ValidateChecksum(msgptr, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, true);
ASSERT_EQ(Test_MSG_NotZero(msgptr), MSG_LENGTH_FLAG | MSG_HASSEC_FLAG | MSG_TYPE_FLAG);
Expand Down
4 changes: 2 additions & 2 deletions modules/msg/unit-test-coverage/test_cfe_msg_fc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void Test_MSG_FcnCode(void)
ASSERT_EQ(CFE_MSG_GetFcnCode(msgptr, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, TEST_FCNCODE_MAX);
ASSERT_EQ(CFE_MSG_SetFcnCode(msgptr, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(msgptr, sizeof(cmd));
UT_DisplayPkt(msgptr, sizeof(cmd));
ASSERT_EQ(CFE_MSG_GetFcnCode(msgptr, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
ASSERT_EQ(Test_MSG_NotF(msgptr), 0);
Expand All @@ -97,7 +97,7 @@ void Test_MSG_FcnCode(void)
ASSERT_EQ(CFE_MSG_GetFcnCode(msgptr, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, 0);
ASSERT_EQ(CFE_MSG_SetFcnCode(msgptr, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(msgptr, sizeof(cmd));
UT_DisplayPkt(msgptr, sizeof(cmd));
ASSERT_EQ(CFE_MSG_GetFcnCode(msgptr, &actual), CFE_SUCCESS);
ASSERT_EQ(actual, input[i]);
ASSERT_EQ(Test_MSG_NotZero(msgptr), MSG_HASSEC_FLAG | MSG_TYPE_FLAG);
Expand Down
4 changes: 2 additions & 2 deletions modules/msg/unit-test-coverage/test_cfe_msg_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void Test_MSG_Init(void)
msgidval_exp = 0;

ASSERT_EQ(CFE_MSG_Init(&cmd.Msg, CFE_SB_ValueToMsgId(msgidval_exp), sizeof(cmd)), CFE_SUCCESS);
Test_MSG_PrintMsg(&cmd.Msg, 0);
UT_DisplayPkt(&cmd.Msg, 0);
ASSERT_EQ(CFE_MSG_GetMsgId(&cmd.Msg, &msgid_act), CFE_SUCCESS);
ASSERT_EQ(CFE_SB_MsgIdToValue(msgid_act), msgidval_exp);
ASSERT_EQ(CFE_MSG_GetSize(&cmd.Msg, &size), CFE_SUCCESS);
Expand Down Expand Up @@ -100,7 +100,7 @@ void Test_MSG_Init(void)
msgidval_exp = CFE_PLATFORM_SB_HIGHEST_VALID_MSGID;

ASSERT_EQ(CFE_MSG_Init(&cmd.Msg, CFE_SB_ValueToMsgId(msgidval_exp), sizeof(cmd)), CFE_SUCCESS);
Test_MSG_PrintMsg(&cmd.Msg, 0);
UT_DisplayPkt(&cmd.Msg, 0);
ASSERT_EQ(CFE_MSG_GetMsgId(&cmd.Msg, &msgid_act), CFE_SUCCESS);
ASSERT_EQ(CFE_SB_MsgIdToValue(msgid_act), msgidval_exp);
ASSERT_EQ(CFE_MSG_GetSize(&cmd.Msg, &size), CFE_SUCCESS);
Expand Down
4 changes: 2 additions & 2 deletions modules/msg/unit-test-coverage/test_cfe_msg_msgid_v1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void Test_MSG_MsgId(void)
ASSERT_EQ(CFE_MSG_GetMsgId(&msg, &msgid), CFE_SUCCESS);
ASSERT_EQ(CFE_SB_MsgIdToValue(msgid), 0xFFFF);
ASSERT_EQ(CFE_MSG_SetMsgId(&msg, 0), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetMsgId(&msg, &msgid), CFE_SUCCESS);
ASSERT_EQ(CFE_SB_MsgIdToValue(msgid), 0);
ASSERT_EQ(Test_MSG_NotF(&msg), MSG_HDRVER_FLAG | MSG_APID_FLAG | MSG_TYPE_FLAG | MSG_HASSEC_FLAG);
Expand All @@ -70,7 +70,7 @@ void Test_MSG_MsgId(void)
ASSERT_EQ(CFE_MSG_GetMsgId(&msg, &msgid), CFE_SUCCESS);
ASSERT_EQ(CFE_SB_MsgIdToValue(msgid), 0);
ASSERT_EQ(CFE_MSG_SetMsgId(&msg, CFE_PLATFORM_SB_HIGHEST_VALID_MSGID), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetMsgId(&msg, &msgid), CFE_SUCCESS);
ASSERT_EQ(CFE_SB_MsgIdToValue(msgid), CFE_PLATFORM_SB_HIGHEST_VALID_MSGID);
ASSERT_EQ(Test_MSG_NotZero(&msg), MSG_APID_FLAG | MSG_TYPE_FLAG | MSG_HASSEC_FLAG);
Expand Down
4 changes: 2 additions & 2 deletions modules/msg/unit-test-coverage/test_cfe_msg_msgid_v2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void Test_MSG_MsgId(void)
ASSERT_EQ(CFE_MSG_GetMsgId(&msg, &msgid), CFE_SUCCESS);
ASSERT_EQ(CFE_SB_MsgIdToValue(msgid), 0xFFFF);
ASSERT_EQ(CFE_MSG_SetMsgId(&msg, 0), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetMsgId(&msg, &msgid), CFE_SUCCESS);
ASSERT_EQ(CFE_SB_MsgIdToValue(msgid), 0);
ASSERT_EQ(Test_MSG_NotF(&msg), MSG_APID_FLAG | MSG_TYPE_FLAG | local_subsys_flag);
Expand All @@ -78,7 +78,7 @@ void Test_MSG_MsgId(void)
ASSERT_EQ(CFE_MSG_GetMsgId(&msg, &msgid), CFE_SUCCESS);
ASSERT_EQ(CFE_SB_MsgIdToValue(msgid), 0);
ASSERT_EQ(CFE_MSG_SetMsgId(&msg, CFE_PLATFORM_SB_HIGHEST_VALID_MSGID), CFE_SUCCESS);
Test_MSG_PrintMsg(&msg, sizeof(msg));
UT_DisplayPkt(&msg, sizeof(msg));
ASSERT_EQ(CFE_MSG_GetMsgId(&msg, &msgid), CFE_SUCCESS);
ASSERT_EQ(CFE_SB_MsgIdToValue(msgid), CFE_PLATFORM_SB_HIGHEST_VALID_MSGID);
ASSERT_EQ(Test_MSG_NotZero(&msg), MSG_APID_FLAG | MSG_TYPE_FLAG | local_subsys_flag);
Expand Down
4 changes: 2 additions & 2 deletions modules/msg/unit-test-coverage/test_cfe_msg_time.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void Test_MSG_Time(void)
ASSERT_EQ(actual.Seconds, 0xFFFFFFFF);
ASSERT_EQ(actual.Subseconds, 0xFFFF0000);
ASSERT_EQ(CFE_MSG_SetMsgTime(msgptr, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(msgptr, sizeof(tlm));
UT_DisplayPkt(msgptr, sizeof(tlm));
ASSERT_EQ(CFE_MSG_GetMsgTime(msgptr, &actual), CFE_SUCCESS);
ASSERT_EQ(actual.Seconds, input[i].Seconds);
ASSERT_EQ(actual.Subseconds, input[i].Subseconds & 0xFFFF0000);
Expand All @@ -89,7 +89,7 @@ void Test_MSG_Time(void)
ASSERT_EQ(actual.Seconds, 0);
ASSERT_EQ(actual.Subseconds, 0);
ASSERT_EQ(CFE_MSG_SetMsgTime(msgptr, input[i]), CFE_SUCCESS);
Test_MSG_PrintMsg(msgptr, sizeof(tlm));
UT_DisplayPkt(msgptr, sizeof(tlm));
ASSERT_EQ(CFE_MSG_GetMsgTime(msgptr, &actual), CFE_SUCCESS);
ASSERT_EQ(actual.Seconds, input[i].Seconds);
ASSERT_EQ(actual.Subseconds, input[i].Subseconds & 0xFFFF0000);
Expand Down
Loading