Add tests for Cynara's offline admin API

Change-Id: I18670e852e05ff35e1ea5b3de41115b65b7f0eaf

diff --git a/src/cynara-tests/common/cynara_test_commons.cpp b/src/cynara-tests/common/cynara_test_commons.cpp
index 4e06b4b4f106e1dc166f94a2839dea7db31adfc9..91a93f4f4a7b4998b2a1bae4eebee5977588d29c 100644 (file)
--- a/src/cynara-tests/common/cynara_test_commons.cpp
+++ b/src/cynara-tests/common/cynara_test_commons.cpp
@@ -17,11 +17,7 @@
 #include <cynara_test_commons.h>
 #include <cynara_test_file_operations.h>
 #include <cynara_test_cynara_mask.h>
-
-#include <dpl/exception.h>
-#include <dpl/test/test_exception.h>
-
-#include <exception>
+#include <service_manager.h>
 
 namespace CynaraTestConsts
 {

diff --git a/src/cynara-tests/common/cynara_test_commons.h b/src/cynara-tests/common/cynara_test_commons.h
index 6df3a83ce13d1821dfb54e0f23a340f71d83815b..f51cc5ad09f080ea9d678e9f23117cedf41b9fb3 100644 (file)
--- a/src/cynara-tests/common/cynara_test_commons.h
+++ b/src/cynara-tests/common/cynara_test_commons.h
@@ -52,8 +52,11 @@ struct CheckKey
     const char *m_privilege;
 };
 
-#define RUN_CYNARA_TEST(Proc)                \
-    RUNNER_TEST(Proc, CynaraTestEnv)         \
+#define RUN_CYNARA_TEST(Proc)                      \
+    RUNNER_TEST(Proc, CynaraTestEnv)               \
+    {                                              \
+        Proc##_func();                             \
+    }
 
 typedef std::vector<std::string> DirectoryPaths;
 void loadServicePlugins(const DirectoryPaths &pluginDirectories);

diff --git a/src/cynara-tests/test_cases.cpp b/src/cynara-tests/test_cases.cpp
index f9bbdcb769f22e3fa4723700a3f372a19f23949d..5fe9f755a00259a0c65f32bcec362b2af1a33cf9 100644 (file)
--- a/src/cynara-tests/test_cases.cpp
+++ b/src/cynara-tests/test_cases.cpp
@@ -36,19 +36,17 @@
 using namespace CynaraTestAdmin;
 using namespace CynaraTestClient;
 
-RUNNER_TEST_GROUP_INIT(cynara_tests)
-
-RUN_CYNARA_TEST(tc01_cynara_initialize)
+void tc01_cynara_initialize_func()
 {
     Client();
 }
 
-RUN_CYNARA_TEST(tc02_admin_initialize)
+void tc02_admin_initialize_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
 }
 
-RUN_CYNARA_TEST(tc03_cynara_check_invalid_params)
+void tc03_cynara_check_invalid_params_func()
 {
     Client cynara;
 
@@ -77,9 +75,9 @@ void checkInvalidPolicy(Admin &admin,
     admin.setPolicies(cp, CYNARA_API_INVALID_PARAM);
 }
 
-RUN_CYNARA_TEST(tc04_admin_set_policies_invalid_params)
+void tc04_admin_set_policies_invalid_params_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *client = "client04";
@@ -99,9 +97,9 @@ RUN_CYNARA_TEST(tc04_admin_set_policies_invalid_params)
     checkInvalidPolicy(admin, bucket,  client,  user,    privilege, resultNone,   resultExtra);
 }
 
-RUN_CYNARA_TEST(tc05_admin_set_bucket_invalid_params)
+void tc05_admin_set_bucket_invalid_params_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
     const int operationAllow = CYNARA_ADMIN_ALLOW;
@@ -115,7 +113,7 @@ RUN_CYNARA_TEST(tc05_admin_set_bucket_invalid_params)
     admin.setBucket(bucket,  operationNone,    extra, CYNARA_API_OPERATION_NOT_ALLOWED);
 }
 
-RUN_CYNARA_TEST(tc06_cynara_check_empty_admin1)
+void tc06_cynara_check_empty_admin1_func()
 {
     Client cynara;
 
@@ -127,7 +125,7 @@ RUN_CYNARA_TEST(tc06_cynara_check_empty_admin1)
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-RUN_CYNARA_TEST(tc06_cynara_check_empty_admin2)
+void tc06_cynara_check_empty_admin2_func()
 {
     Client cynara;
 
@@ -139,9 +137,9 @@ RUN_CYNARA_TEST(tc06_cynara_check_empty_admin2)
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-RUN_CYNARA_TEST(tc07_admin_set_bucket_admin_allow_deny)
+void tc07_admin_set_bucket_admin_allow_deny_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
     Client cynara;
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
@@ -160,9 +158,9 @@ RUN_CYNARA_TEST(tc07_admin_set_bucket_admin_allow_deny)
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-RUN_CYNARA_TEST(tc08_admin_set_policies_allow_remove1)
+void tc08_admin_set_policies_allow_remove1_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
     Client cynara;
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
@@ -216,9 +214,9 @@ RUN_CYNARA_TEST(tc08_admin_set_policies_allow_remove1)
     cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_DENIED);
 }
 
