From: Marcin Niesluchowski <m.niesluchow@samsung.com>
Date: Tue, 21 Oct 2014 09:34:12 +0000 (+0200)
Subject: Revert commits to cynara tests
X-Git-Tag: security-manager_5.5_testing~122^2~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F00%2F29100%2F1;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git

Revert commits to cynara tests

Some commits to cynara tests making security-tests not buildable
with cynara release.

This reverts commits:
1c357c2 "Fix cynara_check return codes"
d2eb84f "Add tests for cynara_admin_check function"
a58d784 "Enhance CynaraTestAdmin with adminCheck() method"
e0b08a3 "Add tests for none bucket"

Change-Id: If344771ef62de103c24cd551cd40a6b9b8be44a3
---

diff --git a/tests/cynara-tests/common/cynara_test_admin.cpp b/tests/cynara-tests/common/cynara_test_admin.cpp
index d08263a..0270510 100644
--- a/tests/cynara-tests/common/cynara_test_admin.cpp
+++ b/tests/cynara-tests/common/cynara_test_admin.cpp
@@ -1,10 +1,7 @@
 #include <cynara_test_admin.h>
-#include <memory.h>
 #include <tests_common.h>
 
 #include <fstream>
-#include <string>
-#include <sstream>
 
 namespace
 {
@@ -111,54 +108,3 @@ void CynaraTestAdmin::setBucket(const char *bucket, int operation, const char *e
                              << " operation: " << operation << ","
                              << " extra: " << formatCstr(extra));
 }
-
-void CynaraTestAdmin::adminCheck(const char *startBucket, int recursive,
-                                 const char *client, const char *user, const char *privilege,
-                                 int expectedCheckResult, const char *expectedCheckResultExtra,
-                                 int expectedResult)
-{
-    int checkResult;
-    char *checkResultExtra = nullptr;
-
-    int ret = cynara_admin_check(m_admin,
-                                 startBucket, recursive,
-                                 client, user, privilege,
-                                 &checkResult, &checkResultExtra);
-    CStringPtr extra(checkResultExtra);
-
-    auto dump = [&]() -> std::string
-    {
-        std::stringstream s;
-        s  << " functionReturn: " << ret << ","
-           << " functionExpectedReturn: " << expectedResult << ",";
-
-        s  << " startBucket: " << formatCstr(startBucket) << ","
-           << " recursive: " << recursive << ","
-           << " client: " << formatCstr(client) << ","
-           << " user: " << formatCstr(user) << ","
-           << " privilege: " << formatCstr(privilege) << ",";
-
-        s  << " checkResult: " << checkResult << ","
-           << " expectedCheckResult: " << expectedCheckResult << ","
-           << " checkResultExtra: " << formatCstr(checkResultExtra) << ","
-           << " expectedCheckResultExtra: " << formatCstr(expectedCheckResultExtra);
-        return s.str();
-    };
-
-    RUNNER_ASSERT_MSG(ret == expectedResult,
-                         "cynara_admin_check returned wrong value: "
-                             << ret << " != " << expectedResult << "."
-                             << dump());
-
-    RUNNER_ASSERT_MSG(checkResult == expectedCheckResult,
-                         "cynara_admin_check returned wrong check result: "
-                             << checkResult << " != " << expectedCheckResult << "."
-                             << dump());
-
-    RUNNER_ASSERT_MSG(formatCstr(checkResultExtra) == formatCstr(expectedCheckResultExtra),
-                         "cynara_admin_check returned wrong check result extra: "
-                             << formatCstr(checkResultExtra) << " != "
-                             << formatCstr(expectedCheckResultExtra) << "."
-                             << dump());
-}
-
diff --git a/tests/cynara-tests/common/cynara_test_admin.h b/tests/cynara-tests/common/cynara_test_admin.h
index 66efe6f..f6b34f9 100644
--- a/tests/cynara-tests/common/cynara_test_admin.h
+++ b/tests/cynara-tests/common/cynara_test_admin.h
@@ -34,11 +34,6 @@ public:
                      int expectedResult = CYNARA_ADMIN_API_SUCCESS);
     void setBucket(const char *bucket, int operation, const char *extra,
                    int expectedResult = CYNARA_ADMIN_API_SUCCESS);
