Provide CynaraTestAdmin namespace for admin classes

[platform/core/test/security-tests.git] / tests / cynara-tests / common / cynara_test_admin.cpp

diff --git a/tests/cynara-tests/common/cynara_test_admin.cpp b/tests/cynara-tests/common/cynara_test_admin.cpp
index d08263a..19362ad 100644 (file)
--- a/tests/cynara-tests/common/cynara_test_admin.cpp
+++ b/tests/cynara-tests/common/cynara_test_admin.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
 #include <cynara_test_admin.h>
 #include <memory.h>
 #include <tests_common.h>
@@ -6,6 +22,8 @@
 #include <string>
 #include <sstream>
 
+namespace CynaraTestAdmin {
+
 namespace
 {
 
@@ -69,22 +87,30 @@ void CynaraPoliciesContainer::add(const char *bucket,
         policy.result_extra = strdup(resultExtra);
 }
 
-CynaraTestAdmin::CynaraTestAdmin()
+void CynaraPoliciesContainer::add(const char *bucket,
+                                  const CheckKey &checkKey,
+                                  const int result,
+                                  const char *resultExtra)
+{
+    add(bucket, checkKey.m_client, checkKey.m_user, checkKey.m_privilege, result, resultExtra);
+}
+
+Admin::Admin()
     : 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");
 }
 
-CynaraTestAdmin::~CynaraTestAdmin()
+Admin::~Admin()
 {
     cynara_admin_finish(m_admin);
 }
 
-void CynaraTestAdmin::setPolicies(const CynaraPoliciesContainer &policiesContainer,
-                                  int expectedResult)
+void Admin::setPolicies(const CynaraPoliciesContainer &policiesContainer,
+                        int expectedResult)
 {
     const cynara_admin_policy *policies[policiesContainer.m_policies.size()+1];
 
@@ -100,8 +126,8 @@ void CynaraTestAdmin::setPolicies(const CynaraPoliciesContainer &policiesContain
                              << "policies:\n" << policies);
 }
 
-void CynaraTestAdmin::setBucket(const char *bucket, int operation, const char *extra,
-                                int expectedResult)
+void Admin::setBucket(const char *bucket, int operation, const char *extra,
+                      int expectedResult)
 {
     int ret = cynara_admin_set_bucket(m_admin, bucket, operation, extra);
     RUNNER_ASSERT_MSG(ret == expectedResult,
@@ -112,10 +138,10 @@ void CynaraTestAdmin::setBucket(const char *bucket, int operation, const char *e
                              << " 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)
+void Admin::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;
@@ -162,3 +188,4 @@ void CynaraTestAdmin::adminCheck(const char *startBucket, int recursive,
                              << dump());
 }
 
+} // namespace CynaraTestAdmin