mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-16 10:25:36 +08:00
committed by
Mathew Sutcliffe
parent
94e5bbcc93
commit
5b08363179
@@ -9,12 +9,14 @@
|
|||||||
|
|
||||||
#include "blackcore/context/contextaudioproxy.h"
|
#include "blackcore/context/contextaudioproxy.h"
|
||||||
#include "blackmisc/dbus.h"
|
#include "blackmisc/dbus.h"
|
||||||
|
#include "blackmisc/dbusserver.h"
|
||||||
#include "blackmisc/genericdbusinterface.h"
|
#include "blackmisc/genericdbusinterface.h"
|
||||||
|
|
||||||
#include <QDBusConnection>
|
#include <QDBusConnection>
|
||||||
#include <QLatin1Literal>
|
#include <QLatin1Literal>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
|
||||||
|
using namespace BlackMisc;
|
||||||
using namespace BlackMisc::Audio;
|
using namespace BlackMisc::Audio;
|
||||||
using namespace BlackMisc::Network;
|
using namespace BlackMisc::Network;
|
||||||
using namespace BlackMisc::Aviation;
|
using namespace BlackMisc::Aviation;
|
||||||
@@ -30,6 +32,14 @@ namespace BlackCore
|
|||||||
this->relaySignals(serviceName, connection);
|
this->relaySignals(serviceName, connection);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CContextAudioProxy::unitTestRelaySignals()
|
||||||
|
{
|
||||||
|
// connect signals, asserts when failures
|
||||||
|
QDBusConnection con = QDBusConnection::sessionBus();
|
||||||
|
CContextAudioProxy c(CDBusServer::coreServiceName(), con, CCoreFacadeConfig::Remote, nullptr);
|
||||||
|
Q_UNUSED(c);
|
||||||
|
}
|
||||||
|
|
||||||
void CContextAudioProxy::relaySignals(const QString &serviceName, QDBusConnection &connection)
|
void CContextAudioProxy::relaySignals(const QString &serviceName, QDBusConnection &connection)
|
||||||
{
|
{
|
||||||
bool s = connection.connect(serviceName, IContextAudio::ObjectPath(), IContextAudio::InterfaceName(),
|
bool s = connection.connect(serviceName, IContextAudio::ObjectPath(), IContextAudio::InterfaceName(),
|
||||||
|
|||||||
@@ -54,6 +54,9 @@ namespace BlackCore
|
|||||||
//! Destructor
|
//! Destructor
|
||||||
virtual ~CContextAudioProxy() {}
|
virtual ~CContextAudioProxy() {}
|
||||||
|
|
||||||
|
//! Unit test relay signals
|
||||||
|
//! \private
|
||||||
|
static void unitTestRelaySignals();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
// interface overrides
|
// interface overrides
|
||||||
|
|||||||
@@ -10,12 +10,14 @@
|
|||||||
#include "blackcore/context/contextnetworkproxy.h"
|
#include "blackcore/context/contextnetworkproxy.h"
|
||||||
#include "blackmisc/audio/voiceroomlist.h"
|
#include "blackmisc/audio/voiceroomlist.h"
|
||||||
#include "blackmisc/dbus.h"
|
#include "blackmisc/dbus.h"
|
||||||
|
#include "blackmisc/dbusserver.h"
|
||||||
#include "blackmisc/genericdbusinterface.h"
|
#include "blackmisc/genericdbusinterface.h"
|
||||||
|
|
||||||
#include <QDBusConnection>
|
#include <QDBusConnection>
|
||||||
#include <QLatin1Literal>
|
#include <QLatin1Literal>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
#include <QMetaObject>
|
||||||
|
|
||||||
using namespace BlackMisc;
|
using namespace BlackMisc;
|
||||||
using namespace BlackMisc::Network;
|
using namespace BlackMisc::Network;
|
||||||
@@ -36,6 +38,14 @@ namespace BlackCore
|
|||||||
this->relaySignals(serviceName, connection);
|
this->relaySignals(serviceName, connection);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CContextNetworkProxy::unitTestRelaySignals()
|
||||||
|
{
|
||||||
|
// connect signals, asserts when failures
|
||||||
|
QDBusConnection con = QDBusConnection::sessionBus();
|
||||||
|
CContextNetworkProxy c(CDBusServer::coreServiceName(), con, CCoreFacadeConfig::Remote, nullptr);
|
||||||
|
Q_UNUSED(c);
|
||||||
|
}
|
||||||
|
|
||||||
void CContextNetworkProxy::relaySignals(const QString &serviceName, QDBusConnection &connection)
|
void CContextNetworkProxy::relaySignals(const QString &serviceName, QDBusConnection &connection)
|
||||||
{
|
{
|
||||||
bool s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
|
bool s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
|
||||||
|
|||||||
@@ -68,6 +68,10 @@ namespace BlackCore
|
|||||||
//! Destructor
|
//! Destructor
|
||||||
virtual ~CContextNetworkProxy() {}
|
virtual ~CContextNetworkProxy() {}
|
||||||
|
|
||||||
|
//! Unit test relay signals
|
||||||
|
//! \private
|
||||||
|
static void unitTestRelaySignals();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
//! \name Interface overrides
|
//! \name Interface overrides
|
||||||
//! @{
|
//! @{
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
#include "blackcore/context/contextownaircraftproxy.h"
|
#include "blackcore/context/contextownaircraftproxy.h"
|
||||||
#include "blackmisc/dbus.h"
|
#include "blackmisc/dbus.h"
|
||||||
|
#include "blackmisc/dbusserver.h"
|
||||||
#include "blackmisc/genericdbusinterface.h"
|
#include "blackmisc/genericdbusinterface.h"
|
||||||
|
|
||||||
#include <QDBusConnection>
|
#include <QDBusConnection>
|
||||||
@@ -41,6 +42,14 @@ namespace BlackCore
|
|||||||
this->relayBaseClassSignals(serviceName, connection, IContextOwnAircraft::ObjectPath(), IContextOwnAircraft::InterfaceName());
|
this->relayBaseClassSignals(serviceName, connection, IContextOwnAircraft::ObjectPath(), IContextOwnAircraft::InterfaceName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CContextOwnAircraftProxy::unitTestRelaySignals()
|
||||||
|
{
|
||||||
|
// connect signals, asserts when failures
|
||||||
|
QDBusConnection con = QDBusConnection::sessionBus();
|
||||||
|
CContextOwnAircraftProxy c(CDBusServer::coreServiceName(), con, CCoreFacadeConfig::Remote, nullptr);
|
||||||
|
Q_UNUSED(c);
|
||||||
|
}
|
||||||
|
|
||||||
BlackMisc::Simulation::CSimulatedAircraft CContextOwnAircraftProxy::getOwnAircraft() const
|
BlackMisc::Simulation::CSimulatedAircraft CContextOwnAircraftProxy::getOwnAircraft() const
|
||||||
{
|
{
|
||||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraft>(QLatin1Literal("getOwnAircraft"));
|
return this->m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraft>(QLatin1Literal("getOwnAircraft"));
|
||||||
|
|||||||
@@ -56,6 +56,10 @@ namespace BlackCore
|
|||||||
//! Destructor
|
//! Destructor
|
||||||
virtual ~CContextOwnAircraftProxy() {}
|
virtual ~CContextOwnAircraftProxy() {}
|
||||||
|
|
||||||
|
//! Unit test relay signals
|
||||||
|
//! \private
|
||||||
|
static void unitTestRelaySignals();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
//! \publicsection
|
//! \publicsection
|
||||||
//! @{
|
//! @{
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
#include "blackcore/context/contextsimulatorproxy.h"
|
#include "blackcore/context/contextsimulatorproxy.h"
|
||||||
#include "blackmisc/dbus.h"
|
#include "blackmisc/dbus.h"
|
||||||
|
#include "blackmisc/dbusserver.h"
|
||||||
#include "blackmisc/genericdbusinterface.h"
|
#include "blackmisc/genericdbusinterface.h"
|
||||||
#include "blackmisc/simulation/simulatedaircraft.h"
|
#include "blackmisc/simulation/simulatedaircraft.h"
|
||||||
|
|
||||||
@@ -36,6 +37,14 @@ namespace BlackCore
|
|||||||
this->relaySignals(serviceName, connection);
|
this->relaySignals(serviceName, connection);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CContextSimulatorProxy::unitTestRelaySignals()
|
||||||
|
{
|
||||||
|
// connect signals, asserts when failures
|
||||||
|
QDBusConnection con = QDBusConnection::sessionBus();
|
||||||
|
CContextSimulatorProxy c(CDBusServer::coreServiceName(), con, CCoreFacadeConfig::Remote, nullptr);
|
||||||
|
Q_UNUSED(c);
|
||||||
|
}
|
||||||
|
|
||||||
void CContextSimulatorProxy::relaySignals(const QString &serviceName, QDBusConnection &connection)
|
void CContextSimulatorProxy::relaySignals(const QString &serviceName, QDBusConnection &connection)
|
||||||
{
|
{
|
||||||
bool s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(),
|
bool s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(),
|
||||||
|
|||||||
@@ -50,6 +50,10 @@ namespace BlackCore
|
|||||||
//! Destructor
|
//! Destructor
|
||||||
virtual ~CContextSimulatorProxy() {}
|
virtual ~CContextSimulatorProxy() {}
|
||||||
|
|
||||||
|
//! Unit test relay signals
|
||||||
|
//! \private
|
||||||
|
static void unitTestRelaySignals();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
//! \name Interface overrides
|
//! \name Interface overrides
|
||||||
//! @{
|
//! @{
|
||||||
|
|||||||
35
tests/blackcore/testcontext.cpp
Normal file
35
tests/blackcore/testcontext.cpp
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
/* Copyright (C) 2017
|
||||||
|
* swift project Community / Contributors
|
||||||
|
*
|
||||||
|
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
|
||||||
|
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
|
||||||
|
* including this file, may be copied, modified, propagated, or distributed except according to the terms
|
||||||
|
* contained in the LICENSE file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
//! \cond PRIVATE_TESTS
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \file
|
||||||
|
* \ingroup testblackcore
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "testcontext.h"
|
||||||
|
#include "blackcore/context/contextallproxies.h"
|
||||||
|
|
||||||
|
using namespace BlackCore::Context;
|
||||||
|
|
||||||
|
namespace BlackCoreTest
|
||||||
|
{
|
||||||
|
void CTestContext::contextInitTest()
|
||||||
|
{
|
||||||
|
// will cause asserts when signal connects fail
|
||||||
|
|
||||||
|
CContextAudioProxy::unitTestRelaySignals();
|
||||||
|
CContextNetworkProxy::unitTestRelaySignals();
|
||||||
|
CContextOwnAircraftProxy::unitTestRelaySignals();
|
||||||
|
CContextSimulatorProxy::unitTestRelaySignals();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//! \endcond
|
||||||
42
tests/blackcore/testcontext.h
Normal file
42
tests/blackcore/testcontext.h
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
/* Copyright (C) 2017
|
||||||
|
* swift project community / contributors
|
||||||
|
*
|
||||||
|
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
|
||||||
|
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
|
||||||
|
* including this file, may be copied, modified, propagated, or distributed except according to the terms
|
||||||
|
* contained in the LICENSE file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef BLACKCORETEST_TESTCONTEXT_H
|
||||||
|
#define BLACKCORETEST_TESTCONTEXT_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
//! \cond PRIVATE_TESTS
|
||||||
|
//! \file
|
||||||
|
//! \ingroup testblackcore
|
||||||
|
|
||||||
|
namespace BlackCoreTest
|
||||||
|
{
|
||||||
|
/*!
|
||||||
|
* Context implementation classes tests
|
||||||
|
*/
|
||||||
|
class CTestContext : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
//! Constructor.
|
||||||
|
explicit CTestContext(QObject *parent = nullptr) :
|
||||||
|
QObject(parent)
|
||||||
|
{}
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
//! Init tests for context
|
||||||
|
void contextInitTest();
|
||||||
|
};
|
||||||
|
} //namespace
|
||||||
|
|
||||||
|
//! \endcond
|
||||||
|
|
||||||
|
#endif // guard
|
||||||
Reference in New Issue
Block a user