Provide CynaraTestClient namespace for sync client

CynaraTestClient is dedicated to contain all classes related
to synchronous client cynara interface wrap in cynara-tests.
CynaraTestClient class was renamed to simpler name Client.

Change-Id: I99808b0f3c17f9272deb6dfee1ed4ab6449abbb3

diff --git a/tests/cynara-tests/common/cynara_test_client.cpp b/tests/cynara-tests/common/cynara_test_client.cpp
index 5c19491..f405145 100644 (file)
--- a/tests/cynara-tests/common/cynara_test_client.cpp
+++ b/tests/cynara-tests/common/cynara_test_client.cpp
@@ -18,7 +18,9 @@
 
 #include <tests_common.h>
 
-CynaraTestClient::CynaraTestClient()
+namespace CynaraTestClient {
+
+Client::Client()
     : m_cynara(nullptr)
 {
     int ret = cynara_initialize(&m_cynara, nullptr);
@@ -27,14 +29,14 @@ CynaraTestClient::CynaraTestClient()
     RUNNER_ASSERT_MSG(m_cynara != nullptr, "cynara struct was not initialized");
 }
 
-CynaraTestClient::~CynaraTestClient()
+Client::~Client()
 {
     cynara_finish(m_cynara);
 }
 
-void CynaraTestClient::check(const char *client, const char *session,
-                             const char *user, const char *privilege,
-                             int expectedResult)
+void Client::check(const char *client, const char *session,
+                   const char *user, const char *privilege,
+                   int expectedResult)
 {
     int ret = cynara_check(m_cynara, client, session, user, privilege);
     RUNNER_ASSERT_MSG(ret == expectedResult,
@@ -45,3 +47,5 @@ void CynaraTestClient::check(const char *client, const char *session,
                              << " user: " << formatCstr(user) << ","
                              << " privilege: " << formatCstr(privilege));
 }
+
+} //namespace CynaraTestClient

diff --git a/tests/cynara-tests/common/cynara_test_client.h b/tests/cynara-tests/common/cynara_test_client.h
index c9bb96b..d5f1eab 100644 (file)
--- a/tests/cynara-tests/common/cynara_test_client.h
+++ b/tests/cynara-tests/common/cynara_test_client.h
@@ -19,11 +19,13 @@
 
 #include <cynara-client.h>
 
-class CynaraTestClient
+namespace CynaraTestClient {
+
+class Client
 {
 public:
-    CynaraTestClient();
-    virtual ~CynaraTestClient();
+    Client();
+    virtual ~Client();
 
     void check(const char *client, const char *session,
                const char *user, const char *privilege,
@@ -33,4 +35,6 @@ private:
     struct cynara *m_cynara;
 };
 
+} //namespace CynaraTestClient
+
 #endif // CYNARA_TEST_CLIENT_H

diff --git a/tests/cynara-tests/test_cases.cpp b/tests/cynara-tests/test_cases.cpp
index e86ad9e..df91958 100644 (file)
--- a/tests/cynara-tests/test_cases.cpp
+++ b/tests/cynara-tests/test_cases.cpp
@@ -32,10 +32,11 @@
 #include <climits>
 
 using namespace CynaraTestAdmin;
+using namespace CynaraTestClient;
 
 void tc01_cynara_initialize_func()
 {
-    CynaraTestClient();
+    Client();
 }
 
 void tc02_admin_initialize_func()
@@ -45,7 +46,7 @@ void tc02_admin_initialize_func()
 
 void tc03_cynara_check_invalid_params_func()
 {
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *client = "client03";
     const char *user = "user03";
@@ -112,7 +113,7 @@ void tc05_admin_set_bucket_invalid_params_func()
 
 void tc06_cynara_check_empty_admin1_func()
 {
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *client = "client06_1";
     const char *session = "session06_1";
@@ -124,7 +125,7 @@ void tc06_cynara_check_empty_admin1_func()
 
 void tc06_cynara_check_empty_admin2_func()
 {
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *client = CYNARA_ADMIN_WILDCARD;
     const char *session = "session06_2";
@@ -137,7 +138,7 @@ void tc06_cynara_check_empty_admin2_func()
 void tc07_admin_set_bucket_admin_allow_deny_func()
 {
     Admin admin;
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *client = "client07";
@@ -158,7 +159,7 @@ void tc07_admin_set_bucket_admin_allow_deny_func()
 void tc08_admin_set_policies_allow_remove1_func()
 {
     Admin admin;
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *session = "session08_1";
@@ -214,7 +215,7 @@ void tc08_admin_set_policies_allow_remove1_func()
 void tc08_admin_set_policies_allow_remove2_func()
 {
     Admin admin;
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *session = "session08_2";
@@ -263,7 +264,7 @@ void tc08_admin_set_policies_allow_remove2_func()
 void tc08_admin_set_policies_allow_remove3_func()
 {
     Admin admin;
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *session = "session08_3";
@@ -304,7 +305,7 @@ void tc08_admin_set_policies_allow_remove3_func()
 void checkAllDeny(const std::vector< std::vector<const char *> > &data,
                   const char *session)
 {
-    CynaraTestClient cynara;
+    Client cynara;
 
     for (auto it = data.begin(); it != data.end(); ++it) {
         RUNNER_ASSERT_MSG(it->size() == 3, "Wrong test data size");
@@ -330,7 +331,7 @@ void checkSingleWildcardData(const std::vector< std::vector<const char *> > &dat
 void checkSingleWildcardAllowRestDeny(const std::vector< std::vector<const char *> > &data,
                                       const char *session)
 {
-    CynaraTestClient cynara;
+    Client cynara;
 
     checkSingleWildcardData(data);
 
@@ -397,7 +398,7 @@ void tc09_admin_set_policies_wildcard_accesses_func()
 void tc10_admin_change_extra_bucket_func()
 {
     Admin admin;
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket = "bucket10";
@@ -457,7 +458,7 @@ void tc10_admin_change_extra_bucket_func()
 void tc11_admin_bucket_not_found_func()
 {
     Admin admin;
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket = "bucket11";
@@ -481,7 +482,7 @@ void tc11_admin_bucket_not_found_func()
 void tc12_admin_delete_bucket_with_policies_pointing_to_it_func()
 {
     Admin admin;
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket = "bucket12";
@@ -515,7 +516,7 @@ void tc12_admin_delete_bucket_with_policies_pointing_to_it_func()
 void tc13_admin_set_policies_to_extra_bucket_func()
 {
     Admin admin;
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket = "bucket13";
@@ -556,7 +557,7 @@ void tc14_admin_set_policies_integrity_func()
     const char *extraResult = nullptr;
 
     {
-        CynaraTestClient cynara;
+        Client cynara;
         cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
     }
 
@@ -573,7 +574,7 @@ void tc14_admin_set_policies_integrity_func()
     }
 
     {
-        CynaraTestClient cynara;
+        Client cynara;
         cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
     }
 }
@@ -581,7 +582,7 @@ void tc14_admin_set_policies_integrity_func()
 void tc15_admin_set_bucket_admin_none1_func()
 {
     Admin admin;
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket = "bucket15_1";
@@ -610,7 +611,7 @@ void tc15_admin_set_bucket_admin_none1_func()
 void tc15_admin_set_bucket_admin_none2_func()
 {
     Admin admin;
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket = "bucket15_2";
@@ -635,7 +636,7 @@ void tc15_admin_set_bucket_admin_none2_func()
 void tc15_admin_set_bucket_admin_none3_func()
 {
     Admin admin;
-    CynaraTestClient cynara;
+    Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket = "bucket15_3";

diff --git a/tests/security-manager-tests/security_manager_tests.cpp b/tests/security-manager-tests/security_manager_tests.cpp
index ab6c0cd..e721eb2 100644 (file)
--- a/tests/security-manager-tests/security_manager_tests.cpp
+++ b/tests/security-manager-tests/security_manager_tests.cpp
@@ -175,7 +175,7 @@ static void check_app_permissions(const char *const app_id, const char *const pk
     std::string smackLabel;
     generateAppLabel(pkg_id, smackLabel);
 
-    CynaraTestClient ctc;
+    CynaraTestClient::Client ctc;
 
     for (auto &priv : allowed_privs) {
         ctc.check(smackLabel.c_str(), "", user, priv.c_str(), CYNARA_API_ACCESS_ALLOWED);