Access Control layer: tests adjusted to C++ API changes.

Change-Id: Ia3b045ab7a935d37186dee37de730ddea4d0ec1b

diff --git a/tests/ckm/async-api.cpp b/tests/ckm/async-api.cpp
index 7325660..c46c732 100644 (file)
--- a/tests/ckm/async-api.cpp
+++ b/tests/ckm/async-api.cpp
@@ -90,8 +90,7 @@ public:
 
     void ReceivedOCSPCheck(int status) { m_ocspStatus = status; Succeeded(); }
 
-    void ReceivedAllowAccess() { Succeeded(); }
-    void ReceivedDenyAccess() { Succeeded(); }
+    void ReceivedSetPermission() { Succeeded(); }
 
     void WaitForResponse()
     {
@@ -1206,9 +1205,9 @@ RUNNER_CHILD_TEST(TA1810_allow_access_invalid_param)
 {
     switch_to_storage_user(TEST_LABEL);
 
-    test_no_observer(&ManagerAsync::allowAccess, "alias", "accessor", AccessRight::AR_READ_REMOVE);
-    test_invalid_param(&ManagerAsync::allowAccess, "", "accessor", AccessRight::AR_READ_REMOVE);
-    test_invalid_param(&ManagerAsync::allowAccess, "alias", "", AccessRight::AR_READ_REMOVE);
+    test_no_observer(&ManagerAsync::setPermission, "alias", "accessor", Permission::READ_REMOVE);
+    test_invalid_param(&ManagerAsync::setPermission, "", "accessor", Permission::READ_REMOVE);
+    test_invalid_param(&ManagerAsync::setPermission, "alias", "", Permission::READ_REMOVE);
 }
 
 RUNNER_TEST(TA1820_allow_access)
@@ -1218,14 +1217,14 @@ RUNNER_TEST(TA1820_allow_access)
     test_positive(&ManagerAsync::saveData, dbc.data("alias"), test_buffer, Policy());
     test_positive(&ManagerAsync::saveData, dbc.data("alias2"), test_buffer, Policy());
     test_positive(&ManagerAsync::saveData, dbc.data("alias3"), test_buffer, Policy());
-    test_positive(&ManagerAsync::allowAccess,
+    test_positive(&ManagerAsync::setPermission,
                   dbc.data("alias2"),
                   TEST_LABEL,
-                  AccessRight::AR_READ);
-    test_positive(&ManagerAsync::allowAccess,
+                  Permission::READ);
+    test_positive(&ManagerAsync::setPermission,
                   dbc.data("alias3"),
                   TEST_LABEL,
-                  AccessRight::AR_READ_REMOVE);
+                  Permission::READ_REMOVE);
 
     {
         ScopedLabel label(TEST_LABEL);
@@ -1252,9 +1251,9 @@ RUNNER_CHILD_TEST(TA1910_deny_access_invalid_param)
 {
     switch_to_storage_user(TEST_LABEL);
 
-    test_no_observer(&ManagerAsync::denyAccess, "alias", "accessor");
-    test_invalid_param(&ManagerAsync::denyAccess, "", "accessor");
-    test_invalid_param(&ManagerAsync::denyAccess, "alias", "");
+    test_no_observer(&ManagerAsync::setPermission, "alias", "accessor", CKM::Permission::NONE);
+    test_invalid_param(&ManagerAsync::setPermission, "", "accessor", CKM::Permission::NONE);
+    test_invalid_param(&ManagerAsync::setPermission, "alias", "", CKM::Permission::NONE);
 }
 
 RUNNER_TEST(TA1920_deny_access)
@@ -1262,11 +1261,11 @@ RUNNER_TEST(TA1920_deny_access)
     DBCleanup dbc;
     CharPtr top_label = get_label();
     test_positive(&ManagerAsync::saveData, dbc.data("alias"), test_buffer, Policy());
-    test_positive(&ManagerAsync::allowAccess,
+    test_positive(&ManagerAsync::setPermission,
                   dbc.data("alias"),
                   TEST_LABEL,
-                  AccessRight::AR_READ_REMOVE);
-    test_positive(&ManagerAsync::denyAccess, dbc.data("alias"), TEST_LABEL);
+                  Permission::READ_REMOVE);
+    test_positive(&ManagerAsync::setPermission, dbc.data("alias"), TEST_LABEL, CKM::Permission::NONE);
 
     {
         ScopedLabel label(TEST_LABEL);