diff options
author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-05-15 11:17:29 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-06-19 14:56:00 +0000 |
commit | 8c4fb0244ff628dc287c43b0a4a884ef5550acee (patch) | |
tree | b6f21b716c9ce0ba21ffdcbe8efca8c638f74285 /tests | |
parent | 72f4414062072f1516fbab6ce7107ed5527a7f8f (diff) | |
download | qtivi-8c4fb0244ff628dc287c43b0a4a884ef5550acee.tar.gz |
Consolidate the Capabilities flag from QIviSearchAndBrowseModel and QIviPagingModel
The flag can be used by both classes and might be extended in the future.
Because of that we moved it into a new QtIviCoreModule class, similar
to the Qt class and the QtIviVehicleFunctionsModule class.
Task-number: AUTOSUITE-420
Change-Id: I4dfa7f17473aec8cc412ab22765706ea3c3085f1
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp | 14 | ||||
-rw-r--r-- | tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp | 34 |
2 files changed, 24 insertions, 24 deletions
diff --git a/tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp b/tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp index dc0c9a3..daebd68 100644 --- a/tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp +++ b/tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp @@ -47,7 +47,7 @@ class TestBackend : public QIviPagingModelInterface public: //Sets the capabilities this instance should report - void setCapabilities(QIviPagingModel::Capabilities capabilities) + void setCapabilities(QtIviCoreModule::ModelCapabilities capabilities) { m_caps = capabilities; } @@ -82,7 +82,7 @@ public: { emit supportedCapabilitiesChanged(identifier, m_caps); - if (m_caps.testFlag(QIviPagingModel::SupportsGetSize)) + if (m_caps.testFlag(QtIviCoreModule::SupportsGetSize)) emit countChanged(identifier, m_list.count()); QVariantList requestedItems; @@ -124,7 +124,7 @@ public: private: QList<QIviSearchAndBrowseModelItem> m_list; - QIviPagingModel::Capabilities m_caps; + QtIviCoreModule::ModelCapabilities m_caps; }; class TestServiceObject : public QIviServiceObject @@ -207,7 +207,7 @@ void tst_QIviPagingModel::testClearServiceObject() TestServiceObject *service = new TestServiceObject(); manager->registerService(service, service->interfaces()); service->testBackend()->initializeSimpleData(); - service->testBackend()->setCapabilities(QIviPagingModel::SupportsGetSize); + service->testBackend()->setCapabilities(QtIviCoreModule::SupportsGetSize); QIviPagingModel defaultModel; QIviPagingModel model; @@ -338,7 +338,7 @@ void tst_QIviPagingModel::testDataChangedMode() { TestServiceObject *service = new TestServiceObject(); manager->registerService(service, service->interfaces()); - service->testBackend()->setCapabilities(QIviPagingModel::SupportsGetSize); + service->testBackend()->setCapabilities(QtIviCoreModule::SupportsGetSize); service->testBackend()->initializeSimpleData(); QIviPagingModel model; @@ -378,7 +378,7 @@ void tst_QIviPagingModel::testReload() { TestServiceObject *service = new TestServiceObject(); manager->registerService(service, service->interfaces()); - service->testBackend()->setCapabilities(QIviPagingModel::SupportsGetSize); + service->testBackend()->setCapabilities(QtIviCoreModule::SupportsGetSize); service->testBackend()->initializeSimpleData(); QIviPagingModel model; @@ -404,7 +404,7 @@ void tst_QIviPagingModel::testDataChangedMode_jump() { TestServiceObject *service = new TestServiceObject(); manager->registerService(service, service->interfaces()); - service->testBackend()->setCapabilities(QIviPagingModel::SupportsGetSize); + service->testBackend()->setCapabilities(QtIviCoreModule::SupportsGetSize); service->testBackend()->initializeSimpleData(); QIviPagingModel model; diff --git a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp index 0dec1c8..7d56330 100644 --- a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp +++ b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp @@ -50,7 +50,7 @@ public: } //Sets the capabilities this instance should report - void setCapabilities(QIviSearchAndBrowseModel::Capabilities capabilities) + void setCapabilities(QtIviCoreModule::ModelCapabilities capabilities) { m_caps = capabilities; } @@ -120,7 +120,7 @@ public: QList<QIviSearchAndBrowseModelItem> list = m_lists.value(type); - if (m_caps.testFlag(QIviSearchAndBrowseModel::SupportsFiltering) && term) { + if (m_caps.testFlag(QtIviCoreModule::SupportsFiltering) && term) { if (term->type() != QIviAbstractQueryTerm::FilterTerm) { qWarning("Only filtering is supported"); return; @@ -166,7 +166,7 @@ public: list = resultList; } - if (m_caps.testFlag(QIviSearchAndBrowseModel::SupportsSorting) && orderTerms.count()) { + if (m_caps.testFlag(QtIviCoreModule::SupportsSorting) && orderTerms.count()) { if (orderTerms.count() > 1) { qWarning("Only one order term is supported"); return; @@ -194,7 +194,7 @@ public: }); } - if (m_caps.testFlag(QIviSearchAndBrowseModel::SupportsGetSize)) + if (m_caps.testFlag(QtIviCoreModule::SupportsGetSize)) emit countChanged(identifier, list.count()); QVariantList requestedItems; @@ -309,7 +309,7 @@ public: private: QHash<QString, QList<QIviSearchAndBrowseModelItem>> m_lists; - QIviSearchAndBrowseModel::Capabilities m_caps; + QtIviCoreModule::ModelCapabilities m_caps; }; class TestServiceObject : public QIviServiceObject @@ -428,7 +428,7 @@ void tst_QIviSearchAndBrowseModel::testClearServiceObject() TestServiceObject *service = new TestServiceObject(); manager->registerService(service, service->interfaces()); service->testBackend()->initializeSimpleData(); - service->testBackend()->setCapabilities(QIviSearchAndBrowseModel::SupportsGetSize); + service->testBackend()->setCapabilities(QtIviCoreModule::SupportsGetSize); QIviSearchAndBrowseModel defaultModel; QIviSearchAndBrowseModel model; @@ -580,7 +580,7 @@ void tst_QIviSearchAndBrowseModel::testDataChangedMode() { TestServiceObject *service = new TestServiceObject(); manager->registerService(service, service->interfaces()); - service->testBackend()->setCapabilities(QIviSearchAndBrowseModel::SupportsGetSize); + service->testBackend()->setCapabilities(QtIviCoreModule::SupportsGetSize); service->testBackend()->initializeSimpleData(); QIviSearchAndBrowseModel model; @@ -623,7 +623,7 @@ void tst_QIviSearchAndBrowseModel::testReload() { TestServiceObject *service = new TestServiceObject(); manager->registerService(service, service->interfaces()); - service->testBackend()->setCapabilities(QIviSearchAndBrowseModel::SupportsGetSize); + service->testBackend()->setCapabilities(QtIviCoreModule::SupportsGetSize); service->testBackend()->initializeSimpleData(); QIviSearchAndBrowseModel model; @@ -652,7 +652,7 @@ void tst_QIviSearchAndBrowseModel::testDataChangedMode_jump() { TestServiceObject *service = new TestServiceObject(); manager->registerService(service, service->interfaces()); - service->testBackend()->setCapabilities(QIviSearchAndBrowseModel::SupportsGetSize); + service->testBackend()->setCapabilities(QtIviCoreModule::SupportsGetSize); service->testBackend()->initializeSimpleData(); QIviSearchAndBrowseModel model; @@ -698,7 +698,7 @@ void tst_QIviSearchAndBrowseModel::testNavigation() QStack<QIviSearchAndBrowseModel*> modelStack; TestServiceObject *service = new TestServiceObject(); - service->testBackend()->setCapabilities(QIviSearchAndBrowseModel::SupportsStatelessNavigation); + service->testBackend()->setCapabilities(QtIviCoreModule::SupportsStatelessNavigation); manager->registerService(service, service->interfaces()); service->testBackend()->initializeNavigationData(); @@ -790,8 +790,8 @@ void tst_QIviSearchAndBrowseModel::testFilter() TestServiceObject *service = new TestServiceObject(); manager->registerService(service, service->interfaces()); - service->testBackend()->setCapabilities(QIviSearchAndBrowseModel::Capabilities( QIviSearchAndBrowseModel::SupportsFiltering | - QIviSearchAndBrowseModel::SupportsSorting)); + service->testBackend()->setCapabilities(QtIviCoreModule::ModelCapabilities( QtIviCoreModule::SupportsFiltering | + QtIviCoreModule::SupportsSorting)); service->testBackend()->initializeFilterData(); QIviSearchAndBrowseModel model; @@ -825,9 +825,9 @@ void tst_QIviSearchAndBrowseModel::testEditing() { TestServiceObject *service = new TestServiceObject(); manager->registerService(service, service->interfaces()); - service->testBackend()->setCapabilities(QIviSearchAndBrowseModel::Capabilities( QIviSearchAndBrowseModel::SupportsInsert | - QIviSearchAndBrowseModel::SupportsRemove | - QIviSearchAndBrowseModel::SupportsMove)); + service->testBackend()->setCapabilities(QtIviCoreModule::ModelCapabilities( QtIviCoreModule::SupportsInsert | + QtIviCoreModule::SupportsRemove | + QtIviCoreModule::SupportsMove)); service->testBackend()->initializeSimpleData(); QIviSearchAndBrowseModel model; @@ -904,8 +904,8 @@ void tst_QIviSearchAndBrowseModel::testInputErrors() TestServiceObject *service = new TestServiceObject(); manager->registerService(service, service->interfaces()); service->testBackend()->initializeSimpleData(); - service->testBackend()->setCapabilities(QIviSearchAndBrowseModel::Capabilities( QIviSearchAndBrowseModel::SupportsFiltering | - QIviSearchAndBrowseModel::SupportsSorting)); + service->testBackend()->setCapabilities(QtIviCoreModule::ModelCapabilities( QtIviCoreModule::SupportsFiltering | + QtIviCoreModule::SupportsSorting)); QIviSearchAndBrowseModel model; model.setServiceObject(service); |