From 2126e6e3754a45f09bc9c557f1703821d7e68789 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 26 Oct 2021 17:24:28 +0200
Subject: [PATCH] simplified test task

---
 .../fsfw_tests/integration/task/TestTask.cpp    | 16 ++--------------
 .../src/fsfw_tests/integration/task/TestTask.h  | 17 ++---------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/tests/src/fsfw_tests/integration/task/TestTask.cpp b/tests/src/fsfw_tests/integration/task/TestTask.cpp
index c9910e90..b33bd51c 100644
--- a/tests/src/fsfw_tests/integration/task/TestTask.cpp
+++ b/tests/src/fsfw_tests/integration/task/TestTask.cpp
@@ -6,9 +6,8 @@
 bool TestTask::oneShotAction = true;
 MutexIF* TestTask::testLock = nullptr;
 
-TestTask::TestTask(object_id_t objectId, bool periodicPrintout, bool periodicEvent):
-	SystemObject(objectId), testMode(testModes::A),
-	periodicPrinout(periodicPrintout), periodicEvent(periodicEvent) {
+TestTask::TestTask(object_id_t objectId):
+	SystemObject(objectId), testMode(testModes::A) {
 	if(testLock == nullptr) {
 		testLock = MutexFactory::instance()->createMutex();
 	}
@@ -52,17 +51,6 @@ ReturnValue_t TestTask::performOneShotAction() {
 ReturnValue_t TestTask::performPeriodicAction() {
     /* This is performed each task cycle */
 	ReturnValue_t result = RETURN_OK;
-
-	if(periodicPrinout) {
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-		sif::info << "TestTask::performPeriodicAction: Hello World!" << std::endl;
-#else
-		sif::printInfo("TestTask::performPeriodicAction: Hello World!\n");
-#endif
-	}
-	if(periodicEvent) {
-	    triggerEvent(TEST_EVENT, 0x1234, 0x4321);
-	}
 	return result;
 }
 
diff --git a/tests/src/fsfw_tests/integration/task/TestTask.h b/tests/src/fsfw_tests/integration/task/TestTask.h
index 95f27bec..e56b5581 100644
--- a/tests/src/fsfw_tests/integration/task/TestTask.h
+++ b/tests/src/fsfw_tests/integration/task/TestTask.h
@@ -5,9 +5,6 @@
 #include <fsfw/objectmanager/SystemObject.h>
 #include <fsfw/storagemanager/StorageManagerIF.h>
 
-#include "fsfw/events/Event.h"
-#include "events/subsystemIdRanges.h"
-
 /**
  * @brief 	Test class for general C++ testing and any other code which will not be part of the
  *          primary mission software.
@@ -19,12 +16,9 @@ class TestTask :
         public ExecutableObjectIF,
         public HasReturnvaluesIF {
 public:
-    TestTask(object_id_t objectId, bool periodicPrintout = false, bool periodicEvent = false);
+    TestTask(object_id_t objectId);
     virtual ~TestTask();
-    virtual ReturnValue_t performOperation(uint8_t operationCode = 0);
-
-    static constexpr uint8_t subsystemId = SUBSYSTEM_ID::TEST_TASK_ID;
-    static constexpr Event TEST_EVENT = event::makeEvent(subsystemId, 0, severity::INFO);
+    virtual ReturnValue_t performOperation(uint8_t operationCode = 0) override;
 
 protected:
     virtual ReturnValue_t performOneShotAction();
@@ -38,15 +32,8 @@ protected:
     };
 
     testModes testMode;
-    bool periodicPrinout = false;
-    bool periodicEvent = false;
-
     bool testFlag = false;
-    uint8_t counter { 1 };
-    uint8_t counterTrigger { 3 };
 
-    void performPusInjectorTest();
-    void examplePacketTest();
 private:
     static bool oneShotAction;
     static MutexIF* testLock;