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

refs #875, refs #879, moved data generating functions to CTesting

Browse Source 
(will be further split up/refactored)
This commit is contained in:
Klaus Basan
2017-02-11 12:00:43 +01:00
committed by Mathew Sutcliffe
parent 7917769802
commit d1827bd162
6 changed files with 74 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/blackmisc/test/testing.cpp
View File

@@ -31,6 +31,7 @@ using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Network;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Simulation::FsCommon;
namespace BlackMisc
{
@@ -89,11 +90,11 @@ namespace BlackMisc
{
foreach (const CAtcStation station, stations)
{
readStation(station, byPropertyIndex);
accessStationData(station, byPropertyIndex);
}
}
QString CTesting::readStation(const CAtcStation &station, bool byPropertyIndex)
QString CTesting::accessStationData(const CAtcStation &station, bool byPropertyIndex)
{
QString r;
if (byPropertyIndex)
@@ -177,5 +178,55 @@ namespace BlackMisc
static const CAtcStationList s = createAtcStations(10000, false);
return s;
}
CAircraftCfgEntriesList CTesting::getAircraftCfgEntries(int number)
{
CAircraftCfgEntriesList list;
for (int i = 0; i < number; i++)
{
CAircraftCfgEntries e;
e.setAtcModel("atc model");
e.setAtcParkingCode(QString::number(i));
e.setIndex(i);
e.setFileName("this will be the file path and pretty long");
e.setTitle("I am the aircraft title foobar");
e.setAtcType("B737");
list.push_back(e);
}
return list;
}
CAirportList CTesting::getAirports(int number)
{
BlackMisc::Aviation::CAirportList list;
for (int i = 0; i < number; i++)
{
const char cc = 65 + (i % 26);
QString icao = QString("EXX%1").arg(QLatin1Char(cc));
BlackMisc::Aviation::CAirport a(icao);
a.setPosition(CCoordinateGeodetic(i, i, i));
list.push_back(a);
}
return list;
}
CClientList CTesting::getClients(int number)
{
BlackMisc::Network::CClientList list;
for (int i = 0; i < number; i++)
{
CCallsign cs(QString("DXX%1").arg(i));
QString rn = QString("Joe Doe%1").arg(i);
CUser user(QString::number(i), rn, cs);
user.setCallsign(cs);
CClient client(user);
client.setCapability(true, CClient::FsdWithInterimPositions);
client.setCapability(true, CClient::FsdWithIcaoCodes);
const QString myFooModel = QString("fooModel %1").arg(i);
client.setQueriedModelString(myFooModel);
list.push_back(client);
}
return list;
}
} // namespace
} // namespace

15
src/blackmisc/test/testing.h
View File

@@ -12,8 +12,10 @@
#ifndef BLACKMISC_TEST_TESTING_H
#define BLACKMISC_TEST_TESTING_H
#include "blackmisc/aviation/atcstation.h"
#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/network/clientlist.h"
#include "blackmisc/blackmiscexport.h"
#include <QString>
@@ -36,7 +38,16 @@ namespace BlackMisc
static void readStations(const BlackMisc::Aviation::CAtcStationList &stations, bool byPropertyIndex = false);
//! Read properties of a station and concatenate them
static QString readStation(const BlackMisc::Aviation::CAtcStation &station, bool byPropertyIndex = false);
static QString accessStationData(const BlackMisc::Aviation::CAtcStation &station, bool byPropertyIndex = false);
//! Get aircraft cfg entries
static BlackMisc::Simulation::FsCommon::CAircraftCfgEntriesList getAircraftCfgEntries(int number);
//! Get airports
static BlackMisc::Aviation::CAirportList getAirports(int number);
//! Get clients
static BlackMisc::Network::CClientList getClients(int number);
//! Calculate n times distance (greater circle distance)
static void calculateDistance(int n);

5
src/blackmisc/test/testservice.cpp
View File

@@ -9,6 +9,7 @@
#include "testservice.h"
#include "testutils.h"
#include "testing.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/track.h"
@@ -343,13 +344,13 @@ namespace BlackMisc
CAtcStationList CTestService::getAtcStationList(int n) const
{
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " getAtcStationList" << endl;
return CTestUtils::getStations(n);
return CTesting::createAtcStations(n, false);
}
CAircraftCfgEntriesList CTestService::getAircraftCfgEntriesList(int n) const
{
if (m_verbose) out() << "Pid: " << CTestService::getPid() << " getAircraftCfgEntriesList" << endl;
return CTestUtils::getAircraftCfgEntries(n);
return CTesting::getAircraftCfgEntries(n);
}
QList<QDBusObjectPath> CTestService::getObjectPaths(int n) const

5
src/blackmisc/test/testserviceinterface.cpp
View File

