Populate error information if required parameters (app_id and token) are absent.

Change-Id: Ia110416b1cd64425abcb3ebcf79209b635050b0b
Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>

5 files changed, 32 insertions, 3 deletions

diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml
index 02ad0e92..72ce5861 100644
--- a/tests/auto/declarative_ui/tst_map.qml
+++ b/tests/auto/declarative_ui/tst_map.qml
@@ -49,7 +49,18 @@ Item {
     // General-purpose elements for the test:
     Plugin { id: testPlugin; name: "qmlgeo.test.plugin"; allowExperimental: true }
     Plugin { id: testPlugin2; name: "gmlgeo.test.plugin"; allowExperimental: true }
-    Plugin { id: nokiaPlugin; name: "nokia"; }
+    Plugin { id: nokiaPlugin; name: "nokia";
+        parameters: [
+                       PluginParameter {
+                           name: "app_id"
+                           value: "stub"
+                       },
+                       PluginParameter {
+                           name: "token"
+                           value: "stub"
+                       }
+                   ]
+    }
     Coordinate{ id: coordinate1; latitude: 10; longitude: 11}
     Coordinate{ id: coordinate2; latitude: 12; longitude: 13}
     Coordinate{ id: coordinate3; latitude: 50; longitude: 50; altitude: 0}
diff --git a/tests/auto/declarative_ui/tst_map_maptype.qml b/tests/auto/declarative_ui/tst_map_maptype.qml
index 7d1a0f3a..a73130e6 100644
--- a/tests/auto/declarative_ui/tst_map_maptype.qml
+++ b/tests/auto/declarative_ui/tst_map_maptype.qml
@@ -51,6 +51,16 @@ TestCase {
     Plugin {
         id: nokiaPlugin
         name: "nokia"
+        parameters: [
+                       PluginParameter {
+                           name: "app_id"
+                           value: "stub"
+                       },
+                       PluginParameter {
+                           name: "token"
+                           value: "stub"
+                       }
+                   ]
     }
 
     Map {
diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp
index 6c710199..87ef7847 100644
--- a/tests/auto/nokia_services/routing/tst_routing.cpp
+++ b/tests/auto/nokia_services/routing/tst_routing.cpp
@@ -337,6 +337,8 @@ void tst_nokia_routing::initTestCase()
 
     QMap<QString, QVariant> parameters;
     parameters.insert(QStringLiteral("nam"), QVariant::fromValue<void*>(m_networkManager));
+    parameters.insert(QStringLiteral("app_id"), "stub");
+    parameters.insert(QStringLiteral("token"), "stub");
 
     m_geoServiceProvider = new QGeoServiceProvider(QStringLiteral("nokia"), parameters);
     QVERIFY(m_geoServiceProvider);
diff --git a/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp b/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp
index 48b75ff7..ef08baf1 100644
--- a/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp
+++ b/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp
@@ -3134,7 +3134,10 @@ void tst_QPlaceManagerJsonDb::providerIcons()
     QPlaceReply * catInitReply = placeManager->initializeCategories();
     QVERIFY(checkSignals(catInitReply, QPlaceReply::NoError));
 
-    QGeoServiceProvider *nokiaProvider = new QGeoServiceProvider(QLatin1String("nokia"));
+    QMap<QString,QVariant> credentials;
+    credentials.insert("app_id", "stub");
+    credentials.insert("token", "stub");
+    QGeoServiceProvider *nokiaProvider = new QGeoServiceProvider(QLatin1String("nokia"), credentials);
     QPlaceManager *nokiaManager = nokiaProvider->placeManager();
     Q_ASSERT(nokiaManager);
 
diff --git a/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp b/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp
index eae75a3d..c1bf04b0 100644
--- a/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp
+++ b/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp
@@ -92,7 +92,10 @@ void tst_QPlaceManagerNokia::initTestCase()
     QStringList providers = QGeoServiceProvider::availableServiceProviders();
     providers.contains("nokia_places_jsondb");
 
-    provider = new QGeoServiceProvider("nokia");
+    QMap<QString, QVariant> params;
+    params.insert("app_id", "stub");
+    params.insert("token", "stub");
+    provider = new QGeoServiceProvider("nokia", params);
     placeManager = provider->placeManager();
     QVERIFY(placeManager);
 }