From: Marcin Niesluchowski <m.niesluchow@samsung.com>
Date: Tue, 21 Oct 2014 12:42:20 +0000 (+0200)
Subject: Adjust cynara wrapper to framework
X-Git-Tag: security-manager_5.5_testing~118^2~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Ftest%2Fsecurity-tests.git;a=commitdiff_plain;h=6e8b7d9c847b6f0ddd095a6a3aecf33840faa892

Adjust cynara wrapper to framework

Change-Id: Ie70abd318963316cd7e83b060969324e99973880
---

diff --git a/src/cynara-tests/common/cynara_test_commons.cpp b/src/cynara-tests/common/cynara_test_commons.cpp
index 38c17dd..4e06b4b 100644
--- a/src/cynara-tests/common/cynara_test_commons.cpp
+++ b/src/cynara-tests/common/cynara_test_commons.cpp
@@ -15,7 +15,6 @@
  */
 
 #include <cynara_test_commons.h>
-#include <cynara_test_env.h>
 #include <cynara_test_file_operations.h>
 #include <cynara_test_cynara_mask.h>
 
@@ -39,30 +38,6 @@ const std::string SERVICE_PLUGINS_DIR("/usr/lib/cynara/plugin/service/");
 
 }
 
-void environmentWrap(const char *testName, const std::function<void(void)> &func)
-{
-    CynaraTestEnv env(testName);
-    env.save();
-    env.loadDefaultDatabase();
-
-    try {
-        func();
-    } catch (const DPL::Test::TestException &e) {
-        env.restore();
-        throw;
-    } catch (const DPL::Exception &e) {
-        env.restore();
-        throw;
-    } catch (const std::exception &e) {
-        env.restore();
-        throw;
-    } catch (...) {
-        env.restore();
-        throw std::runtime_error("Unknown exception");
-    }
-    env.restore();
-}
-
 void loadServicePlugins(const DirectoryPaths &pluginDirectories)
 {
     CynaraMask mask;
diff --git a/src/cynara-tests/common/cynara_test_commons.h b/src/cynara-tests/common/cynara_test_commons.h
index af8ac96..6df3a83 100644
--- a/src/cynara-tests/common/cynara_test_commons.h
+++ b/src/cynara-tests/common/cynara_test_commons.h
@@ -24,10 +24,13 @@
 #ifndef CYNARA_TEST_COMMONS_H_
 #define CYNARA_TEST_COMMONS_H_
 
-#include <functional>
 #include <string>
 #include <vector>
 
+#include <cynara_test_env.h>
+
+#include <dpl/test/test_runner.h>
+
 namespace CynaraTestConsts
 {
 
@@ -49,13 +52,8 @@ struct CheckKey
     const char *m_privilege;
 };
 
-void environmentWrap(const char *testName, const std::function<void(void)> &func);
-
 #define RUN_CYNARA_TEST(Proc)                \
-    RUNNER_TEST(Proc)                        \
-    {                                        \
-        environmentWrap(#Proc, Proc##_func); \
-    }
+    RUNNER_TEST(Proc, CynaraTestEnv)         \
 
 typedef std::vector<std::string> DirectoryPaths;
 void loadServicePlugins(const DirectoryPaths &pluginDirectories);
diff --git a/src/cynara-tests/common/cynara_test_env.cpp b/src/cynara-tests/common/cynara_test_env.cpp
index ba3350a..4af7659 100644
--- a/src/cynara-tests/common/cynara_test_env.cpp
+++ b/src/cynara-tests/common/cynara_test_env.cpp
@@ -23,21 +23,22 @@
 
 using namespace FileOperations;
 
-CynaraTestEnv::CynaraTestEnv(const char *dirName)
+CynaraTestEnv::CynaraTestEnv()
     : m_dbPresent(false)
 {
-    m_saveDir = TMP_DIR + "/" + dirName;
-    m_dbSaveDir = m_saveDir + "/db";
-    m_pluginsSaveDir = m_saveDir + "/plugins";
-    m_defaultDir = "/etc/security-tests/db_patterns/default";
 }
 
 CynaraTestEnv::~CynaraTestEnv()
 {
 }
 
-void CynaraTestEnv::save()
+void CynaraTestEnv::init(const std::string &testName)
 {
+    m_saveDir = TMP_DIR + "/" + testName;
+    m_dbSaveDir = m_saveDir + "/db";
+    m_pluginsSaveDir = m_saveDir + "/plugins";
+    m_defaultDir = "/etc/security-tests/db_patterns/default";
+
     CynaraMask mask;
 
     removeDirFiles(m_dbSaveDir);
@@ -54,9 +55,10 @@ void CynaraTestEnv::save()
     }
     makeDir(m_pluginsSaveDir);
     copyCynaraFiles(CynaraTestConsts::SERVICE_PLUGINS_DIR, m_pluginsSaveDir);
+    unmaskedLoadDefaultDatabase();
 }
 
-void CynaraTestEnv::restore()
+void CynaraTestEnv::finish()
 {
     CynaraMask mask;
 
@@ -76,12 +78,16 @@ void CynaraTestEnv::restore()
     removeDirIfExists(m_saveDir);
 }
 
-void CynaraTestEnv::loadDefaultDatabase()
+void CynaraTestEnv::unmaskedLoadDefaultDatabase()
 {
-    CynaraMask mask;
-
     if (m_dbPresent) {
         removeDirFiles(CynaraTestConsts::DB_DIR);
         copyCynaraFiles(m_defaultDir, CynaraTestConsts::DB_DIR);
     }
 }
+
+void CynaraTestEnv::loadDefaultDatabase()
+{
+    CynaraMask mask;
+    unmaskedLoadDefaultDatabase();
+}
diff --git a/src/cynara-tests/common/cynara_test_env.h b/src/cynara-tests/common/cynara_test_env.h
index 6c528f7..387d6ba 100644
--- a/src/cynara-tests/common/cynara_test_env.h
+++ b/src/cynara-tests/common/cynara_test_env.h
@@ -22,14 +22,14 @@
 class CynaraTestEnv
 {
 public:
-    explicit CynaraTestEnv(const char *dirName);
-    virtual ~CynaraTestEnv();
-
-    void save();
-    void restore();
+    explicit CynaraTestEnv();
+    ~CynaraTestEnv();
+    void init(const std::string &testName);
+    void finish();
     void loadDefaultDatabase();
 
 private:
+    void unmaskedLoadDefaultDatabase();
     std::string m_saveDir;
     std::string m_dbSaveDir;
     std::string m_pluginsSaveDir;
diff --git a/src/cynara-tests/test_cases.cpp b/src/cynara-tests/test_cases.cpp
index 104cd83..f9bbdcb 100644
--- a/src/cynara-tests/test_cases.cpp
+++ b/src/cynara-tests/test_cases.cpp
@@ -36,17 +36,19 @@
 using namespace CynaraTestAdmin;
 using namespace CynaraTestClient;
 
-void tc01_cynara_initialize_func()
+RUNNER_TEST_GROUP_INIT(cynara_tests)
+
+RUN_CYNARA_TEST(tc01_cynara_initialize)
 {
     Client();
 }
 
-void tc02_admin_initialize_func()
+RUN_CYNARA_TEST(tc02_admin_initialize)
 {
     Admin admin;
 }
 
-void tc03_cynara_check_invalid_params_func()
+RUN_CYNARA_TEST(tc03_cynara_check_invalid_params)
 {
     Client cynara;
 
@@ -75,7 +77,7 @@ void checkInvalidPolicy(Admin &admin,
     admin.setPolicies(cp, CYNARA_API_INVALID_PARAM);
 }
 
-void tc04_admin_set_policies_invalid_params_func()
+RUN_CYNARA_TEST(tc04_admin_set_policies_invalid_params)
 {
     Admin admin;
 
@@ -97,7 +99,7 @@ void tc04_admin_set_policies_invalid_params_func()
     checkInvalidPolicy(admin, bucket,  client,  user,    privilege, resultNone,   resultExtra);
 }
 
-void tc05_admin_set_bucket_invalid_params_func()
+RUN_CYNARA_TEST(tc05_admin_set_bucket_invalid_params)
 {
     Admin admin;
 
@@ -113,7 +115,7 @@ void tc05_admin_set_bucket_invalid_params_func()
     admin.setBucket(bucket,  operationNone,    extra, CYNARA_API_OPERATION_NOT_ALLOWED);
 }
 
-void tc06_cynara_check_empty_admin1_func()
+RUN_CYNARA_TEST(tc06_cynara_check_empty_admin1)
 {
     Client cynara;
 
@@ -125,7 +127,7 @@ void tc06_cynara_check_empty_admin1_func()
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-void tc06_cynara_check_empty_admin2_func()
+RUN_CYNARA_TEST(tc06_cynara_check_empty_admin2)
 {
     Client cynara;
 
@@ -137,7 +139,7 @@ void tc06_cynara_check_empty_admin2_func()
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-void tc07_admin_set_bucket_admin_allow_deny_func()
+RUN_CYNARA_TEST(tc07_admin_set_bucket_admin_allow_deny)
 {
     Admin admin;
     Client cynara;
@@ -158,7 +160,7 @@ void tc07_admin_set_bucket_admin_allow_deny_func()
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-void tc08_admin_set_policies_allow_remove1_func()
+RUN_CYNARA_TEST(tc08_admin_set_policies_allow_remove1)
 {
     Admin admin;
     Client cynara;
@@ -214,7 +216,7 @@ void tc08_admin_set_policies_allow_remove1_func()
     cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_DENIED);
 }
 
-void tc08_admin_set_policies_allow_remove2_func()
+RUN_CYNARA_TEST(tc08_admin_set_policies_allow_remove2)
 {
     Admin admin;
     Client cynara;
@@ -263,7 +265,7 @@ void tc08_admin_set_policies_allow_remove2_func()
     cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_DENIED);
 }
 
-void tc08_admin_set_policies_allow_remove3_func()
+RUN_CYNARA_TEST(tc08_admin_set_policies_allow_remove3)
 {
     Admin admin;
     Client cynara;
@@ -374,7 +376,7 @@ void setSingleWildcardPolicies(const char *bucket,
     admin.setPolicies(cp);
 }
 
-void tc09_admin_set_policies_wildcard_accesses_func()
+RUN_CYNARA_TEST(tc09_admin_set_policies_wildcard_accesses)
 {
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *session = "session09";
@@ -397,7 +399,7 @@ void tc09_admin_set_policies_wildcard_accesses_func()
     checkAllDeny(data, session);
 }
 
-void tc10_admin_change_extra_bucket_func()
+RUN_CYNARA_TEST(tc10_admin_change_extra_bucket)
 {
     Admin admin;
     Client cynara;
@@ -457,7 +459,7 @@ void tc10_admin_change_extra_bucket_func()
     admin.setBucket(bucket, CYNARA_ADMIN_DELETE, extra);
 }
 
-void tc11_admin_bucket_not_found_func()
+RUN_CYNARA_TEST(tc11_admin_bucket_not_found)
 {
     Admin admin;
     Client cynara;
@@ -481,7 +483,7 @@ void tc11_admin_bucket_not_found_func()
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-void tc12_admin_delete_bucket_with_policies_pointing_to_it_func()
+RUN_CYNARA_TEST(tc12_admin_delete_bucket_with_policies_pointing_to_it)
 {
     Admin admin;
     Client cynara;
@@ -515,7 +517,7 @@ void tc12_admin_delete_bucket_with_policies_pointing_to_it_func()
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-void tc13_admin_set_policies_to_extra_bucket_func()
+RUN_CYNARA_TEST(tc13_admin_set_policies_to_extra_bucket)
 {
     Admin admin;
     Client cynara;
@@ -548,7 +550,7 @@ void tc13_admin_set_policies_to_extra_bucket_func()
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-void tc14_admin_set_policies_integrity_func()
+RUN_CYNARA_TEST(tc14_admin_set_policies_integrity)
 {
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket = "bucket14";
@@ -581,7 +583,7 @@ void tc14_admin_set_policies_integrity_func()
     }
 }
 
-void tc15_admin_set_bucket_admin_none1_func()
+RUN_CYNARA_TEST(tc15_admin_set_bucket_admin_none1)
 {
     Admin admin;
     Client cynara;
@@ -610,7 +612,7 @@ void tc15_admin_set_bucket_admin_none1_func()
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
 }
 
-void tc15_admin_set_bucket_admin_none2_func()
+RUN_CYNARA_TEST(tc15_admin_set_bucket_admin_none2)
 {
     Admin admin;
     Client cynara;
@@ -635,7 +637,7 @@ void tc15_admin_set_bucket_admin_none2_func()
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-void tc15_admin_set_bucket_admin_none3_func()
+RUN_CYNARA_TEST(tc15_admin_set_bucket_admin_none3)
 {
     Admin admin;
     Client cynara;
@@ -664,7 +666,7 @@ void tc15_admin_set_bucket_admin_none3_func()
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
 }
 
-void tc16_admin_check_single_bucket_func()
+RUN_CYNARA_TEST(tc16_admin_check_single_bucket)
 {
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *client = "client16";
@@ -693,7 +695,7 @@ void tc16_admin_check_single_bucket_func()
                      CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
 }
 
-void tc17_admin_check_nested_bucket_func()
+RUN_CYNARA_TEST(tc17_admin_check_nested_bucket)
 {
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket = "bucket17";
@@ -738,7 +740,7 @@ void tc17_admin_check_nested_bucket_func()
                      CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
 }
 
-void tc18_admin_check_multiple_matches_func()
+RUN_CYNARA_TEST(tc18_admin_check_multiple_matches)
 {
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *client = "client18";
@@ -807,7 +809,7 @@ void tc18_admin_check_multiple_matches_func()
     check(CYNARA_ADMIN_ALLOW);
 }
 
-void tc19_admin_check_none_bucket_func()
+RUN_CYNARA_TEST(tc19_admin_check_none_bucket)
 {
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket1 = "bucket19_a";
@@ -861,7 +863,7 @@ void tc19_admin_check_none_bucket_func()
                      CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
 }
 
-void tc20_admin_list_empty_bucket_func()
+RUN_CYNARA_TEST(tc20_admin_list_empty_bucket)
 {
     const char *emptyBucket = "empty_bucket20";
     const char *client = "client20";
@@ -877,7 +879,7 @@ void tc20_admin_list_empty_bucket_func()
     admin.listPolicies(emptyBucket, client, user, privilege, emptyPolicies);
 }
 
-void tc21_admin_list_no_bucket_func()
+RUN_CYNARA_TEST(tc21_admin_list_no_bucket)
 {
     const char *emptyBucket = "empty_bucket21";
     const char *notExistingBucket = "not_existing_bucket21";
@@ -895,7 +897,7 @@ void tc21_admin_list_no_bucket_func()
                        CYNARA_API_BUCKET_NOT_FOUND);
 }
 
-void tc22_admin_list_bucket_func()
+RUN_CYNARA_TEST(tc22_admin_list_bucket)
 {
     const char *bucket = "bucket22";
     const char *emptyBucket = "empty_bucket22";
@@ -954,7 +956,7 @@ void tc22_admin_list_bucket_func()
     admin.listPolicies(bucket, client, wildcard, any, expectedPolicies);
 }
 
-void tc23_admin_erase_empty_bucket_func()
+RUN_CYNARA_TEST(tc23_admin_erase_empty_bucket)
 {
     const char *emptyBucket = "empty_bucket23";
     const char *client = "client23";
@@ -969,7 +971,7 @@ void tc23_admin_erase_empty_bucket_func()
     admin.erasePolicies(emptyBucket, recursive, client, user, privilege);
 }
 
-void tc24_admin_erase_no_bucket_func()
+RUN_CYNARA_TEST(tc24_admin_erase_no_bucket)
 {
     const char *emptyBucket = "empty_bucket24";
     const char *notExistingBucket = "not_existing_bucket24";
@@ -986,7 +988,7 @@ void tc24_admin_erase_no_bucket_func()
                         CYNARA_API_BUCKET_NOT_FOUND);
 }
 
-void tc25_admin_erase_single_bucket_func()
+RUN_CYNARA_TEST(tc25_admin_erase_single_bucket)
 {
     const char *bucket = "bucket25";
     const char *emptyBucket = "empty_bucket25";
@@ -1076,7 +1078,7 @@ void tc25_admin_erase_single_bucket_func()
     }
 }
 
-void tc26_admin_erase_recursive_not_linked_buckets_func()
+RUN_CYNARA_TEST(tc26_admin_erase_recursive_not_linked_buckets)
 {
     const char *bucket = "bucket26";
     const char *subBucket = "sub_bucket26";
@@ -1120,7 +1122,7 @@ void tc26_admin_erase_recursive_not_linked_buckets_func()
     }
 }
 
-void tc27_admin_erase_recursive_linked_buckets_func()
+RUN_CYNARA_TEST(tc27_admin_erase_recursive_linked_buckets)
 {
     const char *bucket = "bucket27";
     const char *subBucket = "sub_bucket27";
@@ -1165,7 +1167,7 @@ void tc27_admin_erase_recursive_linked_buckets_func()
     }
 }
 
-void tc28_admin_erase_non_recursive_linked_buckets_func()
+RUN_CYNARA_TEST(tc28_admin_erase_non_recursive_linked_buckets)
 {
     const char *bucket = "bucket28";
     const char *subBucket = "sub_bucket28";
@@ -1212,7 +1214,7 @@ void tc28_admin_erase_non_recursive_linked_buckets_func()
     }
 }
 
-void tc29_admin_erase_recursive_from_sub_bucket_func()
+RUN_CYNARA_TEST(tc29_admin_erase_recursive_from_sub_bucket)
 {
     const char *bucket = "bucket29";
     const char *subBucket = "sub_bucket29";
@@ -1280,64 +1282,23 @@ void testPlugins(const std::vector<std::string> &plugins)
     admin.listPoliciesDescriptions(expectedDescriptions);
 }
 
-void tc30_admin_list_descriptions_no_plugins_func()
+RUN_CYNARA_TEST(tc30_admin_list_descriptions_no_plugins)
 {
     testPlugins({});
 }
 
-void tc31_admin_list_descriptions_1_plugin_single_policy_func()
+RUN_CYNARA_TEST(tc31_admin_list_descriptions_1_plugin_single_policy)
 {
     testPlugins({CynaraTestPlugins::SINGLE_POLICY});
 }
 
-void tc32_admin_list_descriptions_1_plugin_multiple_policy_func()
+RUN_CYNARA_TEST(tc32_admin_list_descriptions_1_plugin_multiple_policy)
 {
     testPlugins({CynaraTestPlugins::MULTIPLE_POLICY});
 }
 
-void tc33_admin_list_descriptions_multiple_plugins_func()
+RUN_CYNARA_TEST(tc33_admin_list_descriptions_multiple_plugins)
 {
     testPlugins({CynaraTestPlugins::SINGLE_POLICY,
                  CynaraTestPlugins::MULTIPLE_POLICY});
 }
-
-RUNNER_TEST_GROUP_INIT(cynara_tests)
-
-RUN_CYNARA_TEST(tc01_cynara_initialize)
-RUN_CYNARA_TEST(tc02_admin_initialize)
-RUN_CYNARA_TEST(tc03_cynara_check_invalid_params)
-RUN_CYNARA_TEST(tc04_admin_set_policies_invalid_params)
-RUN_CYNARA_TEST(tc05_admin_set_bucket_invalid_params)
-RUN_CYNARA_TEST(tc06_cynara_check_empty_admin1)
-RUN_CYNARA_TEST(tc06_cynara_check_empty_admin2)
-RUN_CYNARA_TEST(tc07_admin_set_bucket_admin_allow_deny)
-RUN_CYNARA_TEST(tc08_admin_set_policies_allow_remove1)
-RUN_CYNARA_TEST(tc08_admin_set_policies_allow_remove2)
-RUN_CYNARA_TEST(tc08_admin_set_policies_allow_remove3)
-RUN_CYNARA_TEST(tc09_admin_set_policies_wildcard_accesses)
-RUN_CYNARA_TEST(tc10_admin_change_extra_bucket)
-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)
-RUN_CYNARA_TEST(tc20_admin_list_empty_bucket)
-RUN_CYNARA_TEST(tc21_admin_list_no_bucket)
-RUN_CYNARA_TEST(tc22_admin_list_bucket)
-RUN_CYNARA_TEST(tc23_admin_erase_empty_bucket)
-RUN_CYNARA_TEST(tc24_admin_erase_no_bucket)
-RUN_CYNARA_TEST(tc25_admin_erase_single_bucket)
-RUN_CYNARA_TEST(tc26_admin_erase_recursive_not_linked_buckets)
-RUN_CYNARA_TEST(tc27_admin_erase_recursive_linked_buckets)
-RUN_CYNARA_TEST(tc28_admin_erase_non_recursive_linked_buckets)
-RUN_CYNARA_TEST(tc29_admin_erase_recursive_from_sub_bucket)
-RUN_CYNARA_TEST(tc30_admin_list_descriptions_no_plugins)
-RUN_CYNARA_TEST(tc31_admin_list_descriptions_1_plugin_single_policy)
-RUN_CYNARA_TEST(tc32_admin_list_descriptions_1_plugin_multiple_policy)
-RUN_CYNARA_TEST(tc33_admin_list_descriptions_multiple_plugins)
diff --git a/src/cynara-tests/test_cases_agent.cpp b/src/cynara-tests/test_cases_agent.cpp
index a8c74ae..5554e51 100644
--- a/src/cynara-tests/test_cases_agent.cpp
+++ b/src/cynara-tests/test_cases_agent.cpp
@@ -86,19 +86,21 @@ void getAgentRequest(Agent &agent, AgentRequest &request, Client &client,
                          sendClientRequest, hangOnGetRequest);
 }
 
-void tcag01_set_agent_type_policy_without_plugin_func()
+RUNNER_TEST_GROUP_INIT(cynara_agent_tests)
+
+RUN_CYNARA_TEST(tcag01_set_agent_type_policy_without_plugin_func)
 {
     loadServicePlugins(DirectoryPaths());
     setAgentPolicy(CYNARA_API_INVALID_PARAM);
 }
 
-void tcag02_set_agent_type_policy_with_plugin_loaded_func()
+RUN_CYNARA_TEST(tcag02_set_agent_type_policy_with_plugin_loaded_func)
 {
     loadAgentPlugin();
     setAgentPolicy();
 }
 
-void tcag03_check_with_no_agent_func()
+RUN_CYNARA_TEST(tcag03_check_with_no_agent_func)
 {
     std::string testNo("03");
     cynara_check_id id;
@@ -118,12 +120,12 @@ void tcag03_check_with_no_agent_func()
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-void tcag04_agent_initialize_func()
+RUN_CYNARA_TEST(tcag04_agent_initialize_func)
 {
     Agent();
 }
 
-void tcag05_agent_request_timeout_func()
+RUN_CYNARA_TEST(tcag05_agent_request_timeout_func)
 {
     Agent agent;
     AgentRequest request;
@@ -137,7 +139,7 @@ void tcag05_agent_request_timeout_func()
                          restartCynaraServiceAndSockets, hangOnGetRequest);
 }
 
-void tcag06_check_with_unregistered_agent_func()
+RUN_CYNARA_TEST(tcag06_check_with_unregistered_agent_func)
 {
     std::string testNo("06");
     cynara_check_id id;
@@ -159,7 +161,7 @@ void tcag06_check_with_unregistered_agent_func()
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-void tcag07_get_request_func()
+RUN_CYNARA_TEST(tcag07_get_request_func)
 {
     std::string testNo("07");
     CheckData data(testNo);
@@ -188,7 +190,7 @@ void tcag07_get_request_func()
     client.process();
 }
 
-void tcag08_get_request_and_respond_with_wrong_id_func()
+RUN_CYNARA_TEST(tcag08_get_request_and_respond_with_wrong_id_func)
 {
     std::string testNo("08");
     CheckData data(testNo);
@@ -216,7 +218,7 @@ void tcag08_get_request_and_respond_with_wrong_id_func()
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::EXPECT_TIMEOUT, 2);
 }
 
-void tcag09_get_request_and_correct_responded_id_func()
+RUN_CYNARA_TEST(tcag09_get_request_and_correct_responded_id_func)
 {
     std::string testNo("09");
     CheckData data(testNo);
@@ -246,7 +248,7 @@ void tcag09_get_request_and_correct_responded_id_func()
     client.process();
 }
 
