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/OperatorManagement/ModuleTests/opm_tests.cpp
+51 -52
View File
@@ -30,7 +30,6 @@ OpmTests::OpmTests(QObject *parent)
, m_createdId(0)
, m_eTestStep(eUnknown)
, m_bTestsSuccessful(true)
, m_logger(getLogger("OpmTests"))
{
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
} // end of ctor()
@@ -43,7 +42,7 @@ OpmTests::~OpmTests()
//-----------------------------------------------------------------------------
bool OpmTests::init(int domainId, int exerciseId, int testId, int operatorId, int createdId)
{
INFO_LOG(m_logger) << "OpmTests::init() "
INFO_LOG() << "OpmTests::init() "
<< " domainId:" << domainId
<< " exerciseId:" << exerciseId
<< " testId: " << testId
@@ -62,18 +61,18 @@ bool OpmTests::init(int domainId, int exerciseId, int testId, int operatorId, in
m_ddsConnector->initPublisherSubscriber();
// Access to FTC
DEBUG_LOG(m_logger) << "create ftc";
DEBUG_LOG() << "create ftc";
m_ftc = OperatorManagement::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 = OperatorManagement::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_dtc.get(), &Interface::Dtc::userChanged,
this, &OpmTests::onReceiveOperatorChanged);
@@ -87,7 +86,7 @@ bool OpmTests::init(int domainId, int exerciseId, int testId, int operatorId, in
//-----------------------------------------------------------------------------
void OpmTests::startTest()
{
INFO_LOG(m_logger) << "startTest() exerciseId:" << m_exerciseId
INFO_LOG() << "startTest() exerciseId:" << m_exerciseId
<< " testId:" << m_testId
<< " operatorId:" << m_operatorId
;
@@ -122,10 +121,10 @@ void OpmTests::tryCreate()
OperatorCreateModifyRequest data;
getOperatorCreateRequestData( data);
INFO_LOG(m_logger) << "trying to send OperatorCreateRequest";
INFO_LOG() << "trying to send OperatorCreateRequest";
if (!m_ftc->operatorCreateModifyRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting create data";
ERROR_LOG() << "Error requesting create data";
failExit();
}
QTest::qWait(1000);
@@ -138,10 +137,10 @@ void OpmTests::tryModify()
OperatorCreateModifyRequest data;
getOperatorModifyRequestData(data);
INFO_LOG(m_logger) << "trying to send OperatorCreateModifyRequest";
INFO_LOG() << "trying to send OperatorCreateModifyRequest";
if (!m_ftc->operatorCreateModifyRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting modify data";
ERROR_LOG() << "Error requesting modify data";
failExit();
}
QTest::qWait(1000);
@@ -155,10 +154,10 @@ void OpmTests::tryRemove()
data.id(m_operatorId);
INFO_LOG(m_logger) << "trying to send remove request";
INFO_LOG() << "trying to send remove request";
if (!m_ftc->operatorRemoveRequest(data, this))
{
ERROR_LOG(m_logger) << "Error requesting remove data";
ERROR_LOG() << "Error requesting remove data";
failExit();
}
QTest::qWait(1000);
@@ -191,7 +190,7 @@ void OpmTests::tryLogin()
<< ", force:" << data.force();
if (!m_ftc->operatorLoginRequest(data, this))
{
ERROR_LOG(m_logger) << "Error login operator id " << m_operatorId << " on workstation 1";
ERROR_LOG() << "Error login operator id " << m_operatorId << " on workstation 1";
failExit();
}
QTest::qWait(1000);
@@ -214,10 +213,10 @@ void OpmTests::tryLoginForce()
data.workstationId(4);
data.force(true);
INFO_LOG(m_logger) << "trying to send OperatorLoginRequest";
INFO_LOG() << "trying to send OperatorLoginRequest";
if (!m_ftc->operatorLoginRequest(data, this))
{
ERROR_LOG(m_logger) << "Error login operator id " << m_operatorId << " on workstation 1";
ERROR_LOG() << "Error login operator id " << m_operatorId << " on workstation 1";
failExit();
}
QTest::qWait(1000);
@@ -231,10 +230,10 @@ void OpmTests::tryLogout()
data.id(m_operatorId);
INFO_LOG(m_logger) << "trying to send OperatorLogoutRequest";
INFO_LOG() << "trying to send OperatorLogoutRequest";
if (!m_ftc->operatorLogoutRequest(data, this))
{
ERROR_LOG(m_logger) << "Error logout operator id " << m_operatorId;
ERROR_LOG() << "Error logout operator id " << m_operatorId;
failExit();
}
QTest::qWait(1000);
@@ -247,18 +246,18 @@ void OpmTests::tryGetOperatorsByOperatorRight()
int operatorRight = OperatorRights::CContaminationsEdit;
m_dtc->waitForHistoricalDataUser();
INFO_LOG(m_logger) << "trying to send get operators by operatorRight";
INFO_LOG() << "trying to send get operators by operatorRight";
QVector<int> operators = m_dtc->getOperatorsByOperatorRight(operatorRight);
if (operators.empty())
{
ERROR_LOG(m_logger) << "Error no operators for operatorRight: " << operatorRight;
ERROR_LOG() << "Error no operators for operatorRight: " << operatorRight;
failExit();
}
else
{
for (int operatorId : operators)
{
INFO_LOG(m_logger) << "Operator " << operatorId << " found.";
INFO_LOG() << "Operator " << operatorId << " found.";
}
}
QTest::qWait(1000);
@@ -267,22 +266,22 @@ void OpmTests::tryGetOperatorsByOperatorRight()
void OpmTests::tryGetAllOperators()
{
m_eTestStep = eGetAllOperators;
DEBUG_LOG(m_logger) << "trying to get all operators";
DEBUG_LOG() << "trying to get all operators";
m_dtc->waitForHistoricalDataUser();
const QMap<qint32, OperatorManagement::User> opMap = m_dtc->users();
if(opMap.isEmpty())
{
ERROR_LOG(m_logger) << "Error requesting all operator data";
ERROR_LOG() << "Error requesting all operator data";
failExit();
}
else
{
INFO_LOG(m_logger) << "Amout of existing operators = " << opMap.size();
INFO_LOG() << "Amout of existing operators = " << opMap.size();
m_operatorId = opMap.firstKey();
for(auto it = opMap.begin(); it != opMap.end(); ++it)
{
INFO_LOG(m_logger) << "opm(" << it.key() << ") :"
INFO_LOG() << "opm(" << it.key() << ") :"
<< " name:" << it.value().name()
// << " password:" << it.value().password()
// << " effectiveACLs:" << it.value().effectiveAcls()
@@ -295,7 +294,7 @@ void OpmTests::tryGetAllOperators()
//-----------------------------------------------------------------------------
void OpmTests::tryGetOperator()
{
DEBUG_LOG(m_logger) << "trying to get operator with id:" << m_operatorId;
DEBUG_LOG() << "trying to get operator with id:" << m_operatorId;
if(m_testId > 1)
{
@@ -304,7 +303,7 @@ void OpmTests::tryGetOperator()
if(m_operatorId <= 0)
{
ERROR_LOG(m_logger) << "invalid operatorId - test aborted.";
ERROR_LOG() << "invalid operatorId - test aborted.";
failExit();
}
@@ -313,12 +312,12 @@ void OpmTests::tryGetOperator()
if(op.id() <= 0)
{
ERROR_LOG(m_logger) << "Error receiving data for operatorId " << m_operatorId << " returnVal:" << op.id();
ERROR_LOG() << "Error receiving data for operatorId " << m_operatorId << " returnVal:" << op.id();
failExit();
}
else
{
INFO_LOG(m_logger) << "opm(" << op.id() << ") :"
INFO_LOG() << "opm(" << op.id() << ") :"
<< " name: " << op.name()
// << " password: " << data.password()
// << " effectiveACLs:" << it.value().effectiveAcls()
@@ -331,7 +330,7 @@ void OpmTests::tryGetOperator()
{
if(! onCompareCreatedData(op))
{
ERROR_LOG(m_logger) << "Compare created data failed!";
ERROR_LOG() << "Compare created data failed!";
failExit();
}
else
@@ -344,7 +343,7 @@ void OpmTests::tryGetOperator()
{
if(! onCompareModifiedData(op))
{
ERROR_LOG(m_logger) << "Compare modified data failed!";
ERROR_LOG() << "Compare modified data failed!";
failExit();
}
else
@@ -364,20 +363,20 @@ void OpmTests::tryGetOperator()
//-----------------------------------------------------------------------------
void OpmTests::onOperatorCreateModifyReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "Got create/modifyReply with id " << replyObject.id()
INFO_LOG() << "Got create/modifyReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_operatorId = replyObject.id();
if(replyObject.error())
{
ERROR_LOG(m_logger) << "Error requesting create/modify data";
ERROR_LOG() << "Error requesting create/modify data";
failExit();
return;
}
else
{
DEBUG_LOG(m_logger) << "Requesting create/modify data ok. Got id:" << replyObject.id() << " ... ok.";
DEBUG_LOG() << "Requesting create/modify data ok. Got id:" << replyObject.id() << " ... ok.";
}
if(m_testId == 0)
@@ -395,23 +394,23 @@ void OpmTests::onOperatorCreateModifyReply(const Core::FunctionReplyObject &repl
//-----------------------------------------------------------------------------
void OpmTests::onOperatorRemoveReply(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 id:" << replyObject.id();
ERROR_LOG() << "Error requesting remove data for id:" << replyObject.id();
failExit();
return;
}
else
{
DEBUG_LOG(m_logger) << "Requesting remove data for id:" << replyObject.id() << " ... ok.";
DEBUG_LOG() << "Requesting remove data for id:" << replyObject.id() << " ... ok.";
}
if(m_testId == 0)
{
INFO_LOG(m_logger) << "***** FTC/DTC test successfully finished. (used id:" << replyObject.id() << ") *****";
INFO_LOG() << "***** FTC/DTC test successfully finished. (used id:" << replyObject.id() << ") *****";
// ansonsten verheriger Ausstieg mit Errorlog.
}
@@ -422,12 +421,12 @@ void OpmTests::onOperatorRemoveReply(const Core::FunctionReplyObject &replyObjec
//-----------------------------------------------------------------------------
void OpmTests::onOperatorLoginReply(const Core::FunctionReplyObject &replyObject)
{
DEBUG_LOG(m_logger) << "Got loginReply with id " << replyObject.id()
DEBUG_LOG() << "Got loginReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if(replyObject.error())
{
ERROR_LOG(m_logger) << "Error requesting login for id:" << replyObject.id();
ERROR_LOG() << "Error requesting login for id:" << replyObject.id();
failExit();
return;
}
@@ -438,12 +437,12 @@ void OpmTests::onOperatorLoginReply(const Core::FunctionReplyObject &replyObject
//-----------------------------------------------------------------------------
void OpmTests::onOperatorLogoutReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG(m_logger) << "Got logoutReply with id " << replyObject.id()
INFO_LOG() << "Got logoutReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if(replyObject.error())
{
ERROR_LOG(m_logger) << "Error requesting logout for id:" << replyObject.id();
ERROR_LOG() << "Error requesting logout for id:" << replyObject.id();
failExit();
return;
}
@@ -457,8 +456,8 @@ void OpmTests::onReceiveOperatorChanged(const User &data, DataModification modTy
// Check signal/slot connection
if (m_operatorId == data.id())
{
TRACE_LOG(m_logger) << "Check signal/slot connection for DTC. Data for id = " << data.id() << " received";
TRACE_LOG(m_logger) << "ModificationType: = " << (int)modType << " received";
TRACE_LOG() << "Check signal/slot connection for DTC. Data for id = " << data.id() << " received";
TRACE_LOG() << "ModificationType: = " << (int)modType << " received";
}
} // end of onReceiveOperatorData()
@@ -468,8 +467,8 @@ void OpmTests::onReceiveGroupChanged(const Group &data, DataModification modType
// Check signal/slot connection
// if (m_operatorId == data.id())
// {
TRACE_LOG(m_logger) << "Check signal/slot connection for DTC. Data for id = " << data.id() << " received";
TRACE_LOG(m_logger) << "ModificationType: = " << (int)modType << " received";
TRACE_LOG() << "Check signal/slot connection for DTC. Data for id = " << data.id() << " received";
TRACE_LOG() << "ModificationType: = " << (int)modType << " received";
// }
} // end of onReceiveOperatorData()
@@ -514,7 +513,7 @@ void OpmTests::getOperatorModifyRequestData(OperatorCreateModifyRequest &data) c
//-----------------------------------------------------------------------------
bool OpmTests::onCompareCreatedData(User &data)
{
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
OperatorCreateModifyRequest createData;
@@ -529,7 +528,7 @@ bool OpmTests::onCompareCreatedData(User &data)
if (data.description() != createData.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()
@@ -537,7 +536,7 @@ bool OpmTests::onCompareCreatedData(User &data)
//-----------------------------------------------------------------------------
bool OpmTests::onCompareModifiedData(User &data)
{
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
DEBUG_LOG() << "start onCompareModifiedData() for id :" << data.id();
OperatorCreateModifyRequest modifyData;
@@ -552,7 +551,7 @@ bool OpmTests::onCompareModifiedData(User &data)
if (data.description() != modifyData.description())
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()