-RUN_CYNARA_TEST(tc08_admin_set_policies_allow_remove2)
+void tc08_admin_set_policies_allow_remove2_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
     Client cynara;
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
@@ -265,9 +263,9 @@ RUN_CYNARA_TEST(tc08_admin_set_policies_allow_remove2)
     cynara.check(data[1][0], session, data[1][1], data[1][2], CYNARA_API_ACCESS_DENIED);
 }
 
-RUN_CYNARA_TEST(tc08_admin_set_policies_allow_remove3)
+void tc08_admin_set_policies_allow_remove3_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
     Client cynara;
 
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
@@ -356,9 +354,9 @@ void checkSingleWildcardAllowRestDeny(const std::vector< std::vector<const char
 
 void setSingleWildcardPolicies(const char *bucket,
                                const std::vector< std::vector<const char *> > &data,
-                               const int result, const char* resultExtra)
+                               const int result, const char* resultExtra, bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
     CynaraPoliciesContainer cp;
 
     checkSingleWildcardData(data);
@@ -376,7 +374,7 @@ void setSingleWildcardPolicies(const char *bucket,
     admin.setPolicies(cp);
 }
 
-RUN_CYNARA_TEST(tc09_admin_set_policies_wildcard_accesses)
+void tc09_admin_set_policies_wildcard_accesses_func(bool isOnline)
 {
     const char *bucket = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *session = "session09";
@@ -390,18 +388,18 @@ RUN_CYNARA_TEST(tc09_admin_set_policies_wildcard_accesses)
 
     checkAllDeny(data, session);
 
-    setSingleWildcardPolicies(bucket, data, CYNARA_ADMIN_ALLOW, resultExtra);
+    setSingleWildcardPolicies(bucket, data, CYNARA_ADMIN_ALLOW, resultExtra, isOnline);
 
     checkSingleWildcardAllowRestDeny(data, session);
 
-    setSingleWildcardPolicies(bucket, data, CYNARA_ADMIN_DELETE, resultExtra);
+    setSingleWildcardPolicies(bucket, data, CYNARA_ADMIN_DELETE, resultExtra, isOnline);
 
     checkAllDeny(data, session);
 }
 
-RUN_CYNARA_TEST(tc10_admin_change_extra_bucket)
+void tc10_admin_change_extra_bucket_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
     Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
@@ -459,9 +457,9 @@ RUN_CYNARA_TEST(tc10_admin_change_extra_bucket)
     admin.setBucket(bucket, CYNARA_ADMIN_DELETE, extra);
 }
 
-RUN_CYNARA_TEST(tc11_admin_bucket_not_found)
+void tc11_admin_bucket_not_found_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
     Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
@@ -483,9 +481,9 @@ RUN_CYNARA_TEST(tc11_admin_bucket_not_found)
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-RUN_CYNARA_TEST(tc12_admin_delete_bucket_with_policies_pointing_to_it)
+void tc12_admin_delete_bucket_with_policies_pointing_to_it_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
     Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
@@ -517,9 +515,9 @@ RUN_CYNARA_TEST(tc12_admin_delete_bucket_with_policies_pointing_to_it)
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-RUN_CYNARA_TEST(tc13_admin_set_policies_to_extra_bucket)
+void tc13_admin_set_policies_to_extra_bucket_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
     Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
@@ -550,7 +548,7 @@ RUN_CYNARA_TEST(tc13_admin_set_policies_to_extra_bucket)
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-RUN_CYNARA_TEST(tc14_admin_set_policies_integrity)
+void tc14_admin_set_policies_integrity_func(bool isOnline)
 {
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket = "bucket14";
@@ -566,7 +564,7 @@ RUN_CYNARA_TEST(tc14_admin_set_policies_integrity)
     }
 
     {
-        Admin admin;
+        Admin admin(isOnline);
         CynaraPoliciesContainer cp;
         cp.add(bucketDefault,
                client, user, privilege,
@@ -583,9 +581,9 @@ RUN_CYNARA_TEST(tc14_admin_set_policies_integrity)
     }
 }
 
-RUN_CYNARA_TEST(tc15_admin_set_bucket_admin_none1)
+void tc15_admin_set_bucket_admin_none1_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
     Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
@@ -612,9 +610,9 @@ RUN_CYNARA_TEST(tc15_admin_set_bucket_admin_none1)
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
 }
 
-RUN_CYNARA_TEST(tc15_admin_set_bucket_admin_none2)
+void tc15_admin_set_bucket_admin_none2_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
     Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
@@ -637,9 +635,9 @@ RUN_CYNARA_TEST(tc15_admin_set_bucket_admin_none2)
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_DENIED);
 }
 
-RUN_CYNARA_TEST(tc15_admin_set_bucket_admin_none3)
+void tc15_admin_set_bucket_admin_none3_func(bool isOnline)
 {
-    Admin admin;
+    Admin admin(isOnline);
     Client cynara;
 
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
@@ -666,7 +664,7 @@ RUN_CYNARA_TEST(tc15_admin_set_bucket_admin_none3)
     cynara.check(client, session, user, privilege, CYNARA_API_ACCESS_ALLOWED);
 }
 
