Commit 53a32bd5 authored by DonLakeFlyer's avatar DonLakeFlyer

Fail all queries while running unit tests

parent 1d0a8d8e
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "TerrainQuery.h" #include "TerrainQuery.h"
#include "QGCMapEngine.h" #include "QGCMapEngine.h"
#include "QGeoMapReplyQGC.h" #include "QGeoMapReplyQGC.h"
#include "QGCApplication.h"
#include <QUrl> #include <QUrl>
#include <QUrlQuery> #include <QUrlQuery>
...@@ -36,6 +37,11 @@ TerrainAirMapQuery::TerrainAirMapQuery(QObject* parent) ...@@ -36,6 +37,11 @@ TerrainAirMapQuery::TerrainAirMapQuery(QObject* parent)
void TerrainAirMapQuery::requestCoordinateHeights(const QList<QGeoCoordinate>& coordinates) void TerrainAirMapQuery::requestCoordinateHeights(const QList<QGeoCoordinate>& coordinates)
{ {
if (qgcApp()->runningUnitTests()) {
emit coordinateHeights(false, QList<double>());
return;
}
QString points; QString points;
foreach (const QGeoCoordinate& coord, coordinates) { foreach (const QGeoCoordinate& coord, coordinates) {
points += QString::number(coord.latitude(), 'f', 10) + "," points += QString::number(coord.latitude(), 'f', 10) + ","
...@@ -52,6 +58,11 @@ void TerrainAirMapQuery::requestCoordinateHeights(const QList<QGeoCoordinate>& c ...@@ -52,6 +58,11 @@ void TerrainAirMapQuery::requestCoordinateHeights(const QList<QGeoCoordinate>& c
void TerrainAirMapQuery::requestPathHeights(const QGeoCoordinate& fromCoord, const QGeoCoordinate& toCoord) void TerrainAirMapQuery::requestPathHeights(const QGeoCoordinate& fromCoord, const QGeoCoordinate& toCoord)
{ {
if (qgcApp()->runningUnitTests()) {
emit pathHeights(false, qQNaN(), qQNaN(), QList<double>());
return;
}
QString points; QString points;
points += QString::number(fromCoord.latitude(), 'f', 10) + "," points += QString::number(fromCoord.latitude(), 'f', 10) + ","
+ QString::number(fromCoord.longitude(), 'f', 10) + ","; + QString::number(fromCoord.longitude(), 'f', 10) + ",";
...@@ -67,6 +78,11 @@ void TerrainAirMapQuery::requestPathHeights(const QGeoCoordinate& fromCoord, con ...@@ -67,6 +78,11 @@ void TerrainAirMapQuery::requestPathHeights(const QGeoCoordinate& fromCoord, con
void TerrainAirMapQuery::requestCarpetHeights(const QGeoCoordinate& swCoord, const QGeoCoordinate& neCoord, bool statsOnly) void TerrainAirMapQuery::requestCarpetHeights(const QGeoCoordinate& swCoord, const QGeoCoordinate& neCoord, bool statsOnly)
{ {
if (qgcApp()->runningUnitTests()) {
emit carpetHeights(false, qQNaN(), qQNaN(), QList<QList<double>>());
return;
}
QString points; QString points;
points += QString::number(swCoord.latitude(), 'f', 10) + "," points += QString::number(swCoord.latitude(), 'f', 10) + ","
+ QString::number(swCoord.longitude(), 'f', 10) + ","; + QString::number(swCoord.longitude(), 'f', 10) + ",";
...@@ -229,6 +245,11 @@ TerrainOfflineAirMapQuery::TerrainOfflineAirMapQuery(QObject* parent) ...@@ -229,6 +245,11 @@ TerrainOfflineAirMapQuery::TerrainOfflineAirMapQuery(QObject* parent)
void TerrainOfflineAirMapQuery::requestCoordinateHeights(const QList<QGeoCoordinate>& coordinates) void TerrainOfflineAirMapQuery::requestCoordinateHeights(const QList<QGeoCoordinate>& coordinates)
{ {
if (qgcApp()->runningUnitTests()) {
emit coordinateHeights(false, QList<double>());
return;
}
if (coordinates.length() == 0) { if (coordinates.length() == 0) {
return; return;
} }
...@@ -238,11 +259,21 @@ void TerrainOfflineAirMapQuery::requestCoordinateHeights(const QList<QGeoCoordin ...@@ -238,11 +259,21 @@ void TerrainOfflineAirMapQuery::requestCoordinateHeights(const QList<QGeoCoordin
void TerrainOfflineAirMapQuery::requestPathHeights(const QGeoCoordinate& fromCoord, const QGeoCoordinate& toCoord) void TerrainOfflineAirMapQuery::requestPathHeights(const QGeoCoordinate& fromCoord, const QGeoCoordinate& toCoord)
{ {
if (qgcApp()->runningUnitTests()) {
emit pathHeights(false, qQNaN(), qQNaN(), QList<double>());
return;
}
_terrainTileManager->addPathQuery(this, fromCoord, toCoord); _terrainTileManager->addPathQuery(this, fromCoord, toCoord);
} }
void TerrainOfflineAirMapQuery::requestCarpetHeights(const QGeoCoordinate& swCoord, const QGeoCoordinate& neCoord, bool statsOnly) void TerrainOfflineAirMapQuery::requestCarpetHeights(const QGeoCoordinate& swCoord, const QGeoCoordinate& neCoord, bool statsOnly)
{ {
if (qgcApp()->runningUnitTests()) {
emit carpetHeights(false, qQNaN(), qQNaN(), QList<QList<double>>());
return;
}
// TODO // TODO
Q_UNUSED(swCoord); Q_UNUSED(swCoord);
Q_UNUSED(neCoord); Q_UNUSED(neCoord);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment