lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp
+35 -35
View File
@@ -59,7 +59,7 @@ MsgTests::~MsgTests()
bool MsgTests::init(int domainId, int testId)
{
INFO_LOG() << "init begin";
INFO_LOG(m_logger) << "init begin";
m_testId = testId;
@@ -79,7 +79,7 @@ bool MsgTests::init(int domainId, int testId)
void MsgTests::startTest()
{
INFO_LOG() << "startTest m_testId=" << m_testId;
INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
if (m_testId <= 1) // CreateOperatorMessage
{
m_testStep = TestCase::CreateOperator;
@@ -109,7 +109,7 @@ void MsgTests::startTest()
void MsgTests::tryCreateOperatorMessage()
{
INFO_LOG() << "trying to send createRequest Operator Message";
INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
Messaging::AddressType receiverType;
Messaging::AddressType senderType;
@@ -155,7 +155,7 @@ void MsgTests::tryCreateOperatorMessage()
if (!m_ftc->createOperatorMessageRequest(CreateOperatorMessageRequest(recipientIds, exerciseId, sender, subject, m_expectedMessage, senderType, receiverType), this))
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
}
} // tryCreateOperatorMessage
@@ -169,29 +169,29 @@ void MsgTests::checkMessageOnDdsAfterCreate()
const QMap<int, Messaging::OperatorMessage> messages = m_dtc->operatorMessages();
for (const auto &om : messages)
{
INFO_LOG() << "checkMessageOnDdsAfterCreate om.id = " << om.id();
INFO_LOG(m_logger) << "checkMessageOnDdsAfterCreate om.id = " << om.id();
if (om.message() == m_expectedMessage)
{
DEBUG_LOG() << "senderId: " << om.senderId() << ", recipientId: " << om.recipientId();
DEBUG_LOG(m_logger) << "senderId: " << om.senderId() << ", recipientId: " << om.recipientId();
if (om.senderId() != 0 && om.recipientId() == 0)
{
m_msgIdSendMessage = om.id();
DEBUG_LOG() << "m_msgIdSendMessage=" << m_msgIdSendMessage;
DEBUG_LOG(m_logger) << "m_msgIdSendMessage=" << m_msgIdSendMessage;
++m_messageCount;
}
if (om.senderId() != 0 && om.recipientId() != 0)
{
m_msgIdRecvMessage = om.id();
DEBUG_LOG() << "m_msgIdRecvMessage=" << m_msgIdRecvMessage;
DEBUG_LOG(m_logger) << "m_msgIdRecvMessage=" << m_msgIdRecvMessage;
++m_messageCount;
}
}
// msg count == 3 -> one for sender, two for receiver
if (m_messageCount == 3)
{
INFO_LOG() << "Success: receiving messages - got: " << m_messageCount << " expected: 3";
INFO_LOG(m_logger) << "Success: receiving messages - got: " << m_messageCount << " expected: 3";
ExitSuccess();
return;
}
@@ -203,7 +203,7 @@ void MsgTests::checkMessageOnDdsAfterCreate()
return;
}
ERROR_LOG() << "Error receiving messages - got: " << m_messageCount << " expected: 3";
ERROR_LOG(m_logger) << "Error receiving messages - got: " << m_messageCount << " expected: 3";
failExit();
} // checkMessageOnDdsAfterCreate
@@ -211,7 +211,7 @@ void MsgTests::checkMessageOnDdsAfterModify()
{
// read from dds, check if data is as expected
int isRead = 0;
INFO_LOG() << "checkMessageOnDdsAfterModify";
INFO_LOG(m_logger) << "checkMessageOnDdsAfterModify";
m_dtc->waitForHistoricalDataOperatorMessage();
const QMap<int, Messaging::OperatorMessage> messages = m_dtc->operatorMessages();
switch (m_testStep)
@@ -220,18 +220,18 @@ void MsgTests::checkMessageOnDdsAfterModify()
{
for (const auto &om : messages)
{
DEBUG_LOG() << "om.id()=" << om.id() << " om.isRead()=" << om.isRead();
DEBUG_LOG(m_logger) << "om.id()=" << om.id() << " om.isRead()=" << om.isRead();
if (om.id() == m_msgIdRecvMessage && om.isRead() == true)
++isRead;
}
if (isRead == 1)
{
INFO_LOG() << "modify messages isRead = TRUE: Success ";
INFO_LOG(m_logger) << "modify messages isRead = TRUE: Success ";
ExitSuccess();
return;
}
ERROR_LOG() << "Error modify messages - got: " << isRead << " expected: 1";
ERROR_LOG(m_logger) << "Error modify messages - got: " << isRead << " expected: 1";
failExit();
break;
}
@@ -239,34 +239,34 @@ void MsgTests::checkMessageOnDdsAfterModify()
{
// Message removed from DDS
DEBUG_LOG() << "m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
DEBUG_LOG(m_logger) << "m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
if (m_numberMessages > messages.size())
{
INFO_LOG() << "modify messages isDeleted = TRUE: Success ";
INFO_LOG(m_logger) << "modify messages isDeleted = TRUE: Success ";
ExitSuccess();
return;
}
ERROR_LOG() << "Error modify messages - got: " << messages.size() << " expected less than " << m_numberMessages;
ERROR_LOG(m_logger) << "Error modify messages - got: " << messages.size() << " expected less than " << m_numberMessages;
failExit();
break;
}
case TestCase::SendToTetra:
{
DEBUG_LOG() << "SendToTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
DEBUG_LOG(m_logger) << "SendToTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
ExitSuccess();
break;
}
case TestCase::ReceiveFromTetra:
{
DEBUG_LOG() << "ReceiveFromTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
DEBUG_LOG(m_logger) << "ReceiveFromTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
ExitSuccess();
break;
}
default:
{
INFO_LOG() << "Nothing to do in this TestCase";
INFO_LOG(m_logger) << "Nothing to do in this TestCase";
}
}
} // checkMessageOnDdsAfterModify
@@ -275,7 +275,7 @@ void MsgTests::checkMessageOnDdsAfterDelete()
{
// read from dds, check if data is as expected
int isDeleted = 0;
INFO_LOG() << "checkMessageOnDdsAfterModify";
INFO_LOG(m_logger) << "checkMessageOnDdsAfterModify";
m_dtc->waitForHistoricalDataOperatorMessage();
const QMap<int, Messaging::OperatorMessage> messages = m_dtc->operatorMessages();
for (const auto &om : messages)
@@ -285,18 +285,18 @@ void MsgTests::checkMessageOnDdsAfterDelete()
}
if (isDeleted == 1)
{
INFO_LOG() << "modify messages delete: Success ";
INFO_LOG(m_logger) << "modify messages delete: Success ";
return;
}
ERROR_LOG() << "Error modify messages - got: " << isDeleted << " expected: 1";
ERROR_LOG(m_logger) << "Error modify messages - got: " << isDeleted << " expected: 1";
failExit();
} // checkMessageOnDdsAfterDelete
void MsgTests::markMessageAsRead()
{
INFO_LOG() << "trying to mark Message as read m_msgIdRecvMessage =" << m_msgIdRecvMessage;
INFO_LOG(m_logger) << "trying to mark Message as read m_msgIdRecvMessage =" << m_msgIdRecvMessage;
int32_t id = m_msgIdRecvMessage;
bool isRead = true;
@@ -305,14 +305,14 @@ void MsgTests::markMessageAsRead()
if (!m_ftc->modifyOperatorMessageRequest(ModifyOperatorMessageRequest(id, isRead, isSend, isDeleted), this))
{
ERROR_LOG() << "Error mark Message as read";
ERROR_LOG(m_logger) << "Error mark Message as read";
failExit();
}
} // markMessageAsRead
void MsgTests::markMessageAsDeleted()
{
INFO_LOG() << "trying to mark Message as deleted m_msgIdRecvMessage =" << m_msgIdRecvMessage;
INFO_LOG(m_logger) << "trying to mark Message as deleted m_msgIdRecvMessage =" << m_msgIdRecvMessage;
int32_t id = m_msgIdRecvMessage;
bool isRead = true;
@@ -320,21 +320,21 @@ void MsgTests::markMessageAsDeleted()
bool isDeleted = true;
m_dtc->waitForHistoricalDataOperatorMessage();
DEBUG_LOG() << "m_numberMessages =" << m_numberMessages;
DEBUG_LOG(m_logger) << "m_numberMessages =" << m_numberMessages;
if (!m_ftc->modifyOperatorMessageRequest(ModifyOperatorMessageRequest(id, isRead, isSend, isDeleted), this))
{
ERROR_LOG() << "Error mark Message as deleted";
ERROR_LOG(m_logger) << "Error mark Message as deleted";
failExit();
}
} // markMessageAsDeleted
void MsgTests::onCreateOperatorMessageReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "onCreateOperatorMessageReply, error = " << replyObject.error();
INFO_LOG(m_logger) << "onCreateOperatorMessageReply, error = " << replyObject.error();
if (replyObject.error())
{
ERROR_LOG() << "Error creating new message - aborting";
ERROR_LOG(m_logger) << "Error creating new message - aborting";
failExit();
}
else
@@ -348,17 +348,17 @@ void MsgTests::onCreateOperatorMessageReply(const Core::FunctionReplyObject &rep
QTimer::singleShot(1000, this, &MsgTests::checkMessageOnDdsAfterCreate);
break;
default:
INFO_LOG() << "Nothing to do in this Case";
INFO_LOG(m_logger) << "Nothing to do in this Case";
}
}
} // onCreateOperatorMessageReply
void MsgTests::onModifyOperatorMessageReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "onModifyOperatorMessageReply, error = " << replyObject.error();
INFO_LOG(m_logger) << "onModifyOperatorMessageReply, error = " << replyObject.error();
if (replyObject.error())
{
ERROR_LOG() << "Error modify message - aborting";
ERROR_LOG(m_logger) << "Error modify message - aborting";
failExit();
}
else
@@ -371,7 +371,7 @@ void MsgTests::onModifyOperatorMessageReply(const Core::FunctionReplyObject &rep
/*
void MsgTests::onSendEquipmentMessageReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "************** onSendEquipmentMessageReply TODO isRead = TRUE setzen: id = **********************";
INFO_LOG(m_logger) << "************** onSendEquipmentMessageReply TODO isRead = TRUE setzen: id = **********************";
}
*/
@@ -383,7 +383,7 @@ void MsgTests::failExit()
void MsgTests::ExitSuccess()
{
DEBUG_LOG() << "SUCCESS";
DEBUG_LOG(m_logger) << "SUCCESS";
m_bTestsSuccessful = true;
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
} // ExitSuccess