refs #452 updated tests/samples to reflect previous changes

This commit is contained in:
Klaus Basan
2015-09-23 19:45:23 +02:00
committed by Mathew Sutcliffe
parent c80f352710
commit 3e1e1070c1
15 changed files with 66 additions and 61 deletions

View File

@@ -9,12 +9,13 @@
#include "samplesjson.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/aircraft.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include <QJsonDocument>
#include <QTextStream>
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Network;
@@ -54,21 +55,18 @@ namespace BlackMiscTest
CHeading(10, CHeading::True, CAngleUnit::deg()),
CAngle(12, CAngleUnit::deg()), CAngle(5, CAngleUnit::deg()),
CSpeed(111, CSpeedUnit::km_h()));
CAircraft aircraft(CCallsign("DAMBZ"), CUser("123456", "Joe Pilot"), situation);
CSimulatedAircraft aircraft(CCallsign("DAMBZ"), CUser("123456", "Joe Pilot"), situation);
aircraft.setCom1System(CComSystem::getCom1System(122.8, 118.75));
aircraft.setCom2System(CComSystem::getCom2System(123.8, 124.00));
aircraft.setTransponder(CTransponder::getStandardTransponder(7000, CTransponder::ModeC));
aircraft.setIcaoInfo(CAircraftIcaoData(
CAircraftIcaoCode("B737", "L2J"),
CAirlineIcaoCode("DLH")
));
aircraft.setIcaoCodes(CAircraftIcaoCode("B737", "L2J"), CAirlineIcaoCode("DLH"));
json = aircraft.toJson();
doc = QJsonDocument(json);
qDebug() << doc.toJson(QJsonDocument::Indented);
qDebug() << "-------";
aircraft = CAircraft();
aircraft = CSimulatedAircraft();
aircraft.convertFromJson(json);
qDebug() << aircraft;
qDebug() << "------- Enter -----";

View File