-RUN_CYNARA_TEST(tc16_admin_check_single_bucket)
+void tc16_admin_check_single_bucket_func(bool isOnline)
 {
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *client = "client16";
@@ -676,7 +674,7 @@ RUN_CYNARA_TEST(tc16_admin_check_single_bucket)
     int recursive = 1;
     int notrecursive = 0;
 
-    Admin admin;
+    Admin admin(isOnline);
 
     admin.adminCheck(bucketDefault, recursive, client, user, privilege,
                      CYNARA_ADMIN_DENY, nullptr, CYNARA_API_SUCCESS);
@@ -695,7 +693,7 @@ RUN_CYNARA_TEST(tc16_admin_check_single_bucket)
                      CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
 }
 
-RUN_CYNARA_TEST(tc17_admin_check_nested_bucket)
+void tc17_admin_check_nested_bucket_func(bool isOnline)
 {
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket = "bucket17";
@@ -707,7 +705,7 @@ RUN_CYNARA_TEST(tc17_admin_check_nested_bucket)
     int recursive = 1;
     int notrecursive = 0;
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.setBucket(bucket, CYNARA_ADMIN_DENY, extra);
 
     admin.adminCheck(bucketDefault, recursive, client, user, privilege,
@@ -740,7 +738,7 @@ RUN_CYNARA_TEST(tc17_admin_check_nested_bucket)
                      CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
 }
 
-RUN_CYNARA_TEST(tc18_admin_check_multiple_matches)
+void tc18_admin_check_multiple_matches_func(bool isOnline)
 {
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *client = "client18";
@@ -752,7 +750,7 @@ RUN_CYNARA_TEST(tc18_admin_check_multiple_matches)
     int recursive = 1;
     int notrecursive = 0;
 
-    Admin admin;
+    Admin admin(isOnline);
 
     auto check = [&](int expected_result)
     {
@@ -809,7 +807,7 @@ RUN_CYNARA_TEST(tc18_admin_check_multiple_matches)
     check(CYNARA_ADMIN_ALLOW);
 }
 
-RUN_CYNARA_TEST(tc19_admin_check_none_bucket)
+void tc19_admin_check_none_bucket_func(bool isOnline)
 {
     const char *bucketDefault = CYNARA_ADMIN_DEFAULT_BUCKET;
     const char *bucket1 = "bucket19_a";
@@ -821,7 +819,7 @@ RUN_CYNARA_TEST(tc19_admin_check_none_bucket)
     int recursive = 1;
     int notrecursive = 0;
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.setBucket(bucket1, CYNARA_ADMIN_NONE, extra);
     admin.setBucket(bucket2, CYNARA_ADMIN_ALLOW, extra);
 
@@ -863,7 +861,7 @@ RUN_CYNARA_TEST(tc19_admin_check_none_bucket)
                      CYNARA_ADMIN_ALLOW, nullptr, CYNARA_API_SUCCESS);
 }
 
-RUN_CYNARA_TEST(tc20_admin_list_empty_bucket)
+void tc20_admin_list_empty_bucket_func(bool isOnline)
 {
     const char *emptyBucket = "empty_bucket20";
     const char *client = "client20";
@@ -871,7 +869,7 @@ RUN_CYNARA_TEST(tc20_admin_list_empty_bucket)
     const char *privilege = "privilege20";
     const char *extra = nullptr;
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.setBucket(emptyBucket, CYNARA_ADMIN_ALLOW, extra);
 
     CynaraPoliciesContainer emptyPolicies;
@@ -879,7 +877,7 @@ RUN_CYNARA_TEST(tc20_admin_list_empty_bucket)
     admin.listPolicies(emptyBucket, client, user, privilege, emptyPolicies);
 }
 
-RUN_CYNARA_TEST(tc21_admin_list_no_bucket)
+void tc21_admin_list_no_bucket_func(bool isOnline)
 {
     const char *emptyBucket = "empty_bucket21";
     const char *notExistingBucket = "not_existing_bucket21";
@@ -888,7 +886,7 @@ RUN_CYNARA_TEST(tc21_admin_list_no_bucket)
     const char *privilege = "privilege21";
     const char *extra = nullptr;
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.setBucket(emptyBucket, CYNARA_ADMIN_ALLOW, extra);
 
     CynaraPoliciesContainer emptyPolicies;
@@ -897,7 +895,7 @@ RUN_CYNARA_TEST(tc21_admin_list_no_bucket)
                        CYNARA_API_BUCKET_NOT_FOUND);
 }
 
-RUN_CYNARA_TEST(tc22_admin_list_bucket)
+void tc22_admin_list_bucket_func(bool isOnline)
 {
     const char *bucket = "bucket22";
     const char *emptyBucket = "empty_bucket22";
@@ -912,7 +910,7 @@ RUN_CYNARA_TEST(tc22_admin_list_bucket)
 
     const char *extra = nullptr;
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.setBucket(bucket, CYNARA_ADMIN_ALLOW, extra);
     admin.setBucket(emptyBucket, CYNARA_ADMIN_ALLOW, extra);
 
@@ -956,7 +954,7 @@ RUN_CYNARA_TEST(tc22_admin_list_bucket)
     admin.listPolicies(bucket, client, wildcard, any, expectedPolicies);
 }
 
