From 2b638caf80c7ee53976e3de26e5108c9a038a7ad Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 14 Sep 2017 17:22:30 +0200 Subject: [PATCH] Renamed to connectServer --- tests/blackcore/testreaders.cpp | 10 +++++----- tests/blackcore/testreaders.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/blackcore/testreaders.cpp b/tests/blackcore/testreaders.cpp index 14b15202a..d11cf33a0 100644 --- a/tests/blackcore/testreaders.cpp +++ b/tests/blackcore/testreaders.cpp @@ -65,7 +65,7 @@ namespace BlackCoreTest { const CUrl url(sApp->getGlobalSetup().getDbIcaoReaderUrl()); 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->readInBackgroundThread(CEntityFlags::AllIcaoEntities, QDateTime()); @@ -116,7 +116,7 @@ namespace BlackCoreTest { const CUrl url(sApp->getGlobalSetup().getDbModelReaderUrl()); 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->readInBackgroundThread(CEntityFlags::ModelEntity, QDateTime()); @@ -142,7 +142,7 @@ namespace BlackCoreTest const CUrl url(sApp->getGlobalSetup().getDbAirportReaderUrl()); 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->readInBackgroundThread(CEntityFlags::AirportEntity, QDateTime()); @@ -153,7 +153,7 @@ namespace BlackCoreTest } 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[0].isOperating(), "Wrong airport data"); @@ -164,7 +164,7 @@ namespace BlackCoreTest CApplication::processEventsFor(2500); // make sure events are processed } - bool CTestReaders::pingServer(const CUrl &url) + bool CTestReaders::connectServer(const CUrl &url) { QString m; if (CNetworkUtils::canConnect(url, m, 2500)) diff --git a/tests/blackcore/testreaders.h b/tests/blackcore/testreaders.h index b958070e9..ff17ec590 100644 --- a/tests/blackcore/testreaders.h +++ b/tests/blackcore/testreaders.h @@ -60,7 +60,7 @@ namespace BlackCoreTest BlackCore::Db::CModelDataReader *m_modelReader = nullptr; //! Test if server is available - static bool pingServer(const BlackMisc::Network::CUrl &url); + static bool connectServer(const BlackMisc::Network::CUrl &url); }; } //namespace