From 9bf1833aace4dc7a131b87940075aa9e4db2404d Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 19 Oct 2016 20:18:08 +0200
Subject: [PATCH] Improved messages in reader UNIT test * info about URL
 connected * reflect changes in global setup for airport reader

---
 tests/blackcore/testreaders.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/tests/blackcore/testreaders.cpp b/tests/blackcore/testreaders.cpp
index 44cdb3647..16cd0f2b8 100644
--- a/tests/blackcore/testreaders.cpp
+++ b/tests/blackcore/testreaders.cpp
@@ -60,7 +60,8 @@ namespace BlackCoreTest
     void CTestReaders::readIcaoData()
     {
         const CUrl url(sApp->getGlobalSetup().getDbIcaoReaderUrl());
-        if (!this->pingServer(url)) { QSKIP("Server not reachable."); }
+        qDebug() << "Reader URL" << url.toQString();
+        if (!this->pingServer(url)) { QSKIP("Server not reachable."); return; }
         m_icaoReader->start();
         m_icaoReader->readInBackgroundThread(CEntityFlags::AllIcaoEntities, QDateTime());
 
@@ -92,7 +93,8 @@ namespace BlackCoreTest
     void CTestReaders::readModelData()
     {
         const CUrl url(sApp->getGlobalSetup().getDbModelReaderUrl());
-        if (!this->pingServer(url)) { QSKIP("Server not reachable."); }
+        qDebug() << "Reader URL" << url.toQString();
+        if (!this->pingServer(url)) { QSKIP("Server not reachable."); return; }
         m_modelReader->start();
         m_modelReader->readInBackgroundThread(CEntityFlags::ModelEntity, QDateTime());
 
@@ -120,8 +122,9 @@ namespace BlackCoreTest
         using namespace BlackMisc::Geo;
         using namespace BlackMisc::PhysicalQuantities;
 
-        const CUrl url(sApp->getGlobalSetup().getSwiftAirportUrls().getRandomWorkingUrl());
-        if (!this->pingServer(url)) { return; }
+        const CUrl url(sApp->getGlobalSetup().getDbAirportReaderUrl());
+        qDebug() << "Reader URL" << url.toQString();
+        if (!this->pingServer(url)) { QSKIP("Server not reachable."); return; }
         m_airportReader->start();
         m_airportReader->readInBackgroundThread(CEntityFlags::AirportEntity, QDateTime());
 
@@ -147,12 +150,16 @@ namespace BlackCoreTest
     bool CTestReaders::pingServer(const CUrl &url)
     {
         QString m;
-        if (!CNetworkUtils::canConnect(url, m, 2500))
+        if (CNetworkUtils::canConnect(url, m, 2500))
         {
-            qWarning() << "Skipping unit test as" << url.getFullUrl() << "cannot be connected";
+            qDebug() << "URL" << url.getFullUrl() << "connected";
+            return true;
+        }
+        else
+        {
+            qWarning() << "URL" << url.getFullUrl() << "cannot be connected";
             return false;
         }
-        return true;
     }
 } // ns