@@ -10,6 +10,7 @@
#include "testserviceinterface.h"
#include "testservice.h"
#include "testutils.h"
#include "testing.h"
#include "blackmisc/test/testdata.h"
#include <QTextStream>
@@ -142,12 +143,12 @@ namespace BlackMisc
ok = pingCompare(atcStationList, atcStationListPing, out, verbose, errors);
if (verbose) { out << "Pinged ATC station list via interface" << errorInfo(ok) << endl; }
const CAirportList airportList = CTestUtils::getAirports(10);
const CAirportList airportList = CTesting::getAirports(10);
const CAirportList airportListPing = testServiceInterface.pingAirportList(airportList);
ok = pingCompare(airportList, airportListPing, out, verbose, errors);
if (verbose) { out << "Pinged airports list via interface" << errorInfo(ok) << endl; }
const CClientList clients = CTestUtils::getClients(10);
const CClientList clients = CTesting::getClients(10);
const CClient client = clients.front();
const CClient clientPing = testServiceInterface.pingClient(client);
ok = pingCompare(client, clientPing, out, verbose, errors);

68
src/blackmisc/test/testutils.cpp
View File

@@ -9,6 +9,7 @@
#include "testutils.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/aviation/airport.h"
#include <QString>
#include <QStringBuilder>
#include <QVariant>
@@ -20,7 +21,6 @@ using namespace BlackMisc::Geo;
using namespace BlackMisc::Network;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::FsCommon;
namespace BlackMisc
{
@@ -105,71 +105,5 @@ namespace BlackMisc
s = CTestUtils::dBusSignature(var);
out << "CVariant" << " size: " << s.size() << " sig: " << s << endl;
}
CAtcStationList CTestUtils::getStations(int number)
{
BlackMisc::Aviation::CAtcStationList list;
for (int i = 0; i < number; i++)
{
BlackMisc::Aviation::CAtcStation s;
s.setCallsign(QString::number(i));
s.setFrequency(BlackMisc::PhysicalQuantities::CFrequency(i, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
s.setController(CUser(QString::number(i), "FooBar", "", ""));
s.setOnline(i % 2 == 0 ? true : false);
s.setPosition(CCoordinateGeodetic(i, i, i));
list.push_back(s);
}
return list;
}
CAircraftCfgEntriesList CTestUtils::getAircraftCfgEntries(int number)
{
CAircraftCfgEntriesList list;
for (int i = 0; i < number; i++)
{
CAircraftCfgEntries e;
e.setAtcModel("atc model");
e.setAtcParkingCode(QString::number(i));
e.setIndex(i);
e.setFileName("this will be the file path and pretty long");
e.setTitle("I am the aircraft title foobar");
e.setAtcType("B737");
list.push_back(e);
}
return list;
}
CAirportList CTestUtils::getAirports(int number)
{
BlackMisc::Aviation::CAirportList list;
for (int i = 0; i < number; i++)
{
const char cc = 65 + (i % 26);
QString icao = QString("EXX%1").arg(QLatin1Char(cc));
BlackMisc::Aviation::CAirport a(icao);
a.setPosition(CCoordinateGeodetic(i, i, i));
list.push_back(a);
}
return list;
}
CClientList CTestUtils::getClients(int number)
{
BlackMisc::Network::CClientList list;
for (int i = 0; i < number; i++)
{
CCallsign cs(QString("DXX%1").arg(i));
QString rn = QString("Joe Doe%1").arg(i);
CUser user(QString::number(i), rn, cs);
user.setCallsign(cs);
CClient client(user);
client.setCapability(true, CClient::FsdWithInterimPositions);
client.setCapability(true, CClient::FsdWithIcaoCodes);
const QString myFooModel = QString("fooModel %1").arg(i);
client.setQueriedModelString(myFooModel);
list.push_back(client);
}
return list;
}
} // ns
} // ns

18
src/blackmisc/test/testutils.h
View File

@@ -13,11 +13,8 @@
#define BLACKMISC_TEST_TESTUTILS_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/network/clientlist.h"
#include <QDBusArgument>
#include <QTextStream>
namespace BlackMisc
{
@@ -44,19 +41,6 @@ namespace BlackMisc
//! Show some (important) DBus signatures
static void showDBusSignatures(QTextStream &out);
// ----------------- some test data --------------------
//! Get ATC stations
static BlackMisc::Aviation::CAtcStationList getStations(int number);
//! Get aircraft cfg entries
static BlackMisc::Simulation::FsCommon::CAircraftCfgEntriesList getAircraftCfgEntries(int number);
//! Get airports
static BlackMisc::Aviation::CAirportList getAirports(int number);
//! Get clients
static BlackMisc::Network::CClientList getClients(int number);
};
} // ns
} // ns