Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
@@ -52,7 +52,6 @@ MsgTests::MsgTests(QObject *parent)
|
||||
, m_msgIdRecvMessage(3) // Result from last test
|
||||
, m_numberMessages(3) // Result from last test
|
||||
, m_testStep(TestCase::CreateOperator)
|
||||
, m_logger(getLogger("MsgTests"))
|
||||
{}
|
||||
|
||||
MsgTests::~MsgTests()
|
||||
@@ -60,7 +59,7 @@ MsgTests::~MsgTests()
|
||||
|
||||
bool MsgTests::init(int domainId, int testId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "init begin";
|
||||
INFO_LOG() << "init begin";
|
||||
|
||||
m_testId = testId;
|
||||
|
||||
@@ -80,7 +79,7 @@ bool MsgTests::init(int domainId, int testId)
|
||||
|
||||
void MsgTests::startTest()
|
||||
{
|
||||
INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
|
||||
INFO_LOG() << "startTest m_testId=" << m_testId;
|
||||
if (m_testId <= 1) // CreateOperatorMessage
|
||||
{
|
||||
m_testStep = TestCase::CreateOperator;
|
||||
@@ -110,7 +109,7 @@ void MsgTests::startTest()
|
||||
|
||||
void MsgTests::tryCreateOperatorMessage()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
|
||||
INFO_LOG() << "trying to send createRequest Operator Message";
|
||||
Messaging::AddressType receiverType;
|
||||
Messaging::AddressType senderType;
|
||||
|
||||
@@ -156,7 +155,7 @@ void MsgTests::tryCreateOperatorMessage()
|
||||
|
||||
if (!m_ftc->createOperatorMessageRequest(CreateOperatorMessageRequest(recipientIds, exerciseId, sender, subject, m_expectedMessage, senderType, receiverType), this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
failExit();
|
||||
}
|
||||
} // tryCreateOperatorMessage
|
||||
@@ -170,29 +169,29 @@ void MsgTests::checkMessageOnDdsAfterCreate()
|
||||
const QMap<int, Messaging::OperatorMessage> messages = m_dtc->operatorMessages();
|
||||
for (const auto &om : messages)
|
||||
{
|
||||
INFO_LOG(m_logger) << "checkMessageOnDdsAfterCreate om.id = " << om.id();
|
||||
INFO_LOG() << "checkMessageOnDdsAfterCreate om.id = " << om.id();
|
||||
|
||||
if (om.message() == m_expectedMessage)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "senderId: " << om.senderId() << ", recipientId: " << om.recipientId();
|
||||
DEBUG_LOG() << "senderId: " << om.senderId() << ", recipientId: " << om.recipientId();
|
||||
if (om.senderId() != 0 && om.recipientId() == 0)
|
||||
{
|
||||
m_msgIdSendMessage = om.id();
|
||||
DEBUG_LOG(m_logger) << "m_msgIdSendMessage=" << m_msgIdSendMessage;
|
||||
DEBUG_LOG() << "m_msgIdSendMessage=" << m_msgIdSendMessage;
|
||||
++m_messageCount;
|
||||
}
|
||||
|
||||
if (om.senderId() != 0 && om.recipientId() != 0)
|
||||
{
|
||||
m_msgIdRecvMessage = om.id();
|
||||
DEBUG_LOG(m_logger) << "m_msgIdRecvMessage=" << m_msgIdRecvMessage;
|
||||
DEBUG_LOG() << "m_msgIdRecvMessage=" << m_msgIdRecvMessage;
|
||||
++m_messageCount;
|
||||
}
|
||||
}
|
||||
// msg count == 3 -> one for sender, two for receiver
|
||||
if (m_messageCount == 3)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Success: receiving messages - got: " << m_messageCount << " expected: 3";
|
||||
INFO_LOG() << "Success: receiving messages - got: " << m_messageCount << " expected: 3";
|
||||
ExitSuccess();
|
||||
return;
|
||||
}
|
||||
@@ -204,7 +203,7 @@ void MsgTests::checkMessageOnDdsAfterCreate()
|
||||
return;
|
||||
}
|
||||
|
||||
ERROR_LOG(m_logger) << "Error receiving messages - got: " << m_messageCount << " expected: 3";
|
||||
ERROR_LOG() << "Error receiving messages - got: " << m_messageCount << " expected: 3";
|
||||
failExit();
|
||||
} // checkMessageOnDdsAfterCreate
|
||||
|
||||
@@ -212,7 +211,7 @@ void MsgTests::checkMessageOnDdsAfterModify()
|
||||
{
|
||||
// read from dds, check if data is as expected
|
||||
int isRead = 0;
|
||||
INFO_LOG(m_logger) << "checkMessageOnDdsAfterModify";
|
||||
INFO_LOG() << "checkMessageOnDdsAfterModify";
|
||||
m_dtc->waitForHistoricalDataOperatorMessage();
|
||||
const QMap<int, Messaging::OperatorMessage> messages = m_dtc->operatorMessages();
|
||||
switch (m_testStep)
|
||||
@@ -221,18 +220,18 @@ void MsgTests::checkMessageOnDdsAfterModify()
|
||||
{
|
||||
for (const auto &om : messages)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "om.id()=" << om.id() << " om.isRead()=" << om.isRead();
|
||||
DEBUG_LOG() << "om.id()=" << om.id() << " om.isRead()=" << om.isRead();
|
||||
if (om.id() == m_msgIdRecvMessage && om.isRead() == true)
|
||||
++isRead;
|
||||
}
|
||||
if (isRead == 1)
|
||||
{
|
||||
INFO_LOG(m_logger) << "modify messages isRead = TRUE: Success ";
|
||||
INFO_LOG() << "modify messages isRead = TRUE: Success ";
|
||||
ExitSuccess();
|
||||
return;
|
||||
}
|
||||
|
||||
ERROR_LOG(m_logger) << "Error modify messages - got: " << isRead << " expected: 1";
|
||||
ERROR_LOG() << "Error modify messages - got: " << isRead << " expected: 1";
|
||||
failExit();
|
||||
break;
|
||||
}
|
||||
@@ -240,34 +239,34 @@ void MsgTests::checkMessageOnDdsAfterModify()
|
||||
{
|
||||
// Message removed from DDS
|
||||
|
||||
DEBUG_LOG(m_logger) << "m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
|
||||
DEBUG_LOG() << "m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
|
||||
if (m_numberMessages > messages.size())
|
||||
{
|
||||
INFO_LOG(m_logger) << "modify messages isDeleted = TRUE: Success ";
|
||||
INFO_LOG() << "modify messages isDeleted = TRUE: Success ";
|
||||
ExitSuccess();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
ERROR_LOG(m_logger) << "Error modify messages - got: " << messages.size() << " expected less than " << m_numberMessages;
|
||||
ERROR_LOG() << "Error modify messages - got: " << messages.size() << " expected less than " << m_numberMessages;
|
||||
failExit();
|
||||
break;
|
||||
}
|
||||
case TestCase::SendToTetra:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "SendToTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
|
||||
DEBUG_LOG() << "SendToTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
|
||||
ExitSuccess();
|
||||
break;
|
||||
}
|
||||
case TestCase::ReceiveFromTetra:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ReceiveFromTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
|
||||
DEBUG_LOG() << "ReceiveFromTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
|
||||
ExitSuccess();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
INFO_LOG(m_logger) << "Nothing to do in this TestCase";
|
||||
INFO_LOG() << "Nothing to do in this TestCase";
|
||||
}
|
||||
}
|
||||
} // checkMessageOnDdsAfterModify
|
||||
@@ -276,7 +275,7 @@ void MsgTests::checkMessageOnDdsAfterDelete()
|
||||
{
|
||||
// read from dds, check if data is as expected
|
||||
int isDeleted = 0;
|
||||
INFO_LOG(m_logger) << "checkMessageOnDdsAfterModify";
|
||||
INFO_LOG() << "checkMessageOnDdsAfterModify";
|
||||
m_dtc->waitForHistoricalDataOperatorMessage();
|
||||
const QMap<int, Messaging::OperatorMessage> messages = m_dtc->operatorMessages();
|
||||
for (const auto &om : messages)
|
||||
@@ -286,18 +285,18 @@ void MsgTests::checkMessageOnDdsAfterDelete()
|
||||
}
|
||||
if (isDeleted == 1)
|
||||
{
|
||||
INFO_LOG(m_logger) << "modify messages delete: Success ";
|
||||
INFO_LOG() << "modify messages delete: Success ";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
ERROR_LOG(m_logger) << "Error modify messages - got: " << isDeleted << " expected: 1";
|
||||
ERROR_LOG() << "Error modify messages - got: " << isDeleted << " expected: 1";
|
||||
failExit();
|
||||
} // checkMessageOnDdsAfterDelete
|
||||
|
||||
void MsgTests::markMessageAsRead()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to mark Message as read m_msgIdRecvMessage =" << m_msgIdRecvMessage;
|
||||
INFO_LOG() << "trying to mark Message as read m_msgIdRecvMessage =" << m_msgIdRecvMessage;
|
||||
|
||||
int32_t id = m_msgIdRecvMessage;
|
||||
bool isRead = true;
|
||||
@@ -306,14 +305,14 @@ void MsgTests::markMessageAsRead()
|
||||
|
||||
if (!m_ftc->modifyOperatorMessageRequest(ModifyOperatorMessageRequest(id, isRead, isSend, isDeleted), this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error mark Message as read";
|
||||
ERROR_LOG() << "Error mark Message as read";
|
||||
failExit();
|
||||
}
|
||||
} // markMessageAsRead
|
||||
|
||||
void MsgTests::markMessageAsDeleted()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to mark Message as deleted m_msgIdRecvMessage =" << m_msgIdRecvMessage;
|
||||
INFO_LOG() << "trying to mark Message as deleted m_msgIdRecvMessage =" << m_msgIdRecvMessage;
|
||||
|
||||
int32_t id = m_msgIdRecvMessage;
|
||||
bool isRead = true;
|
||||
@@ -321,21 +320,21 @@ void MsgTests::markMessageAsDeleted()
|
||||
bool isDeleted = true;
|
||||
|
||||
m_dtc->waitForHistoricalDataOperatorMessage();
|
||||
DEBUG_LOG(m_logger) << "m_numberMessages =" << m_numberMessages;
|
||||
DEBUG_LOG() << "m_numberMessages =" << m_numberMessages;
|
||||
|
||||
if (!m_ftc->modifyOperatorMessageRequest(ModifyOperatorMessageRequest(id, isRead, isSend, isDeleted), this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error mark Message as deleted";
|
||||
ERROR_LOG() << "Error mark Message as deleted";
|
||||
failExit();
|
||||
}
|
||||
} // markMessageAsDeleted
|
||||
|
||||
void MsgTests::onCreateOperatorMessageReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onCreateOperatorMessageReply, error = " << replyObject.error();
|
||||
INFO_LOG() << "onCreateOperatorMessageReply, error = " << replyObject.error();
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error creating new message - aborting";
|
||||
ERROR_LOG() << "Error creating new message - aborting";
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
@@ -349,17 +348,17 @@ void MsgTests::onCreateOperatorMessageReply(const Core::FunctionReplyObject &rep
|
||||
QTimer::singleShot(1000, this, &MsgTests::checkMessageOnDdsAfterCreate);
|
||||
break;
|
||||
default:
|
||||
INFO_LOG(m_logger) << "Nothing to do in this Case";
|
||||
INFO_LOG() << "Nothing to do in this Case";
|
||||
}
|
||||
}
|
||||
} // onCreateOperatorMessageReply
|
||||
|
||||
void MsgTests::onModifyOperatorMessageReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onModifyOperatorMessageReply, error = " << replyObject.error();
|
||||
INFO_LOG() << "onModifyOperatorMessageReply, error = " << replyObject.error();
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error modify message - aborting";
|
||||
ERROR_LOG() << "Error modify message - aborting";
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
@@ -372,7 +371,7 @@ void MsgTests::onModifyOperatorMessageReply(const Core::FunctionReplyObject &rep
|
||||
/*
|
||||
void MsgTests::onSendEquipmentMessageReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "************** onSendEquipmentMessageReply TODO isRead = TRUE setzen: id = **********************";
|
||||
INFO_LOG() << "************** onSendEquipmentMessageReply TODO isRead = TRUE setzen: id = **********************";
|
||||
}
|
||||
|
||||
*/
|
||||
@@ -384,7 +383,7 @@ void MsgTests::failExit()
|
||||
|
||||
void MsgTests::ExitSuccess()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "SUCCESS";
|
||||
DEBUG_LOG() << "SUCCESS";
|
||||
m_bTestsSuccessful = true;
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
} // ExitSuccess
|
||||
|
||||
Reference in new issue
Block a user