-void tcag10_cancel_request_func()
+RUN_CYNARA_TEST(tcag10_cancel_request_func)
 {
     std::string testNo("10");
     CheckData data(testNo);
@@ -281,7 +283,7 @@ void tcag10_cancel_request_func()
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::EXPECT_NO_TIMEOUT, 2);
 }
 
-void tcag11_cancel_processed_request_func()
+RUN_CYNARA_TEST(tcag11_cancel_processed_request_func)
 {
     std::string testNo("11");
     CheckData data(testNo);
@@ -316,7 +318,7 @@ void tcag11_cancel_processed_request_func()
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::EXPECT_NO_TIMEOUT, 2);
 }
 
-void tcag12_create_two_requests_func()
+RUN_CYNARA_TEST(tcag12_create_two_requests_func)
 {
     std::string testNo("12");
     CheckData data1(testNo, 1), data2(testNo, 2);
@@ -365,7 +367,7 @@ void tcag12_create_two_requests_func()
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::IGNORE_TIMEOUT, 1);
 }
 
-void tcag13_create_many_requests_func()
+RUN_CYNARA_TEST(tcag13_create_many_requests_func)
 {
     const int numberOfRequests = 4;
     std::string testNo("13");
@@ -396,7 +398,7 @@ void tcag13_create_many_requests_func()
     }
 }
 