-RUN_CYNARA_TEST(tc23_admin_erase_empty_bucket)
+void tc23_admin_erase_empty_bucket_func(bool isOnline)
 {
     const char *emptyBucket = "empty_bucket23";
     const char *client = "client23";
@@ -965,13 +963,13 @@ RUN_CYNARA_TEST(tc23_admin_erase_empty_bucket)
     const char *extra = nullptr;
     int recursive = 1;
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.setBucket(emptyBucket, CYNARA_ADMIN_ALLOW, extra);
 
     admin.erasePolicies(emptyBucket, recursive, client, user, privilege);
 }
 
-RUN_CYNARA_TEST(tc24_admin_erase_no_bucket)
+void tc24_admin_erase_no_bucket_func(bool isOnline)
 {
     const char *emptyBucket = "empty_bucket24";
     const char *notExistingBucket = "not_existing_bucket24";
@@ -981,14 +979,14 @@ RUN_CYNARA_TEST(tc24_admin_erase_no_bucket)
     const char *extra = nullptr;
     int recursive = 1;
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.setBucket(emptyBucket, CYNARA_ADMIN_ALLOW, extra);
 
     admin.erasePolicies(notExistingBucket, recursive, client, user, privilege,
                         CYNARA_API_BUCKET_NOT_FOUND);
 }
 
-RUN_CYNARA_TEST(tc25_admin_erase_single_bucket)
+void tc25_admin_erase_single_bucket_func(bool isOnline)
 {
     const char *bucket = "bucket25";
     const char *emptyBucket = "empty_bucket25";
@@ -1003,7 +1001,7 @@ RUN_CYNARA_TEST(tc25_admin_erase_single_bucket)
     const char *extra = nullptr;
     int recursive = 1;
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.setBucket(bucket, CYNARA_ADMIN_ALLOW, extra);
     admin.setBucket(emptyBucket, CYNARA_ADMIN_ALLOW, extra);
 
@@ -1078,7 +1076,7 @@ RUN_CYNARA_TEST(tc25_admin_erase_single_bucket)
     }
 }
 
-RUN_CYNARA_TEST(tc26_admin_erase_recursive_not_linked_buckets)
+void tc26_admin_erase_recursive_not_linked_buckets_func(bool isOnline)
 {
     const char *bucket = "bucket26";
     const char *subBucket = "sub_bucket26";
@@ -1090,7 +1088,7 @@ RUN_CYNARA_TEST(tc26_admin_erase_recursive_not_linked_buckets)
     const char *extra = nullptr;
     int recursive = 1;
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.setBucket(bucket, CYNARA_ADMIN_ALLOW, extra);
     admin.setBucket(subBucket, CYNARA_ADMIN_ALLOW, extra);
 
@@ -1122,7 +1120,7 @@ RUN_CYNARA_TEST(tc26_admin_erase_recursive_not_linked_buckets)
     }
 }
 
-RUN_CYNARA_TEST(tc27_admin_erase_recursive_linked_buckets)
+void tc27_admin_erase_recursive_linked_buckets_func(bool isOnline)
 {
     const char *bucket = "bucket27";
     const char *subBucket = "sub_bucket27";
@@ -1134,7 +1132,7 @@ RUN_CYNARA_TEST(tc27_admin_erase_recursive_linked_buckets)
     const char *extra = nullptr;
     int recursive = 1;
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.setBucket(bucket, CYNARA_ADMIN_ALLOW, extra);
     admin.setBucket(subBucket, CYNARA_ADMIN_ALLOW, extra);
 
@@ -1167,7 +1165,7 @@ RUN_CYNARA_TEST(tc27_admin_erase_recursive_linked_buckets)
     }
 }
 
-RUN_CYNARA_TEST(tc28_admin_erase_non_recursive_linked_buckets)
+void tc28_admin_erase_non_recursive_linked_buckets_func(bool isOnline)
 {
     const char *bucket = "bucket28";
     const char *subBucket = "sub_bucket28";
@@ -1179,7 +1177,7 @@ RUN_CYNARA_TEST(tc28_admin_erase_non_recursive_linked_buckets)
     const char *extra = nullptr;
     int recursive = 0;
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.setBucket(bucket, CYNARA_ADMIN_ALLOW, extra);
     admin.setBucket(subBucket, CYNARA_ADMIN_ALLOW, extra);
 
@@ -1214,7 +1212,7 @@ RUN_CYNARA_TEST(tc28_admin_erase_non_recursive_linked_buckets)
     }
 }
 
-RUN_CYNARA_TEST(tc29_admin_erase_recursive_from_sub_bucket)
+void tc29_admin_erase_recursive_from_sub_bucket_func(bool isOnline)
 {
     const char *bucket = "bucket29";
     const char *subBucket = "sub_bucket29";
@@ -1226,7 +1224,7 @@ RUN_CYNARA_TEST(tc29_admin_erase_recursive_from_sub_bucket)
     const char *extra = nullptr;
     int recursive = 1;
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.setBucket(bucket, CYNARA_ADMIN_ALLOW, extra);
     admin.setBucket(subBucket, CYNARA_ADMIN_ALLOW, extra);
 
@@ -1261,7 +1259,7 @@ RUN_CYNARA_TEST(tc29_admin_erase_recursive_from_sub_bucket)
     }
 }
 
