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

fix deprecation warnings

Browse Source
This commit is contained in:
Robin Müller
2022-07-26 10:27:44 +02:00
parent b827bd8370
commit 88ebb67c8d
5 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fsfw_tests/internal/osal/testMq.cpp
View File

@ -7,8 +7,6 @@
#include "fsfw_tests/internal/UnittDefinitions.h"
using retval = HasReturnvaluesIF;
void testmq::testMq() {
std::string id = "[testMq]";
MessageQueueIF* testSenderMq = QueueFactory::instance()->createMessageQueue(1);
@ -22,22 +20,22 @@ void testmq::testMq() {
testSenderMq->setDefaultDestination(testReceiverMqId);
auto result = testSenderMq->sendMessage(testReceiverMqId, &testMessage);
if (result != retval::RETURN_OK) {
if (result != retval::OK) {
unitt::put_error(id);
}
MessageQueueMessage recvMessage;
result = testReceiverMq->receiveMessage(&recvMessage);
if (result != retval::RETURN_OK or recvMessage.getData()[0] != 42) {
if (result != retval::OK or recvMessage.getData()[0] != 42) {
unitt::put_error(id);
}
result = testSenderMq->sendMessage(testReceiverMqId, &testMessage);
if (result != retval::RETURN_OK) {
if (result != retval::OK) {
unitt::put_error(id);
}
MessageQueueId_t senderId = 0;
result = testReceiverMq->receiveMessage(&recvMessage, &senderId);
if (result != retval::RETURN_OK or recvMessage.getData()[0] != 42) {
if (result != retval::OK or recvMessage.getData()[0] != 42) {
unitt::put_error(id);
}
if (senderId != testSenderMqId) {

15
src/fsfw_tests/internal/serialize/IntTestSerialization.cpp
View File

@ -8,24 +8,23 @@
#include "fsfw_tests/internal/UnittDefinitions.h"
using retval = HasReturnvaluesIF;
std::array<uint8_t, 512> testserialize::test_array = {0};
ReturnValue_t testserialize::test_serialization() {
// Here, we test all serialization tools. First test basic cases.
ReturnValue_t result = test_endianness_tools();
if (result != retval::RETURN_OK) {
if (result != retval::OK) {
return result;
}
result = test_autoserialization();
if (result != retval::RETURN_OK) {
if (result != retval::OK) {
return result;
}
result = test_serial_buffer_adapter();
if (result != retval::RETURN_OK) {
if (result != retval::OK) {
return result;
}
return retval::RETURN_OK;
return retval::OK;
}
ReturnValue_t testserialize::test_endianness_tools() {
@ -49,7 +48,7 @@ ReturnValue_t testserialize::test_endianness_tools() {
if (test_array[0] != 0 and test_array[1] != 1) {
return unitt::put_error(id);
}
return retval::RETURN_OK;
return retval::OK;
}
ReturnValue_t testserialize::test_autoserialization() {
@ -153,7 +152,7 @@ ReturnValue_t testserialize::test_autoserialization() {
}
// Check overflow
return retval::RETURN_OK;
return retval::OK;
}
// TODO: Also test for constant buffers.
@ -206,5 +205,5 @@ ReturnValue_t testserialize::test_serial_buffer_adapter() {
if (testUint16 != 16) {
return unitt::put_error(id);
}
return retval::RETURN_OK;
return retval::OK;
}