Merge branch 'development' into meier/dhbReplyTimeout

tests/src/fsfw_tests/integration/devices/TestDeviceHandler.cpp

@@ -13,14 +13,14 @@ TestDevice::TestDevice(object_id_t objectId, object_id_t comIF, CookieIF* cookie
       dataset(this),
       fullInfoPrintout(fullInfoPrintout) {}
 
-TestDevice::~TestDevice() {}
+TestDevice::~TestDevice() = default;
 
 void TestDevice::performOperationHook() {
   if (periodicPrintout) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::info << "TestDevice" << deviceIdx << "::performOperationHook: Alive!" << std::endl;
 #else
-    sif::printInfo("TestDevice%d::performOperationHook: Alive!", deviceIdx);
+    sif::printInfo("TestDevice%d::performOperationHook: Alive!\n", deviceIdx);
 #endif
   }
 

tests/src/fsfw_tests/integration/task/TestTask.cpp

@@ -12,7 +12,7 @@ TestTask::TestTask(object_id_t objectId) : SystemObject(objectId), testMode(test
   IPCStore = ObjectManager::instance()->get<StorageManagerIF>(objects::IPC_STORE);
 }
 
-TestTask::~TestTask() {}
+TestTask::~TestTask() = default;
 
 ReturnValue_t TestTask::performOperation(uint8_t operationCode) {
   ReturnValue_t result = RETURN_OK;

tests/src/fsfw_tests/integration/task/TestTask.h

@@ -13,9 +13,9 @@
  */
 class TestTask : public SystemObject, public ExecutableObjectIF, public HasReturnvaluesIF {
  public:
-  TestTask(object_id_t objectId);
-  virtual ~TestTask();
-  virtual ReturnValue_t performOperation(uint8_t operationCode = 0) override;
+  explicit TestTask(object_id_t objectId);
+  ~TestTask() override;
+  ReturnValue_t performOperation(uint8_t operationCode) override;
 
  protected:
   virtual ReturnValue_t performOneShotAction();

tests/src/fsfw_tests/unit/hal/testCommandExecutor.cpp

@@ -2,7 +2,9 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include <fstream>
+#include <iostream>
 
+#include "tests/TestsConfig.h"
 #include "fsfw/container/DynamicFIFO.h"
 #include "fsfw/container/SimpleRingBuffer.h"
 #include "fsfw/platform.h"
@@ -61,6 +63,9 @@ TEST_CASE("Command Executor", "[cmd-exec]") {
   std::string cmpString = "Hello World\n";
   CHECK(readString == cmpString);
   outputBuffer.deleteData(12, true);
+
+  // Issues with CI/CD
+#if FSFW_CICD_BUILD == 0
   // Test more complex command
   result = cmdExecutor.load("ping -c 1 localhost", false, false);
   REQUIRE(cmdExecutor.getCurrentState() == CommandExecutor::States::COMMAND_LOADED);
@@ -81,16 +86,27 @@ TEST_CASE("Command Executor", "[cmd-exec]") {
   REQUIRE(cmdExecutor.getCurrentState() == CommandExecutor::States::IDLE);
   readBytes = 0;
   sizesFifo.retrieve(&readBytes);
-  // That's about the size of the reply
-  bool beTrue = (readBytes > 200) and (readBytes < 300);
-  REQUIRE(beTrue);
   uint8_t largerReadBuffer[1024] = {};
+  // That's about the size of the reply
+  bool beTrue = (readBytes > 100) and (readBytes < 400);
+  if (not beTrue) {
+    size_t readLen = outputBuffer.getAvailableReadData();
+    if (readLen > sizeof(largerReadBuffer) - 1) {
+      readLen = sizeof(largerReadBuffer) - 1;
+    }
+    outputBuffer.readData(largerReadBuffer, readLen);
+    std::string readString(reinterpret_cast<char*>(largerReadBuffer));
+    std::cerr << "Catch2 tag cmd-exec: Read " << readBytes << ": " << std::endl;
+    std::cerr << readString << std::endl;
+  }
+  REQUIRE(beTrue);
   outputBuffer.readData(largerReadBuffer, readBytes);
   // You can also check this output in the debugger
   std::string allTheReply(reinterpret_cast<char*>(largerReadBuffer));
   // I am just going to assume that this string is the same across ping implementations
   // of different Linux systems
   REQUIRE(allTheReply.find("PING localhost") != std::string::npos);
+#endif
 
   // Now check failing command
   result = cmdExecutor.load("false", false, false);

tests/src/fsfw_tests/unit/internalerror/TestInternalErrorReporter.cpp

@@ -16,7 +16,7 @@
 #include "fsfw_tests/unit/mocks/PeriodicTaskIFMock.h"
 
 TEST_CASE("Internal Error Reporter", "[TestInternalError]") {
-  PeriodicTaskMock task(10);
+  PeriodicTaskMock task(10, nullptr);
   ObjectManagerIF* manager = ObjectManager::instance();
   if (manager == nullptr) {
     FAIL();
@@ -27,6 +27,8 @@ TEST_CASE("Internal Error Reporter", "[TestInternalError]") {
     FAIL();
   }
   task.addComponent(objects::INTERNAL_ERROR_REPORTER);
+  // This calls the initializeAfterTaskCreation function
+  task.startTask();
   MessageQueueIF* testQueue = QueueFactory::instance()->createMessageQueue(1);
   MessageQueueIF* hkQueue = QueueFactory::instance()->createMessageQueue(1);
   internalErrorReporter->getSubscriptionInterface()->subscribeForSetUpdateMessage(
@@ -115,4 +117,4 @@ TEST_CASE("Internal Error Reporter", "[TestInternalError]") {
   }
   QueueFactory::instance()->deleteMessageQueue(testQueue);
   QueueFactory::instance()->deleteMessageQueue(hkQueue);
-}
+}

tests/src/fsfw_tests/unit/mocks/PeriodicTaskIFMock.h

@@ -2,36 +2,24 @@
 #define FSFW_UNITTEST_TESTS_MOCKS_PERIODICTASKMOCK_H_
 
 #include <fsfw/tasks/ExecutableObjectIF.h>
-#include <fsfw/tasks/PeriodicTaskIF.h>
+#include <fsfw/tasks/PeriodicTaskBase.h>
 
-class PeriodicTaskMock : public PeriodicTaskIF {
+class PeriodicTaskMock : public PeriodicTaskBase {
  public:
-  PeriodicTaskMock(uint32_t period = 5) : period(period) {}
-  /**
-   * @brief	A virtual destructor as it is mandatory for interfaces.
-   */
+  PeriodicTaskMock(TaskPeriod period, TaskDeadlineMissedFunction dlmFunc)
+      : PeriodicTaskBase(period, dlmFunc) {}
+
   virtual ~PeriodicTaskMock() {}
   /**
    * @brief	With the startTask method, a created task can be started
    *          for the first time.
    */
-  virtual ReturnValue_t startTask() override { return HasReturnvaluesIF::RETURN_OK; };
-
-  virtual ReturnValue_t addComponent(object_id_t object) override {
-    ExecutableObjectIF* executableObject =
-        ObjectManager::instance()->get<ExecutableObjectIF>(objects::INTERNAL_ERROR_REPORTER);
-    if (executableObject == nullptr) {
-      return HasReturnvaluesIF::RETURN_FAILED;
-    }
-    executableObject->setTaskIF(this);
-    executableObject->initializeAfterTaskCreation();
+  virtual ReturnValue_t startTask() override {
+    initObjsAfterTaskCreation();
     return HasReturnvaluesIF::RETURN_OK;
   };
 
   virtual ReturnValue_t sleepFor(uint32_t ms) override { return HasReturnvaluesIF::RETURN_OK; };
-
-  virtual uint32_t getPeriodMs() const override { return period; };
-  uint32_t period;
 };
 
-#endif  // FSFW_UNITTEST_TESTS_MOCKS_PERIODICTASKMOCK_H_
+#endif  // FSFW_UNITTEST_TESTS_MOCKS_PERIODICTASKMOCK_H_

tests/src/fsfw_tests/unit/storagemanager/TestNewAccessor.cpp

@@ -156,4 +156,31 @@ TEST_CASE("New Accessor", "[NewAccessor]") {
       CHECK(receptionArray[i] == 42);
     }
   }
+
+  SECTION("Operators"){
+    result = SimplePool.addData(&testStoreId, testDataArray.data(), size);
+    REQUIRE(result == retval::CATCH_OK);
+    {
+      StorageAccessor accessor(testStoreId);
+      StorageAccessor accessor2(0);
+      accessor2 = std::move(accessor);
+      REQUIRE(accessor.data() == nullptr);
+      std::array<uint8_t, 6> data;
+      size_t size = 6;
+      result = accessor.write(data.data(), data.size());
+      REQUIRE(result == HasReturnvaluesIF::RETURN_FAILED);
+      result = SimplePool.modifyData(testStoreId, accessor2);
+      REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
+      CHECK(accessor2.getId() == testStoreId);
+      CHECK(accessor2.size() == 10);
+      
+      std::array<uint8_t, 10> newData;
+      // Expect data to be invalid so this must return RETURN_FAILED
+      result = accessor.getDataCopy(newData.data(),newData.size());
+      REQUIRE(result == HasReturnvaluesIF::RETURN_FAILED);
+      // Expect data to be too small 
+      result = accessor2.getDataCopy(data.data(),data.size());
+      REQUIRE(result == HasReturnvaluesIF::RETURN_FAILED);
+    }
+  }
 }

tests/src/fsfw_tests/unit/storagemanager/TestPool.cpp

@@ -3,6 +3,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include <cstring>
+#include <array>
 
 #include "fsfw_tests/unit/CatchDefinitions.h"
 

tests/src/fsfw_tests/unit/testcfg/TestsConfig.h.in

@@ -1,6 +1,8 @@
 #ifndef FSFW_UNITTEST_CONFIG_TESTSCONFIG_H_
 #define FSFW_UNITTEST_CONFIG_TESTSCONFIG_H_
 
+#cmakedefine01 FSFW_CICD_BUILD
+
 #define FSFW_ADD_DEFAULT_FACTORY_FUNCTIONS 1
 
 #ifdef __cplusplus