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/Evaluations/ModuleTests/evl_tests.cpp
+70 -70
View File
@@ -40,7 +40,7 @@ EvlTests::EvlTests(QObject *parent)
//-----------------------------------------------------------------------------
bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, int criteriumId, int elementId, int sanNineLinerId)
{
INFO_LOG() << "EvlTests::init() "
INFO_LOG(m_logger) << "EvlTests::init() "
<< " domainId:" << domainId
<< " exerciseId:" << exerciseId
<< " testId: " << testId
@@ -54,7 +54,7 @@ bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, in
m_operatorId = operatorId;
m_sanNineLinerId = sanNineLinerId;
DEBUG_LOG() << "Operator Id = " << m_operatorId;
DEBUG_LOG(m_logger) << "Operator Id = " << m_operatorId;
// initialize DDS
m_ddsConnector.reset(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId));
@@ -63,18 +63,18 @@ bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, in
m_ddsConnector->initPublisherSubscriber();
// Access to FTC
DEBUG_LOG() << "create ftc";
DEBUG_LOG(m_logger) << "create ftc";
m_ftc = Evaluations::Interface::Ftc::create(m_ddsConnector);
DEBUG_LOG() << "init ftc";
DEBUG_LOG(m_logger) << "init ftc";
bool bRet = m_ftc->enableAll();
DEBUG_LOG() << "init end - bRet = " << bRet;
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
// Access to DTC
DEBUG_LOG() << "create dtc";
DEBUG_LOG(m_logger) << "create dtc";
m_dtc = Evaluations::Interface::Dtc::create(m_ddsConnector);
DEBUG_LOG() << "init dtc";
DEBUG_LOG(m_logger) << "init dtc";
bRet = m_dtc->enableAll();
DEBUG_LOG() << "init end - bRet = " << bRet;
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
return bRet;
} // end of init()
@@ -82,7 +82,7 @@ bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, in
//-----------------------------------------------------------------------------
void EvlTests::startTest()
{
INFO_LOG() << "startTest() ******* "
INFO_LOG(m_logger) << "startTest() ******* "
<< " exerciseId: " << m_exerciseId
<< " testId: " << m_testId
<< " criteriumId: " << m_criteriumId
@@ -117,10 +117,10 @@ void EvlTests::startTest()
QTimer::singleShot(0, this, &EvlTests::tryGetSanNineLiner);
else
{
ERROR_LOG() << "Unknown test case !";
ERROR_LOG(m_logger) << "Unknown test case !";
failExit();
}
INFO_LOG() << "endTest ******* ";
INFO_LOG(m_logger) << "endTest ******* ";
QTimer::singleShot(0, qApp, QCoreApplication::quit);
} // end of startTest()
@@ -136,10 +136,10 @@ void EvlTests::tryCreateCriterium()
data.description("Test description");
data.operatorId(m_operatorId);
INFO_LOG() << "trying to send EvlCriteriumModifyRequest";
INFO_LOG(m_logger) << "trying to send EvlCriteriumModifyRequest";
if (!m_ftc->evlCriteriumModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
}
QTest::qWait(1000);
@@ -156,10 +156,10 @@ void EvlTests::tryModifyCriterium()
data.description("Description modified");
data.operatorId(m_operatorId);
INFO_LOG() << "trying to send EvlCriteriumModifyRequest for criteriumId:" << data.id();
INFO_LOG(m_logger) << "trying to send EvlCriteriumModifyRequest for criteriumId:" << data.id();
if (!m_ftc->evlCriteriumModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting modify data for criteriumId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting modify data for criteriumId:" << data.id();
failExit();
}
QTest::qWait(1000);
@@ -173,10 +173,10 @@ void EvlTests::tryRemoveCriterium()
data.id(m_criteriumId);
INFO_LOG() << "trying to send remove request for criteriumId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for criteriumId:" << data.id();
if (!m_ftc->evlCriteriumRemoveRequest(data, this))
{
ERROR_LOG() << "Error requesting remove data for criteriumId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for criteriumId:" << data.id();
failExit();
}
QTest::qWait(1000);
@@ -186,14 +186,14 @@ void EvlTests::tryRemoveCriterium()
void EvlTests::tryGetAllCriteria()
{
m_eTestStep = eGetAllCriteria;
DEBUG_LOG() << "trying to get all criteria";
DEBUG_LOG(m_logger) << "trying to get all criteria";
m_dtc->waitForHistoricalDataEvaluationCriterium(5000);
m_criteriumId = -1;
auto cb = [this] (const Evaluations::EvaluationCriterium &c)
{
m_criteriumId = c.id();
INFO_LOG() << "Evl(" << c.id() << ") :"
INFO_LOG(m_logger) << "Evl(" << c.id() << ") :"
<< " name:" << c.name()
<< " desc:" << c.description()
<< " operatorId:" << c.operatorId();
@@ -201,7 +201,7 @@ void EvlTests::tryGetAllCriteria()
m_dtc->evaluationCriteriums(cb);
if (m_criteriumId == -1)
{
ERROR_LOG() << "Error requesting all criterium data";
ERROR_LOG(m_logger) << "Error requesting all criterium data";
failExit();
}
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -210,7 +210,7 @@ void EvlTests::tryGetAllCriteria()
//-----------------------------------------------------------------------------
void EvlTests::tryGetCriterium()
{
DEBUG_LOG() << "trying to get criterium with id:" << m_criteriumId;
DEBUG_LOG(m_logger) << "trying to get criterium with id:" << m_criteriumId;
if(m_testId > 1)
{
@@ -219,7 +219,7 @@ void EvlTests::tryGetCriterium()
if (m_criteriumId <= 0)
{
ERROR_LOG() << "invalid criteriumId - test aborted.";
ERROR_LOG(m_logger) << "invalid criteriumId - test aborted.";
failExit();
}
@@ -228,12 +228,12 @@ void EvlTests::tryGetCriterium()
if (data.id() <= 0)
{
ERROR_LOG() << "Error receiving data for criteriumId " << m_criteriumId << " returnVal: " << data.id();
ERROR_LOG(m_logger) << "Error receiving data for criteriumId " << m_criteriumId << " returnVal: " << data.id();
failExit();
}
else
{
INFO_LOG() << "Evl(" << data.id() << ") :"
INFO_LOG(m_logger) << "Evl(" << data.id() << ") :"
<< " name:" << data.name()
<< " desc:" << data.description()
<< " operatorId:" << data.operatorId();
@@ -243,7 +243,7 @@ void EvlTests::tryGetCriterium()
{
if (!onCompareCreatedData(data))
{
ERROR_LOG() << "Compare created data failed!";
ERROR_LOG(m_logger) << "Compare created data failed!";
failExit();
}
else
@@ -279,10 +279,10 @@ void EvlTests::tryCreateElement()
obj[QStringLiteral("allStreams")] = QJsonValue(QStringLiteral("vhf01, hf01, hf02, vhf03"));
data.audioContent().set(QJsonDocument(obj).toJson().constData());
INFO_LOG() << "trying to send evlElementModifyRequest";
INFO_LOG(m_logger) << "trying to send evlElementModifyRequest";
if (!m_ftc->evlElementModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
}
QTest::qWait(1000);
@@ -310,10 +310,10 @@ void EvlTests::tryModifyElement()
obj[QStringLiteral("allStreams")] = QJsonValue(QStringLiteral("vhf01, hf01, hf02, vhf03"));
data.audioContent().set(QJsonDocument(obj).toJson().constData());
INFO_LOG() << "trying to send evlElementModifyRequest for elementId:" << data.id();
INFO_LOG(m_logger) << "trying to send evlElementModifyRequest for elementId:" << data.id();
if (!m_ftc->evlElementModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting modify data for snapshotId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting modify data for snapshotId:" << data.id();
failExit();
}
QTest::qWait(1000);
@@ -328,10 +328,10 @@ void EvlTests::tryRemoveElement()
data.id(m_elementId);
data.criteriumId(m_criteriumId);
INFO_LOG() << "trying to send remove request for elementId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for elementId:" << data.id();
if (!m_ftc->evlElementRemoveRequest(data, this))
{
ERROR_LOG() << "Error requesting remove data for elementId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for elementId:" << data.id();
failExit();
}
QTest::qWait(1000);
@@ -402,12 +402,12 @@ void EvlTests::tryCreateSanNineLiner()
QJsonDocument doc = SanCategoryLine::toJson(vecCl);
data.lines(doc.toJson().toStdString());
INFO_LOG() << "lines: " << data.lines();
INFO_LOG(m_logger) << "lines: " << data.lines();
INFO_LOG() << "trying to send sanNineLinerRequest";
INFO_LOG(m_logger) << "trying to send sanNineLinerRequest";
if (!m_ftc->sanNineLinerModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
}
QTest::qWait(1000);
@@ -477,12 +477,12 @@ void EvlTests::tryModifySanNineLiner()
QJsonDocument doc = SanCategoryLine::toJson(vecCl);
data.lines(doc.toJson().toStdString());
INFO_LOG() << "lines: " << data.lines();
INFO_LOG(m_logger) << "lines: " << data.lines();
INFO_LOG() << "trying to send sanNineLinerRequest";
INFO_LOG(m_logger) << "trying to send sanNineLinerRequest";
if (!m_ftc->sanNineLinerModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting modify data";
ERROR_LOG(m_logger) << "Error requesting modify data";
failExit();
}
QTest::qWait(1000);
@@ -496,10 +496,10 @@ void EvlTests::tryRemoveSanNineLiner()
data.id(m_sanNineLinerId);
INFO_LOG() << "trying to send remove request for sanNineLinerId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for sanNineLinerId:" << data.id();
if (!m_ftc->sanNineLinerRemoveRequest(data, this))
{
ERROR_LOG() << "Error requesting remove data for sanNineLinerId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for sanNineLinerId:" << data.id();
failExit();
}
QTest::qWait(1000);
@@ -508,7 +508,7 @@ void EvlTests::tryRemoveSanNineLiner()
//-----------------------------------------------------------------------------
void EvlTests::tryGetSanNineLiner()
{
DEBUG_LOG() << "trying to get sanNineLinerId with id:" << m_sanNineLinerId;
DEBUG_LOG(m_logger) << "trying to get sanNineLinerId with id:" << m_sanNineLinerId;
if(m_testId > 1)
{
@@ -517,7 +517,7 @@ void EvlTests::tryGetSanNineLiner()
if (m_sanNineLinerId <= 0)
{
ERROR_LOG() << "invalid sanNineLinerId - test aborted.";
ERROR_LOG(m_logger) << "invalid sanNineLinerId - test aborted.";
failExit();
}
@@ -526,12 +526,12 @@ void EvlTests::tryGetSanNineLiner()
if (data.id() <= 0)
{
ERROR_LOG() << "Error receiving data for sanNineLiner " << m_sanNineLinerId << " returnVal: " << data.id();
ERROR_LOG(m_logger) << "Error receiving data for sanNineLiner " << m_sanNineLinerId << " returnVal: " << data.id();
failExit();
}
else
{
INFO_LOG() << "SanNineLiner(" << data.id() << ") :"
INFO_LOG(m_logger) << "SanNineLiner(" << data.id() << ") :"
<< " lastModified: " << data.lastModified()
<< " position lat: " << data.line1_position().lat()
<< " position lon: " << data.line1_position().lon()
@@ -544,7 +544,7 @@ void EvlTests::tryGetSanNineLiner()
{
if (!onCompareCreatedData(data))
{
ERROR_LOG() << "Compare created data failed!";
ERROR_LOG(m_logger) << "Compare created data failed!";
failExit();
}
else
@@ -562,20 +562,20 @@ void EvlTests::tryGetSanNineLiner()
//-----------------------------------------------------------------------------
void EvlTests::onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got onEvlCriteriumModifyReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got onEvlCriteriumModifyReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_criteriumId = replyObject.id();
if (replyObject.error())
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
}
QTimer::singleShot(0, this, &EvlTests::tryGetCriterium);
@@ -585,18 +585,18 @@ void EvlTests::onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyO
//-----------------------------------------------------------------------------
void EvlTests::onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got removeReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if (replyObject.error())
{
ERROR_LOG() << "Error requesting remove data for criteriumId:" << replyObject.id();
ERROR_LOG(m_logger) << "Error requesting remove data for criteriumId:" << replyObject.id();
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting remove data for criteriumd:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting remove data for criteriumd:" << replyObject.id() << " ... ok.";
}
QTimer::singleShot(0, qApp, QCoreApplication::quit);
@@ -606,20 +606,20 @@ void EvlTests::onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyO
//-----------------------------------------------------------------------------
void EvlTests::onEvlElementModifyReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got modifyReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got modifyReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_elementId = replyObject.id();
if (replyObject.error())
{
ERROR_LOG() << "Error requesting modify data";
ERROR_LOG(m_logger) << "Error requesting modify data";
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting modify data ok. Got id:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting modify data ok. Got id:" << replyObject.id() << " ... ok.";
}
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -630,18 +630,18 @@ void EvlTests::onEvlElementModifyReply(const Core::FunctionReplyObject &replyObj
//-----------------------------------------------------------------------------
void EvlTests::onEvlElementRemoveReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got removeReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if (replyObject.error())
{
ERROR_LOG() << "Error requesting remove data for elementId:" << replyObject.id();
ERROR_LOG(m_logger) << "Error requesting remove data for elementId:" << replyObject.id();
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting remove data for elementId:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting remove data for elementId:" << replyObject.id() << " ... ok.";
}
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -651,20 +651,20 @@ void EvlTests::onEvlElementRemoveReply(const Core::FunctionReplyObject &replyObj
//-----------------------------------------------------------------------------
void EvlTests::onSanNineLinerModifyReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got onSanNineLinerModifyReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got onSanNineLinerModifyReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_sanNineLinerId = replyObject.id();
if (replyObject.error())
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
}
QTimer::singleShot(0, this, &EvlTests::tryGetSanNineLiner);
@@ -673,18 +673,18 @@ void EvlTests::onSanNineLinerModifyReply(const Core::FunctionReplyObject &replyO
//-----------------------------------------------------------------------------
void EvlTests::onSanNineLinerRemoveReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got removeReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if (replyObject.error())
{
ERROR_LOG() << "Error requesting remove data for sanNineLinerId:" << replyObject.id();
ERROR_LOG(m_logger) << "Error requesting remove data for sanNineLinerId:" << replyObject.id();
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting remove data for sanNineLinerId:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting remove data for sanNineLinerId:" << replyObject.id() << " ... ok.";
}
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -695,21 +695,21 @@ void EvlTests::onSanNineLinerRemoveReply(const Core::FunctionReplyObject &replyO
//-----------------------------------------------------------------------------
void EvlTests::onReceiveCriteriumChanged(const EvaluationCriterium &data, DataModification modType)
{
INFO_LOG() << "onReceiveCriteriumChanged() criteriumId:" << data.id()
INFO_LOG(m_logger) << "onReceiveCriteriumChanged() criteriumId:" << data.id()
<< " modificationType: = " << (int)modType<< " received";
switch (modType)
{
case DataModification::eAdded:
INFO_LOG() << "*** Criterium added received. criteriumId:" << data.id();
INFO_LOG(m_logger) << "*** Criterium added received. criteriumId:" << data.id();
break;
case DataModification::eModified:
INFO_LOG() << "*** Criterium modified received. criteriumId:" << data.id();
INFO_LOG(m_logger) << "*** Criterium modified received. criteriumId:" << data.id();
break;
case DataModification::eRemoved:
INFO_LOG() << "*** Criterium removed received. criteriumId:" << data.id();
INFO_LOG(m_logger) << "*** Criterium removed received. criteriumId:" << data.id();
break;
}
@@ -736,7 +736,7 @@ void EvlTests::getSanNineLinerModifyRequestData(SanNineLinerModifyRequest &data)
//-----------------------------------------------------------------------------
bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
{
DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
// Vergleicht die zurueckgelesen Datan mit den statischen create Daten
@@ -754,7 +754,7 @@ bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
return false;
DEBUG_LOG() << "successfully finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfully finished onCompareCreatedData() for id :" << data.id();
return true;
} // end of onCompareCreatedData()
@@ -762,7 +762,7 @@ bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
//-----------------------------------------------------------------------------
bool EvlTests::onCompareCreatedData(SanNineLiner &data)
{
DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
SanNineLinerModifyRequest createData;
@@ -774,7 +774,7 @@ bool EvlTests::onCompareCreatedData(SanNineLiner &data)
if (createData.line2_radioFrequencyCallSignSuffix() != data.line2_RadioFrequencyCallSignSuffix())
return false;
DEBUG_LOG() << "successfully finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfully finished onCompareCreatedData() for id :" << data.id();
return true;
} // end of onCompareCreatedData()