-    void adminCheck(const char *startBucket, int recursive,
-                    const char *client, const char *user, const char *privilege,
-                    int expectedCheckResult, const char *expectedCheckResultExtra,
-                    int expectedResult = CYNARA_ADMIN_API_SUCCESS);
-
 private:
     struct cynara_admin *m_admin;
 };
diff --git a/tests/cynara-tests/common/cynara_test_client.h b/tests/cynara-tests/common/cynara_test_client.h
index 4fbe44a..e2832e9 100644
--- a/tests/cynara-tests/common/cynara_test_client.h
+++ b/tests/cynara-tests/common/cynara_test_client.h
@@ -11,7 +11,7 @@ public:
 
     void check(const char *client, const char *session,
                const char *user, const char *privilege,
-               int expectedResult = CYNARA_API_ACCESS_ALLOWED);
+               int expectedResult = CYNARA_API_SUCCESS);
 
 private:
     struct cynara *m_cynara;
diff --git a/tests/cynara-tests/test_cases.cpp b/tests/cynara-tests/test_cases.cpp
index 953ad86..afc8c03 100644
--- a/tests/cynara-tests/test_cases.cpp
+++ b/tests/cynara-tests/test_cases.cpp
@@ -112,7 +112,6 @@ void tc04_admin_set_policies_invalid_params_func()
     const char *privilege = "privilege04";
     const int resultAllow = CYNARA_ADMIN_ALLOW;
     const int resultBucket = CYNARA_ADMIN_BUCKET;
-    const int resultNone = CYNARA_ADMIN_NONE;
     const char *resultExtra = nullptr;
 
     checkInvalidPolicy(admin, nullptr, client,  user,    privilege, resultAllow,  resultExtra);
@@ -121,7 +120,6 @@ void tc04_admin_set_policies_invalid_params_func()
     checkInvalidPolicy(admin, bucket,  client,  user,    nullptr,   resultAllow,  resultExtra);
     checkInvalidPolicy(admin, bucket,  client,  user,    privilege, INT_MAX,      resultExtra);
     checkInvalidPolicy(admin, bucket,  client,  user,    privilege, resultBucket, nullptr    );
-    checkInvalidPolicy(admin, bucket,  client,  user,    privilege, resultNone,   resultExtra);
 }
 
 void tc05_admin_set_bucket_invalid_params_func()
@@ -131,13 +129,11 @@ void tc05_admin_set_bucket_invalid_params_func()
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
     const int operationAllow = CYNARA_ADMIN_ALLOW;
     const int operationDelete = CYNARA_ADMIN_DELETE;
-    const int operationNone = CYNARA_ADMIN_NONE;
     const char *extra = nullptr;
 
     admin.setBucket(nullptr, operationAllow,   extra, CYNARA_ADMIN_API_INVALID_PARAM);
     admin.setBucket(bucket,  INT_MAX,          extra, CYNARA_ADMIN_API_INVALID_PARAM);
     admin.setBucket(bucket,  operationDelete,  extra, CYNARA_ADMIN_API_OPERATION_NOT_ALLOWED);
-    admin.setBucket(bucket,  operationNone,    extra, CYNARA_ADMIN_API_OPERATION_NOT_ALLOWED);
 }
 
 void tc06_cynara_check_empty_admin1_func()
@@ -178,7 +174,7 @@ void tc07_admin_set_bucket_admin_allow_deny_func()
 
     admin.setBucket(bucket, CYNARA_ADMIN_ALLOW, extra);
 
-    cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
+    cynara.check(client, session, user, privilege, CYNARA_API_SUCCESS);
 
     admin.setBucket(bucket, CYNARA_ADMIN_DENY, extra);
 
@@ -210,7 +206,7 @@ void tc08_admin_set_policies_allow_remove1_func()
         cp.add(bucket, data[0][0], data[0][1], data[0][2], resultAllow, resultExtra);
         admin.setPolicies(cp);
     }
-    cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_ACCESS_ALLOWED);
+    cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_SUCCESS);
     cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_DENIED);
 
     // allow second policy
