test auto-initializers

unittests/tmtcservices/testPsb.cpp

@@ -4,15 +4,18 @@
 #include "fsfw/storagemanager/LocalPool.h"
 #include "mocks/AcceptsTmMock.h"
 #include "mocks/CdsShortTimestamperMock.h"
+#include "mocks/InternalErrorReporterMock.h"
 #include "mocks/MessageQueueMock.h"
+#include "mocks/PusDistributorMock.h"
 #include "mocks/PusServiceBaseMock.h"
 #include "mocks/PusVerificationReporterMock.h"
 
 TEST_CASE("Pus Service Base", "[pus-service-base]") {
+  uint16_t apid = 2;
   auto verificationReporter = PusVerificationReporterMock();
   auto msgQueue = MessageQueueMock(1);
   auto tmReceiver = AcceptsTmMock(2);
-  auto psbParams = PsbParams(0, 0x02, 17);
+  auto psbParams = PsbParams(0, apid, 17);
 
   LocalPool::LocalPoolConfig cfg = {{5, 32}, {2, 64}};
   LocalPool pool(objects::NO_OBJECT, cfg);
@@ -38,6 +41,9 @@ TEST_CASE("Pus Service Base", "[pus-service-base]") {
   SECTION("State") {
     REQUIRE(psb.getIdentifier() == 17);
     REQUIRE(psb.getObjectId() == 0);
+    REQUIRE(psb.getRequestQueue() == msgQueue.getId());
+    auto psbParamsLocal = psb.getParams();
+    REQUIRE(psbParamsLocal.errReporter == nullptr);
   }
 
   SECTION("Perform Service") {
@@ -87,4 +93,106 @@ TEST_CASE("Pus Service Base", "[pus-service-base]") {
     REQUIRE(verifParams.tcPacketId == creator.getPacketIdRaw());
     REQUIRE(verifParams.tcPsc == creator.getPacketSeqCtrlRaw());
   }
+
+  SECTION("Invalid Packet Sent") {
+    tmtcMsg.setStorageId(store_address_t::invalid());
+    msgQueue.addReceivedMessage(tmtcMsg);
+    REQUIRE(psb.performOperation(0) == retval::OK);
+    REQUIRE(verificationReporter.failCallCount() == 1);
+    auto verifParams = verificationReporter.getNextFailCallParams();
+    REQUIRE(verifParams.tcPacketId == 0);
+    REQUIRE(verifParams.tcPsc == 0);
+  }
+
+  SECTION("Set Verif Reporter") {
+    auto verificationReporter2 = PusVerificationReporterMock();
+    psb.setVerificationReporter(verificationReporter2);
+    auto& p = psb.getParams();
+    REQUIRE(p.verifReporter == &verificationReporter2);
+  }
+
+  SECTION("Set Request Queue") {
+    auto msgQueueMock = MessageQueueMock(2);
+    psb.setRequestQueue(msgQueueMock);
+    auto& p = psb.getParams();
+    REQUIRE(p.reqQueue == &msgQueueMock);
+  }
+
+  SECTION("Set TM Receiver") {
+    auto tmReceiver2 = AcceptsTmMock(3);
+    psb.setTmReceiver(tmReceiver2);
+    auto& p = psb.getParams();
+    REQUIRE(p.tmReceiver == &tmReceiver2);
+  }
+
+  SECTION("Set TC Store") {
+    LocalPool tcStore2(5, cfg);
+    psb.setTcPool(tcStore2);
+    auto& p = psb.getParams();
+    REQUIRE(p.tcPool == &tcStore2);
+  }
+
+  SECTION("Set error reporter") {
+    auto errReporter = InternalErrorReporterMock();
+    psb.setErrorReporter(errReporter);
+    auto& p = psb.getParams();
+    REQUIRE(p.errReporter == &errReporter);
+  }
+  SECTION("Owner Queue") {
+    // This will cause the initialize function to create a new owner queue
+    psbParams.reqQueue = nullptr;
+    psbParams.objectId = 1;
+    auto mockWithOwnerQueue = PsbMock(psbParams);
+    REQUIRE(mockWithOwnerQueue.getRequestQueue() == MessageQueueIF::NO_QUEUE);
+    REQUIRE(mockWithOwnerQueue.initialize() == retval::OK);
+    REQUIRE(mockWithOwnerQueue.getRequestQueue() != MessageQueueIF::NO_QUEUE);
+  }
+
+  SECTION("TM Store Helper Initializer") {
+    TmStoreHelper storeHelper(0);
+    psb.initializeTmStoreHelper(storeHelper);
+    REQUIRE(storeHelper.getApid() == apid);
+  }
+
+  SECTION("TM Send Helper Initializer") {
+    TmSendHelper sendHelper;
+    psb.initializeTmSendHelper(sendHelper);
+    REQUIRE(sendHelper.getMsgQueue() == &msgQueue);
+    REQUIRE(sendHelper.getDefaultDestination() == msgQueue.getDefaultDestination());
+  }
+
+  SECTION("TM Send Helper Initializer With Error Reporter") {
+    TmSendHelper sendHelper;
+    auto errReporter = InternalErrorReporterMock();
+    psb.setErrorReporter(errReporter);
+    psb.initializeTmSendHelper(sendHelper);
+    REQUIRE(sendHelper.getMsgQueue() == &msgQueue);
+    REQUIRE(sendHelper.getDefaultDestination() == msgQueue.getDefaultDestination());
+    REQUIRE(sendHelper.getInternalErrorReporter() == &errReporter);
+  }
+
+  SECTION("Auto Initialize PUS Distributor") {
+    psbParams.objectId = 1;
+    object_id_t distributorId = 3;
+    auto psb2 = PsbMock(psbParams);
+    auto pusDistrib = PusDistributorMock(distributorId);
+    PsbMock::setStaticPusDistributor(distributorId);
+    REQUIRE(PsbMock::getStaticPusDistributor() == distributorId);
+    REQUIRE(psb2.initialize() == retval::OK);
+    REQUIRE(pusDistrib.registerCallCount == 1);
+    REQUIRE(pusDistrib.lastServiceArg == &psb2);
+  }
+
+  SECTION("Auto Initialize Packet Destination") {
+    psbParams.tmReceiver = nullptr;
+    psbParams.objectId = 1;
+    object_id_t destId = 3;
+    auto psb2 = PsbMock(psbParams);
+    auto packetDest = AcceptsTmMock(destId, 2);
+    PsbMock::setStaticTmDest(destId);
+    REQUIRE(PsbMock::getStaticTmDest() == destId);
+    REQUIRE(psb2.initialize() == retval::OK);
+    auto& p = psb2.getParams();
+    REQUIRE(p.tmReceiver == &packetDest);
+  }
 }

unittests/tmtcservices/testSendHelper.cpp

@@ -33,8 +33,9 @@ TEST_CASE("TM Send Helper", "[tm-send-helper]") {
     REQUIRE(sendHelper.getDefaultDestination() == destId);
     sendHelper.setDefaultDestination(destId + 1);
     REQUIRE(sendHelper.getDefaultDestination() == destId + 1);
-    sendHelper.setInternalErrorReporter(nullptr);
-    REQUIRE(sendHelper.getInternalErrorReporter() == nullptr);
+    auto errReporter2 = InternalErrorReporterMock();
+    sendHelper.setInternalErrorReporter(errReporter2);
+    REQUIRE(sendHelper.getInternalErrorReporter() == &errReporter2);
   }
 
   SECTION("Default CTOR") {