-void testPlugins(const std::vector<std::string> &plugins)
+void testPlugins(const std::vector<std::string> &plugins, bool isOnline)
 {
     using namespace CynaraTestPlugins;
 
@@ -1278,27 +1276,118 @@ void testPlugins(const std::vector<std::string> &plugins)
 
     loadServicePlugins(paths);
 
-    Admin admin;
+    Admin admin(isOnline);
     admin.listPoliciesDescriptions(expectedDescriptions);
 }
 
-RUN_CYNARA_TEST(tc30_admin_list_descriptions_no_plugins)
+void tc30_admin_list_descriptions_no_plugins_func(bool isOnline)
 {
-    testPlugins({});
+    testPlugins({}, isOnline);
 }
 
-RUN_CYNARA_TEST(tc31_admin_list_descriptions_1_plugin_single_policy)
+void tc31_admin_list_descriptions_1_plugin_single_policy_func(bool isOnline)
 {
-    testPlugins({CynaraTestPlugins::SINGLE_POLICY});
+    testPlugins({CynaraTestPlugins::SINGLE_POLICY}, isOnline);
 }
 
-RUN_CYNARA_TEST(tc32_admin_list_descriptions_1_plugin_multiple_policy)
+void tc32_admin_list_descriptions_1_plugin_multiple_policy_func(bool isOnline)
 {
-    testPlugins({CynaraTestPlugins::MULTIPLE_POLICY});
+    testPlugins({CynaraTestPlugins::MULTIPLE_POLICY}, isOnline);
 }
 
-RUN_CYNARA_TEST(tc33_admin_list_descriptions_multiple_plugins)
+void tc33_admin_list_descriptions_multiple_plugins_func(bool isOnline)
 {
     testPlugins({CynaraTestPlugins::SINGLE_POLICY,
-                 CynaraTestPlugins::MULTIPLE_POLICY});
+                 CynaraTestPlugins::MULTIPLE_POLICY}, isOnline);
 }
