mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

use sanitized include file

Browse Source
This commit is contained in:
Robin Müller
2022-08-01 14:23:52 +02:00
parent aa978205d8
commit bf540ebb49
15 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
unittests/CatchDefinitions.cpp
View File

@ -1,3 +1,4 @@
#include "fsfw/FSFW.h"
#include "CatchDefinitions.h"
#include <fsfw/objectmanager/ObjectManager.h>

1
unittests/CatchDefinitions.h
View File

@ -1,6 +1,7 @@
#ifndef FSFW_UNITTEST_CORE_CATCHDEFINITIONS_H_
#define FSFW_UNITTEST_CORE_CATCHDEFINITIONS_H_
#include "fsfw/FSFW.h"
#include <fsfw/ipc/messageQueueDefinitions.h>
#include <fsfw/returnvalues/HasReturnvaluesIF.h>
#include <fsfw/storagemanager/StorageManagerIF.h>

1
unittests/CatchSetup.cpp
View File

@ -1,3 +1,4 @@
#include "fsfw/FSFW.h"
#include "CatchDefinitions.h"
#include "CatchFactory.h"

4
unittests/mocks/PusDistributorMock.cpp
View File

@ -5,8 +5,8 @@ PusDistributorMock::PusDistributorMock() : SystemObject(objects::NO_OBJECT, fals
PusDistributorMock::PusDistributorMock(object_id_t registeredId)
: SystemObject(registeredId, true) {}
ReturnValue_t PusDistributorMock::registerService(AcceptsTelecommandsIF *service) {
ReturnValue_t PusDistributorMock::registerService(const AcceptsTelecommandsIF& service) {
registerCallCount++;
lastServiceArg = service;
registeredServies.push_back(&service);
return HasReturnvaluesIF::RETURN_OK;
}

6
unittests/mocks/PusDistributorMock.h
View File

@ -4,13 +4,15 @@
#include "fsfw/objectmanager/SystemObject.h"
#include "fsfw/tcdistribution/PusDistributorIF.h"
#include <vector>
class PusDistributorMock : public SystemObject, public PusDistributorIF {
public:
PusDistributorMock();
explicit PusDistributorMock(object_id_t registeredId);
unsigned int registerCallCount = 0;
AcceptsTelecommandsIF* lastServiceArg = nullptr;
ReturnValue_t registerService(AcceptsTelecommandsIF* service) override;
std::vector<const AcceptsTelecommandsIF*> registeredServies;
ReturnValue_t registerService(const AcceptsTelecommandsIF& service) override;
};
#endif // FSFW_TESTS_PUSDISTRIBUTORMOCK_H

3
unittests/testcfg/pollingsequence/PollingSequenceFactory.cpp
View File

@ -1,3 +1,4 @@
#include "fsfw/FSFW.h"
#include "PollingSequenceFactory.h"
#include <fsfw/devicehandlers/DeviceHandlerIF.h>
@ -20,7 +21,7 @@ ReturnValue_t pst::pollingSequenceInitDefault(FixedTimeslotTaskIF *thisSequence)
if (thisSequence->checkSequence() == HasReturnvaluesIF::RETURN_OK) {
return HasReturnvaluesIF::RETURN_OK;
} else {
#if FSFW_CPP_OSTREAM_ENABLED
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "pst::pollingSequenceInitDefault: Sequence invalid!" << std::endl;
#else
sif::printError("pst::pollingSequenceInitDefault: Sequence invalid!");

2
unittests/tmtcservices/testPsb.cpp
View File

@ -192,7 +192,7 @@ TEST_CASE("Pus Service Base", "[pus-service-base]") {
REQUIRE(PsbMock::getStaticPusDistributor() == distributorId);
REQUIRE(psb2.initialize() == result::OK);
REQUIRE(pusDistrib.registerCallCount == 1);
REQUIRE(pusDistrib.lastServiceArg == &psb2);
REQUIRE(pusDistrib.registeredServies.front() == &psb2);
}
SECTION("Auto Initialize Packet Destination") {