Added test case and setting Test configuration
This commit is contained in:
1 parent
f815271486
commit
a86f9b5bac
48 files changed
+423
-168
No files matched your search
@@ -54,6 +54,7 @@ TARGET_COMPILE_DEFINITIONS(ddscore PRIVATE
|
||||
RTI_UNIX
|
||||
RTI_LINUX
|
||||
RTI_64BIT
|
||||
MAKE_DDSCORE_LIB
|
||||
)
|
||||
|
||||
# Skip AUTOMOC for generated header - it will be processed manually with correct dependencies
|
||||
@@ -105,6 +106,7 @@ SET(SRCS_client
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS HLA svcCoreClient SHARED ${SRCS_client})
|
||||
TARGET_COMPILE_DEFINITIONS(svcCoreClient PRIVATE MAKE_SVCCORECLIENT_LIB)
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCoreClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
// filename: core_dtc.h
|
||||
#pragma once
|
||||
|
||||
#include <compare>
|
||||
#include <QtCore/qcompare.h>
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <functional>
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace Core
|
||||
{
|
||||
Pacemaker::Pacemaker(DDSConnector::DdsConnector *ddsConnector)
|
||||
: QObject(nullptr)
|
||||
, m_logger(NGL::INGLLoggerBootstrap::getNGLLogger("Core.Pacemaker"))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Core.Pacemaker"))
|
||||
{
|
||||
init(ddsConnector);
|
||||
}
|
||||
|
||||
@@ -9,11 +9,14 @@
|
||||
|
||||
// Forward declarations for moc compatibility (moc doesn't see BUILD_RTI guards)
|
||||
namespace Core { enum class RunningState; enum class PortType; }
|
||||
#if !BUILD_RTI
|
||||
// Only needed when the generated core_dts_types.h (which defines this as an
|
||||
// alias template instantiation) is not available.
|
||||
namespace DTS { class CurrentRunningStateImpl; }
|
||||
#endif
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <dds/core/core_dts_types.h>
|
||||
#include <dds/core/types/CurrentRunningState.h>
|
||||
#include <Core/core_dts_types.h>
|
||||
#endif
|
||||
|
||||
namespace DDSConnector
|
||||
@@ -65,7 +68,7 @@ class CORE_CLIENT_EXPORT Pacemaker final : public QObject
|
||||
void addPortInternal(unsigned short number, Core::PortType portType,
|
||||
const QString& properties = QStringLiteral(""));
|
||||
|
||||
CurrentRunningState m_state;
|
||||
::Core::CurrentRunningState m_state;
|
||||
DTS::CurrentRunningStateImpl* m_dtsCurrentRunningState = nullptr;
|
||||
#else
|
||||
void* m_reserved1 = nullptr;
|
||||
|
||||
@@ -32,12 +32,12 @@ bool TopicLockMaster::init(const std::shared_ptr<DDSConnector::DdsConnector> &dd
|
||||
});
|
||||
|
||||
connect(m_coreDtc.get(), &Interface::Dtc::lockedEntityChanged, this,
|
||||
[this] (const LockedEntity &data, DataModification modType)
|
||||
[this] (const LockedEntity &data, ::DataModification modType)
|
||||
{
|
||||
key k(data.entityId(), data.exerciseId(), QString::fromStdString(data.entityTypeName()));
|
||||
if (modType == DataModification::eAdded)
|
||||
if (modType == ::DataModification::eAdded)
|
||||
m_lockedEntitys << k;
|
||||
else if (modType == DataModification::eRemoved)
|
||||
else if (modType == ::DataModification::eRemoved)
|
||||
m_lockedEntitys.remove(k);
|
||||
} );
|
||||
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
#pragma once
|
||||
|
||||
#include "svccoreclient_export.h"
|
||||
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <Core/core_dtc.h>
|
||||
@@ -70,7 +73,7 @@ public:
|
||||
private:
|
||||
QSet<key> m_lockedEntitys;
|
||||
#if BUILD_RTI
|
||||
std::shared_ptr<DDS::Core::Interface::Dtc> m_coreDtc;
|
||||
std::shared_ptr<::Core::Interface::Dtc> m_coreDtc;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user