flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 21:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T732, renamed to CFsdClient adjustments

Browse Source
This commit is contained in:
Klaus Basan
2019-09-19 11:03:47 +02:00
committed by Mat Sutcliffe
parent a24d948acd
commit 5e3b758e44
8 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/fsd/main.cpp
View File

@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
COwnAircraftProviderDummy::instance()->updateOwnCallsign("BER368"); COwnAircraftProviderDummy::instance()->updateOwnCallsign("BER368");
FSDClient client(CClientProviderDummy::instance(), COwnAircraftProviderDummy::instance(), CRemoteAircraftProviderDummy::instance(), &qa); CFSDClient client(CClientProviderDummy::instance(), COwnAircraftProviderDummy::instance(), CRemoteAircraftProviderDummy::instance(), &qa);
client.setClientName("Test Client"); client.setClientName("Test Client");
client.setHostApplication("None"); client.setHostApplication("None");
client.setVersion(0, 8); client.setVersion(0, 8);

12
src/blackcore/airspaceanalyzer.cpp
View File

@@ -32,7 +32,7 @@ using namespace BlackCore::Fsd;
namespace BlackCore namespace BlackCore
{ {
CAirspaceAnalyzer::CAirspaceAnalyzer(IOwnAircraftProvider *ownAircraftProvider, FSDClient *fsdClient, CAirspaceMonitor *airspaceMonitorParent) : CAirspaceAnalyzer::CAirspaceAnalyzer(IOwnAircraftProvider *ownAircraftProvider, CFSDClient *fsdClient, CAirspaceMonitor *airspaceMonitorParent) :
CContinuousWorker(airspaceMonitorParent, "CAirspaceAnalyzer"), CContinuousWorker(airspaceMonitorParent, "CAirspaceAnalyzer"),
COwnAircraftAware(ownAircraftProvider), COwnAircraftAware(ownAircraftProvider),
CRemoteAircraftAware(airspaceMonitorParent) CRemoteAircraftAware(airspaceMonitorParent)
@@ -47,17 +47,17 @@ namespace BlackCore
Q_ASSERT(c); Q_ASSERT(c);
// network connected // network connected
c = connect(fsdClient, &FSDClient::deletePilotReceived, this, &CAirspaceAnalyzer::watchdogRemoveAircraftCallsign, Qt::QueuedConnection); c = connect(fsdClient, &CFSDClient::deletePilotReceived, this, &CAirspaceAnalyzer::watchdogRemoveAircraftCallsign, Qt::QueuedConnection);
Q_ASSERT(c); Q_ASSERT(c);
c = connect(fsdClient, &FSDClient::deleteAtcReceived, this, &CAirspaceAnalyzer::watchdogRemoveAtcCallsign, Qt::QueuedConnection); c = connect(fsdClient, &CFSDClient::deleteAtcReceived, this, &CAirspaceAnalyzer::watchdogRemoveAtcCallsign, Qt::QueuedConnection);
Q_ASSERT(c); Q_ASSERT(c);
c = connect(fsdClient, &FSDClient::connectionStatusChanged, this, &CAirspaceAnalyzer::onConnectionStatusChanged, Qt::QueuedConnection); c = connect(fsdClient, &CFSDClient::connectionStatusChanged, this, &CAirspaceAnalyzer::onConnectionStatusChanged, Qt::QueuedConnection);
Q_ASSERT(c); Q_ASSERT(c);
// network situations // network situations
c = connect(fsdClient, &FSDClient::pilotDataUpdateReceived, this, &CAirspaceAnalyzer::onNetworkPositionUpdate, Qt::QueuedConnection); c = connect(fsdClient, &CFSDClient::pilotDataUpdateReceived, this, &CAirspaceAnalyzer::onNetworkPositionUpdate, Qt::QueuedConnection);
Q_ASSERT(c); Q_ASSERT(c);
c = connect(fsdClient, &FSDClient::atcDataUpdateReceived, this, &CAirspaceAnalyzer::watchdogTouchAtcCallsign, Qt::QueuedConnection); c = connect(fsdClient, &CFSDClient::atcDataUpdateReceived, this, &CAirspaceAnalyzer::watchdogTouchAtcCallsign, Qt::QueuedConnection);
Q_ASSERT(c); Q_ASSERT(c);
// Monitor // Monitor

2
src/blackcore/airspaceanalyzer.h
View File

@@ -65,7 +65,7 @@ namespace BlackCore
//! Constructor //! Constructor
CAirspaceAnalyzer(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, CAirspaceAnalyzer(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,
Fsd::FSDClient *fsdClient, Fsd::CFSDClient *fsdClient,
CAirspaceMonitor *airspaceMonitorParent); CAirspaceMonitor *airspaceMonitorParent);
//! Destructor //! Destructor

36
src/blackcore/airspacemonitor.cpp
View File

@@ -65,7 +65,7 @@ using namespace BlackCore::Vatsim;
namespace BlackCore namespace BlackCore
{ {
CAirspaceMonitor::CAirspaceMonitor(IOwnAircraftProvider *ownAircraftProvider, IAircraftModelSetProvider *modelSetProvider, FSDClient *fsdClient, QObject *parent) CAirspaceMonitor::CAirspaceMonitor(IOwnAircraftProvider *ownAircraftProvider, IAircraftModelSetProvider *modelSetProvider, CFSDClient *fsdClient, QObject *parent)
: CRemoteAircraftProvider(parent), : CRemoteAircraftProvider(parent),
COwnAircraftAware(ownAircraftProvider), COwnAircraftAware(ownAircraftProvider),
CAircraftModelSetAware(modelSetProvider), CAircraftModelSetAware(modelSetProvider),
@@ -75,24 +75,24 @@ namespace BlackCore
this->setObjectName("CAirspaceMonitor"); this->setObjectName("CAirspaceMonitor");
this->enableReverseLookupMessages(sApp->isDeveloperFlagSet() || CBuildConfig::isLocalDeveloperDebugBuild() ? RevLogEnabled : RevLogEnabledSimplified); this->enableReverseLookupMessages(sApp->isDeveloperFlagSet() || CBuildConfig::isLocalDeveloperDebugBuild() ? RevLogEnabled : RevLogEnabledSimplified);
connect(m_fsdClient, &FSDClient::atcDataUpdateReceived, this, &CAirspaceMonitor::onAtcPositionUpdate); connect(m_fsdClient, &CFSDClient::atcDataUpdateReceived, this, &CAirspaceMonitor::onAtcPositionUpdate);
// FSD TODO // FSD TODO
connect(m_fsdClient, &FSDClient::atisReplyReceived, this, &CAirspaceMonitor::onAtisReceived); connect(m_fsdClient, &CFSDClient::atisReplyReceived, this, &CAirspaceMonitor::onAtisReceived);
connect(m_fsdClient, &FSDClient::atisVoiceRoomReplyReceived, this, &CAirspaceMonitor::onAtisVoiceRoomReceived); connect(m_fsdClient, &CFSDClient::atisVoiceRoomReplyReceived, this, &CAirspaceMonitor::onAtisVoiceRoomReceived);
connect(m_fsdClient, &FSDClient::atisLogoffTimeReplyReceived, this, &CAirspaceMonitor::onAtisLogoffTimeReceived); connect(m_fsdClient, &CFSDClient::atisLogoffTimeReplyReceived, this, &CAirspaceMonitor::onAtisLogoffTimeReceived);
connect(m_fsdClient, &FSDClient::flightPlanReceived, this, &CAirspaceMonitor::onFlightPlanReceived); connect(m_fsdClient, &CFSDClient::flightPlanReceived, this, &CAirspaceMonitor::onFlightPlanReceived);
connect(m_fsdClient, &FSDClient::realNameResponseReceived, this, &CAirspaceMonitor::onRealNameReplyReceived); connect(m_fsdClient, &CFSDClient::realNameResponseReceived, this, &CAirspaceMonitor::onRealNameReplyReceived);
connect(m_fsdClient, &FSDClient::planeInformationReceived, this, &CAirspaceMonitor::onIcaoCodesReceived); connect(m_fsdClient, &CFSDClient::planeInformationReceived, this, &CAirspaceMonitor::onIcaoCodesReceived);
connect(m_fsdClient, &FSDClient::deletePilotReceived, this, &CAirspaceMonitor::onPilotDisconnected); connect(m_fsdClient, &CFSDClient::deletePilotReceived, this, &CAirspaceMonitor::onPilotDisconnected);
connect(m_fsdClient, &FSDClient::deleteAtcReceived, this, &CAirspaceMonitor::onAtcControllerDisconnected); connect(m_fsdClient, &CFSDClient::deleteAtcReceived, this, &CAirspaceMonitor::onAtcControllerDisconnected);
connect(m_fsdClient, &FSDClient::pilotDataUpdateReceived, this, &CAirspaceMonitor::onAircraftUpdateReceived); connect(m_fsdClient, &CFSDClient::pilotDataUpdateReceived, this, &CAirspaceMonitor::onAircraftUpdateReceived);
connect(m_fsdClient, &FSDClient::interimPilotDataUpdatedReceived, this, &CAirspaceMonitor::onAircraftInterimUpdateReceived); connect(m_fsdClient, &CFSDClient::interimPilotDataUpdatedReceived, this, &CAirspaceMonitor::onAircraftInterimUpdateReceived);
connect(m_fsdClient, &FSDClient::com1FrequencyResponseReceived, this, &CAirspaceMonitor::onFrequencyReceived); connect(m_fsdClient, &CFSDClient::com1FrequencyResponseReceived, this, &CAirspaceMonitor::onFrequencyReceived);
connect(m_fsdClient, &FSDClient::capabilityResponseReceived, this, &CAirspaceMonitor::onCapabilitiesReplyReceived); connect(m_fsdClient, &CFSDClient::capabilityResponseReceived, this, &CAirspaceMonitor::onCapabilitiesReplyReceived);
connect(m_fsdClient, &FSDClient::planeInformationFsinnReceived, this, &CAirspaceMonitor::onCustomFSInnPacketReceived); connect(m_fsdClient, &CFSDClient::planeInformationFsinnReceived, this, &CAirspaceMonitor::onCustomFSInnPacketReceived);
connect(m_fsdClient, &FSDClient::serverResponseReceived, this, &CAirspaceMonitor::onServerReplyReceived); connect(m_fsdClient, &CFSDClient::serverResponseReceived, this, &CAirspaceMonitor::onServerReplyReceived);
connect(m_fsdClient, &FSDClient::aircraftConfigReceived, this, &CAirspaceMonitor::onAircraftConfigReceived); connect(m_fsdClient, &CFSDClient::aircraftConfigReceived, this, &CAirspaceMonitor::onAircraftConfigReceived);
connect(m_fsdClient, &FSDClient::connectionStatusChanged, this, &CAirspaceMonitor::onConnectionStatusChanged); connect(m_fsdClient, &CFSDClient::connectionStatusChanged, this, &CAirspaceMonitor::onConnectionStatusChanged);
// AutoConnection: this should also avoid race conditions by updating the bookings // AutoConnection: this should also avoid race conditions by updating the bookings
Q_ASSERT_X(sApp && sApp->getWebDataServices(), Q_FUNC_INFO, "Missing data reader"); Q_ASSERT_X(sApp && sApp->getWebDataServices(), Q_FUNC_INFO, "Missing data reader");

4
src/blackcore/airspacemonitor.h
View File

@@ -75,7 +75,7 @@ namespace BlackCore
//! Constructor //! Constructor
CAirspaceMonitor(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, CAirspaceMonitor(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft,
BlackMisc::Simulation::IAircraftModelSetProvider *modelSetProvider, BlackMisc::Simulation::IAircraftModelSetProvider *modelSetProvider,
Fsd::FSDClient *fsdClient, Fsd::CFSDClient *fsdClient,
QObject *parent); QObject *parent);
//! Members not implenented or fully implenented by CRemoteAircraftProvider //! Members not implenented or fully implenented by CRemoteAircraftProvider
@@ -257,7 +257,7 @@ namespace BlackCore
BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TModelMatching> m_matchingSettings { this }; //!< settings BlackMisc::CSettingReadOnly<BlackMisc::Simulation::Settings::TModelMatching> m_matchingSettings { this }; //!< settings
QQueue<BlackMisc::Aviation::CCallsign> m_queryAtis; //!< query the ATIS QQueue<BlackMisc::Aviation::CCallsign> m_queryAtis; //!< query the ATIS
QQueue<BlackMisc::Aviation::CCallsign> m_queryPilot; //!< query the pilot data QQueue<BlackMisc::Aviation::CCallsign> m_queryPilot; //!< query the pilot data
Fsd::FSDClient *m_fsdClient = nullptr; //!< corresponding network interface Fsd::CFSDClient *m_fsdClient = nullptr; //!< corresponding network interface
CAirspaceAnalyzer *m_analyzer = nullptr; //!< owned analyzer CAirspaceAnalyzer *m_analyzer = nullptr; //!< owned analyzer
bool m_bookingsRequested = false; //!< bookings have been requested, it can happen we receive an BlackCore::Vatsim::CVatsimBookingReader::atcBookingsReadUnchanged signal bool m_bookingsRequested = false; //!< bookings have been requested, it can happen we receive an BlackCore::Vatsim::CVatsimBookingReader::atcBookingsReadUnchanged signal
QTimer m_processTimer; QTimer m_processTimer;

12
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -68,12 +68,12 @@ namespace BlackCore
CContextNetwork::registerHelp(); CContextNetwork::registerHelp();
// 1. Init by "network driver" // 1. Init by "network driver"
m_fsdClient = new FSDClient(this, this->getRuntime()->getCContextOwnAircraft(), this, this); m_fsdClient = new CFSDClient(this, this->getRuntime()->getCContextOwnAircraft(), this, this);
connect(m_fsdClient, &FSDClient::connectionStatusChanged, this, &CContextNetwork::onFsdConnectionStatusChanged); connect(m_fsdClient, &CFSDClient::connectionStatusChanged, this, &CContextNetwork::onFsdConnectionStatusChanged);
connect(m_fsdClient, &FSDClient::killRequestReceived, this, &CContextNetwork::kicked); connect(m_fsdClient, &CFSDClient::killRequestReceived, this, &CContextNetwork::kicked);
connect(m_fsdClient, &FSDClient::textMessagesReceived, this, &CContextNetwork::textMessagesReceived); connect(m_fsdClient, &CFSDClient::textMessagesReceived, this, &CContextNetwork::textMessagesReceived);
// connect(m_fsdClient, &FSDClient::textMessagesReceived, this, &CContextNetwork::checkForSupervisiorTextMessage); // connect(m_fsdClient, &FSDClient::textMessagesReceived, this, &CContextNetwork::checkForSupervisiorTextMessage);
connect(m_fsdClient, &FSDClient::textMessageSent, this, &CContextNetwork::textMessageSent); connect(m_fsdClient, &CFSDClient::textMessageSent, this, &CContextNetwork::textMessageSent);
// 2. Update timer for data (network data such as frequency) // 2. Update timer for data (network data such as frequency)
// we use 2 timers so we can query at different times (not too many queirs at once) // we use 2 timers so we can query at different times (not too many queirs at once)
@@ -1201,7 +1201,7 @@ namespace BlackCore
// bind does not allow to define connection type, so we use receiver as workaround // bind does not allow to define connection type, so we use receiver as workaround
const QMetaObject::Connection uc; // unconnected const QMetaObject::Connection uc; // unconnected
const QMetaObject::Connection c = rawFsdMessageReceivedSlot ? connect(m_fsdClient, &FSDClient::rawFsdMessage, receiver, rawFsdMessageReceivedSlot) : uc; const QMetaObject::Connection c = rawFsdMessageReceivedSlot ? connect(m_fsdClient, &CFSDClient::rawFsdMessage, receiver, rawFsdMessageReceivedSlot) : uc;
Q_ASSERT_X(c || !rawFsdMessageReceivedSlot, Q_FUNC_INFO, "connect failed"); Q_ASSERT_X(c || !rawFsdMessageReceivedSlot, Q_FUNC_INFO, "connect failed");
return c; return c;
} }

4
src/blackcore/context/contextnetworkimpl.h
View File

@@ -150,7 +150,7 @@ namespace BlackCore
//! \remarks public so values can be logged/monitored //! \remarks public so values can be logged/monitored
//! @{ //! @{
//! Network library //! Network library
Fsd::FSDClient *fsdClient() const { return m_fsdClient; } Fsd::CFSDClient *fsdClient() const { return m_fsdClient; }
//! Airspace //! Airspace
CAirspaceMonitor *airspace() const { return m_airspace; } CAirspaceMonitor *airspace() const { return m_airspace; }
@@ -293,7 +293,7 @@ namespace BlackCore
private: private:
CAirspaceMonitor *m_airspace = nullptr; CAirspaceMonitor *m_airspace = nullptr;
Fsd::FSDClient *m_fsdClient = nullptr; Fsd::CFSDClient *m_fsdClient = nullptr;
BlackMisc::Network::CLoginMode m_currentMode = BlackMisc::Network::CLoginMode::Pilot; //!< current modeM BlackMisc::Network::CLoginMode m_currentMode = BlackMisc::Network::CLoginMode::Pilot; //!< current modeM
QTimer *m_requestAircraftDataTimer = nullptr; //!< general updates such as frequencies, see requestAircraftDataUpdates() QTimer *m_requestAircraftDataTimer = nullptr; //!< general updates such as frequencies, see requestAircraftDataUpdates()
QTimer *m_requestAtisTimer = nullptr; //!< general updates such as ATIS QTimer *m_requestAtisTimer = nullptr; //!< general updates such as ATIS

92
tests/blackcore/fsd/testfsdclient/testfsdclient.cpp
View File

@@ -104,7 +104,7 @@ namespace BlackFsdTest
void testConnection(); void testConnection();
private: private:
FSDClient *client = nullptr; CFSDClient *client = nullptr;
}; };
void CTestFSDClient::initTestCase() void CTestFSDClient::initTestCase()
@@ -132,7 +132,7 @@ namespace BlackFsdTest
CFrequency frequency(123.000, CFrequencyUnit::MHz()); CFrequency frequency(123.000, CFrequencyUnit::MHz());
COwnAircraftProviderDummy::instance()->updateActiveComFrequency(frequency, CComSystem::Com1, {}); COwnAircraftProviderDummy::instance()->updateActiveComFrequency(frequency, CComSystem::Com1, {});
client = new FSDClient(CClientProviderDummy::instance(), COwnAircraftProviderDummy::instance(), CRemoteAircraftProviderDummy::instance(), this); client = new CFSDClient(CClientProviderDummy::instance(), COwnAircraftProviderDummy::instance(), CRemoteAircraftProviderDummy::instance(), this);
client->setUnitTestMode(true); client->setUnitTestMode(true);
client->setCallsign("ABCD"); client->setCallsign("ABCD");
client->setClientName("Test Client"); client->setClientName("Test Client");
@@ -159,7 +159,7 @@ namespace BlackFsdTest
void CTestFSDClient::testDeleteAtc() void CTestFSDClient::testDeleteAtc()
{ {
QSignalSpy spy(client, &FSDClient::deleteAtcReceived); QSignalSpy spy(client, &CFSDClient::deleteAtcReceived);
client->sendFsdMessage("#DAEDDM_OBS:1234567\r\n"); client->sendFsdMessage("#DAEDDM_OBS:1234567\r\n");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -170,7 +170,7 @@ namespace BlackFsdTest
void CTestFSDClient::testDeletePilot() void CTestFSDClient::testDeletePilot()
{ {
QSignalSpy spy(client, &FSDClient::deletePilotReceived); QSignalSpy spy(client, &CFSDClient::deletePilotReceived);
client->sendFsdMessage("#DPOEHAB:1234567\r\n"); client->sendFsdMessage("#DPOEHAB:1234567\r\n");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -181,7 +181,7 @@ namespace BlackFsdTest
void CTestFSDClient::testTextMessage() void CTestFSDClient::testTextMessage()
{ {
QSignalSpy spy(client, &FSDClient::textMessagesReceived); QSignalSpy spy(client, &CFSDClient::textMessagesReceived);
client->sendFsdMessage("#TMEDMM_CTR:BER721:Hey how are you doing?\r\n"); client->sendFsdMessage("#TMEDMM_CTR:BER721:Hey how are you doing?\r\n");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -202,7 +202,7 @@ namespace BlackFsdTest
COwnAircraftProviderDummy::instance()->updateActiveComFrequency(CFrequency(124050, CFrequencyUnit::kHz()), CComSystem::Com1, CIdentifier::anonymous()); COwnAircraftProviderDummy::instance()->updateActiveComFrequency(CFrequency(124050, CFrequencyUnit::kHz()), CComSystem::Com1, CIdentifier::anonymous());
QSignalSpy spy(client, &FSDClient::textMessagesReceived); QSignalSpy spy(client, &CFSDClient::textMessagesReceived);
client->sendFsdMessage("#TMEDMM_CTR:@24050:BER721, Descend F140 when ready\r\n"); client->sendFsdMessage("#TMEDMM_CTR:@24050:BER721, Descend F140 when ready\r\n");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -214,7 +214,7 @@ namespace BlackFsdTest
QCOMPARE(message.getFrequency(), frequency); QCOMPARE(message.getFrequency(), frequency);
QCOMPARE(message.getSenderCallsign(), "EDMM_CTR"); QCOMPARE(message.getSenderCallsign(), "EDMM_CTR");
QSignalSpy spy2(client, &FSDClient::textMessagesReceived); QSignalSpy spy2(client, &CFSDClient::textMessagesReceived);
client->sendFsdMessage("#TMEDMM_CTR:@24050&@27000:BER721, Descend F140 when ready\r\n"); client->sendFsdMessage("#TMEDMM_CTR:@24050&@27000:BER721, Descend F140 when ready\r\n");
QCOMPARE(spy2.count(), 1); QCOMPARE(spy2.count(), 1);
@@ -229,7 +229,7 @@ namespace BlackFsdTest
void CTestFSDClient::testPilotDataUpdate() void CTestFSDClient::testPilotDataUpdate()
{ {
QSignalSpy spy(client, &FSDClient::pilotDataUpdateReceived); QSignalSpy spy(client, &CFSDClient::pilotDataUpdateReceived);
client->sendFsdMessage("@N:ABCD:1200:1:48.353855:11.786155:110:0:4290769188:1\r\n"); client->sendFsdMessage("@N:ABCD:1200:1:48.353855:11.786155:110:0:4290769188:1\r\n");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -255,7 +255,7 @@ namespace BlackFsdTest
void CTestFSDClient::testAtcDataUpdate() void CTestFSDClient::testAtcDataUpdate()
{ {
QSignalSpy spy(client, &FSDClient::atcDataUpdateReceived); QSignalSpy spy(client, &CFSDClient::atcDataUpdateReceived);
client->sendFsdMessage("%ZZZZ_APP:28200:5:150:5:48.11028:16.56972:0\r\n"); client->sendFsdMessage("%ZZZZ_APP:28200:5:150:5:48.11028:16.56972:0\r\n");
const CCallsign callsign("ZZZZ_APP"); const CCallsign callsign("ZZZZ_APP");
const CFrequency freq(128200, CFrequencyUnit::kHz()); const CFrequency freq(128200, CFrequencyUnit::kHz());
@@ -273,7 +273,7 @@ namespace BlackFsdTest
void CTestFSDClient::testPong() void CTestFSDClient::testPong()
{ {
QSignalSpy spy(client, &FSDClient::pongReceived); QSignalSpy spy(client, &CFSDClient::pongReceived);
client->sendFsdMessage("$POSERVER:BER368:90835991\r\n"); client->sendFsdMessage("$POSERVER:BER368:90835991\r\n");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -292,7 +292,7 @@ namespace BlackFsdTest
void CTestFSDClient::testClientResponseRealName1() void CTestFSDClient::testClientResponseRealName1()
{ {
QSignalSpy spy(client, &FSDClient::realNameResponseReceived); QSignalSpy spy(client, &CFSDClient::realNameResponseReceived);
client->sendFsdMessage("$CRDLH123:BER721:RN:Jon Doe\r\n"); client->sendFsdMessage("$CRDLH123:BER721:RN:Jon Doe\r\n");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -304,7 +304,7 @@ namespace BlackFsdTest
void CTestFSDClient::testClientResponseRealName2() void CTestFSDClient::testClientResponseRealName2()
{ {
QSignalSpy spy(client, &FSDClient::realNameResponseReceived); QSignalSpy spy(client, &CFSDClient::realNameResponseReceived);
client->sendFsdMessage("$CRDLH123:BER721:RN:Jon Doe:\r\n"); client->sendFsdMessage("$CRDLH123:BER721:RN:Jon Doe:\r\n");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -316,7 +316,7 @@ namespace BlackFsdTest
void CTestFSDClient::testClientResponseRealName3() void CTestFSDClient::testClientResponseRealName3()
{ {
QSignalSpy spy(client, &FSDClient::realNameResponseReceived); QSignalSpy spy(client, &CFSDClient::realNameResponseReceived);
client->sendFsdMessage("$CRDLH123:BER721:RN:Jon Doe::1\r\n"); client->sendFsdMessage("$CRDLH123:BER721:RN:Jon Doe::1\r\n");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -328,7 +328,7 @@ namespace BlackFsdTest
void CTestFSDClient::testClientResponseCapabilities() void CTestFSDClient::testClientResponseCapabilities()
{ {
QSignalSpy spy(client, &FSDClient::capabilityResponseReceived); QSignalSpy spy(client, &CFSDClient::capabilityResponseReceived);
client->sendFsdMessage("$CRAUA64MN:DECHK:CAPS:VERSION=1:ATCINFO=1:MODELDESC=1:ACCONFIG=1\r\n"); client->sendFsdMessage("$CRAUA64MN:DECHK:CAPS:VERSION=1:ATCINFO=1:MODELDESC=1:ACCONFIG=1\r\n");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -340,7 +340,7 @@ namespace BlackFsdTest
void CTestFSDClient::testPlaneInfoRequestFsinn() void CTestFSDClient::testPlaneInfoRequestFsinn()
{ {
QSignalSpy spy(client, &FSDClient::planeInformationFsinnReceived); QSignalSpy spy(client, &CFSDClient::planeInformationFsinnReceived);
client->sendFsdMessage("#SBLHA449:DLH53M:FSIPIR:1::A320:10.05523:0.49785:1320.00000:2.AB13B127.5611C1A2::A320-200 Airbus Leipzig Air CFM\r\n"); client->sendFsdMessage("#SBLHA449:DLH53M:FSIPIR:1::A320:10.05523:0.49785:1320.00000:2.AB13B127.5611C1A2::A320-200 Airbus Leipzig Air CFM\r\n");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -352,7 +352,7 @@ namespace BlackFsdTest
void CTestFSDClient::testPlaneInformationFsinn() void CTestFSDClient::testPlaneInformationFsinn()
{ {
QSignalSpy spy(client, &FSDClient::planeInformationFsinnReceived); QSignalSpy spy(client, &CFSDClient::planeInformationFsinnReceived);
client->sendFsdMessage("#SBLHA449:AUA89SY:FSIPI:1::A320:10.05523:0.49785:1320.00000:2.AB13B127.5611C1A2::A320-200 Airbus Leipzig Air CFM\r\n"); client->sendFsdMessage("#SBLHA449:AUA89SY:FSIPI:1::A320:10.05523:0.49785:1320.00000:2.AB13B127.5611C1A2::A320-200 Airbus Leipzig Air CFM\r\n");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -364,7 +364,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendPilotLogin() void CTestFSDClient::testSendPilotLogin()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendLogin(); client->sendLogin();
@@ -377,7 +377,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendAtcLogin() void CTestFSDClient::testSendAtcLogin()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->setLoginMode(CLoginMode::Observer); client->setLoginMode(CLoginMode::Observer);
client->setAtcRating(AtcRating::Controller1); client->setAtcRating(AtcRating::Controller1);
client->sendLogin(); client->sendLogin();
@@ -391,7 +391,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendDeletePilot() void CTestFSDClient::testSendDeletePilot()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendDeletePilot(); client->sendDeletePilot();
@@ -404,7 +404,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendDeleteAtc() void CTestFSDClient::testSendDeleteAtc()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendDeleteAtc(); client->sendDeleteAtc();
@@ -417,7 +417,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendPilotDataUpdate1() void CTestFSDClient::testSendPilotDataUpdate1()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
const Geo::CCoordinateGeodetic ownPosition(48.353855, 11.786155); const Geo::CCoordinateGeodetic ownPosition(48.353855, 11.786155);
const CHeading heading(25.0, CAngleUnit::deg()); const CHeading heading(25.0, CAngleUnit::deg());
@@ -446,7 +446,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendPilotDataUpdate2() void CTestFSDClient::testSendPilotDataUpdate2()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
const Geo::CCoordinateGeodetic ownPosition(48.353855, 11.786155); const Geo::CCoordinateGeodetic ownPosition(48.353855, 11.786155);
const CHeading heading(25.0, CAngleUnit::deg()); const CHeading heading(25.0, CAngleUnit::deg());
@@ -475,7 +475,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendAtcDataUpdate() void CTestFSDClient::testSendAtcDataUpdate()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendAtcDataUpdate(48.11028, 8.56972); client->sendAtcDataUpdate(48.11028, 8.56972);
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -487,7 +487,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendPing() void CTestFSDClient::testSendPing()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendPing("SERVER"); client->sendPing("SERVER");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -499,7 +499,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendPong() void CTestFSDClient::testSendPong()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendPong("SERVER", "123456789"); client->sendPong("SERVER", "123456789");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -511,7 +511,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendClientResponse1() void CTestFSDClient::testSendClientResponse1()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendClientResponse(ClientQueryType::RealName, "ZZZZ_TWR"); client->sendClientResponse(ClientQueryType::RealName, "ZZZZ_TWR");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -523,7 +523,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendClientResponse2() void CTestFSDClient::testSendClientResponse2()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendClientResponse(ClientQueryType::Capabilities, "ZZZZ_TWR"); client->sendClientResponse(ClientQueryType::Capabilities, "ZZZZ_TWR");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -535,7 +535,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendClientQuery1() void CTestFSDClient::testSendClientQuery1()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendClientQuery(ClientQueryType::RealName, "ZZZZ_TWR"); client->sendClientQuery(ClientQueryType::RealName, "ZZZZ_TWR");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -547,7 +547,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendClientQuery2() void CTestFSDClient::testSendClientQuery2()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendClientQueryIsValidAtc("EDDM_TWR"); client->sendClientQueryIsValidAtc("EDDM_TWR");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -559,7 +559,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendClientQuery3() void CTestFSDClient::testSendClientQuery3()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendClientQueryAircraftConfig("DLH123"); client->sendClientQueryAircraftConfig("DLH123");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -571,7 +571,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendTextMessage1() void CTestFSDClient::testSendTextMessage1()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendTextMessage("ZZZZ_TWR", "hey dude!"); client->sendTextMessage("ZZZZ_TWR", "hey dude!");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -583,7 +583,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendTextMessage2() void CTestFSDClient::testSendTextMessage2()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendTextMessage(TextMessageGroups::AllSups, "Please help!!!"); client->sendTextMessage(TextMessageGroups::AllSups, "Please help!!!");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -595,7 +595,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendRadioMessage1() void CTestFSDClient::testSendRadioMessage1()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
QVector<int> frequencies { 124050 }; QVector<int> frequencies { 124050 };
client->sendRadioMessage(frequencies, "hey dude!"); client->sendRadioMessage(frequencies, "hey dude!");
@@ -608,7 +608,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendRadioMessage2() void CTestFSDClient::testSendRadioMessage2()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
QVector<int> frequencies { 124050, 135725 }; QVector<int> frequencies { 124050, 135725 };
client->sendRadioMessage(frequencies, "hey dude!"); client->sendRadioMessage(frequencies, "hey dude!");
@@ -621,7 +621,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendFlightPlan() void CTestFSDClient::testSendFlightPlan()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
QDateTime takeoffTimePlanned = QDateTime::fromString("1530", "hhmm"); QDateTime takeoffTimePlanned = QDateTime::fromString("1530", "hhmm");
takeoffTimePlanned.setTimeSpec(Qt::UTC); takeoffTimePlanned.setTimeSpec(Qt::UTC);
QDateTime takeoffTimeActual = QDateTime::fromString("1535", "hhmm"); QDateTime takeoffTimeActual = QDateTime::fromString("1535", "hhmm");
@@ -643,7 +643,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendPlaneInfoRequest() void CTestFSDClient::testSendPlaneInfoRequest()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendPlaneInfoRequest("XYZ"); client->sendPlaneInfoRequest("XYZ");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -655,7 +655,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendPlaneInformation1() void CTestFSDClient::testSendPlaneInformation1()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendPlaneInformation("XYZ", "B744", "BAW"); client->sendPlaneInformation("XYZ", "B744", "BAW");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -667,7 +667,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendPlaneInformation2() void CTestFSDClient::testSendPlaneInformation2()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendPlaneInformation("XYZ", "B744", "BAW", "UNION"); client->sendPlaneInformation("XYZ", "B744", "BAW", "UNION");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -679,7 +679,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendPlaneInformation3() void CTestFSDClient::testSendPlaneInformation3()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendPlaneInformation("XYZ", "B744"); client->sendPlaneInformation("XYZ", "B744");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -691,7 +691,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendPlaneInformation4() void CTestFSDClient::testSendPlaneInformation4()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendPlaneInformation("XYZ", "", "", "UNION"); client->sendPlaneInformation("XYZ", "", "", "UNION");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -703,7 +703,7 @@ namespace BlackFsdTest
void CTestFSDClient::testSendAircraftConfiguration() void CTestFSDClient::testSendAircraftConfiguration()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendAircraftConfiguration("XYZ", "{\"request\":\"full\"}"); client->sendAircraftConfiguration("XYZ", "{\"request\":\"full\"}");
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
@@ -715,7 +715,7 @@ namespace BlackFsdTest
void CTestFSDClient::testCom1FreqQueryResponse() void CTestFSDClient::testCom1FreqQueryResponse()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendFsdMessage("$CQEDMM_CTR:ABCD:C?\r\n"); client->sendFsdMessage("$CQEDMM_CTR:ABCD:C?\r\n");
QCOMPARE(spy.count(), 2); QCOMPARE(spy.count(), 2);
@@ -727,7 +727,7 @@ namespace BlackFsdTest
void CTestFSDClient::testPlaneInfoRequestResponse() void CTestFSDClient::testPlaneInfoRequestResponse()
{ {
QSignalSpy spy(client, &FSDClient::rawFsdMessage); QSignalSpy spy(client, &CFSDClient::rawFsdMessage);
client->sendFsdMessage("#SBEDMM_CTR:ABCD:PIR\r\n"); client->sendFsdMessage("#SBEDMM_CTR:ABCD:PIR\r\n");
QCOMPARE(spy.count(), 2); QCOMPARE(spy.count(), 2);
@@ -784,7 +784,7 @@ namespace BlackFsdTest
const CServer fsdServer = CServer::swiftFsdTestServer(true); const CServer fsdServer = CServer::swiftFsdTestServer(true);
if (!pingServer(fsdServer)) { QSKIP("Server not reachable."); } if (!pingServer(fsdServer)) { QSKIP("Server not reachable."); }
QSignalSpy spy(client, &FSDClient::connectionStatusChanged); QSignalSpy spy(client, &CFSDClient::connectionStatusChanged);
client->setUnitTestMode(false); client->setUnitTestMode(false);
client->connectToServer(); client->connectToServer();
@@ -800,8 +800,8 @@ namespace BlackFsdTest
QCOMPARE(CConnectionStatus::Connecting, arguments.at(0).value<CConnectionStatus>().getConnectionStatus()); QCOMPARE(CConnectionStatus::Connecting, arguments.at(0).value<CConnectionStatus>().getConnectionStatus());
QCOMPARE(CConnectionStatus::Connected, arguments.at(1).value<CConnectionStatus>().getConnectionStatus()); QCOMPARE(CConnectionStatus::Connected, arguments.at(1).value<CConnectionStatus>().getConnectionStatus());
QSignalSpy pongSpy(client, &FSDClient::pongReceived); QSignalSpy pongSpy(client, &CFSDClient::pongReceived);
connect(client, &FSDClient::pongReceived, [](const QString &sender, double elapsedTimeM) connect(client, &CFSDClient::pongReceived, [](const QString &sender, double elapsedTimeM)
{ {
qDebug() << "Received pong from" << sender << "in" << elapsedTimeM << "ms"; qDebug() << "Received pong from" << sender << "in" << elapsedTimeM << "ms";
}); });