Adjust cynara wrapper to framework

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

diff --git a/src/cynara-tests/common/cynara_test_env.cpp b/src/cynara-tests/common/cynara_test_env.cpp
index ba3350a..4af7659 100644 (file)
--- 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();
+}