Merge pull request 'Unittest and Integration test hotfix' (#516) from KSat/fsfw:mueller/unittest-hotfix into development

Reviewed-on: fsfw/fsfw#516
This commit is contained in:
Ulrich Mohr 2021-10-26 17:36:40 +02:00
commit da19764232
8 changed files with 17 additions and 49 deletions

View File

@ -1,9 +1,9 @@
add_subdirectory(integration)
if(FSFW_ADD_INTERNAL_TESTS) if(FSFW_ADD_INTERNAL_TESTS)
add_subdirectory(internal) add_subdirectory(internal)
endif() endif()
if(FSFW_BUILD_UNITTESTS) if(FSFW_BUILD_UNITTESTS)
add_subdirectory(unit) add_subdirectory(unit)
else()
add_subdirectory(integration)
endif() endif()

View File

@ -160,11 +160,11 @@ ReturnValue_t TestAssembly::initialize() {
handler1->setParentQueue(this->getCommandQueue()); handler1->setParentQueue(this->getCommandQueue());
result = registerChild(objects::TEST_DEVICE_HANDLER_0); result = registerChild(deviceHandler0Id);
if (result != HasReturnvaluesIF::RETURN_OK) { if (result != HasReturnvaluesIF::RETURN_OK) {
return result; return result;
} }
result = registerChild(objects::TEST_DEVICE_HANDLER_1); result = registerChild(deviceHandler1Id);
if (result != HasReturnvaluesIF::RETURN_OK) { if (result != HasReturnvaluesIF::RETURN_OK) {
return result; return result;
} }

View File

@ -5,10 +5,11 @@
#include <fsfw/objectmanager/ObjectManager.h> #include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>
TestController::TestController(object_id_t objectId, size_t commandQueueDepth): TestController::TestController(object_id_t objectId, object_id_t device0, object_id_t device1,
size_t commandQueueDepth):
ExtendedControllerBase(objectId, objects::NO_OBJECT, commandQueueDepth), ExtendedControllerBase(objectId, objects::NO_OBJECT, commandQueueDepth),
deviceDataset0(objects::TEST_DEVICE_HANDLER_0), deviceDataset0(device0),
deviceDataset1(objects::TEST_DEVICE_HANDLER_1) { deviceDataset1(device1) {
} }
TestController::~TestController() { TestController::~TestController() {
@ -163,7 +164,7 @@ ReturnValue_t TestController::initializeLocalDataPool(localpool::DataPool &local
ReturnValue_t TestController::initializeAfterTaskCreation() { ReturnValue_t TestController::initializeAfterTaskCreation() {
namespace td = testdevice; namespace td = testdevice;
HasLocalDataPoolIF* device0 = ObjectManager::instance()->get<HasLocalDataPoolIF>( HasLocalDataPoolIF* device0 = ObjectManager::instance()->get<HasLocalDataPoolIF>(
objects::TEST_DEVICE_HANDLER_0); deviceDataset0.getCreatorObjectId());
if(device0 == nullptr) { if(device0 == nullptr) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "TestController::initializeAfterTaskCreation: Test device handler 0 " sif::warning << "TestController::initializeAfterTaskCreation: Test device handler 0 "
@ -185,7 +186,7 @@ ReturnValue_t TestController::initializeAfterTaskCreation() {
HasLocalDataPoolIF* device1 = ObjectManager::instance()->get<HasLocalDataPoolIF>( HasLocalDataPoolIF* device1 = ObjectManager::instance()->get<HasLocalDataPoolIF>(
objects::TEST_DEVICE_HANDLER_1); deviceDataset0.getCreatorObjectId());
if(device1 == nullptr) { if(device1 == nullptr) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "TestController::initializeAfterTaskCreation: Test device handler 1 " sif::warning << "TestController::initializeAfterTaskCreation: Test device handler 1 "

View File

@ -8,7 +8,8 @@
class TestController: class TestController:
public ExtendedControllerBase { public ExtendedControllerBase {
public: public:
TestController(object_id_t objectId, size_t commandQueueDepth = 10); TestController(object_id_t objectId, object_id_t device0, object_id_t device1,
size_t commandQueueDepth = 10);
virtual~ TestController(); virtual~ TestController();
protected: protected:
testdevice::TestDataSet deviceDataset0; testdevice::TestDataSet deviceDataset0;

View File

@ -644,13 +644,7 @@ ReturnValue_t TestDevice::initializeLocalDataPool(localpool::DataPool &localData
localDataPoolMap.emplace(td::PoolIds::TEST_FLOAT_VEC_3_ID, localDataPoolMap.emplace(td::PoolIds::TEST_FLOAT_VEC_3_ID,
new PoolEntry<float>({0.0, 0.0, 0.0})); new PoolEntry<float>({0.0, 0.0, 0.0}));
sid_t sid; sid_t sid(this->getObjectId(), td::TEST_SET_ID);
if(deviceIdx == td::DeviceIndex::DEVICE_0) {
sid = td::TEST_SET_DEV_0_SID;
}
else {
sid = td::TEST_SET_DEV_1_SID;
}
/* Subscribe for periodic HK packets but do not enable reporting for now. /* Subscribe for periodic HK packets but do not enable reporting for now.
Non-diangostic with a period of one second */ Non-diangostic with a period of one second */
poolManager.subscribeForPeriodicPacket(sid, false, 1.0, false); poolManager.subscribeForPeriodicPacket(sid, false, 1.0, false);

View File

@ -3,7 +3,6 @@
#include <fsfw/datapoollocal/StaticLocalDataSet.h> #include <fsfw/datapoollocal/StaticLocalDataSet.h>
#include <fsfw/devicehandlers/DeviceHandlerIF.h> #include <fsfw/devicehandlers/DeviceHandlerIF.h>
#include <commonSystemObjects.h>
namespace testdevice { namespace testdevice {
@ -79,8 +78,6 @@ enum PoolIds: lp_id_t {
}; };
static constexpr uint8_t TEST_SET_ID = TEST_NORMAL_MODE_CMD; static constexpr uint8_t TEST_SET_ID = TEST_NORMAL_MODE_CMD;
static const sid_t TEST_SET_DEV_0_SID = sid_t(objects::TEST_DEVICE_HANDLER_0, TEST_SET_ID);
static const sid_t TEST_SET_DEV_1_SID = sid_t(objects::TEST_DEVICE_HANDLER_1, TEST_SET_ID);
class TestDataSet: public StaticLocalDataSet<3> { class TestDataSet: public StaticLocalDataSet<3> {
public: public:

View File

@ -6,9 +6,8 @@
bool TestTask::oneShotAction = true; bool TestTask::oneShotAction = true;
MutexIF* TestTask::testLock = nullptr; MutexIF* TestTask::testLock = nullptr;
TestTask::TestTask(object_id_t objectId, bool periodicPrintout, bool periodicEvent): TestTask::TestTask(object_id_t objectId):
SystemObject(objectId), testMode(testModes::A), SystemObject(objectId), testMode(testModes::A) {
periodicPrinout(periodicPrintout), periodicEvent(periodicEvent) {
if(testLock == nullptr) { if(testLock == nullptr) {
testLock = MutexFactory::instance()->createMutex(); testLock = MutexFactory::instance()->createMutex();
} }
@ -52,17 +51,6 @@ ReturnValue_t TestTask::performOneShotAction() {
ReturnValue_t TestTask::performPeriodicAction() { ReturnValue_t TestTask::performPeriodicAction() {
/* This is performed each task cycle */ /* This is performed each task cycle */
ReturnValue_t result = RETURN_OK; 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; return result;
} }

View File

@ -5,9 +5,6 @@
#include <fsfw/objectmanager/SystemObject.h> #include <fsfw/objectmanager/SystemObject.h>
#include <fsfw/storagemanager/StorageManagerIF.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 * @brief Test class for general C++ testing and any other code which will not be part of the
* primary mission software. * primary mission software.
@ -19,12 +16,9 @@ class TestTask :
public ExecutableObjectIF, public ExecutableObjectIF,
public HasReturnvaluesIF { public HasReturnvaluesIF {
public: public:
TestTask(object_id_t objectId, bool periodicPrintout = false, bool periodicEvent = false); TestTask(object_id_t objectId);
virtual ~TestTask(); virtual ~TestTask();
virtual ReturnValue_t performOperation(uint8_t operationCode = 0); virtual ReturnValue_t performOperation(uint8_t operationCode = 0) override;
static constexpr uint8_t subsystemId = SUBSYSTEM_ID::TEST_TASK_ID;
static constexpr Event TEST_EVENT = event::makeEvent(subsystemId, 0, severity::INFO);
protected: protected:
virtual ReturnValue_t performOneShotAction(); virtual ReturnValue_t performOneShotAction();
@ -38,15 +32,8 @@ protected:
}; };
testModes testMode; testModes testMode;
bool periodicPrinout = false;
bool periodicEvent = false;
bool testFlag = false; bool testFlag = false;
uint8_t counter { 1 };
uint8_t counterTrigger { 3 };
void performPusInjectorTest();
void examplePacketTest();
private: private:
static bool oneShotAction; static bool oneShotAction;
static MutexIF* testLock; static MutexIF* testLock;