summaryrefslogtreecommitdiff
path: root/platform/qt/test
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-09-14 14:58:36 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-09-26 11:47:34 +0200
commit1ce6e1b4bb164a9735742b0cf3f63b7417bc96ae (patch)
tree998bedafb64f9567c786d4e13e6f52c67ec2d348 /platform/qt/test
parent2ed81bbaaeecab12ea50813275269a3b1778f8ea (diff)
downloadqtlocation-mapboxgl-1ce6e1b4bb164a9735742b0cf3f63b7417bc96ae.tar.gz
[Qt] Move QMapboxGL::MapChange to QMapbox namespace
Diffstat (limited to 'platform/qt/test')
-rw-r--r--platform/qt/test/qmapboxgl.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/platform/qt/test/qmapboxgl.cpp b/platform/qt/test/qmapboxgl.cpp
index 67b2163ab8..8bcc485d89 100644
--- a/platform/qt/test/qmapboxgl.cpp
+++ b/platform/qt/test/qmapboxgl.cpp
@@ -11,8 +11,8 @@ class QMapboxGLTest : public QObject, public ::testing::Test {
public:
QMapboxGLTest() : app(argc, const_cast<char**>(&argv)), map(nullptr, settings) {
- connect(&map, SIGNAL(mapChanged(QMapboxGL::MapChange)),
- this, SLOT(onMapChanged(QMapboxGL::MapChange)));
+ connect(&map, SIGNAL(mapChanged(QMapbox::MapChange)),
+ this, SLOT(onMapChanged(QMapbox::MapChange)));
connect(&map, SIGNAL(needsRendering()),
this, SLOT(onNeedsRendering()));
@@ -23,8 +23,8 @@ public:
map.setCoordinateZoom(QMapbox::Coordinate(60.170448, 24.942046), 14);
}
- void runUntil(QMapboxGL::MapChange status) {
- changeCallback = [&](QMapboxGL::MapChange change) {
+ void runUntil(QMapbox::MapChange status) {
+ changeCallback = [&](QMapbox::MapChange change) {
if (change == status) {
app.exit();
changeCallback = nullptr;
@@ -45,10 +45,10 @@ protected:
QMapboxGLSettings settings;
QMapboxGL map;
- std::function<void(QMapboxGL::MapChange)> changeCallback;
+ std::function<void(QMapbox::MapChange)> changeCallback;
private slots:
- void onMapChanged(QMapboxGL::MapChange change) {
+ void onMapChanged(QMapbox::MapChange change) {
if (changeCallback) {
changeCallback(change);
}
@@ -65,16 +65,16 @@ TEST_F(QMapboxGLTest, TEST_DISABLED_ON_CI(styleJson)) {
map.setStyleJson(json);
ASSERT_EQ(map.styleJson(), json);
- runUntil(QMapboxGL::MapChangeDidFinishLoadingMap);
+ runUntil(QMapbox::MapChangeDidFinishLoadingMap);
map.setStyleJson("invalid json");
- runUntil(QMapboxGL::MapChangeDidFailLoadingMap);
+ runUntil(QMapbox::MapChangeDidFailLoadingMap);
map.setStyleJson("\"\"");
- runUntil(QMapboxGL::MapChangeDidFailLoadingMap);
+ runUntil(QMapbox::MapChangeDidFailLoadingMap);
map.setStyleJson(QString());
- runUntil(QMapboxGL::MapChangeDidFailLoadingMap);
+ runUntil(QMapbox::MapChangeDidFailLoadingMap);
}
TEST_F(QMapboxGLTest, TEST_DISABLED_ON_CI(styleUrl)) {
@@ -82,13 +82,13 @@ TEST_F(QMapboxGLTest, TEST_DISABLED_ON_CI(styleUrl)) {
map.setStyleUrl(url);
ASSERT_EQ(map.styleUrl(), url);
- runUntil(QMapboxGL::MapChangeDidFinishLoadingMap);
+ runUntil(QMapbox::MapChangeDidFinishLoadingMap);
map.setStyleUrl("invalid://url");
- runUntil(QMapboxGL::MapChangeDidFailLoadingMap);
+ runUntil(QMapbox::MapChangeDidFailLoadingMap);
map.setStyleUrl(QString());
- runUntil(QMapboxGL::MapChangeDidFailLoadingMap);
+ runUntil(QMapbox::MapChangeDidFailLoadingMap);
}
#include "qmapboxgl.moc"