Adjust cynara wrapper to framework

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

diff --git a/src/cynara-tests/common/cynara_test_commons.cpp b/src/cynara-tests/common/cynara_test_commons.cpp
index afeec79..4e06b4b 100644 (file)
--- a/src/cynara-tests/common/cynara_test_commons.cpp
+++ b/src/cynara-tests/common/cynara_test_commons.cpp
@@ -15,12 +15,11 @@
  */
 
 #include <cynara_test_commons.h>
-#include <cynara_test_env.h>
 #include <cynara_test_file_operations.h>
 #include <cynara_test_cynara_mask.h>
 
 #include <dpl/exception.h>
-#include <dpl/test/test_runner.h>
+#include <dpl/test/test_exception.h>
 
 #include <exception>
 
@@ -31,34 +30,12 @@ const std::string DB_DIR(CYNARA_DB_DIR);
 const std::string USER("cynara");
 const std::string LABEL("System");
 const std::string SERVICE("cynara.service");
-const std::string SERVICE_PLUGINS_DIR("/usr/lib/cynara/plugin/service/");
-
-}
+const std::string SOCKET_CLIENT("cynara.socket");
+const std::string SOCKET_ADMIN("cynara-admin.socket");
+const std::string SOCKET_AGENT("cynara-agent.socket");
 
-void environmentWrap(const char *testName, const std::function<void(void)> &func)
-{
-    CynaraTestEnv env(testName);
-    env.save();
+const std::string SERVICE_PLUGINS_DIR("/usr/lib/cynara/plugin/service/");
 
-    try {
-        func();
-    } catch (const DPL::Test::TestRunner::TestFailed &e) {
-        env.restore();
-        throw e;
-    } catch (const DPL::Test::TestRunner::Ignored &e) {
-        env.restore();
-        throw e;
-    } catch (const DPL::Exception &e) {
-        env.restore();
-        throw e;
-    } catch (const std::exception &e) {
-        env.restore();
-        throw e;
-    } catch (...) {
-        env.restore();
-        throw std::runtime_error("Unknown exception");
-    }
-    env.restore();
 }
 
 void loadServicePlugins(const DirectoryPaths &pluginDirectories)
@@ -69,3 +46,18 @@ void loadServicePlugins(const DirectoryPaths &pluginDirectories)
     for (const auto &dir : pluginDirectories)
         FileOperations::copyCynaraFiles(dir.c_str(), CynaraTestConsts::SERVICE_PLUGINS_DIR);
 }
+
+void restartCynaraService()
+{
+    ServiceManager service(CynaraTestConsts::SERVICE);
+    service.restartService();
+}
+
+void restartCynaraServiceAndSockets()
+{
+    ServiceManager service(CynaraTestConsts::SERVICE, { CynaraTestConsts::SOCKET_CLIENT,
+                                                        CynaraTestConsts::SOCKET_ADMIN,
+                                                        CynaraTestConsts::SOCKET_AGENT });
+
+    service.restartService(true);
+}