@@ -17,6 +17,8 @@ using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo;
using namespace BlackMisc::PhysicalQuantities;
#include <QRegularExpression>
namespace BlackMiscTest
{

View File

@@ -374,9 +374,8 @@ namespace BlackMiscTest
qDebug() << "Pinged ATC station via interface"
<< ((station == stationReceived) ? "OK" : "ERROR!") << stationReceived;
CAircraftIcaoData icaoData("B737", "DLH");
icaoData.setAircraftCombinedType("L2J");
CAircraftIcaoData icaoReceived = testserviceInterface.pingIcaoData(icaoData);
CAircraftIcaoCode icaoData("B737", "L2J");
CAircraftIcaoCode icaoReceived = testserviceInterface.pingAircraftIcaoData(icaoData);
qDebug() << "Pinged ICAO data via interface"
<< ((icaoData == icaoReceived) ? "OK" : "ERROR!") << icaoReceived;
@@ -394,14 +393,14 @@ namespace BlackMiscTest
qDebug() << "Pinged transponder via interface"
<< ((transponderReceived == transponder) ? "OK" : "ERROR!") << transponderReceived;
CAircraft aircraft(callsign, CUser("123456", "Joe Pilot"), situation);
CSimulatedAircraft aircraft(callsign, CUser("123456", "Joe Pilot"), situation);
aircraft.setTransponder(transponder);
CAircraft aircraftReceived = testserviceInterface.pingAircraft(aircraft);
CSimulatedAircraft aircraftReceived(testserviceInterface.pingAircraft(aircraft));
qDebug() << "Pinged aircraft via interface"
<< ((aircraft == aircraftReceived) ? "OK" : "ERROR!") << aircraftReceived;
CSimulatedAircraft simAircraft(aircraft);
CAircraftModel model("foobar", CAircraftModel::TypeModelMapping);
CAircraftModel model("foobar", CAircraftModel::TypeManuallySet);
simAircraft.setModel(model);
CSimulatedAircraft simAircraftReceived = testserviceInterface.pingSimulatedAircraft(simAircraft);
qDebug() << "Pinged simulated aircraft via interface"

View File

@@ -241,7 +241,7 @@ namespace BlackMiscTest
/*
* Ping aircraft
*/
CAircraftList Testservice::pingAircraftList(const CAircraftList &aircraftList)
CSimulatedAircraftList Testservice::pingAircraftList(const CSimulatedAircraftList &aircraftList)
{
qDebug() << "Pid:" << ServiceTool::getPid() << "ping aircrafts:" << aircraftList;
return aircraftList;
@@ -340,7 +340,7 @@ namespace BlackMiscTest
/*
* Ping aircraft
*/
CAircraft Testservice::pingAircraft(const CAircraft &aircraft)
CSimulatedAircraft Testservice::pingAircraft(const CSimulatedAircraft &aircraft)
{
qDebug() << "Pid:" << ServiceTool::getPid() << "ping aircraft:" << aircraft;
return aircraft;
@@ -358,7 +358,7 @@ namespace BlackMiscTest
/*
* Ping ICAO data
*/
CAircraftIcaoData Testservice::pingIcaoData(const CAircraftIcaoData &icao)
CAircraftIcaoCode Testservice::pingAircraftIcaoData(const CAircraftIcaoCode &icao)
{
qDebug() << "Pid:" << ServiceTool::getPid() << "ping ICAO data:" << icao;
return icao;

View File

@@ -19,7 +19,7 @@
#include "blackmisc/aviation/aviation.h"
#include "blackmisc/network/network.h"
#include "blackmisc/pq/pq.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/math/math.h"
#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
@@ -118,7 +118,7 @@ namespace BlackMiscTest
BlackMisc::Aviation::CTransponder pingTransponder(const BlackMisc::Aviation::CTransponder &transponder);
//! Ping aircraft
BlackMisc::Aviation::CAircraft pingAircraft(const BlackMisc::Aviation::CAircraft &aircraft);
BlackMisc::Simulation::CSimulatedAircraft pingAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
//! Ping simulated aircraft
BlackMisc::Simulation::CSimulatedAircraft pingSimulatedAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
@@ -126,8 +126,8 @@ namespace BlackMiscTest
//! Ping ATC list
BlackMisc::Aviation::CAtcStationList pingAtcStationList(const BlackMisc::Aviation::CAtcStationList &atcStationList) const;
//! Ping aircrafts list
BlackMisc::Aviation::CAircraftList pingAircraftList(const BlackMisc::Aviation::CAircraftList &aircraftList);
//! Ping aircraft list
BlackMisc::Simulation::CSimulatedAircraftList pingAircraftList(const BlackMisc::Simulation::CSimulatedAircraftList &aircraftList);
//! Ping airports list
BlackMisc::Aviation::CAirportList pingAirportList(const BlackMisc::Aviation::CAirportList &airportList);
@@ -148,7 +148,7 @@ namespace BlackMiscTest
BlackMisc::Simulation::CSimulatorPluginInfo pingPluginInfo(const BlackMisc::Simulation::CSimulatorPluginInfo &info);
//! Ping ICAO data object
BlackMisc::Aviation::CAircraftIcaoData pingIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icao);
BlackMisc::Aviation::CAircraftIcaoCode pingAircraftIcaoData(const BlackMisc::Aviation::CAircraftIcaoCode &icao);
//! Ping CVariant
BlackMisc::CVariant pingCVariant(const BlackMisc::Network::CClient &client);

View File

@@ -16,10 +16,9 @@
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/track.h"
#include "blackmisc/aviation/transponder.h"
#include "blackmisc/aviation/aircraftlist.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/network/clientlist.h"
#include "blackmisc/variantlist.h"
@@ -123,14 +122,14 @@ namespace BlackMiscTest
return asyncCallWithArgumentList(QLatin1String("pingAtcStation"), argumentList);
}
inline QDBusPendingReply<BlackMisc::Aviation::CAircraftIcaoData> pingIcaoData(BlackMisc::Aviation::CAircraftIcaoData icaoData)
inline QDBusPendingReply<BlackMisc::Aviation::CAircraftIcaoCode> pingAircraftIcaoData(BlackMisc::Aviation::CAircraftIcaoCode icaoData)
{
QList<QVariant> argumentList;
argumentList << QVariant::fromValue(icaoData);
return asyncCallWithArgumentList(QLatin1String("pingIcaoData"), argumentList);
}
inline QDBusPendingReply<BlackMisc::Aviation::CAircraft> pingAircraft(BlackMisc::Aviation::CAircraft aircraft)
inline QDBusPendingReply<BlackMisc::Simulation::CSimulatedAircraft> pingAircraft(BlackMisc::Simulation::CSimulatedAircraft aircraft)
{
QList<QVariant> argumentList;
argumentList << QVariant::fromValue(aircraft);
@@ -165,7 +164,7 @@ namespace BlackMiscTest
return asyncCallWithArgumentList(QLatin1String("pingSpeed"), argumentList);
}
inline QDBusPendingReply<BlackMisc::Aviation::CAircraftList> pingAircraftList(BlackMisc::Aviation::CAircraftList aircraftList)
inline QDBusPendingReply<BlackMisc::Simulation::CSimulatedAircraftList> pingAircraftList(BlackMisc::Simulation::CSimulatedAircraftList aircraftList)
{
QList<QVariant> argumentList;
argumentList << QVariant::fromValue(aircraftList);

View File

@@ -15,7 +15,6 @@
#include "blackmisc/aviation/transponder.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/flightplan.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/aviation/airporticaocode.h"

View File

@@ -18,6 +18,7 @@
#include <QTime>
#include <QTextStream>
#include <QTemporaryFile>
#include <QJsonDocument>
using namespace BlackMisc;
using namespace BlackMisc::Simulation::FsCommon;
@@ -44,7 +45,7 @@ namespace BlackSimTest
QTime time;
time.start();
streamOut << "reading " << parser.getRootDirectory() << endl;
parser.parse();
parser.startLoading();
streamOut << "read entries: " << parser.getAircraftCfgEntriesList().size() << " in " << time.restart() << "ms" << endl;
CAircraftCfgEntriesList entriesList = parser.getAircraftCfgEntriesList();

View File

@@ -36,13 +36,14 @@ namespace BlackSimTest
std::unique_ptr<IModelMappingsProvider> cvm(new CModelMappingsProviderVPilot(true));
bool s = cvm->read();
streamOut << "directory: " << CVPilotRulesReader::standardMappingsDirectory() << endl;
streamOut << "loaded: " << BlackMisc::boolToYesNo(s) << " size: " << cvm->getMappingList().size() << endl;
streamOut << "loaded: " << BlackMisc::boolToYesNo(s) << " size: " << cvm->getDatastoreModels().size() << endl;
// mapper with rule set, handing over ownership
CAircraftCfgParser cfgParser;
QString fsxDir = CSampleUtils::selectDirectory({QStringLiteral("P:/FlightSimulatorX (MSI)/SimObjects"),
QStringLiteral("P:/Temp/SimObjects"),
QStringLiteral("C:/Flight Simulator 9/Aircraft")}, streamOut, streamIn);
QStringLiteral("P:/Temp/SimObjects"),
QStringLiteral("C:/Flight Simulator 9/Aircraft")
}, streamOut, streamIn);
if (!cfgParser.changeRootDirectory(fsxDir))
{
@@ -51,7 +52,7 @@ namespace BlackSimTest
}
streamOut << "Start reading models" << endl;
cfgParser.parse(CAircraftCfgParser::ModeBlocking);
cfgParser.startLoading(CAircraftCfgParser::ModeBlocking);
streamOut << "Read models: " << cfgParser.getAircraftCfgEntriesList().size() << endl;
streamOut << "Ambigious models: " << cfgParser.getAircraftCfgEntriesList().detectAmbiguousTitles().join(", ") << endl;
@@ -59,13 +60,13 @@ namespace BlackSimTest
CAircraftMatcher matcher(CAircraftMatcher::AllModes);
matcher.setModelMappingProvider(std::move(cvm));
matcher.setInstalledModels(cfgParser.getAircraftCfgEntriesList().toAircraftModelList());
streamOut << "Now synchronizing defintions: " << matcher.getAircraftMappingList().size() << endl;
streamOut << "Now synchronizing defintions: " << matcher.getDatastoreModels().size() << endl;
int afterSync = matcher.synchronize();
streamOut << "After synchronizing definitions: " << afterSync << endl;
CAircraftIcaoData icao("C172");
CAircraftIcaoCode icao("C172");
streamOut << "Searching for " << icao << endl;
streamOut << matcher.getAircraftMappingList().findByIcaoCodeExact(icao) << endl;
streamOut << matcher.getDatastoreModels().findByIcaoDesignators(icao, CAirlineIcaoCode()) << endl;
}
} // namespace

