projects / platform / core / test / security-tests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bd1412a)
Adjust libcynara-admin error codes 94/28794/1
authorLukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Thu, 16 Oct 2014 08:21:42 +0000 (10:21 +0200)
committerLukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Thu, 16 Oct 2014 08:21:42 +0000 (10:21 +0200)
Cynara integrates error codes in all libraries.
Release 0.4.0 uses new unified error codes.
Old error codes are removed.

This patch changes old error codes into new ones.
Please do not merge this patch until 0.4.0 is released
or patch "35771f4 Use client error codes in admin libraries"
in cynara repository is merged.

Change-Id: I7d89945a075b9353399b417f1fce5ef8a06694c4

tests/cynara-tests/common/cynara_test_admin.cpp patch | blob | history
tests/cynara-tests/common/cynara_test_admin.h patch | blob | history
tests/cynara-tests/test_cases.cpp patch | blob | history

diff --git a/tests/cynara-tests/common/cynara_test_admin.cpp b/tests/cynara-tests/common/cynara_test_admin.cpp
index d08263a..7797a06 100644 (file)
--- a/tests/cynara-tests/common/cynara_test_admin.cpp
+++ b/tests/cynara-tests/common/cynara_test_admin.cpp
@@ -73,7 +73,7 @@ CynaraTestAdmin::CynaraTestAdmin()
     : m_admin(nullptr)
 {
     int ret = cynara_admin_initialize(&m_admin);
-    RUNNER_ASSERT_MSG(ret == CYNARA_ADMIN_API_SUCCESS,
+    RUNNER_ASSERT_MSG(ret == CYNARA_API_SUCCESS,
                          "cynara_admin_initialize failed. ret: " << ret);
     RUNNER_ASSERT_MSG(m_admin != nullptr, "cynara_admin struct was not initialized");
 }
diff --git a/tests/cynara-tests/common/cynara_test_admin.h b/tests/cynara-tests/common/cynara_test_admin.h
index 66efe6f..579c94e 100644 (file)
--- a/tests/cynara-tests/common/cynara_test_admin.h
+++ b/tests/cynara-tests/common/cynara_test_admin.h
@@ -31,13 +31,13 @@ public:
     virtual ~CynaraTestAdmin();
 
     void setPolicies(const CynaraPoliciesContainer &policiesContainer,
-                     int expectedResult = CYNARA_ADMIN_API_SUCCESS);
+                     int expectedResult = CYNARA_API_SUCCESS);
     void setBucket(const char *bucket, int operation, const char *extra,
-                   int expectedResult = CYNARA_ADMIN_API_SUCCESS);
+                   int expectedResult = CYNARA_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);
+                    int expectedResult = CYNARA_API_SUCCESS);
 
 private:
     struct cynara_admin *m_admin;
diff --git a/tests/cynara-tests/test_cases.cpp b/tests/cynara-tests/test_cases.cpp
index 953ad86..75e6b23 100644 (file)
--- a/tests/cynara-tests/test_cases.cpp
+++ b/tests/cynara-tests/test_cases.cpp
@@ -99,7 +99,7 @@ void checkInvalidPolicy(CynaraTestAdmin &admin,
     CynaraPoliciesContainer cp;
     cp.add(bucket, client, user, privilege, result, resultExtra);
 
-    admin.setPolicies(cp, CYNARA_ADMIN_API_INVALID_PARAM);
+    admin.setPolicies(cp, CYNARA_API_INVALID_PARAM);
 }
 
 void tc04_admin_set_policies_invalid_params_func()
@@ -134,10 +134,10 @@ void tc05_admin_set_bucket_invalid_params_func()
     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);
+    admin.setBucket(nullptr, operationAllow,   extra, CYNARA_API_INVALID_PARAM);
+    admin.setBucket(bucket,  INT_MAX,          extra, CYNARA_API_INVALID_PARAM);
+    admin.setBucket(bucket,  operationDelete,  extra, CYNARA_API_OPERATION_NOT_ALLOWED);
+    admin.setBucket(bucket,  operationNone,    extra, CYNARA_API_OPERATION_NOT_ALLOWED);
 }
 
 void tc06_cynara_check_empty_admin1_func()
@@ -503,7 +503,7 @@ void tc11_admin_bucket_not_found_func()
         cp.add(bucketDefault,
                client, user, privilege,
                CYNARA_ADMIN_BUCKET, bucket);
-        admin.setPolicies(cp, CYNARA_ADMIN_API_BUCKET_NOT_FOUND);
+        admin.setPolicies(cp, CYNARA_API_BUCKET_NOT_FOUND);
     }
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
@@ -599,7 +599,7 @@ void tc14_admin_set_policies_integrity_func()
         cp.add(bucket,
                client, user, privilege,
                CYNARA_ADMIN_ALLOW, extraResult);
-        admin.setPolicies(cp, CYNARA_ADMIN_API_BUCKET_NOT_FOUND);
+        admin.setPolicies(cp, CYNARA_API_BUCKET_NOT_FOUND);
     }
 
     {
@@ -704,9 +704,9 @@ void tc16_admin_check_single_bucket_func()
     CynaraTestAdmin admin;
 
     admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_DENY, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_DENY, nullptr, CYNARA_API_SUCCESS);
 
     CynaraPoliciesContainer cp;
     cp.add(bucketDefault,
@@ -715,9 +715,9 @@ void tc16_admin_check_single_bucket_func()
     admin.setPolicies(cp);
 
     admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
 }
 
 void tc17_admin_check_nested_bucket_func()
@@ -736,13 +736,13 @@ void tc17_admin_check_nested_bucket_func()
     admin.setBucket(bucket, CYNARA_ADMIN_DENY, extra);
 
     admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_DENY, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_DENY, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucket, recursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_DENY, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucket, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_DENY, nullptr, CYNARA_API_SUCCESS);
 
     {
         CynaraPoliciesContainer cp;
@@ -756,13 +756,13 @@ void tc17_admin_check_nested_bucket_func()
     }
 
     admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_DENY, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucket, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucket, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
 }
 
 void tc18_admin_check_multiple_matches_func()
@@ -782,9 +782,9 @@ void tc18_admin_check_multiple_matches_func()
     auto check = [&](int expected_result)
     {
         admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                         expected_result, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                         expected_result, nullptr, CYNARA_API_SUCCESS);
         admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                         expected_result, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                         expected_result, nullptr, CYNARA_API_SUCCESS);
     };
 
     check(CYNARA_ADMIN_DENY);
@@ -851,17 +851,17 @@ void tc19_admin_check_none_bucket_func()
     admin.setBucket(bucket2, CYNARA_ADMIN_ALLOW, extra);
 
     admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_DENY, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_DENY, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucket1, recursive, client, user, privilege,
-                     CYNARA_ADMIN_NONE, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_NONE, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucket1, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_NONE, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_NONE, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucket2, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucket2, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
 
     {
         CynaraPoliciesContainer cp;
@@ -875,17 +875,17 @@ void tc19_admin_check_none_bucket_func()
     }
 
     admin.adminCheck(bucketDefault, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucketDefault, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_DENY, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_DENY, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucket1, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucket1, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_NONE, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_NONE, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucket2, recursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
     admin.adminCheck(bucket2, notrecursive, client, user, privilege,
-                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_ADMIN_API_SUCCESS);
+                     CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
 }
 
 RUNNER_TEST_GROUP_INIT(cynara_tests)
Domain: Security / Uncategorized;