-void tcag14_client_disconnects_func()
+RUN_CYNARA_TEST(tcag14_client_disconnects_func)
 {
     std::string testNo("14");
     CheckData data(testNo);
@@ -427,7 +429,7 @@ void tcag14_client_disconnects_func()
     agentRequest.assertCancel();
 }
 
-void tcag15_agent_disconnects_func()
+RUN_CYNARA_TEST(tcag15_agent_disconnects_func)
 {
     std::string testNo("15");
     CheckData data(testNo);
@@ -453,20 +455,3 @@ void tcag15_agent_disconnects_func()
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::EXPECT_NO_TIMEOUT, 2);
 }
 
-RUNNER_TEST_GROUP_INIT(cynara_agent_tests)
-
-RUN_CYNARA_TEST(tcag01_set_agent_type_policy_without_plugin)
-RUN_CYNARA_TEST(tcag02_set_agent_type_policy_with_plugin_loaded)
-RUN_CYNARA_TEST(tcag03_check_with_no_agent)
-RUN_CYNARA_TEST(tcag04_agent_initialize)
-RUN_CYNARA_TEST(tcag05_agent_request_timeout)
-RUN_CYNARA_TEST(tcag06_check_with_unregistered_agent)
-RUN_CYNARA_TEST(tcag07_get_request)
-RUN_CYNARA_TEST(tcag08_get_request_and_respond_with_wrong_id)
-RUN_CYNARA_TEST(tcag09_get_request_and_correct_responded_id)
-RUN_CYNARA_TEST(tcag10_cancel_request)
-RUN_CYNARA_TEST(tcag11_cancel_processed_request)
-RUN_CYNARA_TEST(tcag12_create_two_requests)
-RUN_CYNARA_TEST(tcag13_create_many_requests)
-RUN_CYNARA_TEST(tcag14_client_disconnects)
-RUN_CYNARA_TEST(tcag15_agent_disconnects)
diff --git a/src/cynara-tests/test_cases_async.cpp b/src/cynara-tests/test_cases_async.cpp
index 1412fcd..2f8eb48 100644
--- a/src/cynara-tests/test_cases_async.cpp
+++ b/src/cynara-tests/test_cases_async.cpp
@@ -36,12 +36,14 @@
 using namespace CynaraTestClientAsync;
 using namespace CynaraTestAdmin;
 
