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

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/ModuleTests/whg_tests.cpp
+59 -60
View File
@@ -37,7 +37,6 @@ WhgTests::WhgTests(QObject *parent)
, m_boxId(0)
, m_eTestStep(eUnknown)
, m_bTestsSuccessful(true)
, m_logger(getLogger("Test"))
{
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
} // end of ctor()
@@ -50,7 +49,7 @@ WhgTests::~WhgTests()
//-----------------------------------------------------------------------------
bool WhgTests::init(int domainId, int testId, int eqtTypeWhId, int injuryModelWhId, int equipNo, int boxId)
{
INFO_LOG(m_logger) << "WhgTests::init() "
INFO_LOG() << "WhgTests::init() "
<< " domainId:" << domainId
<< " testId: " << testId
<< " equipmentTypeWhId: " << eqtTypeWhId
@@ -71,24 +70,24 @@ bool WhgTests::init(int domainId, int testId, int eqtTypeWhId, int injuryModelWh
m_ddsConnector->initPublisherSubscriber();
// Access to FTC
DEBUG_LOG(m_logger) << "create ftc";
DEBUG_LOG() << "create ftc";
m_ftc = WarehouseGuez::Interface::Ftc::create(m_ddsConnector);
DEBUG_LOG(m_logger) << "init ftc";
DEBUG_LOG() << "init ftc";
bool bRet = m_ftc->enableAll();
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
DEBUG_LOG() << "init end - bRet = " << bRet;
// Access to DTC
DEBUG_LOG(m_logger) << "create dtc";
DEBUG_LOG() << "create dtc";
m_dtc = WarehouseGuez::Interface::Dtc::create(m_ddsConnector);
DEBUG_LOG(m_logger) << "init dtc";
DEBUG_LOG() << "init dtc";
bRet = m_dtc->enableAll();
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
DEBUG_LOG() << "init end - bRet = " << bRet;
connect(&m_wsClient, &QWebSocket::connected, this, &WhgTests::onConnected);
connect(&m_wsClient, &QWebSocket::textMessageReceived, this, &WhgTests::onTextMessageReceived);
int port = NGL::Connections::port(NGL::Connections::eConnection::LVS);
ERROR_LOG(m_logger) << "Port:_ " << port;
ERROR_LOG() << "Port:_ " << port;
//QUrl url(QStringLiteral("ws://%1:%2").arg(QStringLiteral("localhost"), QString::number(9094)));
QUrl url(QStringLiteral("ws://%1:%2").arg(QStringLiteral("localhost"), QString::number(port)));
@@ -99,20 +98,20 @@ bool WhgTests::init(int domainId, int testId, int eqtTypeWhId, int injuryModelWh
void WhgTests::onConnected()
{
ERROR_LOG(m_logger) << "wsClient connected";
ERROR_LOG() << "wsClient connected";
startTest();
}
void WhgTests::onTextMessageReceived(const QString &msg)
{
INFO_LOG(m_logger) << "new text message: " << msg;
INFO_LOG() << "new text message: " << msg;
//QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
//-----------------------------------------------------------------------------
void WhgTests::startTest()
{
INFO_LOG(m_logger) << "startTest()"
INFO_LOG() << "startTest()"
<< " testId:" << m_testId
<< " eqtTypeWhId:" << m_equipmentTypeWhId
;
@@ -140,7 +139,7 @@ void WhgTests::startTest()
QTimer::singleShot(0, this, &WhgTests::tryGetBiteData);
else
{
ERROR_LOG(m_logger) << "Unknown test id " << m_testId;
ERROR_LOG() << "Unknown test id " << m_testId;
failExit();
}
//QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -154,10 +153,10 @@ void WhgTests::tryCreate()
EquipmentTypeWh data;
getEqtTypeWhCreateRequestData(data);
INFO_LOG(m_logger) << "trying to send create EquipmentTypeWh Request";
INFO_LOG() << "trying to send create EquipmentTypeWh Request";
if (!m_ftc->modifyEquipmentTypeWhRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting create data";
ERROR_LOG() << "Error requesting create data";
failExit();
}
} // end of tryCreate()
@@ -169,10 +168,10 @@ void WhgTests::tryModify()
EquipmentTypeWh data;
getEqtTypeWhModifyRequestData(data);
INFO_LOG(m_logger) << "trying to send ModifyEquipementTypeWhRequest for eqtTypeWhId:" << data.id();
INFO_LOG() << "trying to send ModifyEquipementTypeWhRequest for eqtTypeWhId:" << data.id();
if (!m_ftc->modifyEquipmentTypeWhRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting modify data for eqtTypeWhId:" << data.id();
ERROR_LOG() << "Error requesting modify data for eqtTypeWhId:" << data.id();
failExit();
}
} // end of tryModify()
@@ -185,10 +184,10 @@ void WhgTests::tryRemove()
data.id(m_equipmentTypeWhId);
INFO_LOG(m_logger) << "trying to send remove request for eqtTypeWhId:" << data.id();
INFO_LOG() << "trying to send remove request for eqtTypeWhId:" << data.id();
if (!m_ftc->removeEquipmentTypeWhRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting remove data for eqtTypeWhId:" << data.id();
ERROR_LOG() << "Error requesting remove data for eqtTypeWhId:" << data.id();
failExit();
}
} // end of tryRemove()
@@ -197,22 +196,22 @@ void WhgTests::tryRemove()
void WhgTests::tryGetAllEquipmentTypesWh()
{
m_eTestStep = eGetAllEquipmentTypesWh;
DEBUG_LOG(m_logger) << "trying to get all eqtTypesWh";
DEBUG_LOG() << "trying to get all eqtTypesWh";
m_dtc->waitForHistoricalDataEquipmentTypeWh();
const QMap<qint32, WarehouseGuez::EquipmentTypeWh> map = m_dtc->equipmentTypeWhs();
if (map.isEmpty())
{
ERROR_LOG(m_logger) << "Error requesting all eqtTypesWh data";
ERROR_LOG() << "Error requesting all eqtTypesWh data";
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
return;
}
INFO_LOG(m_logger) << "Amout of existing eqtTypesWh:" << map.size();
INFO_LOG() << "Amout of existing eqtTypesWh:" << map.size();
m_equipmentTypeWhId = map.firstKey();
for (auto it = map.begin(); it != map.end(); ++it)
{
INFO_LOG(m_logger) << "whg(" << it.key() << ") :"
INFO_LOG() << "whg(" << it.key() << ") :"
<< " name:" << it.value().name()
<< " minEquipNo:" << it.value().minEquipNo()
<< " maxEquipNo:" << it.value().maxEquipNo()
@@ -226,14 +225,14 @@ void WhgTests::tryGetAllEquipmentTypesWh()
//-----------------------------------------------------------------------------
void WhgTests::tryGetEquipmentTypeWh()
{
DEBUG_LOG(m_logger) << "trying to get eqtTypeWh with id:" << m_equipmentTypeWhId;
DEBUG_LOG() << "trying to get eqtTypeWh with id:" << m_equipmentTypeWhId;
if (m_testId > 1)
m_eTestStep = eGetEquipmentTypeWh;
if (m_equipmentTypeWhId < 0)
{
ERROR_LOG(m_logger) << "invalid eqtTypeWhId - test aborted.";
ERROR_LOG() << "invalid eqtTypeWhId - test aborted.";
failExit();
}
@@ -242,12 +241,12 @@ void WhgTests::tryGetEquipmentTypeWh()
if (data.id() < 0)
{
ERROR_LOG(m_logger) << "Error receiving data for equipmentTypeId " << m_equipmentTypeWhId << " returnVal:" << data.id();
ERROR_LOG() << "Error receiving data for equipmentTypeId " << m_equipmentTypeWhId << " returnVal:" << data.id();
failExit();
}
else
{
INFO_LOG(m_logger) << "whg(" << data.id() << ") :"
INFO_LOG() << "whg(" << data.id() << ") :"
<< " name:" << data.name()
<< " minEquipNo:" << data.minEquipNo()
<< " maxEquipNo:" << data.maxEquipNo()
@@ -260,7 +259,7 @@ void WhgTests::tryGetEquipmentTypeWh()
{
if (! onCompareCreatedData(data))
{
ERROR_LOG(m_logger) << "Compare created data failed!";
ERROR_LOG() << "Compare created data failed!";
failExit();
}
else
@@ -273,7 +272,7 @@ void WhgTests::tryGetEquipmentTypeWh()
{
if (! onCompareModifiedData(data))
{
ERROR_LOG(m_logger) << "Compare modified data failed!";
ERROR_LOG() << "Compare modified data failed!";
failExit();
}
else
@@ -292,19 +291,19 @@ void WhgTests::tryGetEquipmentTypeWh()
//-----------------------------------------------------------------------------
void WhgTests::onModifyEquipmentTypeWhReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "Got onModifyEquipmentTypeWhReply with id " << replyObject.id()
INFO_LOG() << "Got onModifyEquipmentTypeWhReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_equipmentTypeWhId = replyObject.id();
if (replyObject.error())
{
ERROR_LOG(m_logger) << "Error requesting create data";
ERROR_LOG() << "Error requesting create data";
failExit();
return;
}
else
INFO_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
INFO_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
if (m_testId == 0)
// QTimer::singleShot(0, this, &WhgTests::tryModify()));
@@ -318,17 +317,17 @@ void WhgTests::onModifyEquipmentTypeWhReply(const Core::FunctionReplyObject &rep
//-----------------------------------------------------------------------------
void WhgTests::onRemoveEquipmentTypeWhReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
INFO_LOG() << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if (replyObject.error())
{
ERROR_LOG(m_logger) << "Error requesting remove data for eqtTypeWhId:" << replyObject.id();
ERROR_LOG() << "Error requesting remove data for eqtTypeWhId:" << replyObject.id();
failExit();
return;
}
else
DEBUG_LOG(m_logger) << "Requesting remove data for eqtTypeWhId:" << replyObject.id() << " ... ok.";
DEBUG_LOG() << "Requesting remove data for eqtTypeWhId:" << replyObject.id() << " ... ok.";
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -338,19 +337,19 @@ void WhgTests::onRemoveEquipmentTypeWhReply(const Core::FunctionReplyObject &rep
//-----------------------------------------------------------------------------
void WhgTests::onModifyInjuryModelAgdusWhReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "Got onModifyInjuryModelAgdusWhReply with id " << replyObject.id()
INFO_LOG() << "Got onModifyInjuryModelAgdusWhReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_injuryModelWhId = replyObject.id();
if (replyObject.error())
{
ERROR_LOG(m_logger) << "Error requesting create data";
ERROR_LOG() << "Error requesting create data";
failExit();
return;
}
else
DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -359,17 +358,17 @@ void WhgTests::onModifyInjuryModelAgdusWhReply(const Core::FunctionReplyObject &
//-----------------------------------------------------------------------------
void WhgTests::onRemoveInjuryModelAgdusWhReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
INFO_LOG() << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if (replyObject.error())
{
ERROR_LOG(m_logger) << "Error requesting remove data for injuryModelWhId:" << replyObject.id();
ERROR_LOG() << "Error requesting remove data for injuryModelWhId:" << replyObject.id();
failExit();
return;
}
else
DEBUG_LOG(m_logger) << "Requesting remove data for injuryModelWhId:" << replyObject.id() << " ... ok.";
DEBUG_LOG() << "Requesting remove data for injuryModelWhId:" << replyObject.id() << " ... ok.";
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -379,25 +378,25 @@ void WhgTests::onRemoveInjuryModelAgdusWhReply(const Core::FunctionReplyObject &
//-----------------------------------------------------------------------------
void WhgTests::onReceiveEqtTypeChanged(const EquipmentTypeWh &data, DataModification modType)
{
INFO_LOG(m_logger) << "onReceiveEqtTypeChanged() eqtTypeWhId:" << data.id()
INFO_LOG() << "onReceiveEqtTypeChanged() eqtTypeWhId:" << data.id()
<< " modificationType: = " << (int)modType<< " received";
switch (modType)
{
case DataModification::eAdded:
INFO_LOG(m_logger) << "*** EquipmentTypeWh added received. eqtTypeWhId:" << data.id();
INFO_LOG() << "*** EquipmentTypeWh added received. eqtTypeWhId:" << data.id();
break;
case DataModification::eModified:
INFO_LOG(m_logger) << "*** EquipmentTypeWh modified received. eqtTypeWhId:" << data.id();
INFO_LOG() << "*** EquipmentTypeWh modified received. eqtTypeWhId:" << data.id();
break;
case DataModification::eRemoved:
INFO_LOG(m_logger) << "*** EquipmentTypeWh removed received. eqtTypeWhId:" << data.id();
INFO_LOG() << "*** EquipmentTypeWh removed received. eqtTypeWhId:" << data.id();
break;
default:
INFO_LOG(m_logger) << "DataModification::" << modType << " not implemented";
INFO_LOG() << "DataModification::" << modType << " not implemented";
}
} // end of onReceiveEqtTypeChanged()
@@ -449,7 +448,7 @@ void WhgTests::getInjuryModelWhModifyRequestData(InjuryModelAgdusWh &data)
//-----------------------------------------------------------------------------
bool WhgTests::onCompareCreatedData(EquipmentTypeWh &data)
{
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
// Vergleicht die zurueckgelesen Datan mit den statischen create Daten
@@ -470,14 +469,14 @@ bool WhgTests::onCompareCreatedData(EquipmentTypeWh &data)
return false;
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG() << "successfull finished onCompareCreatedData() for id :" << data.id();
return true;
} // end of onCompareCreatedData()
bool WhgTests::onCompareCreatedData(InjuryModelAgdusWh &data)
{
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
// Vergleicht die zurueckgelesen Datan mit den statischen create Daten
@@ -494,7 +493,7 @@ bool WhgTests::onCompareCreatedData(InjuryModelAgdusWh &data)
if (createData.description() != data.description())
return false;
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG() << "successfull finished onCompareCreatedData() for id :" << data.id();
return true;
} // end of onCompareCreatedData()
@@ -502,7 +501,7 @@ bool WhgTests::onCompareCreatedData(InjuryModelAgdusWh &data)
//-----------------------------------------------------------------------------
bool WhgTests::onCompareModifiedData(EquipmentTypeWh &data)
{
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
DEBUG_LOG() << "start onCompareModifiedData() for id :" << data.id();
EquipmentTypeWh modifyData;
@@ -523,7 +522,7 @@ bool WhgTests::onCompareModifiedData(EquipmentTypeWh &data)
if (modifyData.vbAgdusId() != data.vbAgdusId())
return false;
DEBUG_LOG(m_logger) << "successfully finished onCompareModifiedData() for id :" << data.id();
DEBUG_LOG() << "successfully finished onCompareModifiedData() for id :" << data.id();
return true;
} // end of onCompareModifiedData()
@@ -531,7 +530,7 @@ bool WhgTests::onCompareModifiedData(EquipmentTypeWh &data)
//-----------------------------------------------------------------------------
bool WhgTests::onCompareModifiedData(InjuryModelAgdusWh &data)
{
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
DEBUG_LOG() << "start onCompareModifiedData() for id :" << data.id();
InjuryModelAgdusWh modifyData;
@@ -549,7 +548,7 @@ bool WhgTests::onCompareModifiedData(InjuryModelAgdusWh &data)
if (modifyData.description() != data.description())
return false;
DEBUG_LOG(m_logger) << "successfull finished onCompareModifiedData() for id :" << data.id();
DEBUG_LOG() << "successfull finished onCompareModifiedData() for id :" << data.id();
return true;
} // end of onCompareModifiedData()
@@ -562,10 +561,10 @@ void WhgTests::tryCreateInjuryModel()
InjuryModelAgdusWh data;
getInjuryModelWhCreateRequestData(data);
INFO_LOG(m_logger) << "trying to send modifyInjuryModelAgdusWhRequest with id = 0 (create)";
INFO_LOG() << "trying to send modifyInjuryModelAgdusWhRequest with id = 0 (create)";
if (!m_ftc->modifyInjuryModelAgdusWhRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting create data";
ERROR_LOG() << "Error requesting create data";
failExit();
}
} // end of tryCreateInjuryModel()
@@ -577,10 +576,10 @@ void WhgTests::tryModifyInjuryModel()
InjuryModelAgdusWh data;
getInjuryModelWhModifyRequestData(data);
ERROR_LOG(m_logger) << "trying to send modifyInjuryModelAgdusWhRequest for injuryModelWhId:" << data.id();
ERROR_LOG() << "trying to send modifyInjuryModelAgdusWhRequest for injuryModelWhId:" << data.id();
if (!m_ftc->modifyInjuryModelAgdusWhRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting modify data for injuryModelWhId:" << data.id();
ERROR_LOG() << "Error requesting modify data for injuryModelWhId:" << data.id();
failExit();
}
} // end of tryModifyInjuryModel()
@@ -593,10 +592,10 @@ void WhgTests::tryRemoveInjuryModel()
data.id(m_injuryModelWhId);
INFO_LOG(m_logger) << "trying to send remove request for injuryModelWhId:" << data.id();
INFO_LOG() << "trying to send remove request for injuryModelWhId:" << data.id();
if (!m_ftc->removeInjuryModelAgdusWhRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting remove data for injuryModelWhId:" << data.id();
ERROR_LOG() << "Error requesting remove data for injuryModelWhId:" << data.id();
failExit();
}
} // end of tryRemoveInjuryModel()