From: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Date: Thu, 9 Oct 2014 16:28:29 +0000 (+0200)
Subject: Fix cynara_check return codes
X-Git-Tag: security-manager_5.5_testing~199
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Ftest%2Fsecurity-tests.git;a=commitdiff_plain;h=1c357c269b114bfec94f4876c924a54be76b19b4

Fix cynara_check return codes

After merging "151ad89 Change client API error codes"
into cynara values returned by cynara_check() changed.

In case of access allowed cynara_check returns
CYNARA_API_ACCESS_ALLOWED instead of CYNARA_API_SUCCESS.

Change-Id: I98ff68068c9c67648601c339b0ff51af7e3e1280
---

diff --git a/tests/cynara-tests/common/cynara_test_client.h b/tests/cynara-tests/common/cynara_test_client.h
index e2832e9..4fbe44a 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_SUCCESS);
+               int expectedResult = CYNARA_API_ACCESS_ALLOWED);
 
 private:
     struct cynara *m_cynara;
diff --git a/tests/cynara-tests/test_cases.cpp b/tests/cynara-tests/test_cases.cpp
index 63fcac3..953ad86 100644
--- a/tests/cynara-tests/test_cases.cpp
+++ b/tests/cynara-tests/test_cases.cpp
@@ -178,7 +178,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_SUCCESS);
+    cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
 
     admin.setBucket(bucket, CYNARA_ADMIN_DENY, extra);
 
@@ -210,7 +210,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_SUCCESS);
+    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_DENIED);
 
     // allow second policy
@@ -219,8 +219,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_SUCCESS);
-    cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_SUCCESS);
+    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);
 
     // delete first policy
     {
@@ -229,7 +229,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_SUCCESS);
+    cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_ALLOWED);
 
     // delete second policy
     {
@@ -266,7 +266,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_SUCCESS);
+    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_DENIED);
 
     // delete first, allow second policy
@@ -277,7 +277,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_SUCCESS);
+    cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_ALLOWED);
 
     // delete second policy
     {
@@ -316,8 +316,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_SUCCESS);
-    cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_SUCCESS);
+    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);
 
     // delete first and second policy
     {
@@ -370,7 +370,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_SUCCESS);
+                    cynara.check(data[c][0], session, data[u][1], data[p][2], CYNARA_API_ACCESS_ALLOWED);
                 } else {
                     cynara.check(data[c][0], session, data[u][1], data[p][2], CYNARA_API_ACCESS_DENIED);
                 }
@@ -457,7 +457,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_SUCCESS);
+    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_DENIED);
 
     admin.setBucket(bucket, CYNARA_ADMIN_DENY, extra);
@@ -467,7 +467,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_SUCCESS);
+    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_DENIED);
 
     {
@@ -530,7 +530,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_SUCCESS);
+    cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
 
     admin.setBucket(bucket, CYNARA_ADMIN_DELETE, extra);
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
@@ -569,7 +569,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_SUCCESS);
+    cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
 
     admin.setBucket(bucket, CYNARA_ADMIN_DELETE, extra);
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
@@ -634,7 +634,7 @@ void tc15_admin_set_bucket_admin_none1_func()
                CYNARA_ADMIN_ALLOW, extraResult);
         admin.setPolicies(cp);
     }
-    cynara.check(client, session, user, privilege, CYNARA_API_SUCCESS);
+    cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
 }
 
 void tc15_admin_set_bucket_admin_none2_func()
@@ -688,7 +688,7 @@ void tc15_admin_set_bucket_admin_none3_func()
                CYNARA_ADMIN_ALLOW, extraResult);
         admin.setPolicies(cp);
     }
-    cynara.check(client, session, user, privilege, CYNARA_API_SUCCESS);
+    cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
 }
 
 void tc16_admin_check_single_bucket_func()