Use QUrl instead of QString for URL properties/data.

Change-Id: I6165be414937fefc11c560ed2517d7c7ec87c959
Reviewed-on: http://codereview.qt.nokia.com/3537
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: abcd <qt_abcd1@ovi.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

3 files changed, 16 insertions, 11 deletions

diff --git a/tests/auto/qplacedescription/tst_qplacedescription.cpp b/tests/auto/qplacedescription/tst_qplacedescription.cpp
index 9c05a360..6240e653 100644
--- a/tests/auto/qplacedescription/tst_qplacedescription.cpp
+++ b/tests/auto/qplacedescription/tst_qplacedescription.cpp
@@ -75,9 +75,10 @@ void tst_QPlaceDescription::contentTypeTest()
 void tst_QPlaceDescription::sourceUrlTest()
 {
     QPlaceDescription testObj;
-    QVERIFY2(testObj.sourceUrl() == QString(), "Wrong default value");
-    testObj.setSourceUrl("testText");
-    QVERIFY2(testObj.sourceUrl() == "testText", "Wrong value returned");
+    const QUrl testUrl = QUrl::fromEncoded("http://example.com/testUrl");
+    QVERIFY2(testObj.sourceUrl() == QUrl(), "Wrong default value");
+    testObj.setSourceUrl(testUrl);
+    QVERIFY2(testObj.sourceUrl() == testUrl, "Wrong value returned");
 }
 
 void tst_QPlaceDescription::languageTest()
diff --git a/tests/auto/qplacereview/tst_qplacereview.cpp b/tests/auto/qplacereview/tst_qplacereview.cpp
index 77d35237..a3b22e50 100644
--- a/tests/auto/qplacereview/tst_qplacereview.cpp
+++ b/tests/auto/qplacereview/tst_qplacereview.cpp
@@ -162,9 +162,10 @@ void tst_QPlaceReview::userNameTest()
 void tst_QPlaceReview::originatorUrlTest()
 {
     QPlaceReview testObj;
-    QVERIFY2(testObj.originatorUrl() == QString(), "Wrong default value");
-    testObj.setOriginatorUrl("testText");
-    QVERIFY2(testObj.originatorUrl() == "testText", "Wrong value returned");
+    const QUrl testUrl = QUrl::fromEncoded("http://example.com/testUrl");
+    QVERIFY2(testObj.originatorUrl() == QUrl(), "Wrong default value");
+    testObj.setOriginatorUrl(testUrl);
+    QVERIFY2(testObj.originatorUrl() == testUrl, "Wrong value returned");
 }
 
 QTEST_APPLESS_MAIN(tst_QPlaceReview);
diff --git a/tests/auto/qplacesupplier/tst_qplacesupplier.cpp b/tests/auto/qplacesupplier/tst_qplacesupplier.cpp
index fce0e35b..5145268f 100644
--- a/tests/auto/qplacesupplier/tst_qplacesupplier.cpp
+++ b/tests/auto/qplacesupplier/tst_qplacesupplier.cpp
@@ -55,23 +55,26 @@ void tst_QPlaceSupplier::supplierIdTest()
 void tst_QPlaceSupplier::urlTest()
 {
     QPlaceSupplier testObj;
+    const QUrl testUrl = QUrl::fromEncoded("http://example.com/testUrl");
     QVERIFY2(testObj.url() == QString(), "Wrong default value");
-    testObj.setUrl("testText");
-    QVERIFY2(testObj.url() == "testText", "Wrong value returned");
+    testObj.setUrl(testUrl);
+    QVERIFY2(testObj.url() == testUrl, "Wrong value returned");
 }
 
 void tst_QPlaceSupplier::supplierIconUrlTest()
 {
     QPlaceSupplier testObj;
+    const QUrl testUrl = QUrl::fromEncoded("http://example.com/testUrl");
     QVERIFY2(testObj.supplierIconUrl() == QString(), "Wrong default value");
-    testObj.setSupplierIconUrl("testText");
-    QVERIFY2(testObj.supplierIconUrl() == "testText", "Wrong value returned");
+    testObj.setSupplierIconUrl(testUrl);
+    QVERIFY2(testObj.supplierIconUrl() == testUrl, "Wrong value returned");
 }
 
 void tst_QPlaceSupplier::operatorsTest()
 {
     QPlaceSupplier testObj;
-    testObj.setSupplierIconUrl("testValue");
+    const QUrl testUrl = QUrl::fromEncoded("http://example.com/testUrl");
+    testObj.setSupplierIconUrl(testUrl);
     QPlaceSupplier testObj2;
     testObj2 = testObj;
     QVERIFY2(testObj == testObj2, "Not copied correctly");