Rename file operation functions of cynara-tests

Change-Id: Ie24d7360dacf9f236ed36eaaaafbba1913d6e8dd

diff --git a/tests/cynara-tests/common/cynara_test_commons.cpp b/tests/cynara-tests/common/cynara_test_commons.cpp
index 446a801..afeec79 100644 (file)
--- a/tests/cynara-tests/common/cynara_test_commons.cpp
+++ b/tests/cynara-tests/common/cynara_test_commons.cpp
@@ -65,7 +65,7 @@ void loadServicePlugins(const DirectoryPaths &pluginDirectories)
 {
     CynaraMask mask;
 
-    FileOperations::clear(CynaraTestConsts::SERVICE_PLUGINS_DIR);
+    FileOperations::removeDirFiles(CynaraTestConsts::SERVICE_PLUGINS_DIR);
     for (const auto &dir : pluginDirectories)
-        FileOperations::copyDir(dir.c_str(), CynaraTestConsts::SERVICE_PLUGINS_DIR);
+        FileOperations::copyCynaraFiles(dir.c_str(), CynaraTestConsts::SERVICE_PLUGINS_DIR);
 }

diff --git a/tests/cynara-tests/common/cynara_test_env.cpp b/tests/cynara-tests/common/cynara_test_env.cpp
index 7a20291..211869b 100644 (file)
--- a/tests/cynara-tests/common/cynara_test_env.cpp
+++ b/tests/cynara-tests/common/cynara_test_env.cpp
@@ -40,9 +40,9 @@ void CynaraTestEnv::save()
 {
     CynaraMask mask;
 
-    clear(m_dbSaveDir);
+    removeDirFiles(m_dbSaveDir);
     removeDirIfExists(m_dbSaveDir);
-    clear(m_pluginsSaveDir);
+    removeDirFiles(m_pluginsSaveDir);
     removeDirIfExists(m_pluginsSaveDir);
     removeDirIfExists(m_saveDir);
 
@@ -50,28 +50,28 @@ void CynaraTestEnv::save()
     m_dbPresent = dirExists(CynaraTestConsts::DB_DIR);
     if (m_dbPresent) {
         makeDir(m_dbSaveDir);
-        copyDir(CynaraTestConsts::DB_DIR, m_dbSaveDir);
+        copyCynaraFiles(CynaraTestConsts::DB_DIR, m_dbSaveDir);
     }
     makeDir(m_pluginsSaveDir);
-    copyDir(CynaraTestConsts::SERVICE_PLUGINS_DIR, m_pluginsSaveDir);
+    copyCynaraFiles(CynaraTestConsts::SERVICE_PLUGINS_DIR, m_pluginsSaveDir);
 }
 
 void CynaraTestEnv::restore()
 {
     CynaraMask mask;
 
-    clear(CynaraTestConsts::DB_DIR);
+    removeDirFiles(CynaraTestConsts::DB_DIR);
     if (m_dbPresent)
-        copyDir(m_dbSaveDir, CynaraTestConsts::DB_DIR);
+        copyCynaraFiles(m_dbSaveDir, CynaraTestConsts::DB_DIR);
     else
         removeDirIfExists(CynaraTestConsts::DB_DIR);
 
-    clear(CynaraTestConsts::SERVICE_PLUGINS_DIR);
-    copyDir(m_pluginsSaveDir, CynaraTestConsts::SERVICE_PLUGINS_DIR);
+    removeDirFiles(CynaraTestConsts::SERVICE_PLUGINS_DIR);
+    copyCynaraFiles(m_pluginsSaveDir, CynaraTestConsts::SERVICE_PLUGINS_DIR);
 
-    clear(m_dbSaveDir);
+    removeDirFiles(m_dbSaveDir);
     removeDirIfExists(m_dbSaveDir);
-    clear(m_pluginsSaveDir);
+    removeDirFiles(m_pluginsSaveDir);
     removeDirIfExists(m_pluginsSaveDir);
     removeDirIfExists(m_saveDir);
 }

diff --git a/tests/cynara-tests/common/cynara_test_file_operations.cpp b/tests/cynara-tests/common/cynara_test_file_operations.cpp
index 132fc1f..0c27a26 100644 (file)
--- a/tests/cynara-tests/common/cynara_test_file_operations.cpp
+++ b/tests/cynara-tests/common/cynara_test_file_operations.cpp
@@ -35,7 +35,7 @@
 namespace FileOperations
 {
 
-static int removeContents(const char *fpath, const struct stat * /*sb*/,
+static int removeFile(const char *fpath, const struct stat * /*sb*/,
                           int tflag, struct FTW * /*ftwbuf*/)
 {
     if (tflag == FTW_F)
@@ -59,7 +59,7 @@ bool dirExists(const std::string &directory)
     return true;
 }
 
-void copyFile(const std::string &src, const std::string &dst)
+void copyCynaraFile(const std::string &src, const std::string &dst)
 {
     using PwBufPtr = CStringPtr;
     int inFd = TEMP_FAILURE_RETRY(open(src.c_str(), O_RDONLY));
@@ -97,7 +97,7 @@ void copyFile(const std::string &src, const std::string &dst)
     RUNNER_ASSERT_ERRNO_MSG(ret != -1, "sendfile failed");
 }
 
-void copyDir(const std::string &source, const std::string &destination)
+void copyCynaraFiles(const std::string &source, const std::string &destination)
 {
     DIR *dirPtr = nullptr;
     struct dirent *direntPtr;
@@ -112,7 +112,7 @@ void copyDir(const std::string &source, const std::string &destination)
             continue;
         std::string tempDest = destination + "/" + direntPtr->d_name;
         std::string tempSrc = source + "/" + direntPtr->d_name;
-        copyFile(tempSrc, tempDest);
+        copyCynaraFile(tempSrc, tempDest);
     }
 }
 
@@ -122,9 +122,9 @@ void makeDir(const std::string &directory)
                                "Unable to make " << directory << " test directory");
 }
 
-void clear(const std::string &dir)
+void removeDirFiles(const std::string &dir)
 {
-    int ret = nftw(dir.c_str(), removeContents, 2, FTW_DEPTH | FTW_PHYS);
+    int ret = nftw(dir.c_str(), removeFile, 2, FTW_DEPTH | FTW_PHYS);
     if (ret == -1)
         RUNNER_ASSERT_ERRNO_MSG(errno == ENOENT, "nftw failed");
 }

diff --git a/tests/cynara-tests/common/cynara_test_file_operations.h b/tests/cynara-tests/common/cynara_test_file_operations.h
index 109823a..fae2e09 100644 (file)
--- a/tests/cynara-tests/common/cynara_test_file_operations.h
+++ b/tests/cynara-tests/common/cynara_test_file_operations.h
@@ -23,10 +23,10 @@ namespace FileOperations
 {
 
 bool dirExists(const std::string &directory);
-void copyFile(const std::string &src, const std::string &dst);
-void copyDir(const std::string &source, const std::string &destination);
+void copyCynaraFile(const std::string &src, const std::string &dst);
+void copyCynaraFiles(const std::string &source, const std::string &destination);
 void makeDir(const std::string &directory);
-void clear(const std::string &dir);
+void removeDirFiles(const std::string &dir);
 void removeDirIfExists(const std::string &dir);
 
 } // namespace FileOperations