diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-21 14:28:44 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-22 10:18:38 +0100 |
commit | ae0f7deb5b847a292938af9e0a568fcc8b136b82 (patch) | |
tree | 4b47696e65ed5e1e6a0b50fc8d2b1252eae738ea /tests | |
parent | ad3b460df63d249c2ff1fead74bc1e00c847e8a6 (diff) | |
download | qtenginio-ae0f7deb5b847a292938af9e0a568fcc8b136b82.tar.gz |
API: Rename EnginioModel::engino property to client
[ChangeLog][API] Renamed EnginioModel::engino property to client
Change-Id: I56ee3dfeab0f051b92dddf88bc94fb15552572a5
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/enginiomodel/tst_enginiomodel.cpp | 94 | ||||
-rw-r--r-- | tests/auto/qmltests/tst_model.qml | 36 |
2 files changed, 65 insertions, 65 deletions
diff --git a/tests/auto/enginiomodel/tst_enginiomodel.cpp b/tests/auto/enginiomodel/tst_enginiomodel.cpp index 1200052..a7f1051 100644 --- a/tests/auto/enginiomodel/tst_enginiomodel.cpp +++ b/tests/auto/enginiomodel/tst_enginiomodel.cpp @@ -145,7 +145,7 @@ void tst_EnginioModel::ctor() QObject::connect(&client, SIGNAL(error(EnginioReply *)), this, SLOT(error(EnginioReply *))); client.setBackendId(_backendId); client.setServiceUrl(EnginioTests::TESTAPP_URL); - model.setEnginio(&client); + model.setClient(&client); } { // check if destructor of a fully initilized EnginioClient detach fully initilized model EnginioClient client; @@ -155,7 +155,7 @@ void tst_EnginioModel::ctor() model.setQuery(query); client.setBackendId(_backendId); client.setServiceUrl(EnginioTests::TESTAPP_URL); - model.setEnginio(&client); + model.setClient(&client); } } @@ -166,25 +166,25 @@ void tst_EnginioModel::enginio_property() QObject::connect(&client, SIGNAL(error(EnginioReply *)), this, SLOT(error(EnginioReply *))); EnginioModel model; // No initial value - QCOMPARE(model.enginio(), static_cast<EnginioClient*>(0)); + QCOMPARE(model.client(), static_cast<EnginioClient*>(0)); - QSignalSpy spy(&model, SIGNAL(enginioChanged(EnginioClient*))); - model.setEnginio(&client); - QCOMPARE(model.enginio(), &client); + QSignalSpy spy(&model, SIGNAL(clientChanged(EnginioClient*))); + model.setClient(&client); + QCOMPARE(model.client(), &client); QTRY_COMPARE(spy.count(), 1); } { EnginioModel model; - QSignalSpy spy(&model, SIGNAL(enginioChanged(EnginioClient*))); + QSignalSpy spy(&model, SIGNAL(clientChanged(EnginioClient*))); { EnginioClient client; QObject::connect(&client, SIGNAL(error(EnginioReply *)), this, SLOT(error(EnginioReply *))); - model.setEnginio(&client); - QCOMPARE(model.enginio(), &client); + model.setClient(&client); + QCOMPARE(model.client(), &client); QTRY_COMPARE(spy.count(), 1); QCOMPARE(spy[0][0].value<EnginioClient*>(), &client); } - QCOMPARE(model.enginio(), static_cast<EnginioClient*>(0)); + QCOMPARE(model.client(), static_cast<EnginioClient*>(0)); QTRY_COMPARE(spy.count(), 2); QCOMPARE(spy[1][0].value<EnginioClient*>(), static_cast<EnginioClient*>(0)); } @@ -210,7 +210,7 @@ void tst_EnginioModel::enginio_property() query.insert("limit", 1); model.setQuery(query); model.setOperation(EnginioClient::UserOperation); - model.setEnginio(&client); + model.setClient(&client); QTRY_COMPARE(spyAboutToReset.count(), 1); QTRY_COMPARE(spyReset.count(), 1); @@ -224,7 +224,7 @@ void tst_EnginioModel::enginio_property() EnginioModel model; QSignalSpy spyAboutToReset(&model, SIGNAL(modelAboutToBeReset())); QSignalSpy spyReset(&model, SIGNAL(modelReset())); - model.setEnginio(&client); + model.setClient(&client); QJsonObject query; query.insert("limit", 1); query.insert("objectTypes", "objects." + EnginioTests::CUSTOM_OBJECT1); @@ -238,15 +238,15 @@ void tst_EnginioModel::enginio_property() EnginioClient client; EnginioModel model; - QSignalSpy clientSpy(&model, SIGNAL(enginioChanged(EnginioClient*))); - QCOMPARE(model.enginio(), (EnginioClient *)0); + QSignalSpy clientSpy(&model, SIGNAL(clientChanged(EnginioClient*))); + QCOMPARE(model.client(), (EnginioClient *)0); - model.setEnginio(&client); + model.setClient(&client); QCOMPARE(clientSpy.count(), 1); QCOMPARE(clientSpy[0][0].value<EnginioClient*>(), &client); - QCOMPARE(model.enginio(), &client); + QCOMPARE(model.client(), &client); - model.setEnginio(&client); + model.setClient(&client); QCOMPARE(clientSpy.count(), 1); } } @@ -284,7 +284,7 @@ void tst_EnginioModel::query_property() client.setBackendId(_backendId); client.setServiceUrl(EnginioTests::TESTAPP_URL); - model.setEnginio(&client); + model.setClient(&client); model.setQuery(query); QTRY_VERIFY(model.rowCount() > 0); @@ -330,9 +330,9 @@ void tst_EnginioModel::roleNames() QObject::connect(&client, SIGNAL(error(EnginioReply *)), this, SLOT(error(EnginioReply *))); client.setBackendId(_backendId); client.setServiceUrl(EnginioTests::TESTAPP_URL); - model.setEnginio(&client); + model.setClient(&client); - QVERIFY(model.enginio() == &client); + QVERIFY(model.client() == &client); model.setOperation(EnginioClient::UserOperation); QJsonObject query = QJsonDocument::fromJson("{\"limit\":5}").object(); @@ -359,7 +359,7 @@ void tst_EnginioModel::listView() QObject::connect(&client, SIGNAL(error(EnginioReply *)), this, SLOT(error(EnginioReply *))); client.setBackendId(_backendId); client.setServiceUrl(EnginioTests::TESTAPP_URL); - model.setEnginio(&client); + model.setClient(&client); QListView view; view.setModel(&model); @@ -413,7 +413,7 @@ void tst_EnginioModel::invalidRemove() client.setServiceUrl(EnginioTests::TESTAPP_URL); EnginioModel model; - model.setEnginio(&client); + model.setClient(&client); int counter = 0; InvalidRemoveErrorChecker replyCounter(&counter); @@ -449,7 +449,7 @@ void tst_EnginioModel::invalidSetProperty() client.setServiceUrl(EnginioTests::TESTAPP_URL); EnginioModel model; - model.setEnginio(&client); + model.setClient(&client); QJsonObject query = QJsonDocument::fromJson("{\"limit\":2}").object(); model.setOperation(EnginioClient::UserOperation); model.setQuery(query); @@ -523,16 +523,16 @@ void tst_EnginioModel::multpleConnections() EnginioModelConnectionSpy model; for (int i = 0; i < 20; ++i) { - model.setEnginio(&client1); - model.setEnginio(&client2); - model.setEnginio(0); + model.setClient(&client1); + model.setClient(&client2); + model.setClient(0); } // The values here are not strict. Use qDebug() << model.counter; to see what // makes sense. Just to be sure 2097150 or 20 doesn't. QCOMPARE(model.counter["operationChanged"], 0); QCOMPARE(model.counter["queryChanged"], 0); - QCOMPARE(model.counter["enginioChanged"], 0); + QCOMPARE(model.counter["clientChanged"], 0); QCOMPARE(client1.counter["finished"], 0); QCOMPARE(client2.counter["finished"], 0); @@ -549,7 +549,7 @@ void tst_EnginioModel::multpleConnections() client.setServiceUrl(EnginioTests::TESTAPP_URL); EnginioModelConnectionSpy model; - model.setEnginio(&client); + model.setClient(&client); QJsonObject query1, query2; query1.insert("objectType", QString("objects.todos")); query2.insert("objectType", QString("objects.blah")); @@ -563,7 +563,7 @@ void tst_EnginioModel::multpleConnections() // makes sense. Just to be sure 2097150 or 20 doesn't. QCOMPARE(model.counter["operationChanged"], 0); QCOMPARE(model.counter["queryChanged"], 0); - QCOMPARE(model.counter["enginioChanged"], 0); + QCOMPARE(model.counter["clientChanged"], 0); } { EnginioClientConnectionSpy client; @@ -571,7 +571,7 @@ void tst_EnginioModel::multpleConnections() client.setServiceUrl(EnginioTests::TESTAPP_URL); EnginioModelConnectionSpy model; - model.setEnginio(&client); + model.setClient(&client); QJsonObject query; query.insert("objectType", QString("objects.todos")); model.setQuery(query); @@ -585,7 +585,7 @@ void tst_EnginioModel::multpleConnections() // makes sense. Just to be sure 2097150 or 20 doesn't. QCOMPARE(model.counter["operationChanged"], 0); QCOMPARE(model.counter["queryChanged"], 0); - QCOMPARE(model.counter["enginioChanged"], 0); + QCOMPARE(model.counter["clientChanged"], 0); } } @@ -614,7 +614,7 @@ void tst_EnginioModel::deletionReordered() QObject::connect(&client, SIGNAL(error(EnginioReply *)), this, SLOT(error(EnginioReply *))); client.setBackendId(_backendId); client.setServiceUrl(EnginioTests::TESTAPP_URL); - model.setEnginio(&client); + model.setClient(&client); QTRY_COMPARE(model.rowCount(), int(query["limit"].toDouble())); QVERIFY(model.rowCount() >= 2); @@ -651,7 +651,7 @@ void tst_EnginioModel::deleteTwiceTheSame() EnginioClient client; client.setBackendId(_backendId); client.setServiceUrl(EnginioTests::TESTAPP_URL); - model.setEnginio(&client); + model.setClient(&client); QTRY_COMPARE(model.rowCount(), int(query["limit"].toDouble())); @@ -693,7 +693,7 @@ void tst_EnginioModel::updateAndDeleteReordered() EnginioClient client; client.setBackendId(_backendId); client.setServiceUrl(EnginioTests::TESTAPP_URL); - model.setEnginio(&client); + model.setClient(&client); QTRY_COMPARE(model.rowCount(), int(query["limit"].toDouble())); @@ -734,7 +734,7 @@ void tst_EnginioModel::updateReordered() EnginioClient client; client.setBackendId(_backendId); client.setServiceUrl(EnginioTests::TESTAPP_URL); - model.setEnginio(&client); + model.setClient(&client); QTRY_COMPARE(model.rowCount(), int(query["limit"].toDouble())); @@ -785,7 +785,7 @@ void tst_EnginioModel::append() { // init the model QSignalSpy spy(&model, SIGNAL(modelReset())); - model.setEnginio(&client); + model.setClient(&client); QTRY_VERIFY(spy.count() > 0); } @@ -911,7 +911,7 @@ void tst_EnginioModel::externallyRemovedImpl() { // init the model QSignalSpy spy(&model, SIGNAL(modelReset())); - model.setEnginio(&client); + model.setClient(&client); QTRY_VERIFY(spy.count() > 0); QVERIFY(model.rowCount()); @@ -992,7 +992,7 @@ void tst_EnginioModel::createAndModify() model.setQuery(query); { // init the model QSignalSpy spy(&model, SIGNAL(modelReset())); - model.setEnginio(&client); + model.setClient(&client); QTRY_VERIFY(spy.count() > 0); } @@ -1077,7 +1077,7 @@ void tst_EnginioModel::externalNotification() model.setQuery(query); { // init the model QSignalSpy spy(&model, SIGNAL(modelReset())); - model.setEnginio(&client); + model.setClient(&client); QTRY_VERIFY(spy.count() > 0); } @@ -1148,7 +1148,7 @@ void tst_EnginioModel::createUpdateRemoveWithNotification() model.setQuery(query); { // init the model QSignalSpy spy(&model, SIGNAL(modelReset())); - model.setEnginio(&client); + model.setClient(&client); QTRY_VERIFY(spy.count() > 0); } @@ -1232,7 +1232,7 @@ void tst_EnginioModel::appendBeforeInitialModelReset() EnginioModel model; QSignalSpy resetSpy(&model, SIGNAL(modelReset())); model.setQuery(query); - model.setEnginio(&client); + model.setClient(&client); query.insert("title", QString::fromUtf8("appendAndRemoveModel")); EnginioReply *reply = model.append(query); @@ -1262,7 +1262,7 @@ void tst_EnginioModel::delayedRequestBeforeInitialModelReset() EnginioModel model; QSignalSpy resetSpy(&model, SIGNAL(modelReset())); model.setQuery(query); - model.setEnginio(&client); + model.setClient(&client); query.insert("title", QString::fromUtf8("appendAndRemoveModel")); EnginioReply *append1 = model.append(query); @@ -1292,7 +1292,7 @@ void tst_EnginioModel::appendAndChangeQueryBeforeItIsFinished() EnginioModel model; QSignalSpy resetSpy(&model, SIGNAL(modelReset())); model.setQuery(query); - model.setEnginio(&client); + model.setClient(&client); QTRY_COMPARE(resetSpy.count(), 1); query.insert("title", QString::fromUtf8("appendAndChangeQueryBeforeItIsFinished")); @@ -1331,7 +1331,7 @@ void tst_EnginioModel::deleteModelDurringRequests() query.insert("objectType", objectType); EnginioModel model; model.setQuery(query); - model.setEnginio(&client); + model.setClient(&client); query.insert("title", QString::fromUtf8("deleteModelDurringRequests")); replies.append(model.append(query)); replies.append(model.append(query)); @@ -1406,7 +1406,7 @@ void tst_EnginioModel::updatingRoles() QCOMPARE(model.roleNames()[CustomModel::InvalidRole], invalid); model.setQuery(query); - model.setEnginio(&client); + model.setClient(&client); QCOMPARE(model.roleNames()[CustomModel::FooRole], foo); QCOMPARE(model.roleNames()[CustomModel::BarRole], bar); @@ -1457,7 +1457,7 @@ void tst_EnginioModel::setData() { // init the model QSignalSpy spy(&model, SIGNAL(modelReset())); - model.setEnginio(&client); + model.setClient(&client); QTRY_VERIFY(spy.count() > 0); } @@ -1518,7 +1518,7 @@ void tst_EnginioModel::deleteReply() model.disableNotifications(); model.setOperation(EnginioClient::UserOperation); model.setQuery(query); - model.setEnginio(&client); + model.setClient(&client); QJsonObject newUser; newUser.insert("username", QString::fromUtf8("fool")); diff --git a/tests/auto/qmltests/tst_model.qml b/tests/auto/qmltests/tst_model.qml index de4ccb1..0262300 100644 --- a/tests/auto/qmltests/tst_model.qml +++ b/tests/auto/qmltests/tst_model.qml @@ -87,7 +87,7 @@ Item { EnginioModel { id: modelInvalidRow - enginio: Enginio { + client: Enginio { serviceUrl: AppConfig.backendData.serviceUrl backendId: AppConfig.backendData.id } @@ -139,7 +139,7 @@ Item { SignalSpy { id: modelCreateEnginioChanged target: modelCreate - signalName: "enginioChanged" + signalName: "clientChanged" } SignalSpy { @@ -155,25 +155,25 @@ Item { } function init() { - modelCreate.enginio = null + modelCreate.client = null } function cleanupTestCase() { - modelCreate.enginio = null + modelCreate.client = null } function test_assignClient() { var signalCount = modelCreateEnginioChanged.count - modelCreate.enginio = enginioClientCreate - verify(modelCreate.enginio == enginioClientCreate) + modelCreate.client = enginioClientCreate + verify(modelCreate.client == enginioClientCreate) tryCompare(modelCreateEnginioChanged, "count", ++signalCount) - modelCreate.enginio = null - verify(modelCreate.enginio === null) + modelCreate.client = null + verify(modelCreate.client === null) tryCompare(modelCreateEnginioChanged, "count", ++signalCount) - modelCreate.enginio = enginioClientCreate - verify(modelCreate.enginio == enginioClientCreate) + modelCreate.client = enginioClientCreate + verify(modelCreate.client == enginioClientCreate) tryCompare(modelCreateEnginioChanged, "count", ++signalCount) } @@ -208,7 +208,7 @@ Item { EnginioModel { id: modelQuery - enginio: Enginio { + client: Enginio { id: enginioClientQuery serviceUrl: AppConfig.backendData.serviceUrl @@ -225,14 +225,14 @@ Item { } function _query(query, operation) { - var enginioClient = modelQuery.enginio - modelQuery.enginio = null + var enginioClient = modelQuery.client + modelQuery.client = null var count = modelQuery.resetCount modelQuery.operation = operation modelQuery.query = query // re-assigning the same object should not trigger the property change modelQuery.query = query - modelQuery.enginio = enginioClient + modelQuery.client = enginioClient tryCompare(modelQuery, "resetCount", ++count, 10000) } @@ -270,7 +270,7 @@ Item { EnginioModel { id: modelModify - enginio: Enginio { + client: Enginio { id: enginioClientModify serviceUrl: AppConfig.backendData.serviceUrl @@ -331,7 +331,7 @@ Item { EnginioModel { id: modelModifyUndblocked - enginio: Enginio { + client: Enginio { id: enginioClientModifyUndblocked serviceUrl: AppConfig.backendData.serviceUrl @@ -391,7 +391,7 @@ Item { EnginioModel { id: modelModifyChaos - enginio: Enginio { + client: Enginio { id: enginioClientModifyChaos serviceUrl: AppConfig.backendData.serviceUrl @@ -452,7 +452,7 @@ Item { EnginioModel { id: modelRowCount - enginio: Enginio { + client: Enginio { serviceUrl: AppConfig.backendData.serviceUrl property int errorCount: 0 |