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
+55
-56
@@ -73,46 +73,45 @@ double distanceMeter(const Core::GeoPosition2D &geoPos2D, const LtsCoordTrans::U
|
||||
ModuleTestAesOthers::ModuleTestAesOthers(int domainId, int exerciseId)
|
||||
: m_domainId(domainId)
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_logger(getLogger("ModuleTestAesOthers"))
|
||||
{
|
||||
}
|
||||
|
||||
void ModuleTestAesOthers::onSetSimulatedPositionReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
m_replyError = replyObject.error();
|
||||
DEBUG_LOG(m_logger) << " got reply - onSetSimulatedPositionReply : " << m_replyError;
|
||||
DEBUG_LOG() << " got reply - onSetSimulatedPositionReply : " << m_replyError;
|
||||
if (!replyObject.str().empty())
|
||||
ERROR_LOG(m_logger) << " got reply - onExplosionClusterModifyReply: " << replyObject.translated();
|
||||
ERROR_LOG() << " got reply - onExplosionClusterModifyReply: " << replyObject.translated();
|
||||
}
|
||||
|
||||
void ModuleTestAesOthers::onBoobyTrapModifyReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
m_replyError = replyObject.error();
|
||||
DEBUG_LOG(m_logger) << " got reply - onBoobyTrapModifyReply : " << m_replyError;
|
||||
DEBUG_LOG() << " got reply - onBoobyTrapModifyReply : " << m_replyError;
|
||||
if (!replyObject.str().empty())
|
||||
ERROR_LOG(m_logger) << " got reply - onBoobyTrapModifyReply: " << replyObject.translated();
|
||||
ERROR_LOG() << " got reply - onBoobyTrapModifyReply: " << replyObject.translated();
|
||||
}
|
||||
|
||||
void ModuleTestAesOthers::onBoobyTrapRemoveReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " got reply - onBoobyTrapRemoveReply : " << m_replyError;
|
||||
DEBUG_LOG() << " got reply - onBoobyTrapRemoveReply : " << m_replyError;
|
||||
if (!replyObject.str().empty())
|
||||
ERROR_LOG(m_logger) << " got reply - onBoobyTrapRemoveReply: " << replyObject.translated();
|
||||
ERROR_LOG() << " got reply - onBoobyTrapRemoveReply: " << replyObject.translated();
|
||||
}
|
||||
|
||||
void ModuleTestAesOthers::onOffRouteMineModifyReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
m_replyError = replyObject.error();
|
||||
DEBUG_LOG(m_logger) << " got reply - onOffRouteMineModifyReply : " << m_replyError;
|
||||
DEBUG_LOG() << " got reply - onOffRouteMineModifyReply : " << m_replyError;
|
||||
if (!replyObject.str().empty())
|
||||
ERROR_LOG(m_logger) << " got reply - onOffRouteMineModifyReply: " << replyObject.translated();
|
||||
ERROR_LOG() << " got reply - onOffRouteMineModifyReply: " << replyObject.translated();
|
||||
}
|
||||
|
||||
void ModuleTestAesOthers::onOffRouteMineRemoveReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " got reply - onOffRouteMineRemoveReply : " << m_replyError;
|
||||
DEBUG_LOG() << " got reply - onOffRouteMineRemoveReply : " << m_replyError;
|
||||
if (!replyObject.str().empty())
|
||||
ERROR_LOG(m_logger) << " got reply - onOffRouteMineRemoveReply: " << replyObject.translated();
|
||||
ERROR_LOG() << " got reply - onOffRouteMineRemoveReply: " << replyObject.translated();
|
||||
}
|
||||
|
||||
|
||||
@@ -129,10 +128,10 @@ void ModuleTestAesOthers::boobyTrapChanged(const BoobyTrap &data, DataModificati
|
||||
if (m_dataBoobyTrap.effectStart().is_set())
|
||||
startTimeMsec = m_dataBoobyTrap.effectStart().get();
|
||||
|
||||
DEBUG_LOG(m_logger) << " got changed - m_dataBoobyTrap: " << m_dataBoobyTrap.id() << ", state=" << m_dataBoobyTrap.effectStateId()
|
||||
DEBUG_LOG() << " got changed - m_dataBoobyTrap: " << m_dataBoobyTrap.id() << ", state=" << m_dataBoobyTrap.effectStateId()
|
||||
<< ", startTimeMsec=" << startTimeMsec
|
||||
<< ", cntBoobyTrap=" << m_counterDds.cntBoobyTrap;
|
||||
TRACE_LOG(m_logger) << " got changed - m_dataBoobyTrap: " << m_dataBoobyTrap;
|
||||
TRACE_LOG() << " got changed - m_dataBoobyTrap: " << m_dataBoobyTrap;
|
||||
}
|
||||
|
||||
void ModuleTestAesOthers::offRouteMineChanged(const OffRouteMine &data, DataModification modType)
|
||||
@@ -148,10 +147,10 @@ void ModuleTestAesOthers::offRouteMineChanged(const OffRouteMine &data, DataModi
|
||||
if (m_dataOffRouteMine.effectStart().is_set())
|
||||
startTimeMsec = m_dataOffRouteMine.effectStart().get();
|
||||
|
||||
DEBUG_LOG(m_logger) << " got changed - m_dataOffRouteMine: " << m_dataOffRouteMine.id() << ", state=" << m_dataOffRouteMine.effectStateId()
|
||||
DEBUG_LOG() << " got changed - m_dataOffRouteMine: " << m_dataOffRouteMine.id() << ", state=" << m_dataOffRouteMine.effectStateId()
|
||||
<< ", startTimeMsec=" << startTimeMsec
|
||||
<< ", cntOffRouteMine=" << m_counterDds.cntOffRouteMine;
|
||||
TRACE_LOG(m_logger) << " got changed - m_dataOffRouteMine: " << m_dataOffRouteMine;
|
||||
TRACE_LOG() << " got changed - m_dataOffRouteMine: " << m_dataOffRouteMine;
|
||||
}
|
||||
|
||||
|
||||
@@ -161,7 +160,7 @@ void ModuleTestAesOthers::onAesItemViewChanged(const AesItemView &aesItemView, D
|
||||
return;
|
||||
|
||||
AreaEffectSimulation::AesType_def::type aesType = aesItemView.aesTypeId().underlying();
|
||||
DEBUG_LOG(m_logger) << " got onAesItemViewChanged, aesType=" << aesType;
|
||||
DEBUG_LOG() << " got onAesItemViewChanged, aesType=" << aesType;
|
||||
|
||||
switch (aesType)
|
||||
{
|
||||
@@ -178,7 +177,7 @@ void ModuleTestAesOthers::onAesItemViewChanged(const AesItemView &aesItemView, D
|
||||
|
||||
void ModuleTestAesOthers::dumpCnt()
|
||||
{
|
||||
NOTICE_LOG(m_logger) << LOGFUNCTION << " Counter: "
|
||||
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " Counter: "
|
||||
<< " cntBoobyTrap = " << m_counterDds.cntBoobyTrap
|
||||
<< " cntOffRouteMine = " << m_counterDds.cntOffRouteMine
|
||||
<< ", cntItemView = " << m_counterDds.cntItemView;
|
||||
@@ -198,7 +197,7 @@ bool ModuleTestAesOthers::waitForData(const std::function<bool ()> &func, int re
|
||||
|
||||
for (int i = 0; i < retryCount; ++i)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " waitForData - i: " << i;
|
||||
DEBUG_LOG() << " waitForData - i: " << i;
|
||||
if (func())
|
||||
return true;
|
||||
QTest::qWait(100);
|
||||
@@ -211,23 +210,23 @@ void ModuleTestAesOthers::waitForEffectStatesBT(int lineNumber, int durPrep, int
|
||||
// expected condition:
|
||||
if (!waitForData([this]() { return m_replyError == false; }, 1))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error on request" << ", lineNumber = " << lineNumber;
|
||||
ERROR_LOG() << "Error on request" << ", lineNumber = " << lineNumber;
|
||||
return;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " waiting for EsPrepared...";
|
||||
INFO_LOG() << Q_FUNC_INFO << " waiting for EsPrepared...";
|
||||
if (!waitForData([this]() { return m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsPrepared;}, durPrep))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Timeout waiting for EsPrepared of m_dataBoobyTrap with id " << m_dataBoobyTrap.id()
|
||||
ERROR_LOG() << "Timeout waiting for EsPrepared of m_dataBoobyTrap with id " << m_dataBoobyTrap.id()
|
||||
<< ", lineNumber = " << lineNumber;
|
||||
QVERIFY2(false, "ERROR, exit");
|
||||
return;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " waiting for EsActivated...";
|
||||
INFO_LOG() << Q_FUNC_INFO << " waiting for EsActivated...";
|
||||
if (!waitForData([this]() { return m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated;}, durAct))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Timeout waiting for EsActivated of m_dataBoobyTrapr with id " << m_dataBoobyTrap.id()
|
||||
ERROR_LOG() << "Timeout waiting for EsActivated of m_dataBoobyTrapr with id " << m_dataBoobyTrap.id()
|
||||
<< ", lineNumber = " << lineNumber;
|
||||
QVERIFY2(false, "ERROR, exit");
|
||||
return;
|
||||
@@ -235,10 +234,10 @@ void ModuleTestAesOthers::waitForEffectStatesBT(int lineNumber, int durPrep, int
|
||||
|
||||
if (durExp > 0)
|
||||
{
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " waiting for EsExpired...";
|
||||
INFO_LOG() << Q_FUNC_INFO << " waiting for EsExpired...";
|
||||
if (!waitForData([this]() { return m_dataBoobyTrap.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired;}, durExp))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Timeout waiting for EsExpired of m_dataBoobyTrap with id " << m_dataBoobyTrap.id()
|
||||
ERROR_LOG() << "Timeout waiting for EsExpired of m_dataBoobyTrap with id " << m_dataBoobyTrap.id()
|
||||
<< ", lineNumber = " << lineNumber;
|
||||
QVERIFY2(false, "ERROR, exit");
|
||||
return;
|
||||
@@ -251,23 +250,23 @@ void ModuleTestAesOthers::waitForEffectStatesORM(int lineNumber, int durPrep, in
|
||||
// expected condition:
|
||||
if (!waitForData([this]() { return m_replyError == false; }, 1))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error on request" << ", lineNumber = " << lineNumber;
|
||||
ERROR_LOG() << "Error on request" << ", lineNumber = " << lineNumber;
|
||||
return;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " waiting for EsPrepared...";
|
||||
INFO_LOG() << Q_FUNC_INFO << " waiting for EsPrepared...";
|
||||
if (!waitForData([this]() { return m_dataOffRouteMine.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsPrepared;}, durPrep))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Timeout waiting for EsPrepared of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
|
||||
ERROR_LOG() << "Timeout waiting for EsPrepared of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
|
||||
<< ", lineNumber = " << lineNumber;
|
||||
QVERIFY2(false, "ERROR, exit");
|
||||
return;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " waiting for EsActivated...";
|
||||
INFO_LOG() << Q_FUNC_INFO << " waiting for EsActivated...";
|
||||
if (!waitForData([this]() { return m_dataOffRouteMine.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated;}, durAct))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Timeout waiting for EsActivated of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
|
||||
ERROR_LOG() << "Timeout waiting for EsActivated of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
|
||||
<< ", lineNumber = " << lineNumber;
|
||||
QVERIFY2(false, "ERROR, exit");
|
||||
return;
|
||||
@@ -275,10 +274,10 @@ void ModuleTestAesOthers::waitForEffectStatesORM(int lineNumber, int durPrep, in
|
||||
|
||||
if (durExp > 0)
|
||||
{
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " waiting for EsExpired...";
|
||||
INFO_LOG() << Q_FUNC_INFO << " waiting for EsExpired...";
|
||||
if (!waitForData([this]() { return m_dataOffRouteMine.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired;}, durExp))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Timeout waiting for EsExpired of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
|
||||
ERROR_LOG() << "Timeout waiting for EsExpired of m_dataOffRouteMine with id " << m_dataOffRouteMine.id()
|
||||
<< ", lineNumber = " << lineNumber;
|
||||
QVERIFY2(false, "ERROR, exit");
|
||||
return;
|
||||
@@ -289,7 +288,7 @@ void ModuleTestAesOthers::waitForEffectStatesORM(int lineNumber, int durPrep, in
|
||||
|
||||
void ModuleTestAesOthers::setupParticipants()
|
||||
{
|
||||
INFO_LOG(m_logger) << " setupParticipant ...";
|
||||
INFO_LOG() << " setupParticipant ...";
|
||||
|
||||
QVERIFY2(m_ppmFtc, "ERROR, no m_ppmFtc");
|
||||
|
||||
@@ -305,18 +304,18 @@ void ModuleTestAesOthers::setupParticipants()
|
||||
QPointF pos = utmPos.geographic();
|
||||
req.position(Core::GeoPosition(pos.x(), pos.y(), 0.0));
|
||||
|
||||
INFO_LOG(m_logger) << " setSimulatedPositionRequest ...";
|
||||
INFO_LOG() << " setSimulatedPositionRequest ...";
|
||||
m_replyError = true;
|
||||
m_ppmFtc->setSimulatedPositionRequest(req, this);
|
||||
|
||||
// expected condition:
|
||||
if (!waitForData([this]() { return m_replyError == false; }))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error on request";
|
||||
ERROR_LOG() << "Error on request";
|
||||
}
|
||||
}
|
||||
}
|
||||
INFO_LOG(m_logger) << " setSimulatedPositionRequest ...DONE";
|
||||
INFO_LOG() << " setSimulatedPositionRequest ...DONE";
|
||||
}
|
||||
|
||||
bool ModuleTestAesOthers::checkParticipant_18()
|
||||
@@ -325,7 +324,7 @@ bool ModuleTestAesOthers::checkParticipant_18()
|
||||
const int partId = 18;
|
||||
const ParticipantManagement::ParticipantPosition &pos = m_ppmDtc->participantPosition(partId);
|
||||
QString mgrsStr = LtsCoordTrans::mgrsFromGeographic(pos.pos().lon(), pos.pos().lat());
|
||||
INFO_LOG(m_logger) << " for partId = '" << partId << "', we got position: " << mgrsStr;
|
||||
INFO_LOG() << " for partId = '" << partId << "', we got position: " << mgrsStr;
|
||||
|
||||
return mgrsStr == QStringLiteral("32U PD 76900 18100");
|
||||
}
|
||||
@@ -393,17 +392,17 @@ int ModuleTestAesOthers::doMoveParticipant(int participantId, const QString &new
|
||||
QPointF pos = utmPos.geographic();
|
||||
req.position(Core::GeoPosition(pos.x(), pos.y(), 0.0));
|
||||
|
||||
INFO_LOG(m_logger) << " setSimulatedPositionRequest ...";
|
||||
INFO_LOG() << " setSimulatedPositionRequest ...";
|
||||
m_replyError = true;
|
||||
m_ppmFtc->setSimulatedPositionRequest(req, this);
|
||||
|
||||
// expected condition:
|
||||
if (!waitForData([this]() { return m_replyError == false; }))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error on request";
|
||||
ERROR_LOG() << "Error on request";
|
||||
}
|
||||
}
|
||||
INFO_LOG(m_logger) << " doMoveParticipant ...DONE";
|
||||
INFO_LOG() << " doMoveParticipant ...DONE";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -424,14 +423,14 @@ void ModuleTestAesOthers::initTestCase()
|
||||
QVERIFY2(bInit, "ERROR, ddsConnector.init failed!!");
|
||||
if (!bInit)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " ERROR, ddsConnector.init failed!!";
|
||||
ERROR_LOG() << " ERROR, ddsConnector.init failed!!";
|
||||
return;
|
||||
}
|
||||
INFO_LOG(m_logger) << " ddsConnector.init successfull";
|
||||
INFO_LOG() << " ddsConnector.init successfull";
|
||||
|
||||
// cmd
|
||||
m_ddsConnector->initPublisherSubscriber();
|
||||
INFO_LOG(m_logger) << " ddsConnector.initPublisherSubscriber done";
|
||||
INFO_LOG() << " ddsConnector.initPublisherSubscriber done";
|
||||
|
||||
//
|
||||
// Aes
|
||||
@@ -530,9 +529,9 @@ void ModuleTestAesOthers::init()
|
||||
|
||||
void ModuleTestAesOthers::test_justSetupParticipants()
|
||||
{
|
||||
NOTICE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
setupParticipants();
|
||||
NOTICE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
//
|
||||
@@ -542,11 +541,11 @@ void ModuleTestAesOthers::test_boobyTrap_01()
|
||||
{
|
||||
if (m_traingAreaId != s_TraingAreaId_Altmark)
|
||||
{
|
||||
NOTICE_LOG(m_logger) << LOGFUNCTION << " skip testcase due to m_traingAreaId = " << m_traingAreaId;
|
||||
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " skip testcase due to m_traingAreaId = " << m_traingAreaId;
|
||||
return;
|
||||
}
|
||||
|
||||
NOTICE_LOG(m_logger) << LOGFUNCTION << " START, m_traingAreaId = " << m_traingAreaId;
|
||||
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " START, m_traingAreaId = " << m_traingAreaId;
|
||||
QVERIFY2(checkParticipant_18(), "ERROR, checkParticipant_5 failed!!");
|
||||
|
||||
AreaEffectSimulation::BoobyTrap bt;
|
||||
@@ -596,7 +595,7 @@ void ModuleTestAesOthers::test_boobyTrap_01()
|
||||
// wait to let it disappear:
|
||||
waitForData([]() { return false; }, 15);
|
||||
|
||||
NOTICE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
|
||||
@@ -607,11 +606,11 @@ void ModuleTestAesOthers::test_boobyTrap_02_IMPL(const QString &name,
|
||||
{
|
||||
if (m_traingAreaId != s_TraingAreaId_Altmark)
|
||||
{
|
||||
NOTICE_LOG(m_logger) << LOGFUNCTION << " skip testcase due to m_traingAreaId = " << m_traingAreaId;
|
||||
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " skip testcase due to m_traingAreaId = " << m_traingAreaId;
|
||||
return;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " START, m_traingAreaId = " << m_traingAreaId
|
||||
INFO_LOG() << Q_FUNC_INFO << " START, m_traingAreaId = " << m_traingAreaId
|
||||
<< ", name =" << name << "'"
|
||||
<< ", impactCoord= " << impactCoord.mgrs()
|
||||
<< ", rotationAngle = " << rotationAngle
|
||||
@@ -667,7 +666,7 @@ void ModuleTestAesOthers::test_boobyTrap_02_IMPL(const QString &name,
|
||||
|
||||
// wait to let it disappear:
|
||||
waitForData([]() { return false; }, 15);
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " END"
|
||||
INFO_LOG() << Q_FUNC_INFO << " END"
|
||||
<< ", name =" << name << "'"
|
||||
<< ", impactCoord= " << impactCoord.mgrs()
|
||||
<< ", rotationAngle = " << rotationAngle
|
||||
@@ -710,11 +709,11 @@ void ModuleTestAesOthers::test_offRouteMine_02()
|
||||
{
|
||||
if (m_traingAreaId != s_TraingAreaId_Altmark)
|
||||
{
|
||||
NOTICE_LOG(m_logger) << LOGFUNCTION << " skip testcase due to m_traingAreaId = " << m_traingAreaId;
|
||||
NOTICE_LOG(m_logger) << Q_FUNC_INFO << " skip testcase due to m_traingAreaId = " << m_traingAreaId;
|
||||
return;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " START, m_traingAreaId = " << m_traingAreaId;
|
||||
INFO_LOG() << Q_FUNC_INFO << " START, m_traingAreaId = " << m_traingAreaId;
|
||||
|
||||
QVERIFY2(checkParticipant_18(), "ERROR, checkParticipant_5 failed!!");
|
||||
|
||||
@@ -768,7 +767,7 @@ void ModuleTestAesOthers::test_offRouteMine_02()
|
||||
|
||||
// wait to let it disappear:
|
||||
waitForData([]() { return false; }, 15);
|
||||
INFO_LOG(m_logger) << LOGFUNCTION << " END" << ", name =" << orm.name() << "'";
|
||||
INFO_LOG() << Q_FUNC_INFO << " END" << ", name =" << orm.name() << "'";
|
||||
}
|
||||
|
||||
void ModuleTestAesOthers::cleanupTestCase()
|
||||
@@ -776,9 +775,9 @@ void ModuleTestAesOthers::cleanupTestCase()
|
||||
// finish last (dds) calls:
|
||||
waitForData([]() { return false; }, 10);
|
||||
|
||||
INFO_LOG(m_logger) << " ddsConnector destroy...";
|
||||
INFO_LOG() << " ddsConnector destroy...";
|
||||
m_ddsConnector.reset();
|
||||
INFO_LOG(m_logger) << " ddsConnector destroy...DONE";
|
||||
INFO_LOG() << " ddsConnector destroy...DONE";
|
||||
}
|
||||
|
||||
|
||||
|
||||
-2
@@ -169,6 +169,4 @@ private:
|
||||
}
|
||||
}
|
||||
m_counterDds;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
Reference in new issue
Block a user