@@ -219,8 +215,8 @@ void tc08_admin_set_policies_allow_remove1_func()
         cp.add(bucket, data[1][0], data[1][1], data[1][2], resultAllow, resultExtra);
         admin.setPolicies(cp);
     }
-    cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_ACCESS_ALLOWED);
-    cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_ALLOWED);
+    cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_SUCCESS);
+    cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_SUCCESS);
 
     // delete first policy
     {
@@ -229,7 +225,7 @@ void tc08_admin_set_policies_allow_remove1_func()
         admin.setPolicies(cp);
     }
     cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_ACCESS_DENIED);
-    cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_ALLOWED);
+    cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_SUCCESS);
 
     // delete second policy
     {
@@ -266,7 +262,7 @@ void tc08_admin_set_policies_allow_remove2_func()
         cp.add(bucket, data[0][0], data[0][1], data[0][2], resultAllow, resultExtra);
         admin.setPolicies(cp);
     }
-    cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_ACCESS_ALLOWED);
+    cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_SUCCESS);
     cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_DENIED);
 
     // delete first, allow second policy
@@ -277,7 +273,7 @@ void tc08_admin_set_policies_allow_remove2_func()
         admin.setPolicies(cp);
     }
     cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_ACCESS_DENIED);
-    cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_ALLOWED);
+    cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_SUCCESS);
 
     // delete second policy
     {
@@ -316,8 +312,8 @@ void tc08_admin_set_policies_allow_remove3_func()
         cp.add(bucket, data[1][0], data[1][1], data[1][2], resultAllow, resultExtra);
         admin.setPolicies(cp);
     }
-    cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_ACCESS_ALLOWED);
-    cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_ALLOWED);
+    cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_SUCCESS);
+    cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_SUCCESS);
 
     // delete first and second policy
     {
@@ -370,7 +366,7 @@ void checkSingleWildcardAllowRestDeny(const std::vector< std::vector<const char
                 if ((u == 0 && p == 0)
                  || (c == 1 && p == 1)
                  || (c == 2 && u == 2)) {
-                    cynara.check(data[c][0], session, data[u][1], data[p][2], CYNARA_API_ACCESS_ALLOWED);
+                    cynara.check(data[c][0], session, data[u][1], data[p][2], CYNARA_API_SUCCESS);
                 } else {
                     cynara.check(data[c][0], session, data[u][1], data[p][2], CYNARA_API_ACCESS_DENIED);
                 }
@@ -457,7 +453,7 @@ void tc10_admin_change_extra_bucket_func()
         admin.setPolicies(cp);
     }
 
-    cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_ACCESS_ALLOWED);
+    cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_SUCCESS);
     cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_DENIED);
 
     admin.setBucket(bucket, CYNARA_ADMIN_DENY, extra);
@@ -467,7 +463,7 @@ void tc10_admin_change_extra_bucket_func()
 
     admin.setBucket(bucket, CYNARA_ADMIN_ALLOW, extra);
 
-    cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_ACCESS_ALLOWED);
+    cynara.check(data[0][0], session, data[0][1], data[0][2], CYNARA_API_SUCCESS);
     cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_DENIED);
 
     {
@@ -530,7 +526,7 @@ void tc12_admin_delete_bucket_with_policies_pointing_to_it_func()
                CYNARA_ADMIN_BUCKET, bucket);
         admin.setPolicies(cp);
     }
-    cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
+    cynara.check(client, session, user, privilege, CYNARA_API_SUCCESS);
 
     admin.setBucket(bucket, CYNARA_ADMIN_DELETE, extra);
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
@@ -569,7 +565,7 @@ void tc13_admin_set_policies_to_extra_bucket_func()
                CYNARA_ADMIN_ALLOW, extraResult);
         admin.setPolicies(cp);
     }
-    cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
+    cynara.check(client, session, user, privilege, CYNARA_API_SUCCESS);
 
     admin.setBucket(bucket, CYNARA_ADMIN_DELETE, extra);
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
@@ -606,286 +602,7 @@ void tc14_admin_set_policies_integrity_func()
         CynaraTestClient cynara;
         cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
     }