-void tca01_initialize_func()
+RUNNER_TEST_GROUP_INIT(cynara_async_tests)
+
+RUN_CYNARA_TEST(tca01_initialize)
 {
     Client client;
 }
 
-void tca02_empty_cache_miss_func()
+RUN_CYNARA_TEST(tca02_empty_cache_miss)
 {
     std::string testNo("02");
     Client client;
@@ -50,7 +52,7 @@ void tca02_empty_cache_miss_func()
     client.checkCache({testNo}, CYNARA_API_CACHE_MISS);
 }
 
-void tca03_create_max_requests_func()
+RUN_CYNARA_TEST(tca03_create_max_requests)
 {
     std::string testNo("03");
     cynara_check_id id;
@@ -67,7 +69,7 @@ void tca03_create_max_requests_func()
     client.assertStatus(READWRITE);
 }
 
-void tca04_request_and_process_func()
+RUN_CYNARA_TEST(tca04_request_and_process)
 {
     std::string testNo("04");
     cynara_check_id id;
@@ -88,7 +90,7 @@ void tca04_request_and_process_func()
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-void tca05_request_and_cancel1_func()
+RUN_CYNARA_TEST(tca05_request_and_cancel1)
 {
     std::string testNo("05");
     int subtest = 1;
@@ -113,7 +115,7 @@ void tca05_request_and_cancel1_func()
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-void tca05_request_and_cancel2_func()
+RUN_CYNARA_TEST(tca05_request_and_cancel2)
 {
     std::string testNo("05");
     int subtest = 2;
@@ -137,7 +139,7 @@ void tca05_request_and_cancel2_func()
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-void tca05_request_and_cancel3_func()
+RUN_CYNARA_TEST(tca05_request_and_cancel3)
 {
     std::string testNo("05");
     int subtest = 3;
@@ -162,7 +164,7 @@ void tca05_request_and_cancel3_func()
     client.cancel(id, CYNARA_API_INVALID_PARAM);
 }
 
-void tca06_cancel_fail_func()
+RUN_CYNARA_TEST(tca06_cancel_fail)
 {
     cynara_check_id id = 0xDEAD;
 
@@ -171,7 +173,7 @@ void tca06_cancel_fail_func()
     client.cancel(id, CYNARA_API_INVALID_PARAM);
 }
 
-void tca07_request_with_data_insertion_func()
+RUN_CYNARA_TEST(tca07_request_with_data_insertion)
 {
     std::string testNo("07");
     Admin admin;
@@ -220,7 +222,7 @@ void tca07_request_with_data_insertion_func()
     client.checkCache(data[1], CYNARA_API_CACHE_MISS);
 }
 
-void tca08_disconnect1_func()
+RUN_CYNARA_TEST(tca08_disconnect1)
 {
     std::string testNo("08");
     int subtest = 1;
@@ -240,7 +242,7 @@ void tca08_disconnect1_func()
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-void tca08_disconnect2_func()
+RUN_CYNARA_TEST(tca08_disconnect2)
 {
     std::string testNo("08");
     int subtest = 2;
@@ -264,7 +266,7 @@ void tca08_disconnect2_func()
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-void tca08_disconnect3_func()
+RUN_CYNARA_TEST(tca08_disconnect3)
 {
     std::string testNo("08");
     int subtest = 2;
@@ -284,7 +286,7 @@ void tca08_disconnect3_func()
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-void tca09_disconnect_and_cancel1_func()
+RUN_CYNARA_TEST(tca09_disconnect_and_cancel1)
 {
     std::string testNo("09");
     int subtest = 1;
@@ -316,7 +318,7 @@ void tca09_disconnect_and_cancel1_func()
     client.assertStatus(READ);
 }
 
-void tca09_disconnect_and_cancel2_func()
+RUN_CYNARA_TEST(tca09_disconnect_and_cancel2)
 {
     std::string testNo("09");
     int subtest = 2;
@@ -348,7 +350,7 @@ void tca09_disconnect_and_cancel2_func()
     client.assertStatus(READ);
 }
 
-void tca10_double_request_func()
+RUN_CYNARA_TEST(tca10_double_request)
 {
     std::string testNo("10");
     cynara_check_id id, id2;
@@ -372,7 +374,7 @@ void tca10_double_request_func()
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-void tca11_double_request_with_restart_func()
+RUN_CYNARA_TEST(tca11_double_request_with_restart)
 {
     std::string testNo("11");
     cynara_check_id id, id2;
@@ -399,7 +401,7 @@ void tca11_double_request_with_restart_func()
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-void tca12_multiple_connections_without_requests_func()
+RUN_CYNARA_TEST(tca12_multiple_connections_without_requests)
 {
     std::string testNo("12");
 
@@ -435,23 +437,3 @@ void tca12_multiple_connections_without_requests_func()
                              << after << " / " << afterTimestamp.tv_sec << "."
                              << afterTimestamp.tv_usec);
 }
-
-RUNNER_TEST_GROUP_INIT(cynara_async_tests)
-
-RUN_CYNARA_TEST(tca01_initialize)
-RUN_CYNARA_TEST(tca02_empty_cache_miss)
-RUN_CYNARA_TEST(tca03_create_max_requests)
-RUN_CYNARA_TEST(tca04_request_and_process)
-RUN_CYNARA_TEST(tca05_request_and_cancel1)
-RUN_CYNARA_TEST(tca05_request_and_cancel2)
-RUN_CYNARA_TEST(tca05_request_and_cancel3)
-RUN_CYNARA_TEST(tca06_cancel_fail)
-RUN_CYNARA_TEST(tca07_request_with_data_insertion)
-RUN_CYNARA_TEST(tca08_disconnect1)
-RUN_CYNARA_TEST(tca08_disconnect2)
-RUN_CYNARA_TEST(tca08_disconnect3)
-RUN_CYNARA_TEST(tca09_disconnect_and_cancel1)
-RUN_CYNARA_TEST(tca09_disconnect_and_cancel2)
-RUN_CYNARA_TEST(tca10_double_request)
-RUN_CYNARA_TEST(tca11_double_request_with_restart)
-RUN_CYNARA_TEST(tca12_multiple_connections_without_requests)
diff --git a/src/cynara-tests/test_cases_db.cpp b/src/cynara-tests/test_cases_db.cpp
index a0f4d78..237cf12 100644
--- a/src/cynara-tests/test_cases_db.cpp
+++ b/src/cynara-tests/test_cases_db.cpp
@@ -187,6 +187,9 @@ void compareDbs(const std::string &source)
 
 } // anonymous namespace
 
+
+RUNNER_TEST_GROUP_INIT(cynara_db_tests)
+
 /**
  * @brief   Lockdown initialization failure caused by fake guard existence
  * @test    Expected result: refuse to write data to storage as long as guard file creation fails
@@ -196,7 +199,7 @@ void compareDbs(const std::string &source)
  * 4. Retry to make a change (ALLOW) in default bucket (data dump should proceed)
  * 5. Check if database is saved correctly
  */
-void tcdb01_lockdown_init_failure_func()
+RUN_CYNARA_TEST(tcdb01_lockdown_init_failure)
 {
     Admin admin;
     Client cynara;
@@ -225,7 +228,7 @@ void tcdb01_lockdown_init_failure_func()
  * 4. Try to make a change (DENY) in default bucket (data dump should fail)
  * 5. Reload Cynara - policies loaded from default bucket should still be ALLOW
  */
-void tcdb02_write_to_backup_failure_func()
+RUN_CYNARA_TEST(tcdb02_write_to_backup_failure)
 {
     Admin admin;
     Client cynara;
@@ -255,7 +258,7 @@ void tcdb02_write_to_backup_failure_func()
  * 5. Reload Cynara - policies should be loaded from primary (revalidated) database
  * 6. Check if all backup files were removed
  */
-void tcdb03_invalid_and_valid_backup_removal_func()
+RUN_CYNARA_TEST(tcdb03_invalid_and_valid_backup_removal)
 {
     Admin admin;
     Client cynara;
@@ -283,7 +286,7 @@ void tcdb03_invalid_and_valid_backup_removal_func()
  * 1. Write sample policy to database (and let it save to storage)
  * 2. Compare freshly saved files with samples from test patterns directory
  */
-void tcdb04_dumped_file_binary_comparison_func()
+RUN_CYNARA_TEST(tcdb04_dumped_file_binary_comparison)
 {
     Admin admin;
     Client cynara;
@@ -314,7 +317,7 @@ void tcdb04_dumped_file_binary_comparison_func()
  * 2. Reload Cynara
  * 3. Check if any of mentioned above files still remained
  */
-void tcdb05_non_indexed_files_removal_func()
+RUN_CYNARA_TEST(tcdb05_non_indexed_files_removal)
 {
     std::vector<std::string> filenames = { "_broken-backup~", "_non-indexed-bucket",
                                            "some-file-that-doesnt-belong-here" };
@@ -327,11 +330,3 @@ void tcdb05_non_indexed_files_removal_func()
     restartCynaraServiceAndSockets();
     compareDbs(defDb);
 }
-
-RUNNER_TEST_GROUP_INIT(cynara_db_tests)
-
-RUN_CYNARA_TEST(tcdb01_lockdown_init_failure)
-RUN_CYNARA_TEST(tcdb02_write_to_backup_failure)
-RUN_CYNARA_TEST(tcdb03_invalid_and_valid_backup_removal)
-RUN_CYNARA_TEST(tcdb04_dumped_file_binary_comparison)
-RUN_CYNARA_TEST(tcdb05_non_indexed_files_removal)