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

Renamed to connectServer

Browse Source
This commit is contained in:
Klaus Basan
2017-09-14 17:22:30 +02:00
committed by Mathew Sutcliffe
parent b01c7d6333
commit 2b638caf80
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/blackcore/testreaders.cpp
View File

@@ -65,7 +65,7 @@ namespace BlackCoreTest
{ {
const CUrl url(sApp->getGlobalSetup().getDbIcaoReaderUrl()); const CUrl url(sApp->getGlobalSetup().getDbIcaoReaderUrl());
qDebug() << "Reader URL" << url.toQString(); qDebug() << "Reader URL" << url.toQString();
if (!this->pingServer(url)) { QSKIP("Server not reachable."); return; } if (!this->connectServer(url)) { QSKIP("Server not reachable."); return; }
m_icaoReader->start(); m_icaoReader->start();
m_icaoReader->readInBackgroundThread(CEntityFlags::AllIcaoEntities, QDateTime()); m_icaoReader->readInBackgroundThread(CEntityFlags::AllIcaoEntities, QDateTime());
@@ -116,7 +116,7 @@ namespace BlackCoreTest
{ {
const CUrl url(sApp->getGlobalSetup().getDbModelReaderUrl()); const CUrl url(sApp->getGlobalSetup().getDbModelReaderUrl());
qDebug() << "Reader URL" << url.toQString(); qDebug() << "Reader URL" << url.toQString();
if (!this->pingServer(url)) { QSKIP("Server not reachable."); return; } if (!this->connectServer(url)) { QSKIP("Server not reachable."); return; }
m_modelReader->start(); m_modelReader->start();
m_modelReader->readInBackgroundThread(CEntityFlags::ModelEntity, QDateTime()); m_modelReader->readInBackgroundThread(CEntityFlags::ModelEntity, QDateTime());
@@ -142,7 +142,7 @@ namespace BlackCoreTest
const CUrl url(sApp->getGlobalSetup().getDbAirportReaderUrl()); const CUrl url(sApp->getGlobalSetup().getDbAirportReaderUrl());
qDebug() << "Reader URL" << url.toQString(); qDebug() << "Reader URL" << url.toQString();
if (!this->pingServer(url)) { QSKIP("Server not reachable."); return; } if (!this->connectServer(url)) { QSKIP("Server not reachable."); return; }
m_airportReader->start(); m_airportReader->start();
m_airportReader->readInBackgroundThread(CEntityFlags::AirportEntity, QDateTime()); m_airportReader->readInBackgroundThread(CEntityFlags::AirportEntity, QDateTime());
@@ -153,7 +153,7 @@ namespace BlackCoreTest
} }
QVERIFY2(this->m_airportReader->getAirports().size() > 0, "No airports"); QVERIFY2(this->m_airportReader->getAirports().size() > 0, "No airports");
auto heathrow = this->m_airportReader->getAirports().findByIcao("EGLL"); const auto heathrow = this->m_airportReader->getAirports().findByIcao("EGLL");
QVERIFY2(heathrow.size() == 1, "No Heathrow"); QVERIFY2(heathrow.size() == 1, "No Heathrow");
QVERIFY2(heathrow[0].isOperating(), "Wrong airport data"); QVERIFY2(heathrow[0].isOperating(), "Wrong airport data");
@@ -164,7 +164,7 @@ namespace BlackCoreTest
CApplication::processEventsFor(2500); // make sure events are processed CApplication::processEventsFor(2500); // make sure events are processed
} }
bool CTestReaders::pingServer(const CUrl &url) bool CTestReaders::connectServer(const CUrl &url)
{ {
QString m; QString m;
if (CNetworkUtils::canConnect(url, m, 2500)) if (CNetworkUtils::canConnect(url, m, 2500))

2
tests/blackcore/testreaders.h
View File

@@ -60,7 +60,7 @@ namespace BlackCoreTest
BlackCore::Db::CModelDataReader *m_modelReader = nullptr; BlackCore::Db::CModelDataReader *m_modelReader = nullptr;
//! Test if server is available //! Test if server is available
static bool pingServer(const BlackMisc::Network::CUrl &url); static bool connectServer(const BlackMisc::Network::CUrl &url);
}; };
} //namespace } //namespace