diff options
author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2013-11-22 11:26:35 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-22 13:31:42 +0100 |
commit | 8bb5528c99641bd9bbfdf39da8326807d76235aa (patch) | |
tree | 7fefec0af35f992a9bb34d580b88202bb4e2df9e /tests | |
parent | b3dc0c9a72358383c368c2bb881b0868683d8fac (diff) | |
download | qtenginio-8bb5528c99641bd9bbfdf39da8326807d76235aa.tar.gz |
Rename EnginioClientBase to EnginioClientConnection.
The "Base" name was meaningless. EnginioClientConnection is keeping
information about backend connection.
[ChangeLog][API] Renamed EnginioClientBase to EnginioClientConnection
Change-Id: Ide98c67702c2edd3ba2485d10f619917671834b4
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/common/common.cpp | 8 | ||||
-rw-r--r-- | tests/auto/enginiomodel/tst_enginiomodel.cpp | 6 | ||||
-rw-r--r-- | tests/auto/files/tst_files.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/common/common.cpp b/tests/auto/common/common.cpp index 43856e3..4272af9 100644 --- a/tests/auto/common/common.cpp +++ b/tests/auto/common/common.cpp @@ -341,7 +341,7 @@ void prepareTestUsersAndUserGroups(const QByteArray& backendId) QJsonObject query; query["username"] = QStringLiteral("logintest") + (i ? QString::number(i) : ""); obj["query"] = query; - client.query(obj, EnginioClientBase::UserOperation); + client.query(obj, EnginioClientConnection::UserOperation); ++spyCount; } @@ -366,7 +366,7 @@ void prepareTestUsersAndUserGroups(const QByteArray& backendId) query["username"] = identity; query["password"] = identity; query["email"] = identity + "@email.com"; - client.create(query, EnginioClientBase::UserOperation); + client.create(query, EnginioClientConnection::UserOperation); ++spyCount; } } @@ -384,7 +384,7 @@ void prepareTestUsersAndUserGroups(const QByteArray& backendId) QJsonObject query; query["name"] = "usergroup" + (i ? QString::number(i) : ""); obj["query"] = query; - client.query(obj, EnginioClientBase::UsergroupOperation); + client.query(obj, EnginioClientConnection::UsergroupOperation); ++spyCount; } @@ -407,7 +407,7 @@ void prepareTestUsersAndUserGroups(const QByteArray& backendId) if (!data.count()) { QJsonObject query; query["name"] = groupName; - client.create(query, EnginioClientBase::UsergroupOperation); + client.create(query, EnginioClientConnection::UsergroupOperation); ++spyCount; } } diff --git a/tests/auto/enginiomodel/tst_enginiomodel.cpp b/tests/auto/enginiomodel/tst_enginiomodel.cpp index a627f02..307c2bb 100644 --- a/tests/auto/enginiomodel/tst_enginiomodel.cpp +++ b/tests/auto/enginiomodel/tst_enginiomodel.cpp @@ -296,7 +296,7 @@ void tst_EnginioModel::query_property() void tst_EnginioModel::operation_property() { EnginioModel model; - QSignalSpy spy(&model, SIGNAL(operationChanged(EnginioClientBase::Operation))); + QSignalSpy spy(&model, SIGNAL(operationChanged(EnginioClientConnection::Operation))); // check initial value QCOMPARE(model.operation(), EnginioClient::ObjectOperation); @@ -304,7 +304,7 @@ void tst_EnginioModel::operation_property() model.setOperation(EnginioClient::UserOperation); QCOMPARE(model.operation(), EnginioClient::UserOperation); QTRY_COMPARE(spy.count(), 1); - QCOMPARE(spy[0][0].value<EnginioClientBase::Operation>(), EnginioClientBase::UserOperation); + QCOMPARE(spy[0][0].value<EnginioClientConnection::Operation>(), EnginioClientConnection::UserOperation); // try to set the same operation again, it should not emit the signal model.setOperation(EnginioClient::UserOperation); @@ -315,7 +315,7 @@ void tst_EnginioModel::operation_property() model.setOperation(EnginioClient::UsergroupOperation); QTRY_COMPARE(spy.count(), 2); QCOMPARE(model.operation(), EnginioClient::UsergroupOperation); - QCOMPARE(spy[1][0].value<EnginioClientBase::Operation>(), EnginioClientBase::UsergroupOperation); + QCOMPARE(spy[1][0].value<EnginioClientConnection::Operation>(), EnginioClientConnection::UsergroupOperation); } void tst_EnginioModel::roleNames() diff --git a/tests/auto/files/tst_files.cpp b/tests/auto/files/tst_files.cpp index fbce43e..e513330 100644 --- a/tests/auto/files/tst_files.cpp +++ b/tests/auto/files/tst_files.cpp @@ -133,7 +133,7 @@ void tst_Files::fileUploadDownload() client.setServiceUrl(EnginioTests::TESTAPP_URL); if (chunkSize > 0) { - EnginioClientBasePrivate *clientPrivate = EnginioClientBasePrivate::get(&client); + EnginioClientConnectionPrivate *clientPrivate = EnginioClientConnectionPrivate::get(&client); clientPrivate->_uploadChunkSize = chunkSize; } |