eive/fsfw
eive/fsfw
14
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

fixed unittest

Browse Source
This commit is contained in:
Robin Müller 2020-12-03 14:44:11 +01:00
parent 51b9e0074b
commit 03aacea4dd
6 changed files with 300 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
unittest/core/CatchFactory.cpp Normal file
View File

@ -0,0 +1,60 @@
#include "CatchFactory.h"
#include "../../events/EventManager.h"
#include "../../health/HealthTable.h"
#include "../../internalError/InternalErrorReporter.h"
#include "../../objectmanager/frameworkObjects.h"
#include "../../storagemanager/PoolManager.h"
/**
* @brief Produces system objects.
* @details
* Build tasks by using SystemObject Interface (Interface).
* Header files of all tasks must be included
* Please note that an object has to implement the system object interface
* if the interface validity is checked or retrieved later by using the
* get<TargetInterface>(object_id) function from the ObjectManagerIF.
*
* Framework objects are created first.
*
* @ingroup init
*/
void Factory::produce(void) {
setStaticFrameworkObjectIds();
new EventManager(objects::EVENT_MANAGER);
new HealthTable(objects::HEALTH_TABLE);
//new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
{
static constexpr uint8_t NUMBER_OF_POOLS = 5;
const uint16_t element_sizes[NUMBER_OF_POOLS] = {16, 32, 64, 128, 1024};
const uint16_t n_elements[NUMBER_OF_POOLS] = {100, 50, 25, 15, 5};
new PoolManager<NUMBER_OF_POOLS>(objects::TC_STORE, element_sizes,
n_elements);
}
{
static constexpr uint8_t NUMBER_OF_POOLS = 5;
const uint16_t element_sizes[NUMBER_OF_POOLS] = {16, 32, 64, 128, 1024};
const uint16_t n_elements[NUMBER_OF_POOLS] = {100, 50, 25, 15, 5};
new PoolManager<NUMBER_OF_POOLS>(objects::TM_STORE, element_sizes,
n_elements);
}
{
static constexpr uint8_t NUMBER_OF_POOLS = 6;
const uint16_t element_sizes[NUMBER_OF_POOLS] = {32, 64, 512,
1024, 2048, 4096};
const uint16_t n_elements[NUMBER_OF_POOLS] = {200, 100, 50, 25, 15, 5};
new PoolManager<NUMBER_OF_POOLS>(objects::IPC_STORE, element_sizes,
n_elements);
}
}
void Factory::setStaticFrameworkObjectIds() {
}

0
unittest/testcfg/objects/Factory.h → unittest/core/CatchFactory.h
View File

3
unittest/core/CatchSetup.cpp
View File

@ -1,8 +1,7 @@
#include "CatchDefinitions.h" #include "CatchDefinitions.h"
#include "CatchFactory.h"
#include <testcfg/cdatapool/dataPoolInit.h> #include <testcfg/cdatapool/dataPoolInit.h>
#include <testcfg/objects/Factory.h>
#ifdef GCOV #ifdef GCOV
#include <gcov.h> #include <gcov.h>

34
unittest/testcfg/objects/Factory.cpp
View File

@ -1,34 +0,0 @@
#include "Factory.h"
#include <fsfw/events/EventManager.h>
#include <fsfw/health/HealthTable.h>
#include <fsfw/internalError/InternalErrorReporter.h>
#include <fsfw/objectmanager/frameworkObjects.h>
/**
* @brief Produces system objects.
* @details
* Build tasks by using SystemObject Interface (Interface).
* Header files of all tasks must be included
* Please note that an object has to implement the system object interface
* if the interface validity is checked or retrieved later by using the
* get<TargetInterface>(object_id) function from the ObjectManagerIF.
*
* Framework objects are created first.
*
* @ingroup init
*/
void Factory::produce(void) {
setStaticFrameworkObjectIds();
new EventManager(objects::EVENT_MANAGER);
new HealthTable(objects::HEALTH_TABLE);
new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
}
void Factory::setStaticFrameworkObjectIds() {
}

213
unittest/tests/action/TestActionHelper.cpp
View File

