Fix unit test

garthwatney · Apr 9, 2024 · 70867a8 · 70867a8
1 parent 5138aab
commit 70867a8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/Svc/FPManager/CommandOpcodes.hpp b/Svc/FPManager/CommandOpcodes.hpp
@@ -27,8 +27,8 @@ namespace Svc {
   namespace OPCODES {
 
   enum Opcodes {
-    CMD_NO_OP = 0x500,
     CMD_CLEAR_TRACKING = 0x503,
+    CMD_NO_OP = 0x500,
     CMD_TEST_CMD_1 = 0x502,
   };
 

diff --git a/Svc/FPManager/CommandSerializer.cpp b/Svc/FPManager/CommandSerializer.cpp
@@ -29,7 +29,7 @@ namespace Svc {
 
 
     Fw::SerializeStatus
-    CMD_NO_OP(
+    CMD_CLEAR_TRACKING(
           Fw::ComBuffer& comBuffer
       )
     {
@@ -41,7 +41,7 @@ namespace Svc {
       status = comBuffer.serialize(descriptor);
       // Serialize the opcode
       if (status == Fw::FW_SERIALIZE_OK) {
-        FwOpcodeType opcode = OPCODES::CMD_NO_OP;
+        FwOpcodeType opcode = OPCODES::CMD_CLEAR_TRACKING;
         status = comBuffer.serialize(opcode);
       }
       // Serialize arguments
@@ -50,7 +50,7 @@ namespace Svc {
 
 
     Fw::SerializeStatus
-    CMD_CLEAR_TRACKING(
+    CMD_NO_OP(
           Fw::ComBuffer& comBuffer
       )
     {
@@ -62,7 +62,7 @@ namespace Svc {
       status = comBuffer.serialize(descriptor);
       // Serialize the opcode
       if (status == Fw::FW_SERIALIZE_OK) {
-        FwOpcodeType opcode = OPCODES::CMD_CLEAR_TRACKING;
+        FwOpcodeType opcode = OPCODES::CMD_NO_OP;
         status = comBuffer.serialize(opcode);
       }
       // Serialize arguments

diff --git a/Svc/FPManager/CommandSerializer.hpp b/Svc/FPManager/CommandSerializer.hpp
@@ -33,16 +33,16 @@ namespace Svc {
   namespace CommandSerializer {
 
 
-    //! Serialize a CMD_NO_OP command
+    //! Serialize a CMD_CLEAR_TRACKING command
     //! return The serialization status
-    Fw::SerializeStatus CMD_NO_OP (   
+    Fw::SerializeStatus CMD_CLEAR_TRACKING (   
         Fw::ComBuffer& comBuffer //!< The result
     );
 
 
-    //! Serialize a CMD_CLEAR_TRACKING command
+    //! Serialize a CMD_NO_OP command
     //! return The serialization status
-    Fw::SerializeStatus CMD_CLEAR_TRACKING (   
+    Fw::SerializeStatus CMD_NO_OP (   
         Fw::ComBuffer& comBuffer //!< The result
     );
 

diff --git a/Svc/FPManager/test/ut/ResponseExecutionRules.cpp b/Svc/FPManager/test/ut/ResponseExecutionRules.cpp
@@ -418,7 +418,7 @@ void IndicateRESP_1DroppedExecuting::action(Tester& tester) {
 
 
     // Check telemetry response indication counter
-    tester.assertTlm_size(__FILE__, __LINE__, 3);
+    tester.assertTlm_size(__FILE__, __LINE__, 4);
     // Count should now be 2.
     tester.assertTlm_FP_RESP_1AlertCount(__FILE__, __LINE__, 0, 2);
     tester.assertTlm_FP_LastResponseAlert(__FILE__, __LINE__, 0, FPResponses::RESP_1);
@@ -741,7 +741,7 @@ void IndicateRESP_2DroppedExecuting::action(Tester& tester) {
 
 
     // Check telemetry response indication counter
-    tester.assertTlm_size(__FILE__, __LINE__, 3);
+    tester.assertTlm_size(__FILE__, __LINE__, 4);
     // Count should now be 2.
     tester.assertTlm_FP_RESP_2AlertCount(__FILE__, __LINE__, 0, 2);
     tester.assertTlm_FP_LastResponseAlert(__FILE__, __LINE__, 0, FPResponses::RESP_2);
@@ -1064,7 +1064,7 @@ void IndicateSAFINGDroppedExecuting::action(Tester& tester) {
 
 
     // Check telemetry response indication counter
-    tester.assertTlm_size(__FILE__, __LINE__, 3);
+    tester.assertTlm_size(__FILE__, __LINE__, 4);
     // Count should now be 2.
     tester.assertTlm_FP_SAFINGAlertCount(__FILE__, __LINE__, 0, 2);
     tester.assertTlm_FP_LastResponseAlert(__FILE__, __LINE__, 0, FPResponses::SAFING);

diff --git a/Svc/FPManager/test/ut/ResponseExecutionRules.cpp.tmpl b/Svc/FPManager/test/ut/ResponseExecutionRules.cpp.tmpl
@@ -400,7 +400,7 @@ void Indicate$(resp)DroppedExecuting::action(Tester& tester) {
 
 
     // Check telemetry response indication counter
-    tester.assertTlm_size(__FILE__, __LINE__, 3);
+    tester.assertTlm_size(__FILE__, __LINE__, 4);
     // Count should now be 2.
     tester.assertTlm_FP_$(resp)AlertCount(__FILE__, __LINE__, 0, 2);
     tester.assertTlm_FP_LastResponseAlert(__FILE__, __LINE__, 0, FPResponses::$resp.upper());

diff --git a/Svc/FPManager/test/ut/TestRules.cpp b/Svc/FPManager/test/ut/TestRules.cpp
@@ -115,7 +115,7 @@ void PackedTlm::action(Tester& tester) {
     U32 expectedTlmVal = pow(2, static_cast<int>(FPResponses::NUMBER_RESPONSES)) - 1;
 
     // Check packed telemetry
-    tester.assertTlm_size(__FILE__, __LINE__, 2);
+    tester.assertTlm_size(__FILE__, __LINE__, 3);
     tester.assertTlm_FP_ResponsePackedState(__FILE__, __LINE__, 0, expectedTlmVal);