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/AudioVideoManagement/ModuleTests/avm_ft_tests.cpp
+20 -20
View File
@@ -36,7 +36,7 @@ AvmFtTests::~AvmFtTests()
// ------------------------------------------------------------------------------
bool AvmFtTests::init(int domainId, int testId, int menuId, int mountingPointId)
{
INFO_LOG() << "init begin";
INFO_LOG(m_logger) << "init begin";
m_testId = testId;
m_menuStructId = menuId;
@@ -47,14 +47,14 @@ bool AvmFtTests::init(int domainId, int testId, int menuId, int mountingPointId)
return false;
m_ddsConnector->initPublisherSubscriber();
DEBUG_LOG() << "create ftc AVM";
DEBUG_LOG(m_logger) << "create ftc AVM";
m_ftc = AudioVideoManagement::Interface::Ftc::create(m_ddsConnector);
DEBUG_LOG() << "init ftc AVM";
DEBUG_LOG(m_logger) << "init ftc AVM";
bool bRet = m_ftc->enableAll();
DEBUG_LOG() << "init end AVM - bRet = " << bRet;
DEBUG_LOG(m_logger) << "init end AVM - bRet = " << bRet;
DEBUG_LOG() << "Domain Id = " << domainId;
DEBUG_LOG() << "Test Id = " << testId;
DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
DEBUG_LOG(m_logger) << "Test Id = " << testId;
return bRet;
}
@@ -62,7 +62,7 @@ bool AvmFtTests::init(int domainId, int testId, int menuId, int mountingPointId)
// ------------------------------------------------------------------------------
void AvmFtTests::startTest()
{
INFO_LOG() << "startTest";
INFO_LOG(m_logger) << "startTest";
if (m_testId <= 1)
QTimer::singleShot(0, this, &AvmFtTests::tryCreate);
else if (m_testId == 2)
@@ -74,7 +74,7 @@ void AvmFtTests::startTest()
// ------------------------------------------------------------------------------
void AvmFtTests::tryCreate()
{
INFO_LOG() << "trying to send createMenuStructRequest";
INFO_LOG(m_logger) << "trying to send createMenuStructRequest";
m_menuStructId = -2;
ModifyMenuStructRequest request;
@@ -101,7 +101,7 @@ void AvmFtTests::tryCreate()
if (!m_ftc->modifyMenuStructRequest(request, this))
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
}
}
@@ -109,7 +109,7 @@ void AvmFtTests::tryCreate()
// ------------------------------------------------------------------------------
void AvmFtTests::tryModify()
{
INFO_LOG() << "trying to send modify request for menuStructId = " << m_menuStructId;
INFO_LOG(m_logger) << "trying to send modify request for menuStructId = " << m_menuStructId;
ModifyMenuStructRequest request;
request.id(m_menuStructId);
request.name("TestGlobalMenuModify");
@@ -134,7 +134,7 @@ void AvmFtTests::tryModify()
if (!m_ftc->modifyMenuStructRequest(request, this))
{
ERROR_LOG() << "Error requesting modify data";
ERROR_LOG(m_logger) << "Error requesting modify data";
failExit();
}
}
@@ -142,13 +142,13 @@ void AvmFtTests::tryModify()
// ------------------------------------------------------------------------------
void AvmFtTests::tryDelete()
{
INFO_LOG() << "trying to send delete request for menuStructId = " << m_menuStructId;
INFO_LOG(m_logger) << "trying to send delete request for menuStructId = " << m_menuStructId;
RemoveMenuStructRequest request;
request.id(m_menuStructId);
if (!m_ftc->removeMenuStructRequest(request, this))
{
ERROR_LOG() << "Error requesting delete data";
ERROR_LOG(m_logger) << "Error requesting delete data";
failExit();
}
}
@@ -167,15 +167,15 @@ void AvmFtTests::createMenuStructReply(const Core::FunctionReplyObject &replyObj
{
if (replyObject.error())
{
ERROR_LOG() << "Got onCreateMenuStructReply error: " << replyObject();
ERROR_LOG(m_logger) << "Got onCreateMenuStructReply error: " << replyObject();
failExit();
return;
}
INFO_LOG() << "Got createReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got createReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_menuStructId = replyObject.id();
DEBUG_LOG() << "m_testId = " << m_testId;
DEBUG_LOG(m_logger) << "m_testId = " << m_testId;
if(m_testId == 0)
QTimer::singleShot(0, this, &AvmFtTests::tryModify);
@@ -188,11 +188,11 @@ void AvmFtTests::modifyMenuStructReply(const Core::FunctionReplyObject &replyObj
{
if (replyObject.error())
{
ERROR_LOG() << "Got onModifyMenuStructReply error: " << replyObject();
ERROR_LOG(m_logger) << "Got onModifyMenuStructReply error: " << replyObject();
failExit();
return;
}
INFO_LOG() << "Got modifyRequest with id " << replyObject.id()
INFO_LOG(m_logger) << "Got modifyRequest with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if(m_testId == 0)
QTimer::singleShot(0, this, &AvmFtTests::tryDelete);
@@ -205,11 +205,11 @@ void AvmFtTests::onRemoveMenuStructReply(const Core::FunctionReplyObject &replyO
{
if (replyObject.error())
{
ERROR_LOG() << "Got onRemoveMenuStructReply error: " << replyObject();
ERROR_LOG(m_logger) << "Got onRemoveMenuStructReply error: " << replyObject();
failExit();
return;
}
INFO_LOG() << "Got removeReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_ft_tests.h
+1
View File
@@ -50,6 +50,7 @@ protected Q_SLOTS:
void tryModify();
void tryDelete();
protected:
NGL::INGLLogger &m_logger;
void onModifyMenuStructReply(const Core::FunctionReplyObject &replyObject) override final;
void createMenuStructReply(const Core::FunctionReplyObject &replyObject);
void modifyMenuStructReply(const Core::FunctionReplyObject &replyObject);
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.h
+2
View File
@@ -43,6 +43,8 @@ private slots:
void test();
private:
NGL::INGLLogger &m_logger;
void create();
void modify();
void remove();
qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/mvs_tests.cpp
+33 -33
View File
@@ -38,7 +38,7 @@ MvsTests::~MvsTests()
//----------------------------------------------------------------------------------
bool MvsTests::init(int domainId, int testId, int teamId, int receiverId, int stationId, int exerciseId)
{
INFO_LOG() << "init begin";
INFO_LOG(m_logger) << "init begin";
m_testId = testId;
m_teamId = teamId;
@@ -52,18 +52,18 @@ bool MvsTests::init(int domainId, int testId, int teamId, int receiverId, int st
return false;
m_ddsConnector->initPublisherSubscriber();
DEBUG_LOG() << "create ftc MVS";
DEBUG_LOG(m_logger) << "create ftc MVS";
m_ftc = AudioVideoManagement::Interface::Ftc::create(m_ddsConnector);
DEBUG_LOG() << "init ftc MVS";
DEBUG_LOG(m_logger) << "init ftc MVS";
bool bRet = m_ftc->enableAll();
DEBUG_LOG() << "init end MVS - bRet = " << bRet;
DEBUG_LOG(m_logger) << "init end MVS - bRet = " << bRet;
DEBUG_LOG() << "Domain Id = " << domainId;
DEBUG_LOG() << "Team Id = " << teamId;
DEBUG_LOG() << "Test Id = " << testId;
DEBUG_LOG() << "Receiver Id = " << receiverId;
DEBUG_LOG() << "Radio Station Id = " << stationId;
DEBUG_LOG() << "Exercise Id = " << exerciseId;
DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
DEBUG_LOG(m_logger) << "Team Id = " << teamId;
DEBUG_LOG(m_logger) << "Test Id = " << testId;
DEBUG_LOG(m_logger) << "Receiver Id = " << receiverId;
DEBUG_LOG(m_logger) << "Radio Station Id = " << stationId;
DEBUG_LOG(m_logger) << "Exercise Id = " << exerciseId;
return bRet;
}
@@ -71,7 +71,7 @@ bool MvsTests::init(int domainId, int testId, int teamId, int receiverId, int st
//----------------------------------------------------------------------------------
void MvsTests::startTest()
{
INFO_LOG() << "startTest";
INFO_LOG(m_logger) << "startTest";
switch (m_testId)
{
// case 1:
@@ -99,18 +99,18 @@ void MvsTests::startTest()
tryModifyAvsVideoReceiver();
break;
default:
ERROR_LOG() << "Unknown test case !";
ERROR_LOG(m_logger) << "Unknown test case !";
failExit();
break;
}
INFO_LOG() << "********* endTest **************";
INFO_LOG(m_logger) << "********* endTest **************";
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
//----------------------------------------------------------------------------------
//void MvsTests::tryCreateVideoTeam()
//{
// INFO_LOG() << "trying to send createRequest VideoTeam";
// INFO_LOG(m_logger) << "trying to send createRequest VideoTeam";
// VideoTeamModifyRequest request;
// request.id(0);
@@ -125,7 +125,7 @@ void MvsTests::startTest()
// if (!m_ftc->videoTeamModifyRequest(request, this))
// {
// INFO_LOG() << "Error requesting create data, as expected";
// INFO_LOG(m_logger) << "Error requesting create data, as expected";
// successExit();
// }
@@ -150,7 +150,7 @@ void MvsTests::tryModifyVideoTeam()
if (!m_ftc->videoTeamModifyRequest(request, this))
{
ERROR_LOG() << "Error requesting modify data";
ERROR_LOG(m_logger) << "Error requesting modify data";
failExit();
}
@@ -166,7 +166,7 @@ void MvsTests::tryModifyVideoTeam()
// if (!m_ftc->videoTeamRemoveRequest(request, this))
// {
// ERROR_LOG() << "Error requesting remove data";
// ERROR_LOG(m_logger) << "Error requesting remove data";
// failExit();
// }
@@ -176,7 +176,7 @@ void MvsTests::tryModifyVideoTeam()
//----------------------------------------------------------------------------------
void MvsTests::tryCreateVideoReceiver()
{
INFO_LOG() << "trying to send createRequest VideoReceiver";
INFO_LOG(m_logger) << "trying to send createRequest VideoReceiver";
VideoReceiverModifyRequest request;
request.id(0);
@@ -189,7 +189,7 @@ void MvsTests::tryCreateVideoReceiver()
if (!m_ftc->videoReceiverModifyRequest(request, this))
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
}
@@ -211,7 +211,7 @@ void MvsTests::tryModifyVideoReceiver()
if (!m_ftc->videoReceiverModifyRequest(request, this))
{
ERROR_LOG() << "Error requesting modify data";
ERROR_LOG(m_logger) << "Error requesting modify data";
failExit();
}
@@ -229,7 +229,7 @@ void MvsTests::tryModifyAvsVideoReceiver()
if (!m_ftc->videoReceiverModifyAvsRequest(request, this))
{
ERROR_LOG() << "Error requesting modify AVS data";
ERROR_LOG(m_logger) << "Error requesting modify AVS data";
failExit();
}
@@ -246,7 +246,7 @@ void MvsTests::tryModifyActiveVideoReceiver()
if (!m_ftc->videoReceiverModifyActiveRequest(request, this))
{
ERROR_LOG() << "Error requesting modify active data";
ERROR_LOG(m_logger) << "Error requesting modify active data";
failExit();
}
@@ -263,7 +263,7 @@ void MvsTests::tryDeleteVideoReceiver()
if (!m_ftc->videoReceiverRemoveRequest(request, this))
{
ERROR_LOG() << "Error requesting remove data";
ERROR_LOG(m_logger) << "Error requesting remove data";
failExit();
}
@@ -274,7 +274,7 @@ void MvsTests::tryDeleteVideoReceiver()
//----------------------------------------------------------------------------------
void MvsTests::failExit()
{
ERROR_LOG() << "FAIL EXIT !";
ERROR_LOG(m_logger) << "FAIL EXIT !";
m_bTestsSuccessful = false;
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
@@ -282,7 +282,7 @@ void MvsTests::failExit()
//----------------------------------------------------------------------------------
void MvsTests::successExit()
{
INFO_LOG() << "SUCCES EXIT !";
INFO_LOG(m_logger) << "SUCCES EXIT !";
m_bTestsSuccessful = true;
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
}
@@ -291,14 +291,14 @@ void MvsTests::successExit()
//----------------------------------------------------------------------------------
void MvsTests::onVideoTeamModifyReply(const Core::FunctionReplyObject &replyObject)
{
DEBUG_LOG() << "END (onVideoTeamModifyReply)";
DEBUG_LOG(m_logger) << "END (onVideoTeamModifyReply)";
if (replyObject.error())
{
ERROR_LOG() << "Got onVideoTeamModifyReply error: " << replyObject();
ERROR_LOG(m_logger) << "Got onVideoTeamModifyReply error: " << replyObject();
QTimer::singleShot(0, qApp, SLOT(quit()));
return;
}
INFO_LOG() << "Got Reply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_teamId = replyObject.id();
@@ -309,14 +309,14 @@ void MvsTests::onVideoTeamModifyReply(const Core::FunctionReplyObject &replyObje
//----------------------------------------------------------------------------------
void MvsTests::onVideoReceiverModifyReply(const Core::FunctionReplyObject &replyObject)
{
DEBUG_LOG() << "END (onVideoReceiverModifyReply)";
DEBUG_LOG(m_logger) << "END (onVideoReceiverModifyReply)";
if (replyObject.error())
{
ERROR_LOG() << "Got onVideoReceiverModifyReply error: " << replyObject();
ERROR_LOG(m_logger) << "Got onVideoReceiverModifyReply error: " << replyObject();
QTimer::singleShot(0, qApp, SLOT(quit()));
return;
}
INFO_LOG() << "Got Reply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_receiverId = replyObject.id();
@@ -327,7 +327,7 @@ void MvsTests::onVideoReceiverModifyReply(const Core::FunctionReplyObject &reply
// ------------------------------------------------------------------------------
void MvsTests::onError(const QString &reason)
{
ERROR_LOG() << "Got Reply error: " << reason;
ERROR_LOG(m_logger) << "Got Reply error: " << reason;
failExit();
}
@@ -339,7 +339,7 @@ void MvsTests::onReply(const Core::FunctionReplyObject &replyObject)
onError(replyObject.translated());
return;
}
INFO_LOG() << "Got Reply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
// QTimer::singleShot(0, qApp, SLOT(quit()));
}