+
+#define ONLINE(Proc)                                       \
+    RUNNER_TEST(Proc##_online,  CynaraTestEnv)             \
+    {                                                      \
+        Proc##_func(true);                                 \
+    }
+
+#define OFFLINE(Proc)                                      \
+    RUNNER_TEST(Proc##_offline, CynaraTestEnv)             \
+    {                                                      \
+        Proc##_func(false);                                \
+    }
+
+RUNNER_TEST_GROUP_INIT(cynara_tests_online)
+
+RUN_CYNARA_TEST(tc01_cynara_initialize)
+ONLINE(tc02_admin_initialize)
+RUN_CYNARA_TEST(tc03_cynara_check_invalid_params)
+ONLINE(tc04_admin_set_policies_invalid_params)
+ONLINE(tc05_admin_set_bucket_invalid_params)
+RUN_CYNARA_TEST(tc06_cynara_check_empty_admin1)
+RUN_CYNARA_TEST(tc06_cynara_check_empty_admin2)
+ONLINE(tc07_admin_set_bucket_admin_allow_deny)
+ONLINE(tc08_admin_set_policies_allow_remove1)
+ONLINE(tc08_admin_set_policies_allow_remove2)
+ONLINE(tc08_admin_set_policies_allow_remove3)
+ONLINE(tc09_admin_set_policies_wildcard_accesses)
+ONLINE(tc10_admin_change_extra_bucket)
+ONLINE(tc11_admin_bucket_not_found)
+ONLINE(tc12_admin_delete_bucket_with_policies_pointing_to_it)
+ONLINE(tc13_admin_set_policies_to_extra_bucket)
+ONLINE(tc14_admin_set_policies_integrity)
+ONLINE(tc15_admin_set_bucket_admin_none1)
+ONLINE(tc15_admin_set_bucket_admin_none2)
+ONLINE(tc15_admin_set_bucket_admin_none3)
+ONLINE(tc16_admin_check_single_bucket)
+ONLINE(tc17_admin_check_nested_bucket)
+ONLINE(tc18_admin_check_multiple_matches)
+ONLINE(tc19_admin_check_none_bucket)
+ONLINE(tc20_admin_list_empty_bucket)
+ONLINE(tc21_admin_list_no_bucket)
+ONLINE(tc22_admin_list_bucket)
+ONLINE(tc23_admin_erase_empty_bucket)
+ONLINE(tc24_admin_erase_no_bucket)
+ONLINE(tc25_admin_erase_single_bucket)
+ONLINE(tc26_admin_erase_recursive_not_linked_buckets)
+ONLINE(tc27_admin_erase_recursive_linked_buckets)
+ONLINE(tc28_admin_erase_non_recursive_linked_buckets)
+ONLINE(tc29_admin_erase_recursive_from_sub_bucket)
+ONLINE(tc30_admin_list_descriptions_no_plugins)
+ONLINE(tc31_admin_list_descriptions_1_plugin_single_policy)
+ONLINE(tc32_admin_list_descriptions_1_plugin_multiple_policy)
+ONLINE(tc33_admin_list_descriptions_multiple_plugins)
+
+
+RUNNER_TEST_GROUP_INIT(cynara_tests_offline)
+
+OFFLINE(tc02_admin_initialize)
+OFFLINE(tc04_admin_set_policies_invalid_params)
+OFFLINE(tc05_admin_set_bucket_invalid_params)
+OFFLINE(tc07_admin_set_bucket_admin_allow_deny)
+OFFLINE(tc08_admin_set_policies_allow_remove1)
+OFFLINE(tc08_admin_set_policies_allow_remove2)
+OFFLINE(tc08_admin_set_policies_allow_remove3)
+OFFLINE(tc09_admin_set_policies_wildcard_accesses)
+OFFLINE(tc10_admin_change_extra_bucket)
+OFFLINE(tc11_admin_bucket_not_found)
+OFFLINE(tc12_admin_delete_bucket_with_policies_pointing_to_it)
+OFFLINE(tc13_admin_set_policies_to_extra_bucket)
+OFFLINE(tc14_admin_set_policies_integrity)
+OFFLINE(tc15_admin_set_bucket_admin_none1)
+OFFLINE(tc15_admin_set_bucket_admin_none2)
+OFFLINE(tc15_admin_set_bucket_admin_none3)
+OFFLINE(tc16_admin_check_single_bucket)
+OFFLINE(tc17_admin_check_nested_bucket)
+OFFLINE(tc18_admin_check_multiple_matches)
+OFFLINE(tc19_admin_check_none_bucket)
+OFFLINE(tc20_admin_list_empty_bucket)
+OFFLINE(tc21_admin_list_no_bucket)
+OFFLINE(tc22_admin_list_bucket)
+OFFLINE(tc23_admin_erase_empty_bucket)
+OFFLINE(tc24_admin_erase_no_bucket)
+OFFLINE(tc25_admin_erase_single_bucket)
+OFFLINE(tc26_admin_erase_recursive_not_linked_buckets)
+OFFLINE(tc27_admin_erase_recursive_linked_buckets)
+OFFLINE(tc28_admin_erase_non_recursive_linked_buckets)
+OFFLINE(tc29_admin_erase_recursive_from_sub_bucket)
+OFFLINE(tc30_admin_list_descriptions_no_plugins)
+OFFLINE(tc31_admin_list_descriptions_1_plugin_single_policy)
+OFFLINE(tc32_admin_list_descriptions_1_plugin_multiple_policy)
+OFFLINE(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 5554e5160d6e9bc1a0e25437b54fdfc6d5e3bc52..a8c74ae1270a1de8eb36c678a131cb7889fe3f3b 100644 (file)
--- a/src/cynara-tests/test_cases_agent.cpp
+++ b/src/cynara-tests/test_cases_agent.cpp
@@ -86,21 +86,19 @@ void getAgentRequest(Agent &agent, AgentRequest &request, Client &client,
                          sendClientRequest, hangOnGetRequest);
 }
 
-RUNNER_TEST_GROUP_INIT(cynara_agent_tests)
-
-RUN_CYNARA_TEST(tcag01_set_agent_type_policy_without_plugin_func)
+void tcag01_set_agent_type_policy_without_plugin_func()
 {
     loadServicePlugins(DirectoryPaths());
     setAgentPolicy(CYNARA_API_INVALID_PARAM);
 }
 
-RUN_CYNARA_TEST(tcag02_set_agent_type_policy_with_plugin_loaded_func)
+void tcag02_set_agent_type_policy_with_plugin_loaded_func()
 {
     loadAgentPlugin();
     setAgentPolicy();
 }
 
-RUN_CYNARA_TEST(tcag03_check_with_no_agent_func)
+void tcag03_check_with_no_agent_func()
 {
     std::string testNo("03");
     cynara_check_id id;
@@ -120,12 +118,12 @@ RUN_CYNARA_TEST(tcag03_check_with_no_agent_func)
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-RUN_CYNARA_TEST(tcag04_agent_initialize_func)
+void tcag04_agent_initialize_func()
 {
     Agent();
 }
 
-RUN_CYNARA_TEST(tcag05_agent_request_timeout_func)
+void tcag05_agent_request_timeout_func()
 {
     Agent agent;
     AgentRequest request;
@@ -139,7 +137,7 @@ RUN_CYNARA_TEST(tcag05_agent_request_timeout_func)
                          restartCynaraServiceAndSockets, hangOnGetRequest);
 }
 
-RUN_CYNARA_TEST(tcag06_check_with_unregistered_agent_func)
+void tcag06_check_with_unregistered_agent_func()
 {
     std::string testNo("06");
     cynara_check_id id;
@@ -161,7 +159,7 @@ RUN_CYNARA_TEST(tcag06_check_with_unregistered_agent_func)
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-RUN_CYNARA_TEST(tcag07_get_request_func)
+void tcag07_get_request_func()
 {
     std::string testNo("07");
     CheckData data(testNo);
@@ -190,7 +188,7 @@ RUN_CYNARA_TEST(tcag07_get_request_func)
     client.process();
 }
 
-RUN_CYNARA_TEST(tcag08_get_request_and_respond_with_wrong_id_func)
+void tcag08_get_request_and_respond_with_wrong_id_func()
 {
     std::string testNo("08");
     CheckData data(testNo);
@@ -218,7 +216,7 @@ RUN_CYNARA_TEST(tcag08_get_request_and_respond_with_wrong_id_func)
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::EXPECT_TIMEOUT, 2);
 }
 
-RUN_CYNARA_TEST(tcag09_get_request_and_correct_responded_id_func)
+void tcag09_get_request_and_correct_responded_id_func()
 {
     std::string testNo("09");
     CheckData data(testNo);
@@ -248,7 +246,7 @@ RUN_CYNARA_TEST(tcag09_get_request_and_correct_responded_id_func)
     client.process();
 }
 
-RUN_CYNARA_TEST(tcag10_cancel_request_func)
+void tcag10_cancel_request_func()
 {
     std::string testNo("10");
     CheckData data(testNo);
@@ -283,7 +281,7 @@ RUN_CYNARA_TEST(tcag10_cancel_request_func)
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::EXPECT_NO_TIMEOUT, 2);
 }
 
-RUN_CYNARA_TEST(tcag11_cancel_processed_request_func)
+void tcag11_cancel_processed_request_func()
 {
     std::string testNo("11");
     CheckData data(testNo);
@@ -318,7 +316,7 @@ RUN_CYNARA_TEST(tcag11_cancel_processed_request_func)
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::EXPECT_NO_TIMEOUT, 2);
 }
 
