From b706dfb290dc41d0b958e25ffbdd5f2fd51c08a2 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 21 Nov 2013 13:46:48 +0100 Subject: API: Rename ObjectAclOperation to AccessControlOperation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ChangeLog][API] Renamed ObjectAclOperation to AccessControlOperation Change-Id: I5490bae6790e69384d2a3de60962071525630ffe Reviewed-by: Jędrzej Nowacki --- tests/auto/enginioclient/tst_enginioclient.cpp | 20 ++++++++++---------- tests/auto/enginiomodel/tst_enginiomodel.cpp | 2 +- tests/auto/identity/common/identitycommon.h | 2 +- tests/auto/qmltests/tst_enginioclient.qml | 12 ++++++------ tests/auto/qmltests/tst_model.qml | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'tests') diff --git a/tests/auto/enginioclient/tst_enginioclient.cpp b/tests/auto/enginioclient/tst_enginioclient.cpp index 5223bcb..fbfe21d 100644 --- a/tests/auto/enginioclient/tst_enginioclient.cpp +++ b/tests/auto/enginioclient/tst_enginioclient.cpp @@ -1167,20 +1167,20 @@ void tst_EnginioClient::backendFakeReply() objectWithObjectTypes["objectTypes"] = objectTypes; QVERIFY(client.query(empty, EnginioClient::ObjectOperation)); - QVERIFY(client.query(empty, EnginioClient::ObjectAclOperation)); - QVERIFY(client.query(objectTypeOnly, EnginioClient::ObjectAclOperation)); + QVERIFY(client.query(empty, EnginioClient::AccessControlOperation)); + QVERIFY(client.query(objectTypeOnly, EnginioClient::AccessControlOperation)); QVERIFY(client.query(empty, EnginioClient::UsergroupMembersOperation)); QVERIFY(client.update(empty, EnginioClient::ObjectOperation)); - QVERIFY(client.update(empty, EnginioClient::ObjectAclOperation)); + QVERIFY(client.update(empty, EnginioClient::AccessControlOperation)); QVERIFY(client.update(objectTypeOnly, EnginioClient::ObjectOperation)); - QVERIFY(client.update(objectTypeOnly, EnginioClient::ObjectAclOperation)); + QVERIFY(client.update(objectTypeOnly, EnginioClient::AccessControlOperation)); QVERIFY(client.update(empty, EnginioClient::UsergroupMembersOperation)); QVERIFY(client.remove(empty, EnginioClient::ObjectOperation)); - QVERIFY(client.remove(empty, EnginioClient::ObjectAclOperation)); + QVERIFY(client.remove(empty, EnginioClient::AccessControlOperation)); QVERIFY(client.remove(objectTypeOnly, EnginioClient::ObjectOperation)); - QVERIFY(client.remove(objectTypeOnly, EnginioClient::ObjectAclOperation)); + QVERIFY(client.remove(objectTypeOnly, EnginioClient::AccessControlOperation)); QVERIFY(client.remove(empty, EnginioClient::UsergroupMembersOperation)); QVERIFY(client.search(empty)); @@ -1273,7 +1273,7 @@ void tst_EnginioClient::acl() obj = response->data(); // so obj contains valid id // view acl of the object - reqId = client.query(obj, EnginioClient::ObjectAclOperation); + reqId = client.query(obj, EnginioClient::AccessControlOperation); QVERIFY(reqId); QTRY_COMPARE(spy.count(), 2); response = spy[1][0].value(); @@ -1299,7 +1299,7 @@ void tst_EnginioClient::acl() json = json.arg(id1, id2, id3); aclUpdate["access"] = QJsonDocument::fromJson(json.toUtf8()).object(); - reqId = client.update(aclUpdate, EnginioClient::ObjectAclOperation); + reqId = client.update(aclUpdate, EnginioClient::AccessControlOperation); //![update-access] QVERIFY(reqId); @@ -1344,7 +1344,7 @@ void tst_EnginioClient::acl() QVERIFY(valid); // view acl again to confirm the change on the server side - reqId = client.query(obj, EnginioClient::ObjectAclOperation); + reqId = client.query(obj, EnginioClient::AccessControlOperation); QVERIFY(reqId); QTRY_COMPARE(spy.count(), 4); QCOMPARE(spyError.count(), 0); @@ -1384,7 +1384,7 @@ void tst_EnginioClient::acl() } QVERIFY(valid); // it seems to work fine, let's delete the acl we created - reqId = client.remove(aclUpdate, EnginioClient::ObjectAclOperation); + reqId = client.remove(aclUpdate, EnginioClient::AccessControlOperation); QVERIFY(reqId); QTRY_COMPARE(spy.count(), 5); QCOMPARE(spyError.count(), 0); diff --git a/tests/auto/enginiomodel/tst_enginiomodel.cpp b/tests/auto/enginiomodel/tst_enginiomodel.cpp index 68db94e..1200052 100644 --- a/tests/auto/enginiomodel/tst_enginiomodel.cpp +++ b/tests/auto/enginiomodel/tst_enginiomodel.cpp @@ -578,7 +578,7 @@ void tst_EnginioModel::multpleConnections() for (int i = 0; i < 20; ++i) { model.setOperation(EnginioClient::ObjectOperation); - model.setOperation(EnginioClient::ObjectAclOperation); + model.setOperation(EnginioClient::AccessControlOperation); } // The values here are not strict. Use qDebug() << model.counter; to see what diff --git a/tests/auto/identity/common/identitycommon.h b/tests/auto/identity/common/identitycommon.h index 5870ec3..a711c46 100644 --- a/tests/auto/identity/common/identitycommon.h +++ b/tests/auto/identity/common/identitycommon.h @@ -552,7 +552,7 @@ void IdentityCommonTest::queryRestrictedObject() // json = json.arg(userId); // aclUpdate["access"] = QJsonDocument::fromJson(json.toUtf8()).object(); // qDebug() << aclUpdate; -// EnginioReply *reply = client.update(aclUpdate, EnginioClient::ObjectAclOperation); +// EnginioReply *reply = client.update(aclUpdate, EnginioClient::AccessControlOperation); // QTRY_VERIFY(reply->isFinished()); // qDebug() << reply; // CHECK_NO_ERROR(reply); diff --git a/tests/auto/qmltests/tst_enginioclient.qml b/tests/auto/qmltests/tst_enginioclient.qml index 28f98c8..b1337ca 100644 --- a/tests/auto/qmltests/tst_enginioclient.qml +++ b/tests/auto/qmltests/tst_enginioclient.qml @@ -108,18 +108,18 @@ Item { var empty = {} var objectTypeOnly = {"objectType" : "objects.todos"} var replies = [ fake.query(empty, Enginio.ObjectOperation), - fake.query(empty, Enginio.ObjectAclOperation), - fake.query(objectTypeOnly, Enginio.ObjectAclOperation), + fake.query(empty, Enginio.AccessControlOperation), + fake.query(objectTypeOnly, Enginio.AccessControlOperation), fake.query(empty, Enginio.UsergroupMembersOperation), fake.update(empty, Enginio.ObjectOperation), - fake.update(empty, Enginio.ObjectAclOperation), - fake.update(objectTypeOnly, Enginio.ObjectAclOperation), + fake.update(empty, Enginio.AccessControlOperation), + fake.update(objectTypeOnly, Enginio.AccessControlOperation), fake.update(empty, Enginio.UsergroupMembersOperation), fake.remove(empty, Enginio.ObjectOperation), - fake.remove(empty, Enginio.ObjectAclOperation), - fake.remove(objectTypeOnly, Enginio.ObjectAclOperation), + fake.remove(empty, Enginio.AccessControlOperation), + fake.remove(objectTypeOnly, Enginio.AccessControlOperation), fake.remove(empty, Enginio.UsergroupMembersOperation), fake.search(empty), diff --git a/tests/auto/qmltests/tst_model.qml b/tests/auto/qmltests/tst_model.qml index 185b81b..de4ccb1 100644 --- a/tests/auto/qmltests/tst_model.qml +++ b/tests/auto/qmltests/tst_model.qml @@ -198,8 +198,8 @@ Item { modelCreate.operation = Enginio.ObjectOperation verify(modelCreate.operation === Enginio.ObjectOperation) - modelCreate.operation = Enginio.ObjectAclOperation - verify(modelCreate.operation === Enginio.ObjectAclOperation) + modelCreate.operation = Enginio.AccessControlOperation + verify(modelCreate.operation === Enginio.AccessControlOperation) } } -- cgit v1.2.1