diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2013-08-29 11:27:50 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-03 09:06:50 +0200 |
commit | fc53ebdbd043642aaab0ce39f48d7c05231d10fd (patch) | |
tree | edb5635f9fb1c9252f31434452e05e75d7b9bcb7 /tests/auto/qgeocodingmanager | |
parent | 9f98392aff316bff0b89ac20234234e1e3f060e2 (diff) | |
download | qtlocation-fc53ebdbd043642aaab0ce39f48d7c05231d10fd.tar.gz |
Fix some name inconsistencies in QtLocation
1. Rename QGeocoding* classes to QGeoCoding*. This emphasizes the QGeo
prefix rather than the geocing word. The QML interfaces continues to use
the Geocoding* as they don't a prefix as such.
2. Rename QProposedSearchResult to QPlaceProposedSearchResult. The class is place
related and should carry the QPlace name prefix
Change-Id: I428c7e6368774a9f199db5c113de11649e4a665c
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'tests/auto/qgeocodingmanager')
-rw-r--r-- | tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp | 52 | ||||
-rw-r--r-- | tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h | 8 |
2 files changed, 30 insertions, 30 deletions
diff --git a/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp b/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp index 0cc9d329..d3f183b7 100644 --- a/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp +++ b/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp @@ -46,39 +46,39 @@ QT_USE_NAMESPACE -void tst_QGeocodingManager::initTestCase() +void tst_QGeoCodingManager::initTestCase() { /* * Set custom path since CI doesn't install test plugins */ QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath() + QStringLiteral("/../../../plugins")); - tst_QGeocodingManager::loadGeocodingManager(); + tst_QGeoCodingManager::loadGeocodingManager(); } -void tst_QGeocodingManager::cleanupTestCase() +void tst_QGeoCodingManager::cleanupTestCase() { delete qgeoserviceprovider; } -void tst_QGeocodingManager::init() +void tst_QGeoCodingManager::init() { - qRegisterMetaType<QGeocodeReply::Error>("Error"); - qRegisterMetaType<QGeocodeReply*>(); + qRegisterMetaType<QGeoCodeReply::Error>("Error"); + qRegisterMetaType<QGeoCodeReply*>(); - signalerror = new QSignalSpy(qgeocodingmanager, SIGNAL(error(QGeocodeReply*,QGeocodeReply::Error,QString))); - signalfinished = new QSignalSpy(qgeocodingmanager, SIGNAL(finished(QGeocodeReply*))); + signalerror = new QSignalSpy(qgeocodingmanager, SIGNAL(error(QGeoCodeReply*,QGeoCodeReply::Error,QString))); + signalfinished = new QSignalSpy(qgeocodingmanager, SIGNAL(finished(QGeoCodeReply*))); QVERIFY( signalerror->isValid() ); QVERIFY( signalfinished->isValid() ); } -void tst_QGeocodingManager::cleanup() +void tst_QGeoCodingManager::cleanup() { delete signalerror; delete signalfinished; } -void tst_QGeocodingManager::loadGeocodingManager() +void tst_QGeoCodingManager::loadGeocodingManager() { QStringList providers = QGeoServiceProvider::availableServiceProviders(); QVERIFY(providers.contains("geocode.test.plugin")); @@ -97,7 +97,7 @@ void tst_QGeocodingManager::loadGeocodingManager() QVERIFY(qgeocodingmanager); } -void tst_QGeocodingManager::locale() +void tst_QGeoCodingManager::locale() { QLocale *german = new QLocale (QLocale::German, QLocale::Germany); QLocale *english = new QLocale (QLocale::C, QLocale::AnyCountry); @@ -115,20 +115,20 @@ void tst_QGeocodingManager::locale() delete english; } -void tst_QGeocodingManager::name() +void tst_QGeoCodingManager::name() { QString name = "geocode.test.plugin"; QCOMPARE(qgeocodingmanager->managerName(),name); } -void tst_QGeocodingManager::version() +void tst_QGeoCodingManager::version() { int version=100; QCOMPARE(qgeocodingmanager->managerVersion(),version); } -void tst_QGeocodingManager::search() +void tst_QGeoCodingManager::search() { QCOMPARE(signalerror->count(),0); QCOMPARE(signalfinished->count(),0); @@ -137,7 +137,7 @@ void tst_QGeocodingManager::search() int limit = 10; int offset = 2; - QGeocodeReply * reply = qgeocodingmanager->geocode(search, limit,offset); + QGeoCodeReply * reply = qgeocodingmanager->geocode(search, limit,offset); QCOMPARE(reply->errorString(),search); QCOMPARE(signalfinished->count(),1); @@ -146,7 +146,7 @@ void tst_QGeocodingManager::search() delete reply; } -void tst_QGeocodingManager::geocode() +void tst_QGeoCodingManager::geocode() { QCOMPARE(signalerror->count(),0); QCOMPARE(signalfinished->count(),0); @@ -155,7 +155,7 @@ void tst_QGeocodingManager::geocode() QString city = "Berlin"; address->setCity(city); - QGeocodeReply *reply = qgeocodingmanager->geocode(*address); + QGeoCodeReply *reply = qgeocodingmanager->geocode(*address); QCOMPARE(reply->errorString(),city); QCOMPARE(signalfinished->count(),1); @@ -165,18 +165,18 @@ void tst_QGeocodingManager::geocode() delete reply; } -void tst_QGeocodingManager::reverseGeocode() +void tst_QGeoCodingManager::reverseGeocode() { - QCOMPARE(signalerror->count(),0); - QCOMPARE(signalfinished->count(),0); + QCOMPARE(signalerror->count(), 0); + QCOMPARE(signalfinished->count(), 0); - QGeoCoordinate *coordinate = new QGeoCoordinate (34.34 , 56.65); + QGeoCoordinate *coordinate = new QGeoCoordinate(34.34, 56.65); - QGeocodeReply *reply = qgeocodingmanager->reverseGeocode(*coordinate); + QGeoCodeReply *reply = qgeocodingmanager->reverseGeocode(*coordinate); - QCOMPARE(reply->errorString(),coordinate->toString()); - QCOMPARE(signalfinished->count(),1); - QCOMPARE(signalerror->count(),0); + QCOMPARE(reply->errorString(), coordinate->toString()); + QCOMPARE(signalfinished->count(), 1); + QCOMPARE(signalerror->count(), 0); delete coordinate; delete reply; @@ -185,5 +185,5 @@ void tst_QGeocodingManager::reverseGeocode() } -QTEST_GUILESS_MAIN(tst_QGeocodingManager) +QTEST_GUILESS_MAIN(tst_QGeoCodingManager) diff --git a/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h b/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h index 065d5134..8a0ee146 100644 --- a/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h +++ b/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h @@ -58,7 +58,7 @@ QT_USE_NAMESPACE -class tst_QGeocodingManager: public QObject +class tst_QGeoCodingManager: public QObject { Q_OBJECT @@ -76,14 +76,14 @@ private Q_SLOTS: private: QGeoServiceProvider *qgeoserviceprovider; - QGeocodingManager *qgeocodingmanager; + QGeoCodingManager *qgeocodingmanager; QSignalSpy *signalerror; QSignalSpy *signalfinished; void loadGeocodingManager(); }; -Q_DECLARE_METATYPE( QGeocodeReply*); -Q_DECLARE_METATYPE( QGeocodeReply::Error); +Q_DECLARE_METATYPE(QGeoCodeReply*); +Q_DECLARE_METATYPE(QGeoCodeReply::Error); #endif |