Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+25
-26
@@ -22,8 +22,7 @@
|
||||
|
||||
|
||||
|
||||
DataTopicTests::DataTopicTests()
|
||||
: m_domainParticipantPub(nullptr)
|
||||
DataTopicTests::DataTopicTests() : m_domainParticipantPub(nullptr)
|
||||
, m_domainParticipantSub(nullptr)
|
||||
, m_domainId(0)
|
||||
, m_ddsPublisher(nullptr)
|
||||
@@ -35,12 +34,12 @@ DataTopicTests::DataTopicTests()
|
||||
, m_dtcServiceInformation(nullptr)
|
||||
, m_dtcGroupInformation(nullptr)
|
||||
, m_mainThreadId(QThread::currentThreadId())
|
||||
.getNGLLogger("UnitTests.DataTopicTests"))
|
||||
{
|
||||
.getNGLLogger("UnitTests.DataTopicTests")),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
if (!DDS::QosProfile::setDefault())
|
||||
ERROR_LOG() << "Error setting default QoS from xml-file ";
|
||||
ERROR_LOG(m_logger) << "Error setting default QoS from xml-file ";
|
||||
|
||||
DEBUG_LOG() << "Main thread ID is " << m_mainThreadId;
|
||||
DEBUG_LOG(m_logger) << "Main thread ID is " << m_mainThreadId;
|
||||
}
|
||||
|
||||
DataTopicTests::~DataTopicTests()
|
||||
@@ -83,7 +82,7 @@ bool DataTopicTests::initPublisher()
|
||||
partitionQos.name( { partition } );
|
||||
publisherQos << partitionQos;
|
||||
|
||||
DEBUG_LOG() << "Publish on partition " << partition;
|
||||
DEBUG_LOG(m_logger) << "Publish on partition " << partition;
|
||||
|
||||
m_ddsPublisher = dds::pub::Publisher(m_domainParticipantPub, publisherQos);
|
||||
|
||||
@@ -96,9 +95,9 @@ bool DataTopicTests::initPublisher()
|
||||
|
||||
bool DataTopicTests::write(const ServiceManagement::ServiceInformation &data)
|
||||
{
|
||||
INFO_LOG() << "Publish topic ServiceInformation ";
|
||||
INFO_LOG(m_logger) << "Publish topic ServiceInformation ";
|
||||
|
||||
DEBUG_LOG() << "Id: " << data.id()
|
||||
DEBUG_LOG(m_logger) << "Id: " << data.id()
|
||||
<< ", Name: " << data.name()
|
||||
<< ", State: " << data.state()
|
||||
<< ", Timestamp: " << data.timestamp()
|
||||
@@ -110,7 +109,7 @@ bool DataTopicTests::write(const ServiceManagement::ServiceInformation &data)
|
||||
|
||||
bool DataTopicTests::write(const ServiceManagement::GroupInformation &data)
|
||||
{
|
||||
INFO_LOG() << "Publish topic GroupInformation ";
|
||||
INFO_LOG(m_logger) << "Publish topic GroupInformation ";
|
||||
|
||||
if(m_logger.isDebugEnabled())
|
||||
{
|
||||
@@ -125,7 +124,7 @@ bool DataTopicTests::write(const ServiceManagement::GroupInformation &data)
|
||||
if(services.endsWith(QLatin1Char(',')))
|
||||
services.chop(1);
|
||||
|
||||
DEBUG_LOG() << "Type: " << data.type()
|
||||
DEBUG_LOG(m_logger) << "Type: " << data.type()
|
||||
<< ", Domain: " << data.domainId()
|
||||
<< ", Partition: " << data.exercisePartitionId()
|
||||
<< ", Partition: " << data.replayPartitionId()
|
||||
@@ -149,13 +148,13 @@ ServiceManagement::GroupInformation DataTopicTests::getReceivedGroupInformationD
|
||||
void DataTopicTests::processData(const ServiceManagement::ServiceInformation &instance, DataModification modType)
|
||||
{
|
||||
Q_UNUSED(modType);
|
||||
INFO_LOG() << "process Lts_ServiceInformation";
|
||||
INFO_LOG(m_logger) << "process Lts_ServiceInformation";
|
||||
|
||||
DEBUG_LOG() << "Id: " << instance.id();
|
||||
DEBUG_LOG() << "Name: " << instance.name();
|
||||
DEBUG_LOG() << "State: " << instance.state();
|
||||
DEBUG_LOG() << "Timestamp: " << instance.timestamp();
|
||||
DEBUG_LOG() << "ErrorString: " << instance.errorString();
|
||||
DEBUG_LOG(m_logger) << "Id: " << instance.id();
|
||||
DEBUG_LOG(m_logger) << "Name: " << instance.name();
|
||||
DEBUG_LOG(m_logger) << "State: " << instance.state();
|
||||
DEBUG_LOG(m_logger) << "Timestamp: " << instance.timestamp();
|
||||
DEBUG_LOG(m_logger) << "ErrorString: " << instance.errorString();
|
||||
|
||||
m_receivedServiceInformationData = instance;
|
||||
|
||||
@@ -167,7 +166,7 @@ void DataTopicTests::processData(const ServiceManagement::ServiceInformation &in
|
||||
void DataTopicTests::processData(const ServiceManagement::GroupInformation &instance, DataModification modType)
|
||||
{
|
||||
Q_UNUSED(modType);
|
||||
INFO_LOG() << "process Lts_ServiceInformation";
|
||||
INFO_LOG(m_logger) << "process Lts_ServiceInformation";
|
||||
|
||||
if(m_logger.isDebugEnabled())
|
||||
{
|
||||
@@ -182,12 +181,12 @@ void DataTopicTests::processData(const ServiceManagement::GroupInformation &inst
|
||||
if(services.endsWith(QLatin1Char(',')))
|
||||
services.chop(1);
|
||||
|
||||
DEBUG_LOG() << "Type: " << instance.type();
|
||||
DEBUG_LOG() << "Domain: " << instance.domainId();
|
||||
DEBUG_LOG() << "Partition: " << instance.exercisePartitionId();
|
||||
DEBUG_LOG() << "Replay Partition: " << instance.replayPartitionId();
|
||||
DEBUG_LOG() << "Services: " << services;
|
||||
DEBUG_LOG() << "Timestamp: " << instance.timestamp();
|
||||
DEBUG_LOG(m_logger) << "Type: " << instance.type();
|
||||
DEBUG_LOG(m_logger) << "Domain: " << instance.domainId();
|
||||
DEBUG_LOG(m_logger) << "Partition: " << instance.exercisePartitionId();
|
||||
DEBUG_LOG(m_logger) << "Replay Partition: " << instance.replayPartitionId();
|
||||
DEBUG_LOG(m_logger) << "Services: " << services;
|
||||
DEBUG_LOG(m_logger) << "Timestamp: " << instance.timestamp();
|
||||
}
|
||||
|
||||
m_receivedGroupInformationData = instance;
|
||||
@@ -203,7 +202,7 @@ void DataTopicTests::processData(const ServiceManagement::GroupInformation &inst
|
||||
|
||||
bool DataTopicTests::initSubscriber()
|
||||
{
|
||||
DEBUG_LOG() << "Initialisation DDS (Subscriber/Reader)";
|
||||
DEBUG_LOG(m_logger) << "Initialisation DDS (Subscriber/Reader)";
|
||||
|
||||
m_domainParticipantSub =
|
||||
dds::domain::DomainParticipant(m_domainId,
|
||||
@@ -224,7 +223,7 @@ bool DataTopicTests::initSubscriber()
|
||||
partitionQos.name( partitions );
|
||||
subscriberQos << partitionQos;
|
||||
|
||||
DEBUG_LOG() << "Initialise DTC::SubscriberListener";
|
||||
DEBUG_LOG(m_logger) << "Initialise DTC::SubscriberListener";
|
||||
m_subscriberListener = new DDSGeneric::SubscriberListener;
|
||||
|
||||
m_ddsSubscriber = dds::sub::Subscriber(m_domainParticipantSub,
|
||||
|
||||
+1
@@ -44,6 +44,7 @@ public:
|
||||
ServiceManagement::GroupInformation getReceivedGroupInformationData() const;
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
// Subscriber Methods
|
||||
void processData(const ServiceManagement::ServiceInformation& instance, DataModification modType);
|
||||
void processData(const ServiceManagement::GroupInformation& instance, DataModification modType);
|
||||
|
||||
+6
-6
@@ -38,7 +38,7 @@ DataTopicTestsMain::DataTopicTestsMain()
|
||||
|
||||
void DataTopicTestsMain::initTestCase()
|
||||
{
|
||||
DEBUG_LOG() <<"DataTopicTestsMain: initTestCase";
|
||||
DEBUG_LOG(m_logger) <<"DataTopicTestsMain: initTestCase";
|
||||
|
||||
m_dtTest = new DataTopicTests();
|
||||
|
||||
@@ -52,7 +52,7 @@ void DataTopicTestsMain::initTestCase()
|
||||
|
||||
void DataTopicTestsMain::publishServiceInformationTestCase()
|
||||
{
|
||||
DEBUG_LOG() <<"DataTopicTestsMain: publish ServiceInformation data";
|
||||
DEBUG_LOG(m_logger) <<"DataTopicTestsMain: publish ServiceInformation data";
|
||||
|
||||
// Topic ServiceInformation
|
||||
m_sentServiceInformationData.id(13);
|
||||
@@ -66,7 +66,7 @@ void DataTopicTestsMain::publishServiceInformationTestCase()
|
||||
|
||||
void DataTopicTestsMain::subscribeServiceInformationTestCase()
|
||||
{
|
||||
DEBUG_LOG() << "IN subscribeServiceInformationTestCase";
|
||||
DEBUG_LOG(m_logger) << "IN subscribeServiceInformationTestCase";
|
||||
|
||||
QTRY_COMPARE(m_serviceInformationDataArrivedSpy->count(), 1);
|
||||
|
||||
@@ -81,7 +81,7 @@ void DataTopicTestsMain::subscribeServiceInformationTestCase()
|
||||
|
||||
void DataTopicTestsMain::publishGroupInformationTestCase()
|
||||
{
|
||||
DEBUG_LOG() << "DataTopicTestsMain: publish GroupInformation data";
|
||||
DEBUG_LOG(m_logger) << "DataTopicTestsMain: publish GroupInformation data";
|
||||
|
||||
std::vector<int> services = {1, 3, 5, 7, 11, 13, 17, 19, 23, 42};
|
||||
|
||||
@@ -97,7 +97,7 @@ void DataTopicTestsMain::publishGroupInformationTestCase()
|
||||
|
||||
void DataTopicTestsMain::subscribeGroupInformationTestCase()
|
||||
{
|
||||
DEBUG_LOG() << "IN subscribeGroupInformationTestCase";
|
||||
DEBUG_LOG(m_logger) << "IN subscribeGroupInformationTestCase";
|
||||
|
||||
QTRY_COMPARE(m_groupInformationDataArrivedSpy->count(), 1);
|
||||
|
||||
@@ -112,7 +112,7 @@ void DataTopicTestsMain::subscribeGroupInformationTestCase()
|
||||
|
||||
void DataTopicTestsMain::cleanupTestCase()
|
||||
{
|
||||
DEBUG_LOG() <<"DataTopicTestsMain: cleanupTestCase";
|
||||
DEBUG_LOG(m_logger) <<"DataTopicTestsMain: cleanupTestCase";
|
||||
delete m_dtTest; m_dtTest = nullptr;
|
||||
delete m_serviceInformationDataArrivedSpy; m_serviceInformationDataArrivedSpy = nullptr;
|
||||
delete m_groupInformationDataArrivedSpy; m_groupInformationDataArrivedSpy = nullptr;
|
||||
|
||||
+1
@@ -35,6 +35,7 @@ private Q_SLOTS:
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
private:
|
||||
ServiceManagement::ServiceInformation m_sentServiceInformationData;
|
||||
ServiceManagement::GroupInformation m_sentGroupInformationData;
|
||||
|
||||
Reference in new issue
Block a user