View File

@@ -29,7 +29,7 @@ namespace BlackSimTest
{
BlackMisc::registerMetadata();
QScopedPointer<CVPilotRulesReader> vPilotReader(new CVPilotRulesReader());
bool s = vPilotReader->read();
bool s = vPilotReader->read(false);
streamOut << "Read success: " << BlackMisc::boolToYesNo(s) << endl;
streamOut << "Read " << vPilotReader->countRulesLoaded() << " rules from " << vPilotReader->countFilesLoaded() << " files" << endl;
streamOut << "Distributors: " << vPilotReader->getRules().getSortedDistributors().join(", ");

View File

@@ -165,10 +165,10 @@ void Client::presetIcaoCodesCmd(QTextStream &args)
QString combinedIcaoType; // e.g. "L2J"
QString airlineICAO;
args >> acTypeICAO >> combinedIcaoType >> airlineICAO;
BlackMisc::Aviation::CAircraftIcaoData icaoData(
CAircraftIcaoCode(acTypeICAO, combinedIcaoType),
CAirlineIcaoCode(airlineICAO));
emit presetIcaoCodes(icaoData);
CSimulatedAircraft aircraft;
aircraft.setIcaoCodes(CAircraftIcaoCode(acTypeICAO, combinedIcaoType), CAirlineIcaoCode(airlineICAO));
emit presetIcaoCodes(aircraft);
}
void Client::presetLoginModeCmd(QTextStream &args)
@@ -323,7 +323,7 @@ void Client::setOwnAircraftCmd(QTextStream &args)
int xpdrCode;
QString xpdrMode;
args >> lat >> lon >> alt >> hdg >> pitch >> bank >> gs >> com1 >> com2 >> xpdrCode >> xpdrMode;
BlackMisc::Aviation::CAircraft aircraft("", BlackMisc::Network::CUser(), BlackMisc::Aviation::CAircraftSituation(
BlackMisc::Simulation::CSimulatedAircraft aircraft("", BlackMisc::Network::CUser(), BlackMisc::Aviation::CAircraftSituation(
BlackMisc::Geo::CCoordinateGeodetic(lat, lon, 0),
BlackMisc::Aviation::CAltitude(alt, BlackMisc::Aviation::CAltitude::MeanSeaLevel, BlackMisc::PhysicalQuantities::CLengthUnit::ft()),
BlackMisc::Aviation::CHeading(hdg, BlackMisc::Aviation::CHeading::True, BlackMisc::PhysicalQuantities::CAngleUnit::deg()),
@@ -531,9 +531,9 @@ void Client::pilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign)
std::cout << "PILOT_DISCONNECTED " << callsign << std::endl;
}
void Client::icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcaoData &icaoData)
void Client::icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery)
{
std::cout << "PLANE_INFO_REPLY " << callsign << " " << icaoData.toStdString();
std::cout << "PLANE_INFO_REPLY " << callsign << " " << aircraftIcaoDesignator.toStdString() << " " << airlineIcaoDesignator.toStdString() << " " << livery.toStdString();
}
void Client::pongReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CTime &elapsedTime)