@ -1,106 +1,107 @@
//#include "TestActionHelper.h" #include "TestActionHelper.h"
//#include <fsfw/action/ActionHelper.h> #include <fsfw/action/ActionHelper.h>
//#include <fsfw/ipc/CommandMessage.h> #include <fsfw/ipc/CommandMessage.h>
//#include <catch2/catch.hpp> #include <catch2/catch.hpp>
//#include "../../core/CatchDefinitions.h" #include "../../core/CatchDefinitions.h"
//
//
//TEST_CASE( "Action Helper" , "[ActionHelper]") { TEST_CASE( "Action Helper" , "[ActionHelper]") {
// ActionHelperOwnerMockBase testDhMock; ActionHelperOwnerMockBase testDhMock;
// MessageQueueMockBase testMqMock; MessageQueueMockBase testMqMock;
// ActionHelper actionHelper = ActionHelper( ActionHelper actionHelper = ActionHelper(
// &testDhMock, dynamic_cast<MessageQueueIF*>(&testMqMock)); &testDhMock, dynamic_cast<MessageQueueIF*>(&testMqMock));
// CommandMessage actionMessage; CommandMessage actionMessage;
// ActionId_t testActionId = 777; ActionId_t testActionId = 777;
// std::array <uint8_t, 3> testParams {1, 2, 3}; std::array <uint8_t, 3> testParams {1, 2, 3};
// store_address_t paramAddress; store_address_t paramAddress;
// StorageManagerIF *ipcStore = tglob::getIpcStoreHandle(); StorageManagerIF *ipcStore = tglob::getIpcStoreHandle();
// ipcStore->addData(&paramAddress, testParams.data(), 3); REQUIRE(ipcStore != nullptr);
// REQUIRE(actionHelper.initialize() == retval::CATCH_OK); ipcStore->addData(&paramAddress, testParams.data(), 3);
// REQUIRE(actionHelper.initialize() == retval::CATCH_OK);
// SECTION ("Simple tests") {
// ActionMessage::setCommand(&actionMessage, testActionId, paramAddress); SECTION ("Simple tests") {
// CHECK(not testDhMock.executeActionCalled); ActionMessage::setCommand(&actionMessage, testActionId, paramAddress);
// REQUIRE(actionHelper.handleActionMessage(&actionMessage) == retval::CATCH_OK); CHECK(not testDhMock.executeActionCalled);
// CHECK(testDhMock.executeActionCalled); REQUIRE(actionHelper.handleActionMessage(&actionMessage) == retval::CATCH_OK);
// // No message is sent if everything is alright. CHECK(testDhMock.executeActionCalled);
// CHECK(not testMqMock.wasMessageSent()); // No message is sent if everything is alright.
// store_address_t invalidAddress; CHECK(not testMqMock.wasMessageSent());
// ActionMessage::setCommand(&actionMessage, testActionId, invalidAddress); store_address_t invalidAddress;
// actionHelper.handleActionMessage(&actionMessage); ActionMessage::setCommand(&actionMessage, testActionId, invalidAddress);
// CHECK(testMqMock.wasMessageSent()); actionHelper.handleActionMessage(&actionMessage);
// const uint8_t* ptr = nullptr; CHECK(testMqMock.wasMessageSent());
// size_t size = 0; const uint8_t* ptr = nullptr;
// REQUIRE(ipcStore->getData(paramAddress, &ptr, &size) == static_cast<uint32_t>(StorageManagerIF::DATA_DOES_NOT_EXIST)); size_t size = 0;
// REQUIRE(ptr == nullptr); REQUIRE(ipcStore->getData(paramAddress, &ptr, &size) == static_cast<uint32_t>(StorageManagerIF::DATA_DOES_NOT_EXIST));
// REQUIRE(size == 0); REQUIRE(ptr == nullptr);
// testDhMock.getBuffer(&ptr, &size); REQUIRE(size == 0);
// REQUIRE(size == 3); testDhMock.getBuffer(&ptr, &size);
// for(uint8_t i = 0; i<3;i++){ REQUIRE(size == 3);
// REQUIRE(ptr[i] == (i+1)); for(uint8_t i = 0; i<3;i++){
// } REQUIRE(ptr[i] == (i+1));
// testDhMock.clearBuffer(); }
// } testDhMock.clearBuffer();
// }
// SECTION("Handle failures"){
// actionMessage.setCommand(1234); SECTION("Handle failures"){
// REQUIRE(actionHelper.handleActionMessage(&actionMessage) == static_cast<uint32_t>(CommandMessage::UNKNOWN_COMMAND)); actionMessage.setCommand(1234);
// CHECK(not testMqMock.wasMessageSent()); REQUIRE(actionHelper.handleActionMessage(&actionMessage) == static_cast<uint32_t>(CommandMessage::UNKNOWN_COMMAND));
// uint16_t step = 5; CHECK(not testMqMock.wasMessageSent());
// ReturnValue_t status = 0x1234; uint16_t step = 5;
// actionHelper.step(step, testMqMock.getId(), testActionId, status); ReturnValue_t status = 0x1234;
// step += 1; actionHelper.step(step, testMqMock.getId(), testActionId, status);
// CHECK(testMqMock.wasMessageSent()); step += 1;
// CommandMessage testMessage; CHECK(testMqMock.wasMessageSent());
// REQUIRE(testMqMock.receiveMessage(&testMessage) == static_cast<uint32_t>(HasReturnvaluesIF::RETURN_OK)); CommandMessage testMessage;
// REQUIRE(testMessage.getCommand() == static_cast<uint32_t>(ActionMessage::STEP_FAILED)); REQUIRE(testMqMock.receiveMessage(&testMessage) == static_cast<uint32_t>(HasReturnvaluesIF::RETURN_OK));
// REQUIRE(testMessage.getParameter() == static_cast<uint32_t>(testActionId)); REQUIRE(testMessage.getCommand() == static_cast<uint32_t>(ActionMessage::STEP_FAILED));
// uint32_t parameter2 = ((uint32_t)step << 16) | (uint32_t)status; REQUIRE(testMessage.getParameter() == static_cast<uint32_t>(testActionId));
// REQUIRE(testMessage.getParameter2() == parameter2); uint32_t parameter2 = ((uint32_t)step << 16) | (uint32_t)status;
// REQUIRE(ActionMessage::getStep(&testMessage) == step); REQUIRE(testMessage.getParameter2() == parameter2);
// } REQUIRE(ActionMessage::getStep(&testMessage) == step);
// }
// SECTION("Handle finish"){
// CHECK(not testMqMock.wasMessageSent()); SECTION("Handle finish"){
// ReturnValue_t status = 0x9876; CHECK(not testMqMock.wasMessageSent());
// actionHelper.finish(testMqMock.getId(), testActionId, status); ReturnValue_t status = 0x9876;
// CHECK(testMqMock.wasMessageSent()); actionHelper.finish(testMqMock.getId(), testActionId, status);
// CommandMessage testMessage; CHECK(testMqMock.wasMessageSent());
// REQUIRE(testMqMock.receiveMessage(&testMessage) == static_cast<uint32_t>(HasReturnvaluesIF::RETURN_OK)); CommandMessage testMessage;
// REQUIRE(testMessage.getCommand() == static_cast<uint32_t>(ActionMessage::COMPLETION_FAILED)); REQUIRE(testMqMock.receiveMessage(&testMessage) == static_cast<uint32_t>(HasReturnvaluesIF::RETURN_OK));
// REQUIRE(ActionMessage::getActionId(&testMessage) == testActionId); REQUIRE(testMessage.getCommand() == static_cast<uint32_t>(ActionMessage::COMPLETION_FAILED));
// REQUIRE(ActionMessage::getReturnCode(&testMessage) == static_cast<uint32_t>(status)); REQUIRE(ActionMessage::getActionId(&testMessage) == testActionId);
// } REQUIRE(ActionMessage::getReturnCode(&testMessage) == static_cast<uint32_t>(status));
// }
// SECTION("Handle failed"){
// store_address_t toLongParamAddress = StorageManagerIF::INVALID_ADDRESS; SECTION("Handle failed"){
// std::array<uint8_t, 5> toLongData = {5, 4, 3, 2, 1}; store_address_t toLongParamAddress = StorageManagerIF::INVALID_ADDRESS;
// REQUIRE(ipcStore->addData(&toLongParamAddress, toLongData.data(), 5) == retval::CATCH_OK); std::array<uint8_t, 5> toLongData = {5, 4, 3, 2, 1};
// ActionMessage::setCommand(&actionMessage, testActionId, toLongParamAddress); REQUIRE(ipcStore->addData(&toLongParamAddress, toLongData.data(), 5) == retval::CATCH_OK);
// CHECK(not testDhMock.executeActionCalled); ActionMessage::setCommand(&actionMessage, testActionId, toLongParamAddress);
// REQUIRE(actionHelper.handleActionMessage(&actionMessage) == retval::CATCH_OK); CHECK(not testDhMock.executeActionCalled);
// REQUIRE(ipcStore->getData(toLongParamAddress).first == static_cast<uint32_t>(StorageManagerIF::DATA_DOES_NOT_EXIST)); REQUIRE(actionHelper.handleActionMessage(&actionMessage) == retval::CATCH_OK);
// CommandMessage testMessage; REQUIRE(ipcStore->getData(toLongParamAddress).first == static_cast<uint32_t>(StorageManagerIF::DATA_DOES_NOT_EXIST));
// REQUIRE(testMqMock.receiveMessage(&testMessage) == static_cast<uint32_t>(HasReturnvaluesIF::RETURN_OK)); CommandMessage testMessage;
// REQUIRE(testMessage.getCommand() == static_cast<uint32_t>(ActionMessage::STEP_FAILED)); REQUIRE(testMqMock.receiveMessage(&testMessage) == static_cast<uint32_t>(HasReturnvaluesIF::RETURN_OK));
// REQUIRE(ActionMessage::getReturnCode(&testMessage) == 0xAFFE); REQUIRE(testMessage.getCommand() == static_cast<uint32_t>(ActionMessage::STEP_FAILED));
// REQUIRE(ActionMessage::getStep(&testMessage) == 0); REQUIRE(ActionMessage::getReturnCode(&testMessage) == 0xAFFE);
// REQUIRE(ActionMessage::getActionId(&testMessage) == testActionId); REQUIRE(ActionMessage::getStep(&testMessage) == 0);
// } REQUIRE(ActionMessage::getActionId(&testMessage) == testActionId);
// }
// SECTION("Missing IPC Data"){
// ActionMessage::setCommand(&actionMessage, testActionId, StorageManagerIF::INVALID_ADDRESS); SECTION("Missing IPC Data"){
// CHECK(not testDhMock.executeActionCalled); ActionMessage::setCommand(&actionMessage, testActionId, StorageManagerIF::INVALID_ADDRESS);
// REQUIRE(actionHelper.handleActionMessage(&actionMessage) == retval::CATCH_OK); CHECK(not testDhMock.executeActionCalled);
// CommandMessage testMessage; REQUIRE(actionHelper.handleActionMessage(&actionMessage) == retval::CATCH_OK);
// REQUIRE(testMqMock.receiveMessage(&testMessage) == static_cast<uint32_t>(HasReturnvaluesIF::RETURN_OK)); CommandMessage testMessage;
// REQUIRE(testMessage.getCommand() == static_cast<uint32_t>(ActionMessage::STEP_FAILED)); REQUIRE(testMqMock.receiveMessage(&testMessage) == static_cast<uint32_t>(HasReturnvaluesIF::RETURN_OK));
// REQUIRE(ActionMessage::getReturnCode(&testMessage) == static_cast<uint32_t>(StorageManagerIF::ILLEGAL_STORAGE_ID)); REQUIRE(testMessage.getCommand() == static_cast<uint32_t>(ActionMessage::STEP_FAILED));
// REQUIRE(ActionMessage::getStep(&testMessage) == 0); REQUIRE(ActionMessage::getReturnCode(&testMessage) == static_cast<uint32_t>(StorageManagerIF::ILLEGAL_STORAGE_ID));
// } REQUIRE(ActionMessage::getStep(&testMessage) == 0);
// }
//
// SECTION("Data Reply"){
// SECTION("Data Reply"){
// }
//} }
}

