diff options
| author | abcd <amos.choy@nokia.com> | 2012-01-27 12:28:28 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 04:40:48 +0100 |
| commit | 074260af5a59c2a6a9d49cf0b4b9e8a5db5b11f8 (patch) | |
| tree | c99d3107da3df7971e7062bbdee172c1775aeb2f /tests/auto/qplacesupplier | |
| parent | 2250712e52f15dae62e74f2106e2226a42635deb (diff) | |
| download | qtlocation-074260af5a59c2a6a9d49cf0b4b9e8a5db5b11f8.tar.gz | |
Refactor Icons
Change-Id: I702e8a1b6f0e80cb990315165f1bf331a82e65a5
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'tests/auto/qplacesupplier')
| -rw-r--r-- | tests/auto/qplacesupplier/tst_qplacesupplier.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/qplacesupplier/tst_qplacesupplier.cpp b/tests/auto/qplacesupplier/tst_qplacesupplier.cpp index 1c23d052..f10f6cc1 100644 --- a/tests/auto/qplacesupplier/tst_qplacesupplier.cpp +++ b/tests/auto/qplacesupplier/tst_qplacesupplier.cpp @@ -107,14 +107,16 @@ void tst_QPlaceSupplier::iconTest() QPlaceSupplier testObj; QVERIFY(testObj.icon().isEmpty()); QPlaceIcon icon; - icon.setFullUrl(QUrl::fromEncoded("http://example.com/icon.png")); + QVariantMap iconParams; + iconParams.insert(QPlaceIcon::SingleUrl, QUrl::fromEncoded("http://example.com/icon.png")); + icon.setParameters(iconParams); testObj.setIcon(icon); QCOMPARE(testObj.icon(), icon); - QCOMPARE(testObj.icon().fullUrl(), QUrl::fromEncoded("http://example.com/icon.png")); + QCOMPARE(testObj.icon().url(), QUrl::fromEncoded("http://example.com/icon.png")); testObj.setIcon(QPlaceIcon()); QVERIFY(testObj.icon().isEmpty()); - QCOMPARE(testObj.icon().fullUrl(), QUrl()); + QCOMPARE(testObj.icon().url(), QUrl()); } void tst_QPlaceSupplier::operatorsTest() @@ -122,7 +124,9 @@ void tst_QPlaceSupplier::operatorsTest() QPlaceSupplier testObj; testObj.setName(QLatin1String("Acme")); QPlaceIcon icon; - icon.setFullUrl(QUrl::fromEncoded("http://example.com/testUrl")); + QVariantMap iconParams; + iconParams.insert(QPlaceIcon::SingleUrl, QUrl::fromEncoded("http://example.com/icon.png")); + icon.setParameters(iconParams); testObj.setIcon(icon); testObj.setSupplierId(QLatin1String("34292")); |