View File

@@ -73,7 +73,7 @@ signals: //to send to INetwork
void presetServer(const BlackMisc::Network::CServer &server);
void presetCallsign(const BlackMisc::Aviation::CCallsign &callsign);
void presetRealName(const QString &name);
void presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoData &icao);
void presetIcaoCodes(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
void presetLoginMode(BlackCore::INetwork::LoginMode mode);
void initiateConnection();
void terminateConnection();
@@ -112,7 +112,7 @@ public slots: //to receive from INetwork
void metarReplyReceived(const QString &data);
void flightPlanReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CFlightPlan &flightPlan);
void pilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign);
void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcaoData &icaoData);
void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery);
void pongReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CTime &elapsedTime);
void textMessagesReceived(const BlackMisc::Network::CTextMessageList &messages);
void customPacketReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data);

View File

@@ -13,6 +13,7 @@
using namespace BlackCore;
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Network;
using namespace BlackMisc::Geo;
using namespace BlackMisc::PhysicalQuantities;
@@ -23,13 +24,13 @@ void BlackCoreTest::CTestNetwork::networkTest(BlackCore::INetwork *net)
QVERIFY(string == "Connected");
Expect e(net);
CSimulatedAircraft aircraft;
aircraft.setIcaoCodes(CAircraftIcaoCode("C172", "L1P"), CAirlineIcaoCode("YYY"));
EXPECT_UNIT(e)
.send(&INetwork::presetServer, CServer("", "", "vatsim-germany.org", 6809, CUser("1234567", "", "", "123456")))
.send(&INetwork::presetCallsign, "SWIFT")
.send(&INetwork::presetIcaoCodes, CAircraftIcaoData(
CAircraftIcaoCode("C172", "L1P"),
CAirlineIcaoCode("YYY")))
.send(&INetwork::presetIcaoCodes, aircraft)
.send(&INetwork::initiateConnection)
.expect(&INetwork::connectionStatusChanged, [](INetwork::ConnectionStatus, INetwork::ConnectionStatus newStatus)
{

View File

@@ -9,15 +9,17 @@
#include "testreaders.h"
#include "expect.h"
#include "blackcore/global_reader_settings.h"
#include "blackcore/settings/global_reader_settings.h"
#include "blackmisc/networkutils.h"
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/airlineicaocode.h"
using namespace BlackCore;
using namespace BlackCore::Settings;
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Network;
namespace BlackCoreTest
{
@@ -43,8 +45,8 @@ namespace BlackCoreTest
m_icaoReader.start();
Expect e(&this->m_icaoReader);
EXPECT_UNIT(e)
.send(&CIcaoDataReader::readInBackgroundThread)
.expect(&CIcaoDataReader::readAll, [server]()
.send(&CIcaoDataReader::readInBackgroundThread, CDbFlags::AllIcaoEntities)
.expect(&CIcaoDataReader::readData, [server]()
{
qDebug() << "Read ICAO data from" << server;
})
@@ -66,10 +68,11 @@ namespace BlackCoreTest
m_modelReader.start();
Expect e(&this->m_modelReader);
EXPECT_UNIT(e)
.send(&CModelDataReader::readInBackgroundThread)
.expect(&CModelDataReader::readAll, [server]()
.send(&CModelDataReader::readInBackgroundThread, CDbFlags::AllIcaoEntities)
.expect(&CModelDataReader::readData, [server]()
{
qDebug() << "Read model data from" << server;
// CDbFlags::flagToString(entity) << CDbFlags::flagToString(state) << number
qDebug() << "Read model data " << server;
})
.wait(10);

View File

@@ -12,11 +12,12 @@
#include "blackmisc/aviation/heading.h"
#include "blackmisc/aviation/informationmessage.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/aviation/callsignset.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/navsystem.h"
#include "blackmisc/aviation/transponder.h"
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/aviation/atcstation.h"
#include "blackmisc/network/user.h"
#include "blackmisc/network/server.h"
@@ -163,12 +164,13 @@ namespace BlackMiscTest
CAircraftSituation situation2(situation1);
QVERIFY2(situation1 == situation2, "situations shall be equal");
CAircraftIcaoData icao1(
CAircraftIcaoCode("C172", "L1P"),
CAirlineIcaoCode("GA")
);
CAircraftIcaoData icao2(icao1);
QVERIFY2(icao1 == icao2, "ICAOs shall be equal");
CAircraftIcaoCode aircraftIcao1("C172", "L1P");
CAircraftIcaoCode aircraftIcao2(aircraftIcao1);
QVERIFY2(aircraftIcao1 == aircraftIcao2, "aircraft ICAOs shall be equal");
CAirlineIcaoCode airlineIcao1("GA");
CAirlineIcaoCode airlineIcao2(airlineIcao1);
QVERIFY2(airlineIcao1 == airlineIcao2, "airline ICAOs shall be equal");
CCallsign call1("EDDS_N_APP", CCallsign::Atc);
CCallsign call2("edds_n_app", CCallsign::Atc);