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

Migrates Participant and OperatorManagement to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access in ppm and opm services and plugins.
This commit is contained in:
berrux-dev committed 2026-09-21 02:46:44 +02:00
1 parent bdb2461737
commit 95071993f5
36 files changed
+513 -529
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
+41 -41
View File
@@ -153,7 +153,7 @@ void OpmTests::tryRemove()
m_eTestStep = eRemove;
OperatorRemoveRequest data;
data.id(m_operatorId);
data.id = m_operatorId;
INFO_LOG(m_logger) << "trying to send remove request";
if (!m_ftc->operatorRemoveRequest(data, this))
@@ -172,23 +172,23 @@ void OpmTests::tryLogin()
m_eTestStep = eLogin;
OperatorLoginRequest data;
data.id(m_operatorId);
data.id = m_operatorId;
std::string pass("ctc");
const QByteArray ba(QByteArray::fromRawData(pass.c_str(), pass.size()));
//pass = QCryptographicHash::hash(ba, QCryptographicHash::Md5).toHex().data();
data.password(pass);
data.workstationIp(-1);
data.workstationId(301);
data.force(false);
data.password = pass;
data.workstationIp = -1;
data.workstationId = 301;
data.force = false;
NOTICE_LOG(m_logger) << "trying to send OperatorLoginRequest"
<< ", operatorId:" << m_operatorId
<< ", pass:" << pass
<< ", workstationIp:" << data.workstationIp()
<< ", workstationId:" << data.workstationId()
<< ", force:" << data.force();
<< ", workstationIp:" << data.workstationIp
<< ", workstationId:" << data.workstationId
<< ", force:" << data.force;
if (!m_ftc->operatorLoginRequest(data, this))
{
ERROR_LOG(m_logger) << "Error login operator id " << m_operatorId << " on workstation 1";
@@ -203,16 +203,16 @@ void OpmTests::tryLoginForce()
m_eTestStep = eLogin;
OperatorLoginRequest data;
data.id(m_operatorId);
data.id = m_operatorId;
std::string pass("password");
const QByteArray ba(QByteArray::fromRawData(pass.c_str(), pass.size()));
pass = QCryptographicHash::hash(ba, QCryptographicHash::Md5).toHex().data();
data.password(pass);
data.workstationIp(-1);
data.workstationId(4);
data.force(true);
data.password = pass;
data.workstationIp = -1;
data.workstationId = 4;
data.force = true;
INFO_LOG(m_logger) << "trying to send OperatorLoginRequest";
if (!m_ftc->operatorLoginRequest(data, this))
@@ -229,7 +229,7 @@ void OpmTests::tryLogout()
m_eTestStep = eLogout;
OperatorLogoutRequest data;
data.id(m_operatorId);
data.id = m_operatorId;
INFO_LOG(m_logger) << "trying to send OperatorLogoutRequest";
if (!m_ftc->operatorLogoutRequest(data, this))
@@ -283,7 +283,7 @@ void OpmTests::tryGetAllOperators()
for(auto it = opMap.begin(); it != opMap.end(); ++it)
{
INFO_LOG(m_logger) << "opm(" << it.key() << ") :"
<< " name:" << it.value().name()
<< " name:" << it.value().name
// << " password:" << it.value().password()
// << " effectiveACLs:" << it.value().effectiveAcls()
;
@@ -311,15 +311,15 @@ void OpmTests::tryGetOperator()
m_dtc->waitForHistoricalDataUser();
OperatorManagement::User op = m_dtc->user(m_operatorId);
if(op.id() <= 0)
if(op.id <= 0)
{
ERROR_LOG(m_logger) << "Error receiving data for operatorId " << m_operatorId << " returnVal:" << op.id();
ERROR_LOG(m_logger) << "Error receiving data for operatorId " << m_operatorId << " returnVal:" << op.id;
failExit();
}
else
{
INFO_LOG(m_logger) << "opm(" << op.id() << ") :"
<< " name: " << op.name()
INFO_LOG(m_logger) << "opm(" << op.id << ") :"
<< " name: " << op.name
// << " password: " << data.password()
// << " effectiveACLs:" << it.value().effectiveAcls()
;
@@ -455,9 +455,9 @@ void OpmTests::onOperatorLogoutReply(const Core::FunctionReplyObject &replyObjec
void OpmTests::onReceiveOperatorChanged(const User &data, DataModification modType)
{
// Check signal/slot connection
if (m_operatorId == data.id())
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) << "Check signal/slot connection for DTC. Data for id = " << data.id << " received";
TRACE_LOG(m_logger) << "ModificationType: = " << (int)modType << " received";
}
} // end of onReceiveOperatorData()
@@ -468,7 +468,7 @@ 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) << "Check signal/slot connection for DTC. Data for id = " << data.id << " received";
TRACE_LOG(m_logger) << "ModificationType: = " << (int)modType << " received";
// }
} // end of onReceiveOperatorData()
@@ -480,20 +480,20 @@ void OpmTests::getOperatorCreateRequestData(OperatorCreateModifyRequest &data) c
if(m_testId == 0)
currentTime = currentTime/10;
data.name(std::string("TestOperatorCreate" + std::to_string(currentTime)));
data.name = std::string("TestOperatorCreate" + std::to_string(currentTime));
std::string pass("password");
const QByteArray ba(QByteArray::fromRawData(pass.c_str(), pass.size()));
pass = QCryptographicHash::hash(ba, QCryptographicHash::Md5).toHex().data();
data.password(pass);
data.description(std::string("Description"));
data.password = pass;
data.description = std::string("Description");
// Todo: test anpassen
PartiesByExercise pbe;
pbe.exerciseId(0);
pbe.visibleParties().set({0,1,2,3,4,5,6,7,8,9,10,11,12});
data.visiblePartiesByExercise().push_back(pbe);
data.rolePresetId(1001);
pbe.exerciseId = 0;
pbe.visibleParties.set({0,1,2,3,4,5,6,7,8,9,10,11,12});
data.visiblePartiesByExercise.push_back(pbe);
data.rolePresetId = 1001;
} // end of getOperatorCreateRequestData()
@@ -504,32 +504,32 @@ void OpmTests::getOperatorModifyRequestData(OperatorCreateModifyRequest &data) c
if(m_testId == 0)
currentTime = currentTime/10;
data.id(m_operatorId);
data.id = m_operatorId;
// data.name(std::string("Operator"+std::to_string(m_operatorId)));
// only changing the description
data.description(std::string("Description" + std::to_string(m_operatorId)));
data.description = std::string("Description" + std::to_string(m_operatorId));
} // end of getOperatorChangeNameRequestData()
//-----------------------------------------------------------------------------
bool OpmTests::onCompareCreatedData(User &data)
{
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id;
OperatorCreateModifyRequest createData;
getOperatorCreateRequestData(createData);
if (createData.name() != data.name())
if (createData.name != data.name)
return false;
// if(createData.password() != data.password())
// return false;
if (data.description() != createData.description())
if (data.description != createData.description)
return false;
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id;
return true;
} // end of onCompareCreatedData()
@@ -537,22 +537,22 @@ bool OpmTests::onCompareCreatedData(User &data)
//-----------------------------------------------------------------------------
bool OpmTests::onCompareModifiedData(User &data)
{
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id;
OperatorCreateModifyRequest modifyData;
getOperatorModifyRequestData(modifyData);
if (modifyData.id() != data.id())
if (modifyData.id != data.id)
return false;
if (modifyData.name() != data.name())
if (modifyData.name != data.name)
return false;
if (data.description() != modifyData.description())
if (data.description != modifyData.description)
return false;
DEBUG_LOG(m_logger) << "successfully finished onCompareModifiedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfully finished onCompareModifiedData() for id :" << data.id;
return true;
} // end of onCompareModifiedData()