Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+64
-64
@@ -50,7 +50,7 @@ ExmTests::~ExmTests()
|
||||
//--------------------------------------------------------------------------
|
||||
bool ExmTests::init(int domainId, int exerciseId, int testId, int trainingAreaId, int phaseId)
|
||||
{
|
||||
INFO_LOG() << "init begin";
|
||||
INFO_LOG(m_logger) << "init begin";
|
||||
|
||||
m_testId = testId;
|
||||
m_exerciseId = exerciseId; // overwritten when new exercise created
|
||||
@@ -64,32 +64,32 @@ bool ExmTests::init(int domainId, int exerciseId, int testId, int trainingAreaId
|
||||
return false;
|
||||
m_ddsConnector->initPublisherSubscriber();
|
||||
|
||||
DEBUG_LOG() << "Create dtc EXM";
|
||||
DEBUG_LOG(m_logger) << "Create dtc EXM";
|
||||
m_dtc = ExerciseManagement::Interface::Dtc::create(m_ddsConnector);
|
||||
DEBUG_LOG() << "Init dtc";
|
||||
DEBUG_LOG(m_logger) << "Init dtc";
|
||||
bool bRet = m_dtc->enableAll();
|
||||
DEBUG_LOG() << "init DTC EXM end - bRet = " << bRet;
|
||||
DEBUG_LOG(m_logger) << "init DTC EXM end - bRet = " << bRet;
|
||||
|
||||
connect(m_dtc.get(), &ExerciseManagement::Interface::Dtc::exerciseChanged,
|
||||
this, &ExmTests::onExerciseChanged);
|
||||
|
||||
DEBUG_LOG() << "create ftc EXM";
|
||||
DEBUG_LOG(m_logger) << "create ftc EXM";
|
||||
m_ftc = ExerciseManagement::Interface::Ftc::create(m_ddsConnector);
|
||||
DEBUG_LOG() << "init ftc EXM";
|
||||
DEBUG_LOG(m_logger) << "init ftc EXM";
|
||||
bRet &= m_ftc->enableAll();
|
||||
DEBUG_LOG() << "init FTC EXM end - bRet = " << bRet;
|
||||
DEBUG_LOG(m_logger) << "init FTC EXM end - bRet = " << bRet;
|
||||
|
||||
DEBUG_LOG() << "create ftc ASM";
|
||||
DEBUG_LOG(m_logger) << "create ftc ASM";
|
||||
m_ftc_asm = AssetManagement::Interface::Ftc::create(m_ddsConnector);
|
||||
DEBUG_LOG() << "init ftc ASM";
|
||||
DEBUG_LOG(m_logger) << "init ftc ASM";
|
||||
bRet &= m_ftc_asm->enableAll();
|
||||
DEBUG_LOG() << "init end EXM - bRet = " << bRet;
|
||||
DEBUG_LOG(m_logger) << "init end EXM - bRet = " << bRet;
|
||||
|
||||
DEBUG_LOG() << "Domain Id = " << domainId;
|
||||
DEBUG_LOG() << "Exercise Id = " << exerciseId;
|
||||
DEBUG_LOG() << "Test Id = " << testId;
|
||||
DEBUG_LOG() << "Training Area Id = " << trainingAreaId;
|
||||
DEBUG_LOG() << "Phase Id = " << phaseId;
|
||||
DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
|
||||
DEBUG_LOG(m_logger) << "Exercise Id = " << exerciseId;
|
||||
DEBUG_LOG(m_logger) << "Test Id = " << testId;
|
||||
DEBUG_LOG(m_logger) << "Training Area Id = " << trainingAreaId;
|
||||
DEBUG_LOG(m_logger) << "Phase Id = " << phaseId;
|
||||
|
||||
//TODO: add connects
|
||||
|
||||
@@ -99,7 +99,7 @@ bool ExmTests::init(int domainId, int exerciseId, int testId, int trainingAreaId
|
||||
//--------------------------------------------------------------------------
|
||||
void ExmTests::startTest()
|
||||
{
|
||||
INFO_LOG() << "startTest";
|
||||
INFO_LOG(m_logger) << "startTest";
|
||||
if (m_testId <= 1)
|
||||
QTimer::singleShot(0, this, &ExmTests::tryCreate);
|
||||
else if (m_testId == 2)
|
||||
@@ -125,7 +125,7 @@ void ExmTests::startTest()
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
else
|
||||
{
|
||||
ERROR_LOG() << "Unknown test id: " << m_testId;
|
||||
ERROR_LOG(m_logger) << "Unknown test id: " << m_testId;
|
||||
failExit();
|
||||
}
|
||||
}
|
||||
@@ -133,7 +133,7 @@ void ExmTests::startTest()
|
||||
//--------------------------------------------------------------------------
|
||||
void ExmTests::tryCreateTrainingArea()
|
||||
{
|
||||
INFO_LOG() << "trying to send modifyRequest TrainingArea (create)";
|
||||
INFO_LOG(m_logger) << "trying to send modifyRequest TrainingArea (create)";
|
||||
AssetManagement::TrainingAreaModifyRequest request;
|
||||
request.id(0);
|
||||
request.name("TestTrainingAreaCreate");
|
||||
@@ -144,10 +144,10 @@ void ExmTests::tryCreateTrainingArea()
|
||||
if (!m_ftc_asm->trainingAreaModifyRequest(request, this))
|
||||
|
||||
{
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
failExit();
|
||||
}
|
||||
INFO_LOG() << "Training Area Id = " << m_trainingAreaId;
|
||||
INFO_LOG(m_logger) << "Training Area Id = " << m_trainingAreaId;
|
||||
|
||||
QTest::qWait(1000);
|
||||
}
|
||||
@@ -155,10 +155,10 @@ void ExmTests::tryCreateTrainingArea()
|
||||
//--------------------------------------------------------------------------
|
||||
void ExmTests::tryCreateExercisePhase()
|
||||
{
|
||||
INFO_LOG() << "trying to send createrequest Exercise Phase";
|
||||
INFO_LOG(m_logger) << "trying to send createrequest Exercise Phase";
|
||||
if(!m_ftc->exercisePhaseCreateRequest(ExercisePhaseCreateRequest(std::string("Test Phase"), std::string("Test Phase description"), 10, 20, m_exerciseId), this))
|
||||
{
|
||||
ERROR_LOG() << "Error requesting create Exercise Phase";
|
||||
ERROR_LOG(m_logger) << "Error requesting create Exercise Phase";
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -171,9 +171,9 @@ void ExmTests::tryCreate()
|
||||
int symbolFillType = 1;
|
||||
int radioGroupId = 1;
|
||||
|
||||
INFO_LOG() << "Training Area Id = " << m_trainingAreaId;
|
||||
INFO_LOG(m_logger) << "Training Area Id = " << m_trainingAreaId;
|
||||
|
||||
INFO_LOG() << "trying to send createRequest Exercise";
|
||||
INFO_LOG(m_logger) << "trying to send createRequest Exercise";
|
||||
ExerciseCreateRequest req;
|
||||
req.name(std::string("TestExerciseCreate"));
|
||||
req.beginTime(10);
|
||||
@@ -186,7 +186,7 @@ void ExmTests::tryCreate()
|
||||
|
||||
if (!m_ftc->exerciseCreateRequest(req, this))
|
||||
{
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(10000);
|
||||
@@ -195,7 +195,7 @@ void ExmTests::tryCreate()
|
||||
//--------------------------------------------------------------------------
|
||||
void ExmTests::tryModify()
|
||||
{
|
||||
INFO_LOG() << "trying to send modify request for exercise Id = " << m_exerciseId;
|
||||
INFO_LOG(m_logger) << "trying to send modify request for exercise Id = " << m_exerciseId;
|
||||
ExerciseModifyRequest req;
|
||||
req.id(m_exerciseId);
|
||||
req.name(std::string("ExerciseModifyTest"));
|
||||
@@ -210,7 +210,7 @@ void ExmTests::tryModify()
|
||||
req.newState(ExerciseState::Created);
|
||||
if (!m_ftc->exerciseModifyRequest(req, this))
|
||||
{
|
||||
ERROR_LOG() << "Error requesting modify data";
|
||||
ERROR_LOG(m_logger) << "Error requesting modify data";
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -219,10 +219,10 @@ void ExmTests::tryModify()
|
||||
//--------------------------------------------------------------------------
|
||||
void ExmTests::tryModifyExercisePhase()
|
||||
{
|
||||
INFO_LOG() << "trying to send modify exercise phase request for exercise phase Id = " << m_phaseId;
|
||||
INFO_LOG(m_logger) << "trying to send modify exercise phase request for exercise phase Id = " << m_phaseId;
|
||||
if (!m_ftc->exercisePhaseModifyRequest(ExercisePhaseModifyRequest(std::string("Modified Exercise Phase"), std::string("Exercise Phase has been modified"), 20, 30, m_exerciseId, m_phaseId), this))
|
||||
{
|
||||
ERROR_LOG() << "Error requesting modify exercise phase";
|
||||
ERROR_LOG(m_logger) << "Error requesting modify exercise phase";
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -231,10 +231,10 @@ void ExmTests::tryModifyExercisePhase()
|
||||
//--------------------------------------------------------------------------
|
||||
void ExmTests::tryDelete()
|
||||
{
|
||||
INFO_LOG() << "trying to send delete request for exercise Id = " << m_exerciseId;
|
||||
INFO_LOG(m_logger) << "trying to send delete request for exercise Id = " << m_exerciseId;
|
||||
if (!m_ftc->exerciseRemoveRequest(ExerciseRemoveRequest(m_exerciseId, false), this))
|
||||
{
|
||||
ERROR_LOG() << "Error requesting delete data";
|
||||
ERROR_LOG(m_logger) << "Error requesting delete data";
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(5000);
|
||||
@@ -245,15 +245,15 @@ void ExmTests::tryDeleteExercisePhase()
|
||||
{
|
||||
if (m_phaseId == 0)
|
||||
{
|
||||
ERROR_LOG() << "No phase available for deleting";
|
||||
ERROR_LOG(m_logger) << "No phase available for deleting";
|
||||
failExit();
|
||||
}
|
||||
|
||||
INFO_LOG() << "trying to send delete request for exercise phase Id = " << m_phaseId;
|
||||
INFO_LOG(m_logger) << "trying to send delete request for exercise phase Id = " << m_phaseId;
|
||||
m_ftc->enableExercisePhaseRemove();
|
||||
if (!m_ftc->exercisePhaseRemoveRequest(ExercisePhaseRemoveRequest(m_phaseId), this))
|
||||
{
|
||||
ERROR_LOG() << "Error requesting delete exercise phase";
|
||||
ERROR_LOG(m_logger) << "Error requesting delete exercise phase";
|
||||
failExit();
|
||||
}
|
||||
QTest::qWait(1000);
|
||||
@@ -262,12 +262,12 @@ void ExmTests::tryDeleteExercisePhase()
|
||||
//--------------------------------------------------------------------------
|
||||
void ExmTests::tryStartExercise()
|
||||
{
|
||||
INFO_LOG() << "trying to start exercise Id = " << m_exerciseId;
|
||||
INFO_LOG(m_logger) << "trying to start exercise Id = " << m_exerciseId;
|
||||
|
||||
m_dtc->waitForHistoricalDataExercise();
|
||||
ExerciseManagement::Exercise ex = m_dtc->exercise(m_exerciseId);
|
||||
|
||||
DEBUG_LOG() << "Training area id = " << ex.trainingAreaId();
|
||||
DEBUG_LOG(m_logger) << "Training area id = " << ex.trainingAreaId();
|
||||
|
||||
ExerciseModifyRequest req;
|
||||
req.id(m_exerciseId);
|
||||
@@ -283,7 +283,7 @@ void ExmTests::tryStartExercise()
|
||||
req.newState(ExerciseState::Started);
|
||||
if (!m_ftc->exerciseModifyRequest(req, this))
|
||||
{
|
||||
ERROR_LOG() << "Error requesting modify data";
|
||||
ERROR_LOG(m_logger) << "Error requesting modify data";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -294,7 +294,7 @@ void ExmTests::tryStartExercise()
|
||||
|
||||
// if (!m_ftc->exerciseChangeStateRequest(req, this))
|
||||
// {
|
||||
// ERROR_LOG() << "Error requesting change state";
|
||||
// ERROR_LOG(m_logger) << "Error requesting change state";
|
||||
// failExit();
|
||||
// }
|
||||
|
||||
@@ -304,19 +304,19 @@ void ExmTests::tryStartExercise()
|
||||
//-------------------------------------------------------------------------------
|
||||
void ExmTests::tryGetAllExercises()
|
||||
{
|
||||
INFO_LOG() << "trying to get all exercises";
|
||||
INFO_LOG(m_logger) << "trying to get all exercises";
|
||||
m_dtc->waitForHistoricalDataExercise();
|
||||
|
||||
bool bAtLeastOneFound = false;
|
||||
auto cb = [this, &bAtLeastOneFound](const ExerciseManagement::Exercise &ex)
|
||||
{
|
||||
INFO_LOG() << "Exe(" << ex.id() << ") : " << ex.name();
|
||||
INFO_LOG(m_logger) << "Exe(" << ex.id() << ") : " << ex.name();
|
||||
bAtLeastOneFound = true;
|
||||
};
|
||||
m_dtc->exercises(cb);
|
||||
if (!bAtLeastOneFound)
|
||||
{
|
||||
ERROR_LOG() << "Error receiving data for exercises";
|
||||
ERROR_LOG(m_logger) << "Error receiving data for exercises";
|
||||
failExit();
|
||||
}
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
@@ -325,19 +325,19 @@ void ExmTests::tryGetAllExercises()
|
||||
//-------------------------------------------------------------------------------
|
||||
void ExmTests::tryGetExercise()
|
||||
{
|
||||
INFO_LOG() << "trying get itemData for exercise " << m_exerciseId;
|
||||
INFO_LOG(m_logger) << "trying get itemData for exercise " << m_exerciseId;
|
||||
m_dtc->waitForHistoricalDataExercise();
|
||||
ExerciseManagement::Exercise data = m_dtc->exercise(m_exerciseId);
|
||||
|
||||
if (data.id() <= 0)
|
||||
{
|
||||
ERROR_LOG() << "Error receiving data for exercise " << m_exerciseId;
|
||||
DEBUG_LOG() << "data.id() = " << data.id();
|
||||
ERROR_LOG(m_logger) << "Error receiving data for exercise " << m_exerciseId;
|
||||
DEBUG_LOG(m_logger) << "data.id() = " << data.id();
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
{
|
||||
INFO_LOG() << "## Exe(" << data.id() << ") : name = " << data.name()
|
||||
INFO_LOG(m_logger) << "## Exe(" << data.id() << ") : name = " << data.name()
|
||||
<< ", begin = " << data.beginTime() << ", end = " << data.endTime()
|
||||
<< ", state = " << data.state();
|
||||
}
|
||||
@@ -349,10 +349,10 @@ void ExmTests::onExerciseChanged(const ExerciseManagement::Exercise &data,
|
||||
DataModification modType)
|
||||
{
|
||||
const int id = data.id();
|
||||
DEBUG_LOG() << "onExerciseChanged for exercise " << id
|
||||
DEBUG_LOG(m_logger) << "onExerciseChanged for exercise " << id
|
||||
<< " - modType: " << (int)modType;
|
||||
if (m_exerciseId == id)
|
||||
INFO_LOG() << "##################### Data for id = " << id << " received";
|
||||
INFO_LOG(m_logger) << "##################### Data for id = " << id << " received";
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
@@ -360,11 +360,11 @@ void ExmTests::onExerciseCreateReply(const Core::FunctionReplyObject &replyObjec
|
||||
{
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG() << "Got onExerciseCreateReply error: " << replyObject();
|
||||
ERROR_LOG(m_logger) << "Got onExerciseCreateReply 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_exerciseId = replyObject.id();
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
@@ -375,11 +375,11 @@ void ExmTests::onExerciseModifyReply(const Core::FunctionReplyObject &replyObjec
|
||||
{
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG() << "Got onExerciseModifyReply error: " << replyObject();
|
||||
ERROR_LOG(m_logger) << "Got onExerciseModifyReply 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();
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
}
|
||||
@@ -389,11 +389,11 @@ void ExmTests::onExerciseModifyReply(const Core::FunctionReplyObject &replyObjec
|
||||
//{
|
||||
// if (replyObject.error())
|
||||
// {
|
||||
// ERROR_LOG() << "Got onExerciseChangeStateReply error: " << replyObject();
|
||||
// ERROR_LOG(m_logger) << "Got onExerciseChangeStateReply error: " << replyObject();
|
||||
// failExit();
|
||||
// return;
|
||||
// }
|
||||
// INFO_LOG() << "Got changeStateRequest with id " << replyObject.id()
|
||||
// INFO_LOG(m_logger) << "Got changeStateRequest with id " << replyObject.id()
|
||||
// << " and errorString " << replyObject.translated();
|
||||
// QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
//}
|
||||
@@ -403,11 +403,11 @@ void ExmTests::onExerciseRemoveReply(const Core::FunctionReplyObject &replyObjec
|
||||
{
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG() << "Got onExerciseRemoveReply error: " << replyObject();
|
||||
ERROR_LOG(m_logger) << "Got onExerciseRemoveReply 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);
|
||||
}
|
||||
@@ -417,11 +417,11 @@ void ExmTests::onExercisePhaseCreateReply(const Core::FunctionReplyObject &reply
|
||||
{
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG() << "Got onExercisePhaseCreateReply error: " << replyObject();
|
||||
ERROR_LOG(m_logger) << "Got onExercisePhaseCreateReply error: " << replyObject();
|
||||
failExit();
|
||||
return;
|
||||
}
|
||||
INFO_LOG() << "Got createExercisePhaseReply with id " << replyObject.id()
|
||||
INFO_LOG(m_logger) << "Got createExercisePhaseReply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.translated();
|
||||
|
||||
m_phaseId = replyObject.id();
|
||||
@@ -433,11 +433,11 @@ void ExmTests::onExercisePhaseModifyReply(const Core::FunctionReplyObject &reply
|
||||
{
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG() << "Got onExercisePhaseModifyReply error: " << replyObject();
|
||||
ERROR_LOG(m_logger) << "Got onExercisePhaseModifyReply error: " << replyObject();
|
||||
failExit();
|
||||
return;
|
||||
}
|
||||
INFO_LOG() << "Got modifyExercisePhaseReply with id " << replyObject.id()
|
||||
INFO_LOG(m_logger) << "Got modifyExercisePhaseReply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.translated();
|
||||
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
@@ -448,11 +448,11 @@ void ExmTests::onExercisePhaseRemoveReply(const Core::FunctionReplyObject &reply
|
||||
{
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG() << "Got onExercisePhaseRemoveReply error: " << replyObject();
|
||||
ERROR_LOG(m_logger) << "Got onExercisePhaseRemoveReply error: " << replyObject();
|
||||
failExit();
|
||||
return;
|
||||
}
|
||||
INFO_LOG() << "Got removeExercisePhaseReply with id " << replyObject.id()
|
||||
INFO_LOG(m_logger) << "Got removeExercisePhaseReply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.translated();
|
||||
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
@@ -463,11 +463,11 @@ void ExmTests::onTrainingAreaModifyReply(const Core::FunctionReplyObject &replyO
|
||||
{
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG() << "Got onTrainingAreaModifyReply error: " << replyObject();
|
||||
ERROR_LOG(m_logger) << "Got onTrainingAreaModifyReply 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_trainingAreaId = replyObject.id();
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
@@ -476,7 +476,7 @@ void ExmTests::onTrainingAreaModifyReply(const Core::FunctionReplyObject &replyO
|
||||
// ------------------------------------------------------------------------------
|
||||
void ExmTests::failExit()
|
||||
{
|
||||
ERROR_LOG() << "FAIL EXIT !";
|
||||
ERROR_LOG(m_logger) << "FAIL EXIT !";
|
||||
m_bTestsSuccessful = false;
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user