-RUN_CYNARA_TEST(tcag12_create_two_requests_func)
+void tcag12_create_two_requests_func()
 {
     std::string testNo("12");
     CheckData data1(testNo, 1), data2(testNo, 2);
@@ -367,7 +365,7 @@ RUN_CYNARA_TEST(tcag12_create_two_requests_func)
     client.process(CYNARA_API_SUCCESS, Client::TimeoutExpectation::IGNORE_TIMEOUT, 1);
 }
 
-RUN_CYNARA_TEST(tcag13_create_many_requests_func)
+void tcag13_create_many_requests_func()
 {
     const int numberOfRequests = 4;
     std::string testNo("13");
@@ -398,7 +396,7 @@ RUN_CYNARA_TEST(tcag13_create_many_requests_func)
     }
 }
 
-RUN_CYNARA_TEST(tcag14_client_disconnects_func)
+void tcag14_client_disconnects_func()
 {
     std::string testNo("14");
     CheckData data(testNo);
@@ -429,7 +427,7 @@ RUN_CYNARA_TEST(tcag14_client_disconnects_func)
     agentRequest.assertCancel();
 }
 
-RUN_CYNARA_TEST(tcag15_agent_disconnects_func)
+void tcag15_agent_disconnects_func()
 {
     std::string testNo("15");
     CheckData data(testNo);
@@ -455,3 +453,20 @@ RUN_CYNARA_TEST(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 2f8eb488617897971e2fa5b597a3d9a17725b726..1412fcdf3a231ddec8070b5b63a2848ba4fe3f55 100644 (file)
--- a/src/cynara-tests/test_cases_async.cpp
+++ b/src/cynara-tests/test_cases_async.cpp
@@ -36,14 +36,12 @@
 using namespace CynaraTestClientAsync;
 using namespace CynaraTestAdmin;
 
-RUNNER_TEST_GROUP_INIT(cynara_async_tests)
-
-RUN_CYNARA_TEST(tca01_initialize)
+void tca01_initialize_func()
 {
     Client client;
 }
 
-RUN_CYNARA_TEST(tca02_empty_cache_miss)
+void tca02_empty_cache_miss_func()
 {
     std::string testNo("02");
     Client client;
@@ -52,7 +50,7 @@ RUN_CYNARA_TEST(tca02_empty_cache_miss)
     client.checkCache({testNo}, CYNARA_API_CACHE_MISS);
 }
 
-RUN_CYNARA_TEST(tca03_create_max_requests)
+void tca03_create_max_requests_func()
 {
     std::string testNo("03");
     cynara_check_id id;
@@ -69,7 +67,7 @@ RUN_CYNARA_TEST(tca03_create_max_requests)
     client.assertStatus(READWRITE);
 }
 
-RUN_CYNARA_TEST(tca04_request_and_process)
+void tca04_request_and_process_func()
 {
     std::string testNo("04");
     cynara_check_id id;
@@ -90,7 +88,7 @@ RUN_CYNARA_TEST(tca04_request_and_process)
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-RUN_CYNARA_TEST(tca05_request_and_cancel1)
+void tca05_request_and_cancel1_func()
 {
     std::string testNo("05");
     int subtest = 1;
@@ -115,7 +113,7 @@ RUN_CYNARA_TEST(tca05_request_and_cancel1)
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-RUN_CYNARA_TEST(tca05_request_and_cancel2)
+void tca05_request_and_cancel2_func()
 {
     std::string testNo("05");
     int subtest = 2;
@@ -139,7 +137,7 @@ RUN_CYNARA_TEST(tca05_request_and_cancel2)
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-RUN_CYNARA_TEST(tca05_request_and_cancel3)
+void tca05_request_and_cancel3_func()
 {
     std::string testNo("05");
     int subtest = 3;
@@ -164,7 +162,7 @@ RUN_CYNARA_TEST(tca05_request_and_cancel3)
     client.cancel(id, CYNARA_API_INVALID_PARAM);
 }
 
-RUN_CYNARA_TEST(tca06_cancel_fail)
+void tca06_cancel_fail_func()
 {
     cynara_check_id id = 0xDEAD;
 
@@ -173,7 +171,7 @@ RUN_CYNARA_TEST(tca06_cancel_fail)
     client.cancel(id, CYNARA_API_INVALID_PARAM);
 }
 
-RUN_CYNARA_TEST(tca07_request_with_data_insertion)
+void tca07_request_with_data_insertion_func()
 {
     std::string testNo("07");
     Admin admin;
@@ -222,7 +220,7 @@ RUN_CYNARA_TEST(tca07_request_with_data_insertion)
     client.checkCache(data[1], CYNARA_API_CACHE_MISS);
 }
 
-RUN_CYNARA_TEST(tca08_disconnect1)
+void tca08_disconnect1_func()
 {
     std::string testNo("08");
     int subtest = 1;
@@ -242,7 +240,7 @@ RUN_CYNARA_TEST(tca08_disconnect1)
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-RUN_CYNARA_TEST(tca08_disconnect2)
+void tca08_disconnect2_func()
 {
     std::string testNo("08");
     int subtest = 2;
@@ -266,7 +264,7 @@ RUN_CYNARA_TEST(tca08_disconnect2)
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-RUN_CYNARA_TEST(tca08_disconnect3)
+void tca08_disconnect3_func()
 {
     std::string testNo("08");
     int subtest = 2;
@@ -286,7 +284,7 @@ RUN_CYNARA_TEST(tca08_disconnect3)
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-RUN_CYNARA_TEST(tca09_disconnect_and_cancel1)
+void tca09_disconnect_and_cancel1_func()
 {
     std::string testNo("09");
     int subtest = 1;
@@ -318,7 +316,7 @@ RUN_CYNARA_TEST(tca09_disconnect_and_cancel1)
     client.assertStatus(READ);
 }
 
-RUN_CYNARA_TEST(tca09_disconnect_and_cancel2)
+void tca09_disconnect_and_cancel2_func()
 {
     std::string testNo("09");
     int subtest = 2;
@@ -350,7 +348,7 @@ RUN_CYNARA_TEST(tca09_disconnect_and_cancel2)
     client.assertStatus(READ);
 }
 
-RUN_CYNARA_TEST(tca10_double_request)
+void tca10_double_request_func()
 {
     std::string testNo("10");
     cynara_check_id id, id2;
@@ -374,7 +372,7 @@ RUN_CYNARA_TEST(tca10_double_request)
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-RUN_CYNARA_TEST(tca11_double_request_with_restart)
+void tca11_double_request_with_restart_func()
 {
     std::string testNo("11");
     cynara_check_id id, id2;
@@ -401,7 +399,7 @@ RUN_CYNARA_TEST(tca11_double_request_with_restart)
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
 }
 
-RUN_CYNARA_TEST(tca12_multiple_connections_without_requests)
+void tca12_multiple_connections_without_requests_func()
 {
     std::string testNo("12");
 
@@ -437,3 +435,23 @@ RUN_CYNARA_TEST(tca12_multiple_connections_without_requests)
                              << 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 237cf12d9532b23c462cbd7978c88af39f21a9e0..9ac246c53c1ea02545ffc247d49da579cdb1085c 100644 (file)
--- a/src/cynara-tests/test_cases_db.cpp
+++ b/src/cynara-tests/test_cases_db.cpp
@@ -188,8 +188,6 @@ 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
@@ -199,7 +197,7 @@ RUNNER_TEST_GROUP_INIT(cynara_db_tests)
  * 4. Retry to make a change (ALLOW) in default bucket (data dump should proceed)
  * 5. Check if database is saved correctly
  */
-RUN_CYNARA_TEST(tcdb01_lockdown_init_failure)
+void tcdb01_lockdown_init_failure_func()
 {
     Admin admin;
     Client cynara;
@@ -228,7 +226,7 @@ RUN_CYNARA_TEST(tcdb01_lockdown_init_failure)
  * 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
  */
-RUN_CYNARA_TEST(tcdb02_write_to_backup_failure)
+void tcdb02_write_to_backup_failure_func()
 {
     Admin admin;
     Client cynara;
@@ -258,7 +256,7 @@ RUN_CYNARA_TEST(tcdb02_write_to_backup_failure)
  * 5. Reload Cynara - policies should be loaded from primary (revalidated) database
  * 6. Check if all backup files were removed
  */
-RUN_CYNARA_TEST(tcdb03_invalid_and_valid_backup_removal)
+void tcdb03_invalid_and_valid_backup_removal_func()
 {
     Admin admin;
     Client cynara;
@@ -286,7 +284,7 @@ RUN_CYNARA_TEST(tcdb03_invalid_and_valid_backup_removal)
  * 1. Write sample policy to database (and let it save to storage)
  * 2. Compare freshly saved files with samples from test patterns directory
  */
-RUN_CYNARA_TEST(tcdb04_dumped_file_binary_comparison)
+void tcdb04_dumped_file_binary_comparison_func()
 {
     Admin admin;
     Client cynara;
@@ -317,7 +315,7 @@ RUN_CYNARA_TEST(tcdb04_dumped_file_binary_comparison)
  * 2. Reload Cynara
  * 3. Check if any of mentioned above files still remained
  */
-RUN_CYNARA_TEST(tcdb05_non_indexed_files_removal)
+void tcdb05_non_indexed_files_removal_func()
 {
     std::vector<std::string> filenames = { "_broken-backup~", "_non-indexed-bucket",
                                            "some-file-that-doesnt-belong-here" };
@@ -330,3 +328,11 @@ RUN_CYNARA_TEST(tcdb05_non_indexed_files_removal)
     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)