-}
-
-void tc15_admin_set_bucket_admin_none1_func()
-{
-    CynaraTestAdmin admin;
-    CynaraTestClient cynara;
-
-    const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
-    const char *bucket = "bucket15_1";
-    const char *client = "client15_1";
-    const char *session = "session15_1";
-    const char *user = "user15_1";
-    const char *privilege = "privilege15_1";
-    const char *extra = nullptr;
-    const char *extraResult = nullptr;
-
-    admin.setBucket(bucket, CYNARA_ADMIN_NONE, extra);
-
-    {
-        CynaraPoliciesContainer cp;
-        cp.add(bucketDefault,
-               client, user, privilege,
-               CYNARA_ADMIN_BUCKET, bucket);
-        cp.add(bucket,
-               client, user, privilege,
-               CYNARA_ADMIN_ALLOW, extraResult);
-        admin.setPolicies(cp);
-    }
-    cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
-}
-
-void tc15_admin_set_bucket_admin_none2_func()
-{
-    CynaraTestAdmin admin;
-    CynaraTestClient cynara;
-
-    const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
-    const char *bucket = "bucket15_2";
-    const char *client = "client15_2";
-    const char *session = "session15_2";
-    const char *user = "user15_2";
-    const char *privilege = "privilege15_2";
-    const char *extra = nullptr;
-
-    admin.setBucket(bucket, CYNARA_ADMIN_NONE, extra);
-
-    {
-        CynaraPoliciesContainer cp;
-        cp.add(bucketDefault,
-               client, user, privilege,
-               CYNARA_ADMIN_BUCKET, bucket);
-        admin.setPolicies(cp);
-    }
-    cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
-}
-
-void tc15_admin_set_bucket_admin_none3_func()
-{
-    CynaraTestAdmin admin;
-    CynaraTestClient cynara;
-
-    const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
-    const char *bucket = "bucket15_3";
-    const char *client = "client15_3";
-    const char *session = "session15_3";
-    const char *user = "user15_3";
-    const char *privilege = "privilege15_3";
-    const char *extra = nullptr;
-    const char *extraResult = nullptr;
-
-    admin.setBucket(bucket, CYNARA_ADMIN_NONE, extra);
-
-    {
-        CynaraPoliciesContainer cp;
-        cp.add(bucketDefault,
-               client, user, privilege,
-               CYNARA_ADMIN_BUCKET, bucket);
-        cp.add(bucketDefault,
-               client, user, CYNARA_ADMIN_WILDCARD,
-               CYNARA_ADMIN_ALLOW, extraResult);
-        admin.setPolicies(cp);
-    }
-    cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
-}
-
-void tc16_admin_check_single_bucket_func()
-{
-    const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
-    const char *client = "client16";
-    const char *user = "user16";
-    const char *privilege = "privilege16";
-    const char *extraResult = nullptr;
-    int recursive = 1;
-    int notrecursive = 0;
-
-    CynaraTestAdmin admin;
-
-    admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
-
-    CynaraPoliciesContainer cp;
-    cp.add(bucketDefault,
-           client, user, privilege,
-           CYNARA_ADMIN_ALLOW, extraResult);
-    admin.setPolicies(cp);
-
-    admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
-}
-
-void tc17_admin_check_nested_bucket_func()
-{
-    const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
-    const char *bucket = "bucket17";
-    const char *client = "client17";
-    const char *user = "user17";
-    const char *privilege = "privilege17";
-    const char *extra = nullptr;
-    const char *extraResult = nullptr;
-    int recursive = 1;
-    int notrecursive = 0;
-
-    CynaraTestAdmin admin;
-    admin.setBucket(bucket, CYNARA_ADMIN_DENY, extra);
-
-    admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucket, recursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucket, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
-
-    {
-        CynaraPoliciesContainer cp;
-        cp.add(bucketDefault,
-               client, user, privilege,
-               CYNARA_ADMIN_BUCKET, bucket);
-        cp.add(bucket,
-               client, user, privilege,
-               CYNARA_ADMIN_ALLOW, extraResult);
-        admin.setPolicies(cp);
-    }
-
-    admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucket, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucket, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
-}
-
-void tc18_admin_check_multiple_matches_func()
-{
-    const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
-    const char *client = "client18";
-    const char *user = "user18";
-    const char *privilege = "privilege18";
-    const char *wildcard = CYNARA_ADMIN_WILDCARD;
-    const char *extra = nullptr;
-    const char *extraResult = nullptr;
-    int recursive = 1;
-    int notrecursive = 0;
-
-    CynaraTestAdmin admin;
-
-    auto check = [&](int expected_result)
-    {
-        admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                         expected_result, nullptr, CYNARA_ADMIN_API_SUCCESS);
-        admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                         expected_result, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    };
-
-    check(CYNARA_ADMIN_DENY);
-
-    {
-        CynaraPoliciesContainer cp;
-        cp.add(bucketDefault,
-               client, user, privilege,
-               CYNARA_ADMIN_ALLOW, extraResult);
-        admin.setPolicies(cp);
-    }
-
-    check(CYNARA_ADMIN_ALLOW);
-
-    {
-        CynaraPoliciesContainer cp;
-        cp.add(bucketDefault,
-               wildcard, user, privilege,
-               CYNARA_ADMIN_DENY, extraResult);
-        admin.setPolicies(cp);
-    }
-
-    check(CYNARA_ADMIN_DENY);
-
-    admin.setBucket(bucketDefault, CYNARA_ADMIN_ALLOW, extra);
-
-    check(CYNARA_ADMIN_DENY);
-
-    {
-        CynaraPoliciesContainer cp;
-        cp.add(bucketDefault,
-               client, user, privilege,
-               CYNARA_ADMIN_DELETE, extraResult);
-        admin.setPolicies(cp);
-    }
-
-    check(CYNARA_ADMIN_DENY);
-
-    {
-        CynaraPoliciesContainer cp;
-        cp.add(bucketDefault,
-               wildcard, user, privilege,
-               CYNARA_ADMIN_DELETE, extraResult);
-        admin.setPolicies(cp);
-    }
-
-    check(CYNARA_ADMIN_ALLOW);
-}
-
-void tc19_admin_check_none_bucket_func()
-{
-    const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
-    const char *bucket1 = "bucket19_a";
-    const char *bucket2 = "bucket19_b";
-    const char *client = "client19";
-    const char *user = "user19";
-    const char *privilege = "privilege19";
-    const char *extra = nullptr;
-    int recursive = 1;
-    int notrecursive = 0;
-
-    CynaraTestAdmin admin;
-    admin.setBucket(bucket1, CYNARA_ADMIN_NONE, extra);
-    admin.setBucket(bucket2, CYNARA_ADMIN_ALLOW, extra);
-
-    admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucket1, recursive, client, user, privilege,
-                     CYNARA_ADMIN_NONE, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucket1, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_NONE, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucket2, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucket2, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
-
-    {
-        CynaraPoliciesContainer cp;
-        cp.add(bucketDefault,
-               client, user, privilege,
-               CYNARA_ADMIN_BUCKET, bucket1);
-        cp.add(bucket1,
-               client, user, privilege,
-               CYNARA_ADMIN_BUCKET, bucket2);
-        admin.setPolicies(cp);
-    }
 
-    admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucket1, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucket1, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_NONE, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucket2, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
-    admin.adminCheck(bucket2, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
 }
 
 RUNNER_TEST_GROUP_INIT(cynara_tests)
@@ -907,10 +624,3 @@ RUN_CYNARA_TEST(tc11_admin_bucket_not_found)
 RUN_CYNARA_TEST(tc12_admin_delete_bucket_with_policies_pointing_to_it)
 RUN_CYNARA_TEST(tc13_admin_set_policies_to_extra_bucket)
 RUN_CYNARA_TEST(tc14_admin_set_policies_integrity)
-RUN_CYNARA_TEST(tc15_admin_set_bucket_admin_none1)
-RUN_CYNARA_TEST(tc15_admin_set_bucket_admin_none2)
-RUN_CYNARA_TEST(tc15_admin_set_bucket_admin_none3)
-RUN_CYNARA_TEST(tc16_admin_check_single_bucket)
-RUN_CYNARA_TEST(tc17_admin_check_nested_bucket)
-RUN_CYNARA_TEST(tc18_admin_check_multiple_matches)
-RUN_CYNARA_TEST(tc19_admin_check_none_bucket)