diff options
| author | abcd <amos.choy@nokia.com> | 2012-01-30 11:35:06 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 05:39:18 +0100 |
| commit | 8ba3a6ffd2a974c9ea91035ac6c4ccf30a6c74af (patch) | |
| tree | 44043ae3b0ba63177ad19466320d4c28ece99d57 /tests | |
| parent | 074260af5a59c2a6a9d49cf0b4b9e8a5db5b11f8 (diff) | |
| download | qtlocation-8ba3a6ffd2a974c9ea91035ac6c4ccf30a6c74af.tar.gz | |
Fix inconsistency, use childCategoryIds over childrenCategoryIds
Change-Id: I37dfa12027bcc5424e65aa515f512b18a94692c4
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/geotestplugin/qplacemanagerengine_test.h | 2 | ||||
| -rw-r--r-- | tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h index f634b57f..b36913d1 100644 --- a/tests/auto/geotestplugin/qplacemanagerengine_test.h +++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h @@ -328,7 +328,7 @@ public: return QString(); } - virtual QStringList childrenCategoryIds(const QString &categoryId) const + virtual QStringList childCategoryIds(const QString &categoryId) const { return m_childCategories.value(categoryId); } diff --git a/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp b/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp index 0499e382..2900b935 100644 --- a/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp +++ b/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp @@ -1207,16 +1207,16 @@ void tst_QPlaceManagerJsonDb::categoryFunctions() QCOMPARE(placeManager->parentCategoryId(QLatin1String("does-not-exist")), QString()); //try find the child ids - QStringList childIds = placeManager->childrenCategoryIds(restaurant.categoryId()); + QStringList childIds = placeManager->childCategoryIds(restaurant.categoryId()); QVERIFY(childIds.contains(fastFood.categoryId())); QVERIFY(childIds.contains(fineDining.categoryId())); QCOMPARE(childIds.count(), 2); //try find the child id of a category without a child - QCOMPARE(placeManager->childrenCategoryIds(fineDining.categoryId()), QStringList()); + QCOMPARE(placeManager->childCategoryIds(fineDining.categoryId()), QStringList()); //try to find child ids of a non-existent category - QCOMPARE(placeManager->childrenCategoryIds(QLatin1String("does-not-exist")), QStringList()); + QCOMPARE(placeManager->childCategoryIds(QLatin1String("does-not-exist")), QStringList()); //try to find a category by it's id QCOMPARE(placeManager->category(fastFood.categoryId()), fastFood); |