From a4db91e79695c74a20a6c293ee10f3a2b8d6bb3b Mon Sep 17 00:00:00 2001
From: abcd <qt-info@nokia.com>
Date: Tue, 26 Jul 2011 10:47:17 +1000
Subject: Remove label from geolocation

The rest API does not support labels for locations

Change-Id: I2737072fe2e577926d96549233324fe38fd960c4
Reviewed-on: http://codereview.qt.nokia.com/2136
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
---
 tests/auto/qgeolocation/tst_qgeolocation.cpp | 17 -----------------
 tests/auto/qgeolocation/tst_qgeolocation.h   |  2 --
 2 files changed, 19 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/qgeolocation/tst_qgeolocation.cpp b/tests/auto/qgeolocation/tst_qgeolocation.cpp
index e4a7d70c..d638112f 100644
--- a/tests/auto/qgeolocation/tst_qgeolocation.cpp
+++ b/tests/auto/qgeolocation/tst_qgeolocation.cpp
@@ -72,7 +72,6 @@ void tst_QGeoLocation::constructor()
     QCOMPARE(m_location.viewport(), m_viewport);
     QCOMPARE(m_location.additionalData().count(), 0);
     QCOMPARE(m_location.additionalData(), m_additionalData );
-    QCOMPARE(m_location.label(), m_label);
     QCOMPARE(m_location.locationId(), m_locationId);
 }
 
@@ -174,16 +173,6 @@ void tst_QGeoLocation::navigationPositions()
     QVERIFY(m_location.navigationPositions() != m_navigationPositions);
 }
 
-void tst_QGeoLocation::label()
-{
-    m_label = "testText";
-    m_location.setLabel(m_label);
-    QCOMPARE(m_location.label(), m_label);
-
-    m_label = "differentText";
-    QVERIFY(m_location.label() != m_label);
-}
-
 void tst_QGeoLocation::locationId()
 {
     m_locationId = "id";
@@ -261,9 +250,6 @@ void tst_QGeoLocation::comparison()
     navPos.append(QGeoCoordinate(10,2));
     location.setNavigationPositions(navPos);
 
-    //set label
-    location.setLabel("label");
-
     //set locationId
     location.setLocationId("id");
 
@@ -288,8 +274,6 @@ void tst_QGeoLocation::comparison()
             navPos.clear();
             navPos.append(QGeoCoordinate(-5, -5));
             otherLocation.setNavigationPositions(navPos);
-        } else if (dataField == "label") {
-            otherLocation.setLabel("otherLabel");
         } else if (dataField == "locationId") {
             otherLocation.setLocationId("otherId");
         } else {
@@ -308,7 +292,6 @@ void tst_QGeoLocation::comparison_data()
     QTest::newRow("coordinate") << "coordinate";
     QTest::newRow("additionalData") << "additionalData";
     QTest::newRow("navigationPositions") << "navigationPositions";
-    QTest::newRow("label") << "label";
     QTest::newRow("locationId") << "locationId";
 }
 
diff --git a/tests/auto/qgeolocation/tst_qgeolocation.h b/tests/auto/qgeolocation/tst_qgeolocation.h
index 8ae94b08..bf05e8fe 100644
--- a/tests/auto/qgeolocation/tst_qgeolocation.h
+++ b/tests/auto/qgeolocation/tst_qgeolocation.h
@@ -77,7 +77,6 @@ private Q_SLOTS:
     void viewport();
     void additionalData();
     void navigationPositions();
-    void label();
     void locationId();
     void operators();
     void comparison();
@@ -93,7 +92,6 @@ private:
 
     QVariantHash m_additionalData;
     QList<QGeoCoordinate> m_navigationPositions;
-    QString m_label;
     QString m_locationId;
 };
 
-- 
cgit v1.2.1