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

Issue #77 Factor out parts of CDirectoryUtils into CSwiftDirectories

Browse Source 
CDirectoryUtils is utilities for manipulating directories.
CSwiftDirectories is getters that return directories used by swift.
This commit is contained in:
Mat Sutcliffe
2020-08-24 22:04:10 +01:00
parent 802576eda9
commit 8e065a8fef
61 changed files with 880 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackmisc/test/testdata.cpp
View File

@@ -13,6 +13,7 @@
#include "blackmisc/network/userlist.h"
#include "blackmisc/network/server.h"
#include "blackmisc/fileutils.h"
#include "blackmisc/swiftdirectories.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/variantlist.h"
#include "blackmisc/math/mathutils.h"
@@ -243,7 +244,7 @@ namespace BlackMisc
const CAircraftIcaoCode &CTestData::getDBAircraftIcaoB737()
{
static const QString json = CFileUtils::readFileToString(CDirectoryUtils::testFilesDirectory(), "DBAircraftIcaoB737Boeing.json");
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBAircraftIcaoB737Boeing.json");
static const CAircraftIcaoCode icao(CAircraftIcaoCode::fromJson(json));
Q_ASSERT(icao.hasValidDbKey());
return icao;
@@ -251,7 +252,7 @@ namespace BlackMisc
const CAircraftIcaoCode &CTestData::getDBAircraftIcaoC172()
{
static const QString json = CFileUtils::readFileToString(CDirectoryUtils::testFilesDirectory(), "DBAircraftIcaoC172Cessna.json");
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBAircraftIcaoC172Cessna.json");
static const CAircraftIcaoCode icao(CAircraftIcaoCode::fromJson(json));
Q_ASSERT(icao.hasValidDbKey());
return icao;
@@ -259,7 +260,7 @@ namespace BlackMisc
const CAirlineIcaoCode &CTestData::getDbAirlineIcaoDLH()
{
static const QString json = CFileUtils::readFileToString(CDirectoryUtils::testFilesDirectory(), "DBAirlineIcaoDLH.json");
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBAirlineIcaoDLH.json");
static const CAirlineIcaoCode icao(CAirlineIcaoCode::fromJson(json));
Q_ASSERT(icao.hasValidDbKey());
return icao;
@@ -267,7 +268,7 @@ namespace BlackMisc
const CAirlineIcaoCode &CTestData::getDbAirlineIcaoBAW()
{
static const QString json = CFileUtils::readFileToString(CDirectoryUtils::testFilesDirectory(), "DBAirlineIcaoBAW.json");
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBAirlineIcaoBAW.json");
static const CAirlineIcaoCode icao(CAirlineIcaoCode::fromJson(json));
Q_ASSERT(icao.hasValidDbKey());
return icao;
@@ -275,7 +276,7 @@ namespace BlackMisc
const CLivery &CTestData::getDbLiveryDLHStarAlliance()
{
static const QString json = CFileUtils::readFileToString(CDirectoryUtils::testFilesDirectory(), "DBLiveryDLHStarAlliance.json");
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBLiveryDLHStarAlliance.json");
static const CLivery livery(CLivery::fromJson(json));
Q_ASSERT(livery.hasValidDbKey());
return livery;
@@ -283,7 +284,7 @@ namespace BlackMisc
const CAircraftModel &CTestData::getDbAircraftModelFsxA2AC172Skyhawk()
{
static const QString json = CFileUtils::readFileToString(CDirectoryUtils::testFilesDirectory(), "DBModelFSXA2ACessnaC172.json");
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBModelFSXA2ACessnaC172.json");
static const CAircraftModel model(CAircraftModel::fromDatabaseJson(Json::jsonObjectFromString(json)));
Q_ASSERT(model.hasValidDbKey());
Q_ASSERT(!model.getModelString().isEmpty());
@@ -292,7 +293,7 @@ namespace BlackMisc
const CAircraftModel &CTestData::getDbAircraftModelFsxAerosoftA320()
{
static const QString json = CFileUtils::readFileToString(CDirectoryUtils::testFilesDirectory(), "DBModelFSXAerosoftA320.json");
static const QString json = CFileUtils::readFileToString(CSwiftDirectories::testFilesDirectory(), "DBModelFSXAerosoftA320.json");
static const CAircraftModel model(CAircraftModel::fromDatabaseJson(Json::jsonObjectFromString(json)));
Q_ASSERT(model.hasValidDbKey());
Q_ASSERT(!model.getModelString().isEmpty());