diff options
Diffstat (limited to 'tests/auto')
4 files changed, 5 insertions, 23 deletions
diff --git a/tests/auto/declarative_core/tst_placesearchmodel.qml b/tests/auto/declarative_core/tst_placesearchmodel.qml index 6b041d07..ddc9d912 100644 --- a/tests/auto/declarative_core/tst_placesearchmodel.qml +++ b/tests/auto/declarative_core/tst_placesearchmodel.qml @@ -75,7 +75,6 @@ TestCase { { tag: "limit", property: "limit", signal: "limitChanged", value: 10, reset: -1 }, { tag: "searchTerm", property: "searchTerm", signal: "searchTermChanged", value: "Test term", reset: "" }, - { tag: "maximumCorrections", property: "maximumCorrections", signal: "maximumCorrectionsChanged", value: 5, reset: 0 }, { tag: "relevanceHint", property: "relevanceHint", signal: "relevanceHintChanged", value: PlaceSearchModel.DistanceHint, reset: PlaceSearchModel.UnspecifiedHint }, { tag: "visibilityScope", property: "visibilityScope", signal: "visibilityScopeChanged", value: Place.DeviceVisibility, reset: Place.UnspecifiedVisibility }, ]; diff --git a/tests/auto/declarative_core/tst_plugin.qml b/tests/auto/declarative_core/tst_plugin.qml index 8f171a33..3e2e2825 100644 --- a/tests/auto/declarative_core/tst_plugin.qml +++ b/tests/auto/declarative_core/tst_plugin.qml @@ -134,7 +134,6 @@ Item { verify(testPlugin.supportsPlaces(Plugin.SavePlaceFeature)) verify(testPlugin.supportsPlaces(Plugin.SaveCategoryFeature)) verify(testPlugin.supportsPlaces(Plugin.SearchSuggestionsFeature)) - verify(!testPlugin.supportsPlaces(Plugin.CorrectionsFeature)) verify(!testPlugin.supportsPlaces(Plugin.RemovePlaceFeature)) } diff --git a/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp b/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp index 2b5c510b..76139e3f 100644 --- a/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp +++ b/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp @@ -62,7 +62,6 @@ private Q_SLOTS: void boundingCircleTest(); void boundingBoxTest(); void searchAreaTest(); - void maximumCorrectionsTest(); void visibilityScopeTest(); void relevanceHintTest(); void operatorsTest(); @@ -165,16 +164,6 @@ void tst_QPlaceSearchRequest::searchAreaTest() QVERIFY2(query->searchArea() == box, "New search area not assigned"); } -void tst_QPlaceSearchRequest::maximumCorrectionsTest() -{ - QPlaceSearchRequest testObj; - QVERIFY2(testObj.maximumCorrections() == 0, "Wrong default value"); - testObj.setMaximumCorrections(10); - QVERIFY2(testObj.maximumCorrections() == 10, "Wrong value returned"); - testObj.clear(); - QVERIFY2(testObj.maximumCorrections() == 0, "Wrong cleared value returned"); -} - void tst_QPlaceSearchRequest::visibilityScopeTest() { QPlaceSearchRequest query; @@ -202,13 +191,13 @@ void tst_QPlaceSearchRequest::relevanceHintTest() void tst_QPlaceSearchRequest::operatorsTest() { QPlaceSearchRequest testObj; - testObj.setSearchTerm("testValue"); + testObj.setSearchTerm(QLatin1String("testValue")); QPlaceSearchRequest testObj2; testObj2 = testObj; QVERIFY2(testObj == testObj2, "Not copied correctly"); - testObj2.setMaximumCorrections(-5); + testObj2.setSearchTerm(QLatin1String("abc")); QVERIFY2(testObj != testObj2, "Object should be different"); - testObj2.setMaximumCorrections(0); + testObj2.setSearchTerm(QLatin1String("testValue")); QVERIFY(testObj == testObj2); QGeoBoundingBox b1(QGeoCoordinate(20,20), QGeoCoordinate(10,30)); @@ -264,7 +253,6 @@ void tst_QPlaceSearchRequest::clearTest() QPlaceCategory category; category.setName("Fast Food"); req.setCategory(category); - req.setMaximumCorrections(5); req.setLimit(100); req.setOffset(5); @@ -272,7 +260,6 @@ void tst_QPlaceSearchRequest::clearTest() QVERIFY(req.searchTerm().isEmpty()); QVERIFY(req.searchArea() == QGeoBoundingArea()); QVERIFY(req.categories().isEmpty()); - QVERIFY(req.maximumCorrections() == 0); QVERIFY(req.limit() == -1); QVERIFY(req.offset() == 0); } diff --git a/tests/auto/qplacesearchresult/tst_qplacesearchresult.cpp b/tests/auto/qplacesearchresult/tst_qplacesearchresult.cpp index e73a5523..b6b6e54b 100644 --- a/tests/auto/qplacesearchresult/tst_qplacesearchresult.cpp +++ b/tests/auto/qplacesearchresult/tst_qplacesearchresult.cpp @@ -60,28 +60,25 @@ void tst_QPlaceSearchResult::test() QCOMPARE(result.type(), QPlaceSearchResult::UnknownSearchResult); QVERIFY(qIsNaN(result.distance())); QCOMPARE(result.place(), QPlace()); - QVERIFY(result.correction().isEmpty()); QVERIFY(!result.isSponsored()); result.setType(QPlaceSearchResult::PlaceResult); result.setDistance(2.0); result.setPlace(QPlace()); - result.setCorrection(QLatin1String("suggestion")); result.setSponsored(true); QCOMPARE(result.type(), QPlaceSearchResult::PlaceResult); QCOMPARE(result.distance(), 2.0); QCOMPARE(result.place(), QPlace()); - QCOMPARE(result.correction(), QLatin1String("suggestion")); QVERIFY(result.isSponsored()); QPlaceSearchResult result2(result); QCOMPARE(result2, result); - result2.setType(QPlaceSearchResult::CorrectionResult); + result2.setType(QPlaceSearchResult::UnknownSearchResult); - QCOMPARE(result2.type(), QPlaceSearchResult::CorrectionResult); + QCOMPARE(result2.type(), QPlaceSearchResult::UnknownSearchResult); QVERIFY(result2 != result); |