src/fsfw/cfdp/handler/RemoteConfigTableIF.h

@@ -6,6 +6,7 @@
 namespace cfdp {
 
 class RemoteConfigTableIF {
+ public:
   virtual ~RemoteConfigTableIF() = default;
   virtual bool getRemoteCfg(EntityId remoteId, RemoteEntityCfg* cfg) = 0;
 };

unittests/cfdp/handler/testDestHandler.cpp

@@ -1,12 +1,12 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include "fsfw/cfdp.h"
-#include "mocks/CfdpFaultHandlerMock.h"
+#include "mocks/cfdp/FaultHandlerMock.h"
 
 TEST_CASE("CFDP Dest Handler", "[cfdp]") {
   using namespace cfdp;
   EntityId localId = EntityId(UnsignedByteField<uint16_t>(2));
-  auto fhMock = CfdpFaultHandlerMock();
+  auto fhMock = FaultHandlerMock();
   auto localEntityCfg = LocalEntityCfg(localId, IndicationCfg(), fhMock);
   // auto destHandler = DestHandler();
 

unittests/cfdp/handler/testFaultHandler.cpp

@@ -1,10 +1,10 @@
 #include <catch2/catch_test_macros.hpp>
 
-#include "mocks/CfdpFaultHandlerMock.h"
+#include "mocks/cfdp/FaultHandlerMock.h"
 
 TEST_CASE("CFDP Fault Handler", "[cfdp]") {
   using namespace cfdp;
-  auto fhMock = CfdpFaultHandlerMock();
+  auto fhMock = FaultHandlerMock();
   cfdp::FaultHandlerCodes fhCode;
 
   SECTION("State") {

unittests/mocks/CMakeLists.txt

@@ -14,5 +14,6 @@ target_sources(
           PusDistributorMock.cpp
           CcsdsCheckerMock.cpp
           AcceptsTcMock.cpp
-          StorageManagerMock.cpp
+          StorageManagerMock.cpp)
-          CfdpFaultHandlerMock.cpp)
+
+add_subdirectory(cfdp)

unittests/mocks/cfdp/CMakeLists.txt

@@ -0,0 +1 @@
+target_sources(${FSFW_TEST_TGT} PRIVATE FaultHandlerMock.cpp UserMock.cpp RemoteConfigTableMock.cpp)

unittests/mocks/cfdp/FaultHandlerMock.cpp

@@ -1,38 +1,42 @@
-#include "CfdpFaultHandlerMock.h"
+#include "FaultHandlerMock.h"
 
-void CfdpFaultHandlerMock::noticeOfSuspensionCb(cfdp::ConditionCode code) {
+namespace cfdp {
+
+void FaultHandlerMock::noticeOfSuspensionCb(cfdp::ConditionCode code) {
   auto& info = fhInfoMap.at(cfdp::FaultHandlerCodes::NOTICE_OF_SUSPENSION);
   info.callCount++;
   info.condCodes.push(code);
 }
 
-void CfdpFaultHandlerMock::noticeOfCancellationCb(cfdp::ConditionCode code) {
+void FaultHandlerMock::noticeOfCancellationCb(cfdp::ConditionCode code) {
   auto& info = fhInfoMap.at(cfdp::FaultHandlerCodes::NOTICE_OF_CANCELLATION);
   info.callCount++;
   info.condCodes.push(code);
 }
 
-void CfdpFaultHandlerMock::abandonCb(cfdp::ConditionCode code) {
+void FaultHandlerMock::abandonCb(cfdp::ConditionCode code) {
   auto& info = fhInfoMap.at(cfdp::FaultHandlerCodes::ABANDON_TRANSACTION);
   info.callCount++;
   info.condCodes.push(code);
 }
 
-void CfdpFaultHandlerMock::ignoreCb(cfdp::ConditionCode code) {
+void FaultHandlerMock::ignoreCb(cfdp::ConditionCode code) {
   auto& info = fhInfoMap.at(cfdp::FaultHandlerCodes::IGNORE_ERROR);
   info.callCount++;
   info.condCodes.push(code);
 }
 
-CfdpFaultHandlerMock::FaultInfo& CfdpFaultHandlerMock::getFhInfo(cfdp::FaultHandlerCodes fhCode) {
+FaultHandlerMock::FaultInfo& FaultHandlerMock::getFhInfo(cfdp::FaultHandlerCodes fhCode) {
   return fhInfoMap.at(fhCode);
 }
 
-void CfdpFaultHandlerMock::reset() { fhInfoMap.clear(); }
+void FaultHandlerMock::reset() { fhInfoMap.clear(); }
 
-bool CfdpFaultHandlerMock::faultCbWasCalled() const {
+bool FaultHandlerMock::faultCbWasCalled() const {
   return std::any_of(fhInfoMap.begin(), fhInfoMap.end(),
                      [](const std::pair<cfdp::FaultHandlerCodes, FaultInfo>& pair) {
                        return pair.second.callCount > 0;
                      });
 }
+
+}  // namespace cfdp

unittests/mocks/cfdp/FaultHandlerMock.h

@@ -1,24 +1,26 @@
-#ifndef FSFW_TESTS_CFDPFAULTHANDLERMOCK_H
+#ifndef FSFW_TESTS_FAULTHANDLERMOCK_H
-#define FSFW_TESTS_CFDPFAULTHANDLERMOCK_H
+#define FSFW_TESTS_FAULTHANDLERMOCK_H
 
 #include <map>
 #include <queue>
 
 #include "fsfw/cfdp/handler/FaultHandlerBase.h"
 
-class CfdpFaultHandlerMock : public cfdp::FaultHandlerBase {
+namespace cfdp {
+
+class FaultHandlerMock : public FaultHandlerBase {
  public:
   struct FaultInfo {
     size_t callCount = 0;
     std::queue<cfdp::ConditionCode> condCodes;
   };
 
-  void noticeOfSuspensionCb(cfdp::ConditionCode code) override;
+  void noticeOfSuspensionCb(ConditionCode code) override;
-  void noticeOfCancellationCb(cfdp::ConditionCode code) override;
+  void noticeOfCancellationCb(ConditionCode code) override;
-  void abandonCb(cfdp::ConditionCode code) override;
+  void abandonCb(ConditionCode code) override;
-  void ignoreCb(cfdp::ConditionCode code) override;
+  void ignoreCb(ConditionCode code) override;
 
-  FaultInfo& getFhInfo(cfdp::FaultHandlerCodes fhCode);
+  FaultInfo& getFhInfo(FaultHandlerCodes fhCode);
   [[nodiscard]] bool faultCbWasCalled() const;
   void reset();
 
@@ -29,4 +31,7 @@ class CfdpFaultHandlerMock : public cfdp::FaultHandlerBase {
       std::pair{cfdp::FaultHandlerCodes::NOTICE_OF_SUSPENSION, FaultInfo()},
       std::pair{cfdp::FaultHandlerCodes::ABANDON_TRANSACTION, FaultInfo()}};
 };
-#endif  // FSFW_TESTS_CFDPFAULTHANDLERMOCK_H
+
+}  // namespace cfdp
+
+#endif  // FSFW_TESTS_FAULTHANDLERMOCK_H

unittests/mocks/cfdp/RemoteConfigTableMock.cpp

@@ -0,0 +1,6 @@
+#include "RemoteConfigTableMock.h"
+
+bool cfdp::RemoteConfigTableMock::getRemoteCfg(cfdp::EntityId remoteId,
+                                               cfdp::RemoteEntityCfg *cfg) {
+  return false;
+}

unittests/mocks/cfdp/RemoteConfigTableMock.h

@@ -0,0 +1,15 @@
+#ifndef FSFW_TESTS_CFDP_REMOTCONFIGTABLEMOCK_H
+#define FSFW_TESTS_CFDP_REMOTCONFIGTABLEMOCK_H
+
+#include "fsfw/cfdp/handler/RemoteConfigTableIF.h"
+
+namespace cfdp {
+
+class RemoteConfigTableMock: public RemoteConfigTableIF {
+ public:
+  bool getRemoteCfg(EntityId remoteId, RemoteEntityCfg *cfg) override;
+};
+
+}
+
+#endif  // FSFW_TESTS_CFDP_REMOTCONFIGTABLEMOCK_H

unittests/mocks/cfdp/UserMock.cpp

@@ -0,0 +1,16 @@
+#include "UserMock.h"
+
+cfdp::UserMock::UserMock(HasFileSystemIF& vfs) : UserBase(vfs) {}
+
+void cfdp::UserMock::transactionIndication(cfdp::TransactionId id) {}
+void cfdp::UserMock::eofSentIndication(cfdp::TransactionId id) {}
+void cfdp::UserMock::abandonedIndication(cfdp::TransactionId id, cfdp::ConditionCode code,
+                                         uint64_t progress) {}
+void cfdp::UserMock::eofRecvIndication(cfdp::TransactionId id) {}
+void cfdp::UserMock::transactionFinishedIndication() {}
+void cfdp::UserMock::metadataRecvdIndication() {}
+void cfdp::UserMock::fileSegmentRecvdIndication() {}
+void cfdp::UserMock::reportIndication() {}
+void cfdp::UserMock::suspendedIndication() {}
+void cfdp::UserMock::resumedIndication() {}
+

unittests/mocks/cfdp/UserMock.h

@@ -0,0 +1,25 @@
+#ifndef FSFW_TESTS_CFDP_USERMOCK_H
+#define FSFW_TESTS_CFDP_USERMOCK_H
+
+#include "fsfw/cfdp/handler/UserBase.h"
+
+namespace cfdp {
+
+class UserMock: public UserBase {
+  explicit UserMock(HasFileSystemIF& vfs);
+ public:
+  void transactionIndication(TransactionId id) override;
+  void eofSentIndication(TransactionId id) override;
+  void abandonedIndication(TransactionId id, ConditionCode code, uint64_t progress) override;
+  void eofRecvIndication(TransactionId id) override;
+  void transactionFinishedIndication() override;
+  void metadataRecvdIndication() override;
+  void fileSegmentRecvdIndication() override;
+  void reportIndication() override;
+  void suspendedIndication() override;
+  void resumedIndication() override;
+};
+
+}
+
+#endif  // FSFW_TESTS_CFDP_USERMOCK_H