From 53a32bd5141de1e51ff7287994184acda0667963 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Wed, 4 Apr 2018 12:49:07 -0700 Subject: [PATCH] Fail all queries while running unit tests --- src/Terrain/TerrainQuery.cc | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/Terrain/TerrainQuery.cc b/src/Terrain/TerrainQuery.cc index 49fa1a5..e57b9c0 100644 --- a/src/Terrain/TerrainQuery.cc +++ b/src/Terrain/TerrainQuery.cc @@ -10,6 +10,7 @@ #include "TerrainQuery.h" #include "QGCMapEngine.h" #include "QGeoMapReplyQGC.h" +#include "QGCApplication.h" #include #include @@ -36,6 +37,11 @@ TerrainAirMapQuery::TerrainAirMapQuery(QObject* parent) void TerrainAirMapQuery::requestCoordinateHeights(const QList& coordinates) { + if (qgcApp()->runningUnitTests()) { + emit coordinateHeights(false, QList()); + return; + } + QString points; foreach (const QGeoCoordinate& coord, coordinates) { points += QString::number(coord.latitude(), 'f', 10) + "," @@ -52,6 +58,11 @@ void TerrainAirMapQuery::requestCoordinateHeights(const QList& c void TerrainAirMapQuery::requestPathHeights(const QGeoCoordinate& fromCoord, const QGeoCoordinate& toCoord) { + if (qgcApp()->runningUnitTests()) { + emit pathHeights(false, qQNaN(), qQNaN(), QList()); + return; + } + QString points; points += QString::number(fromCoord.latitude(), 'f', 10) + "," + QString::number(fromCoord.longitude(), 'f', 10) + ","; @@ -67,6 +78,11 @@ void TerrainAirMapQuery::requestPathHeights(const QGeoCoordinate& fromCoord, con void TerrainAirMapQuery::requestCarpetHeights(const QGeoCoordinate& swCoord, const QGeoCoordinate& neCoord, bool statsOnly) { + if (qgcApp()->runningUnitTests()) { + emit carpetHeights(false, qQNaN(), qQNaN(), QList>()); + return; + } + QString points; points += QString::number(swCoord.latitude(), 'f', 10) + "," + QString::number(swCoord.longitude(), 'f', 10) + ","; @@ -229,6 +245,11 @@ TerrainOfflineAirMapQuery::TerrainOfflineAirMapQuery(QObject* parent) void TerrainOfflineAirMapQuery::requestCoordinateHeights(const QList& coordinates) { + if (qgcApp()->runningUnitTests()) { + emit coordinateHeights(false, QList()); + return; + } + if (coordinates.length() == 0) { return; } @@ -238,11 +259,21 @@ void TerrainOfflineAirMapQuery::requestCoordinateHeights(const QListrunningUnitTests()) { + emit pathHeights(false, qQNaN(), qQNaN(), QList()); + return; + } + _terrainTileManager->addPathQuery(this, fromCoord, toCoord); } void TerrainOfflineAirMapQuery::requestCarpetHeights(const QGeoCoordinate& swCoord, const QGeoCoordinate& neCoord, bool statsOnly) { + if (qgcApp()->runningUnitTests()) { + emit carpetHeights(false, qQNaN(), qQNaN(), QList>()); + return; + } + // TODO Q_UNUSED(swCoord); Q_UNUSED(neCoord);