Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+30
-30
@@ -76,7 +76,7 @@ CesTests::CesTests(QObject *parent)
|
||||
bool CesTests::init(int domainId, int exerciseId, int testId, int roomId)
|
||||
{
|
||||
bool bRet = true;
|
||||
INFO_LOG() << "init begin";
|
||||
INFO_LOG(m_logger) << "init begin";
|
||||
|
||||
m_testId = testId;
|
||||
m_roomId = roomId;
|
||||
@@ -96,7 +96,7 @@ bool CesTests::init(int domainId, int exerciseId, int testId, int roomId)
|
||||
bRet &= m_aesDts->enableBorderline();
|
||||
bRet &= m_aesDts->enableDusMineState();
|
||||
bRet &= m_aesDts->enableMineArea();
|
||||
DEBUG_LOG() << "AES Dts create interface bRet:" << bRet ;
|
||||
DEBUG_LOG(m_logger) << "AES Dts create interface bRet:" << bRet ;
|
||||
|
||||
m_ismDts = InfrastructureManagement::Interface::Dts::create(m_ddsConnector42);
|
||||
bRet &= m_ismDts->enableMainStructureElement();
|
||||
@@ -141,7 +141,7 @@ bool CesTests::init(int domainId, int exerciseId, int testId, int roomId)
|
||||
|
||||
void CesTests::startTest()
|
||||
{
|
||||
INFO_LOG() << "startTest m_testId:" << m_testId;
|
||||
INFO_LOG(m_logger) << "startTest m_testId:" << m_testId;
|
||||
if (m_testId <= 1) // AES-Hit On Buildings area explosions
|
||||
{
|
||||
m_countHitOnBuildingReply = 0;
|
||||
@@ -464,7 +464,7 @@ void CesTests::tryCreateTriggeredExplosion()
|
||||
ti.bitfield().resize(1);
|
||||
ti.bitfield()[0] = 0; // 0 = Mine active
|
||||
|
||||
DEBUG_LOG() << "Publishing TriggeredExplosions: " << ti;
|
||||
DEBUG_LOG(m_logger) << "Publishing TriggeredExplosions: " << ti;
|
||||
if (!m_aesDts->publish(ti))
|
||||
failExit("Error publishing TriggeredExplosions");
|
||||
}
|
||||
@@ -476,7 +476,7 @@ void CesTests::tryCreateExplosionArea()
|
||||
ea.participantId(m_originatorParticipantId); // In ddsview <not set>
|
||||
ea.effectStateId(AreaEffectSimulation::AesEffectState::inner_enum::EsPrepared);
|
||||
|
||||
DEBUG_LOG() << "Publishing ExplosionArea: " << ea;
|
||||
DEBUG_LOG(m_logger) << "Publishing ExplosionArea: " << ea;
|
||||
if (!m_aesDts->publish(ea))
|
||||
failExit("Error publishing ExplosionArea");
|
||||
}
|
||||
@@ -505,7 +505,7 @@ void CesTests::tryCreateExplosionSinglePrepared()
|
||||
m_es.sampleTime(QDateTime::currentMSecsSinceEpoch());
|
||||
m_es.chargeStruct().chargeTypeId(m_chargeTypeId);
|
||||
|
||||
DEBUG_LOG() << "Publishing ExplosionSingle: " << m_es;
|
||||
DEBUG_LOG(m_logger) << "Publishing ExplosionSingle: " << m_es;
|
||||
if (!m_aesDts->publish(m_es))
|
||||
failExit("Error publishing ExplosionSingle");
|
||||
}
|
||||
@@ -521,14 +521,14 @@ void CesTests::tryCreateExplosionSingle()
|
||||
m_es.effectStateId(AreaEffectSimulation::AesEffectState_def::EsActivated);
|
||||
m_es.sampleTime(QDateTime::currentMSecsSinceEpoch());
|
||||
|
||||
DEBUG_LOG() << "Publishing ExplosionSingle: " << m_es;
|
||||
DEBUG_LOG(m_logger) << "Publishing ExplosionSingle: " << m_es;
|
||||
if (!m_aesDts->publish(m_es))
|
||||
failExit("Error publishing ExplosionSingle");
|
||||
}
|
||||
|
||||
void CesTests::tryCreateAesItemView()
|
||||
{
|
||||
INFO_LOG() << "trying to send AesItemView AtExplosionArea";
|
||||
INFO_LOG(m_logger) << "trying to send AesItemView AtExplosionArea";
|
||||
|
||||
m_aiv = AreaEffectSimulation::AesItemView();
|
||||
m_aiv.aesItemId(m_aesItemId);
|
||||
@@ -547,7 +547,7 @@ void CesTests::tryCreateAesItemView()
|
||||
setPos(m_aiv.form(), m_housePos.geographic(30, 30));
|
||||
setPos(m_aiv.form(), m_housePos.geographic(30, -10));
|
||||
|
||||
DEBUG_LOG() << "Publishing AesItemView: " << m_aiv;
|
||||
DEBUG_LOG(m_logger) << "Publishing AesItemView: " << m_aiv;
|
||||
if (!m_aesDts->publish(m_aiv))
|
||||
failExit("Error publishing AesItemView");
|
||||
}
|
||||
@@ -557,13 +557,13 @@ void CesTests::tryCreateChargeType()
|
||||
ProjectDataManagement::ChargeType ct;
|
||||
ct.id(m_chargeTypeId);
|
||||
ct.properties("{\"impactRadius\":5}");
|
||||
DEBUG_LOG() << "Publishing ChargeType: " << ct;
|
||||
DEBUG_LOG(m_logger) << "Publishing ChargeType: " << ct;
|
||||
if (!m_pdmDts->publish(ct))
|
||||
failExit("Error publishing ChargeType");
|
||||
|
||||
ct.id(40); // old charge type 10040 -> 40, hard-codded?!
|
||||
ct.properties("{\"impactRadius\":6}");
|
||||
DEBUG_LOG() << "Publishing ChargeType: " << ct;
|
||||
DEBUG_LOG(m_logger) << "Publishing ChargeType: " << ct;
|
||||
if (!m_pdmDts->publish(ct))
|
||||
failExit("Error publishing ChargeType");
|
||||
}
|
||||
@@ -591,7 +591,7 @@ void CesTests::tryCreateAesItemViewSingleExplosions()
|
||||
setPos(m_aiv.form(), m_housePos.geographic(-10, 20));
|
||||
setPos(m_aiv.form(), m_housePos.geographic(-10, 30));
|
||||
|
||||
DEBUG_LOG() << "Publishing AesItemView: " << m_aiv;
|
||||
DEBUG_LOG(m_logger) << "Publishing AesItemView: " << m_aiv;
|
||||
if (!m_aesDts->publish(m_aiv))
|
||||
failExit("Error publishing AesItemView");
|
||||
}
|
||||
@@ -615,7 +615,7 @@ void CesTests::tryCreateAesItemViewBC(AreaEffectSimulation::AesEffectState desir
|
||||
setPos(m_aiv.form(), m_housePos.geographic(35, 35));
|
||||
setPos(m_aiv.form(), m_housePos.geographic(35, 3));
|
||||
|
||||
DEBUG_LOG() << "Publishing AesItemView: " << m_aiv;
|
||||
DEBUG_LOG(m_logger) << "Publishing AesItemView: " << m_aiv;
|
||||
if (!m_aesDts->publish(m_aiv))
|
||||
failExit("Error publishing AesItemView");
|
||||
}
|
||||
@@ -640,14 +640,14 @@ void CesTests::tryCreateAesItemViewSM()
|
||||
setPos(m_aiv.form(), m_housePos.geographic(35, 35));
|
||||
setPos(m_aiv.form(), m_housePos.geographic(35, 3));
|
||||
|
||||
DEBUG_LOG() << "Publishing AesItemView: " << m_aiv;
|
||||
DEBUG_LOG(m_logger) << "Publishing AesItemView: " << m_aiv;
|
||||
if (!m_aesDts->publish(m_aiv))
|
||||
failExit("Error publishing AesItemView");
|
||||
}
|
||||
|
||||
void CesTests::tryCreateAesItemViewMA()
|
||||
{
|
||||
INFO_LOG() << "trying to send AesItemView AtMineArea";
|
||||
INFO_LOG(m_logger) << "trying to send AesItemView AtMineArea";
|
||||
|
||||
m_aiv = AreaEffectSimulation::AesItemView();
|
||||
m_aiv.aesItemId(m_aesItemId);
|
||||
@@ -667,7 +667,7 @@ void CesTests::tryCreateAesItemViewMA()
|
||||
setPos(m_aiv.form(), m_housePos.geographic(37, 37));
|
||||
setPos(m_aiv.form(), m_housePos.geographic(37, 1));
|
||||
|
||||
DEBUG_LOG() << "Publishing AesItemView: " << m_aiv;
|
||||
DEBUG_LOG(m_logger) << "Publishing AesItemView: " << m_aiv;
|
||||
if (!m_aesDts->publish(m_aiv))
|
||||
failExit("Error publishing AesItemView");
|
||||
}
|
||||
@@ -689,7 +689,7 @@ void CesTests::tryCreateBorderline()
|
||||
setPos(bl.segments(), m_housePos.geographic(5, 3));
|
||||
|
||||
bl.isDeleted(false);
|
||||
DEBUG_LOG() << "Publishing BorderLine: " << bl;
|
||||
DEBUG_LOG(m_logger) << "Publishing BorderLine: " << bl;
|
||||
if (!m_aesDts->publish(bl))
|
||||
failExit("Error publishing Borderline");
|
||||
}
|
||||
@@ -708,7 +708,7 @@ void CesTests::tryCreateMainStructureElement()
|
||||
m_mse.angle(318.83);
|
||||
m_mse.modelId(1337);
|
||||
m_mse.externalWlsId(0);
|
||||
DEBUG_LOG() << "Publishing MainStructureElement: " << m_mse;
|
||||
DEBUG_LOG(m_logger) << "Publishing MainStructureElement: " << m_mse;
|
||||
if (!m_ismDts->publish(m_mse))
|
||||
failExit("Error publishing MainStructureElement");
|
||||
}
|
||||
@@ -739,7 +739,7 @@ void CesTests::tryCreateMainFootprint()
|
||||
elem.relPosition(Core::RelativePosition(0.0, 10.0, 0.0));
|
||||
mf.elements().push_back(elem);
|
||||
|
||||
DEBUG_LOG() << "Publishing MainFootprint: " << mf;
|
||||
DEBUG_LOG(m_logger) << "Publishing MainFootprint: " << mf;
|
||||
if (!m_ismDts->publish(mf))
|
||||
failExit("Error publishing MainFootprint");
|
||||
}
|
||||
@@ -758,7 +758,7 @@ void CesTests::tryCreateDynamicParticipantData()
|
||||
|
||||
dp.sampleTime(si.stateTime());
|
||||
|
||||
DEBUG_LOG() << "Publishing DynamicParticipantData: " << dp;
|
||||
DEBUG_LOG(m_logger) << "Publishing DynamicParticipantData: " << dp;
|
||||
if (!m_ppmDts->publish(dp))
|
||||
failExit("Error publishing DynamicParticipantData");
|
||||
}
|
||||
@@ -782,7 +782,7 @@ void CesTests::tryCreateParticipantPosition()
|
||||
pp.pos(pos);
|
||||
m_expectedPosition[pp.participantId()] = Core::GeoPosition2D(posF.x(), posF.y());
|
||||
|
||||
DEBUG_LOG() << "Publishing ParticipantPosition: " << pp;
|
||||
DEBUG_LOG(m_logger) << "Publishing ParticipantPosition: " << pp;
|
||||
if (!m_ppmDts->publish(pp))
|
||||
failExit("Error publishing ParticipantPosition");
|
||||
}
|
||||
@@ -812,7 +812,7 @@ void CesTests::tryCreateBuildingState()
|
||||
rs.remainingEffectPercent(60);
|
||||
bs.roomStates().push_back(rs);
|
||||
|
||||
DEBUG_LOG() << "Publishing BuildingState: " << bs;
|
||||
DEBUG_LOG(m_logger) << "Publishing BuildingState: " << bs;
|
||||
if (!m_bldDts->publish(bs))
|
||||
failExit("Error publishing BuildingState");
|
||||
}
|
||||
@@ -833,7 +833,7 @@ void CesTests::onSendCesHitOnBuildingRequest(const rti::core::SampleIdentity &co
|
||||
|
||||
// debug und co
|
||||
m_countHitOnBuildingReply++;
|
||||
DEBUG_LOG() << "onSendCesHitOnBuildingRequest cnt = " << m_countHitOnBuildingReply << "\n"
|
||||
DEBUG_LOG(m_logger) << "onSendCesHitOnBuildingRequest cnt = " << m_countHitOnBuildingReply << "\n"
|
||||
<< " request: " << request << ", "
|
||||
<< dateTime.toString(QStringLiteral("dd.MM.yy - hh:mm:ss.zzz")) << "\n";
|
||||
|
||||
@@ -889,7 +889,7 @@ void CesTests::onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
|
||||
/* comes out with timeout on STTW
|
||||
if (request.effectTime() + 1000 < QDateTime::currentMSecsSinceEpoch())
|
||||
{
|
||||
DEBUG_LOG() << "onSendCesHitRequest from previous test - ignoring"
|
||||
DEBUG_LOG(m_logger) << "onSendCesHitRequest from previous test - ignoring"
|
||||
<< request.effectTime()
|
||||
<< QDateTime::currentMSecsSinceEpoch();
|
||||
return;
|
||||
@@ -897,7 +897,7 @@ void CesTests::onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
|
||||
*/
|
||||
// debug und co
|
||||
const QDateTime dateTime(QDateTime::fromMSecsSinceEpoch(request.effectTime()));
|
||||
DEBUG_LOG() << "onSendCesHitRequest" << "\n"
|
||||
DEBUG_LOG(m_logger) << "onSendCesHitRequest" << "\n"
|
||||
<< " request: " << request << ", "
|
||||
<< dateTime.toString(QStringLiteral("dd.MM.yy - hh:mm:ss.zzz")) << "\n";
|
||||
if (request.remainEffectPercent())
|
||||
@@ -924,7 +924,7 @@ void CesTests::onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
|
||||
// 3 x Enter
|
||||
if (request.remainEffectPercent() == 1)
|
||||
m_replyEnterFunctionalArea ++;
|
||||
DEBUG_LOG()<< "m_replyEnterFunctionalArea=" << m_replyEnterFunctionalArea;
|
||||
DEBUG_LOG(m_logger)<< "m_replyEnterFunctionalArea=" << m_replyEnterFunctionalArea;
|
||||
if (m_replyEnterFunctionalArea == 3)
|
||||
ExitSuccess();
|
||||
break;
|
||||
@@ -968,7 +968,7 @@ void CesTests::checkParticipantEvent()
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "Waiting for a participant event: " << expectedType;
|
||||
DEBUG_LOG(m_logger) << "Waiting for a participant event: " << expectedType;
|
||||
|
||||
bool bRet = false;
|
||||
for (int i = 0; i < 50; ++i)
|
||||
@@ -1012,7 +1012,7 @@ void CesTests::tryCreateParticipant()
|
||||
pt.isSimulated(false);
|
||||
pt.equipmentNumber(4711);
|
||||
|
||||
DEBUG_LOG() << "Publishing Participant:" << pt;
|
||||
DEBUG_LOG(m_logger) << "Publishing Participant:" << pt;
|
||||
if (!m_ppmDts->publish(pt))
|
||||
failExit("Error requesting create Participant");
|
||||
}
|
||||
@@ -1020,7 +1020,7 @@ void CesTests::tryCreateParticipant()
|
||||
|
||||
void CesTests::failExit(const char *reason)
|
||||
{
|
||||
ERROR_LOG() << "FailExit: " << reason << " for test case = " << m_testId;
|
||||
ERROR_LOG(m_logger) << "FailExit: " << reason << " for test case = " << m_testId;
|
||||
m_bTestsSuccessful = false;
|
||||
QTimer::singleShot(50, qApp, QCoreApplication::quit);
|
||||
}
|
||||
@@ -1029,7 +1029,7 @@ void CesTests::ExitSuccess()
|
||||
{
|
||||
if (!m_bTestsSuccessful)
|
||||
return;
|
||||
INFO_LOG() << "ExitSuccess for test case = " << m_testId;
|
||||
INFO_LOG(m_logger) << "ExitSuccess for test case = " << m_testId;
|
||||
m_bTestsSuccessful = true;
|
||||
QTimer::singleShot(50, qApp, QCoreApplication::quit);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user