eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Merge remote-tracking branch 'origin/develop' into petri_dev
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Irini Kosmidou
2022-09-27 19:31:57 +02:00
parent 5bfe72e430 24062071c0
commit a04372ff55
319 changed files with 3234 additions and 18305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
unittest/controller/testThermalController.cpp
View File

@ -19,14 +19,14 @@ TEST_CASE("Thermal Controller", "[ThermalController]") {
ThermalController controller(THERMAL_CONTROLLER_ID, objects::NO_OBJECT);
ReturnValue_t result = controller.initialize();
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
REQUIRE(result == returnvalue::OK);
PeriodicTaskIF* thermalTask = TaskFactory::instance()->createPeriodicTask(
"THERMAL_CTL_TASK", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, nullptr);
result = thermalTask->addComponent(THERMAL_CONTROLLER_ID);
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
REQUIRE(result == returnvalue::OK);
REQUIRE(controller.initializeAfterTaskCreation() == HasReturnvaluesIF::RETURN_OK);
REQUIRE(controller.initializeAfterTaskCreation() == returnvalue::OK);
testEnvironment::eventManager->clearEventList();
@ -42,7 +42,7 @@ TEST_CASE("Thermal Controller", "[ThermalController]") {
commandQueue->sendMessage(controllerQueue, &modeMessage);
REQUIRE(controller.performOperation(0) == HasReturnvaluesIF::RETURN_OK);
REQUIRE(controller.performOperation(0) == returnvalue::OK);
REQUIRE(testEnvironment::eventManager->isEventInEventList(
THERMAL_CONTROLLER_ID, HasModesIF::MODE_INFO, ControllerBase::MODE_NORMAL,

8
unittest/mocks/EventManagerMock.cpp
View File

@ -5,16 +5,16 @@
EventManagerMock::EventManagerMock() : EventManager(objects::EVENT_MANAGER) {}
ReturnValue_t EventManagerMock::performOperation(uint8_t opCode) {
ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
while (result == HasReturnvaluesIF::RETURN_OK) {
ReturnValue_t result = returnvalue::OK;
while (result == returnvalue::OK) {
EventMessage message;
result = eventReportQueue->receiveMessage(&message);
if (result == HasReturnvaluesIF::RETURN_OK) {
if (result == returnvalue::OK) {
notifyListeners(&message);
eventList.emplace_back(message);
}
}
return HasReturnvaluesIF::RETURN_OK;
return returnvalue::OK;
}
const std::list<EventMessage>* EventManagerMock::getEventList() {