Adjust cynara wrapper to framework

[platform/core/test/security-tests.git] / src / cynara-tests / common / cynara_test_commons.h

diff --git a/src/cynara-tests/common/cynara_test_commons.h b/src/cynara-tests/common/cynara_test_commons.h
index af8ac96..6df3a83 100644 (file)
--- 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);