Interface rule of five, some clang tidy suggestions.

eclipse-ecal · Jan 14, 2025 · 8512efe · 8512efe
1 parent dd30c06
commit 8512efe
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/ecal/core/src/config/ecal_path_processing.cpp b/ecal/core/src/config/ecal_path_processing.cpp
@@ -331,7 +331,7 @@ namespace eCAL
           }
           else
           {
-            std::cout << "[eCAL] Log path does not exist: " << path << std::endl;
+            std::cout << "[eCAL] Log path does not exist: " << path << "\n";
           }
         }
       }
@@ -381,10 +381,10 @@ namespace eCAL
       return ecal_default_paths;
     }
 
-    std::string GeteCALDataDirImpl(const Util::IDirProvider& env_provider /* = DirProvider() */, const Util::IDirManager& dir_manager_ /* = DirManager() */)
+    std::string GeteCALDataDirImpl(const Util::IDirProvider& dir_provider /* = DirProvider() */, const Util::IDirManager& dir_manager_ /* = DirManager() */)
     {
       // Return the possible default paths that could contain the yaml file
-      const std::vector<std::string> search_directories = getEcalDefaultPaths(env_provider, dir_manager_);
+      const std::vector<std::string> search_directories = getEcalDefaultPaths(dir_provider, dir_manager_);
 
       // return the first non empty path that also exists
       for (const auto& path : search_directories)

diff --git a/ecal/core/src/config/ecal_path_processing.h b/ecal/core/src/config/ecal_path_processing.h
@@ -35,6 +35,14 @@ namespace eCAL
     class IDirManager
     {
       public:
+        virtual ~IDirManager() = default;
+
+        IDirManager() = default;
+        IDirManager(const IDirManager&) = default;
+        IDirManager(IDirManager&&) = default;
+        IDirManager& operator=(const IDirManager&) = default;
+        IDirManager& operator=(IDirManager&&) = default;
+
         virtual bool dirExists(const std::string& path_) const = 0;
         virtual bool createDir(const std::string& path_) const = 0;
         virtual bool dirExistsOrCreate(const std::string& path_) const = 0;
@@ -101,6 +109,14 @@ namespace eCAL
     class IDirProvider 
     {
       public:
+        virtual ~IDirProvider() = default;
+
+        IDirProvider() = default;
+        IDirProvider(const IDirProvider&) = default;
+        IDirProvider(IDirProvider&&) = default;
+        IDirProvider& operator=(const IDirProvider&) = default;
+        IDirProvider& operator=(IDirProvider&&) = default;
+
         virtual std::string eCALEnvVar(const std::string& var_) const = 0;
         virtual std::string eCALLocalUserDir() const = 0;
         virtual std::string eCALDataSystemDir(const eCAL::Util::IDirManager& dir_manager_) const = 0;

diff --git a/ecal/tests/cpp/config_test/src/path_processing_test.cpp b/ecal/tests/cpp/config_test/src/path_processing_test.cpp
@@ -70,8 +70,8 @@ TEST(core_cpp_path_processing /*unused*/, ecal_data_log_env_vars /*unused*/)
   const int expected_call_count = 5;
   const int expected_call_count_log_var = 3;
 
-  MockDirProvider mock_dir_provider;
-  NiceMock<MockDirManager> mock_dir_manager;
+  const MockDirProvider mock_dir_provider;
+  const NiceMock<MockDirManager> mock_dir_manager;
 
   // Disable all other calls right now, as we just want to test the env vars
   EXPECT_CALL(mock_dir_provider, eCALDataSystemDir(::testing::Ref(mock_dir_manager)))
@@ -120,8 +120,8 @@ TEST(core_cpp_path_processing /*unused*/, ecal_local_user_dir /*unused*/)
   const int expected_call_count = 4;
   const int expected_call_count_log_var = 2;
 
-  MockDirProvider mock_dir_provider;
-  NiceMock<MockDirManager> mock_dir_manager;
+  const MockDirProvider mock_dir_provider;
+  const NiceMock<MockDirManager> mock_dir_manager;
 
   // mock the environment variables to be empty
   EXPECT_CALL(mock_dir_provider, eCALEnvVar(ECAL_DATA_VAR))
@@ -166,8 +166,8 @@ TEST(core_cpp_path_processing /*unused*/, ecal_data_system_dir /*unused*/)
   const int expected_call_count = 4;
   const int expected_call_count_log_var = 2;
 
-  MockDirProvider mock_dir_provider;
-  NiceMock<MockDirManager> mock_dir_manager;
+  const MockDirProvider mock_dir_provider;
+  const NiceMock<MockDirManager> mock_dir_manager;
 
   // mock the environment variables to be empty
   EXPECT_CALL(mock_dir_provider, eCALEnvVar(ECAL_DATA_VAR))
@@ -210,8 +210,8 @@ TEST(core_cpp_path_processing /*unused*/, ecal_config_log_dir /*unused*/)
   const std::string unique_tmp_dir = "/tmp/unique";
   const int expected_call_count = 2;
 
-  MockDirProvider mock_dir_provider;
-  NiceMock<MockDirManager> mock_dir_manager;
+  const MockDirProvider mock_dir_provider;
+  const NiceMock<MockDirManager> mock_dir_manager;
 
   // mock the environment variables to be empty
   EXPECT_CALL(mock_dir_provider, eCALEnvVar(ECAL_DATA_VAR))
@@ -258,8 +258,8 @@ TEST(core_cpp_path_processing /*unused*/, ecal_log_order_test /*unused*/)
   const std::string ecal_local_user_log_dir = ecal_local_user_dir + path_separator + ECAL_FOLDER_NAME_LOG;
   const std::string ecal_data_system_log_dir = ecal_data_system_dir + path_separator + ECAL_FOLDER_NAME_LOG;
 
-  MockDirProvider mock_dir_provider;
-  NiceMock<MockDirManager> mock_dir_manager;
+  const MockDirProvider mock_dir_provider;
+  const NiceMock<MockDirManager> mock_dir_manager;
 
   ::testing::Sequence seq_env_log, seq_env_data, seq_local_user, seq_data_system;