263
unittest/tests/action/TestActionHelper.h
View File

@ -1,131 +1,132 @@
//#ifndef UNITTEST_HOSTED_TESTACTIONHELPER_H_ #ifndef UNITTEST_HOSTED_TESTACTIONHELPER_H_
//#define UNITTEST_HOSTED_TESTACTIONHELPER_H_ #define UNITTEST_HOSTED_TESTACTIONHELPER_H_
//
//#include <fsfw/action/HasActionsIF.h> #include <fsfw/action/HasActionsIF.h>
//#include <fsfw/ipc/MessageQueueIF.h> #include <fsfw/ipc/MessageQueueIF.h>
//#include <fsfw/unittest/core/CatchDefinitions.h> #include <fsfw/unittest/core/CatchDefinitions.h>
//#include <cstring> #include <cstring>
//
//
//class ActionHelperOwnerMockBase: public HasActionsIF { class ActionHelperOwnerMockBase: public HasActionsIF {
//public: public:
// bool getCommandQueueCalled = false; bool getCommandQueueCalled = false;
// bool executeActionCalled = false; bool executeActionCalled = false;
// static const size_t MAX_SIZE = 3; static const size_t MAX_SIZE = 3;
// uint8_t buffer[MAX_SIZE] = {0, 0, 0}; uint8_t buffer[MAX_SIZE] = {0, 0, 0};
// size_t size = 0; size_t size = 0;
//
// MessageQueueId_t getCommandQueue() const override { MessageQueueId_t getCommandQueue() const override {
// return tconst::testQueueId; return tconst::testQueueId;
// } }
//
// ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy, ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
// const uint8_t* data, size_t size) override { const uint8_t* data, size_t size) override {
// executeActionCalled = true; executeActionCalled = true;
// if(size > MAX_SIZE){ if(size > MAX_SIZE){
// return 0xAFFE; return 0xAFFE;
// } }
// this->size = size; this->size = size;
// memcpy(buffer, data, size); memcpy(buffer, data, size);
// return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
// } }
//
// void clearBuffer(){ void clearBuffer(){
// this->size = 0; this->size = 0;
// for(size_t i = 0; i<MAX_SIZE; i++){ for(size_t i = 0; i<MAX_SIZE; i++){
// buffer[i] = 0; buffer[i] = 0;
// } }
// } }
//
// void getBuffer(const uint8_t** ptr, size_t* size){ void getBuffer(const uint8_t** ptr, size_t* size){
// if(size != nullptr){ if(size != nullptr){
// *size = this->size; *size = this->size;
// } }
// if(ptr != nullptr){ if(ptr != nullptr){
// *ptr = buffer; *ptr = buffer;
// } }
// } }
//}; };
//
//
//class MessageQueueMockBase: public MessageQueueIF { class MessageQueueMockBase: public MessageQueueIF {
//public: public:
// MessageQueueId_t myQueueId = 0; MessageQueueId_t myQueueId = 0;
// bool defaultDestSet = false; bool defaultDestSet = false;
// bool messageSent = false; bool messageSent = false;
//
//
//
// bool wasMessageSent() { bool wasMessageSent() {
// bool tempMessageSent = messageSent; bool tempMessageSent = messageSent;
// messageSent = false; messageSent = false;
// return tempMessageSent; return tempMessageSent;
// } }
//
// virtual ReturnValue_t reply( MessageQueueMessage* message ) { virtual ReturnValue_t reply( MessageQueueMessageIF* message ) {
// messageSent = true; messageSent = true;
// lastMessage = (*message); lastMessage = *(dynamic_cast<MessageQueueMessage*>(message));
// return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
// }; };
// virtual ReturnValue_t receiveMessage(MessageQueueMessage* message, virtual ReturnValue_t receiveMessage(MessageQueueMessageIF* message,
// MessageQueueId_t *receivedFrom) { MessageQueueId_t *receivedFrom) {
// (*message) = lastMessage; (*message) = lastMessage;
// lastMessage.clear(); lastMessage.clear();
// return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
// } }
// virtual ReturnValue_t receiveMessage(MessageQueueMessage* message) { virtual ReturnValue_t receiveMessage(MessageQueueMessageIF* message) {
// (*message) = lastMessage; memcpy(message->getBuffer(), lastMessage.getBuffer(),
// lastMessage.clear(); message->getMessageSize());
// return HasReturnvaluesIF::RETURN_OK; lastMessage.clear();
// } return HasReturnvaluesIF::RETURN_OK;
// virtual ReturnValue_t flush(uint32_t* count) { }
// return HasReturnvaluesIF::RETURN_OK; virtual ReturnValue_t flush(uint32_t* count) {
// } return HasReturnvaluesIF::RETURN_OK;
// virtual MessageQueueId_t getLastPartner() const { }
// return tconst::testQueueId; virtual MessageQueueId_t getLastPartner() const {
// } return tconst::testQueueId;
// virtual MessageQueueId_t getId() const { }
// return tconst::testQueueId; virtual MessageQueueId_t getId() const {
// } return tconst::testQueueId;
// virtual ReturnValue_t sendMessageFrom( MessageQueueId_t sendTo, }
// MessageQueueMessage* message, MessageQueueId_t sentFrom, virtual ReturnValue_t sendMessageFrom( MessageQueueId_t sendTo,
// bool ignoreFault = false ) { MessageQueueMessageIF* message, MessageQueueId_t sentFrom,
// messageSent = true; bool ignoreFault = false ) {
// lastMessage = (*message); messageSent = true;
// return HasReturnvaluesIF::RETURN_OK; lastMessage = *(dynamic_cast<MessageQueueMessage*>(message));
// } return HasReturnvaluesIF::RETURN_OK;
// virtual ReturnValue_t sendMessage( MessageQueueId_t sendTo, }
// MessageQueueMessage* message, bool ignoreFault = false ) override { virtual ReturnValue_t sendMessage( MessageQueueId_t sendTo,
// messageSent = true; MessageQueueMessageIF* message, bool ignoreFault = false ) override {
// lastMessage = (*message); messageSent = true;
// return HasReturnvaluesIF::RETURN_OK; lastMessage = *(dynamic_cast<MessageQueueMessage*>(message));
// } return HasReturnvaluesIF::RETURN_OK;
// virtual ReturnValue_t sendToDefaultFrom( MessageQueueMessage* message, }
// MessageQueueId_t sentFrom, bool ignoreFault = false ) { virtual ReturnValue_t sendToDefaultFrom( MessageQueueMessageIF* message,
// messageSent = true; MessageQueueId_t sentFrom, bool ignoreFault = false ) {
// lastMessage = (*message); messageSent = true;
// return HasReturnvaluesIF::RETURN_OK; lastMessage = *(dynamic_cast<MessageQueueMessage*>(message));
// } return HasReturnvaluesIF::RETURN_OK;
// virtual ReturnValue_t sendToDefault( MessageQueueMessage* message ) { }
// messageSent = true; virtual ReturnValue_t sendToDefault( MessageQueueMessageIF* message ) {
// lastMessage = (*message); messageSent = true;
// return HasReturnvaluesIF::RETURN_OK; lastMessage = *(dynamic_cast<MessageQueueMessage*>(message));
// } return HasReturnvaluesIF::RETURN_OK;
// virtual void setDefaultDestination(MessageQueueId_t defaultDestination) { }
// myQueueId = defaultDestination; virtual void setDefaultDestination(MessageQueueId_t defaultDestination) {
// defaultDestSet = true; myQueueId = defaultDestination;
// } defaultDestSet = true;
// }
// virtual MessageQueueId_t getDefaultDestination() const {
// return myQueueId; virtual MessageQueueId_t getDefaultDestination() const {
// } return myQueueId;
// virtual bool isDefaultDestinationSet() const { }
// return defaultDestSet; virtual bool isDefaultDestinationSet() const {
// } return defaultDestSet;
//private: }
// MessageQueueMessage lastMessage; private:
// MessageQueueMessage lastMessage;
//};
// };
//
//#endif /* UNITTEST_TESTFW_NEWTESTS_TESTACTIONHELPER_H_ */
#endif /* UNITTEST_TESTFW_NEWTESTS_TESTACTIONHELPER_H_ */