From cae2117817420200328f61d19ea4ebfaba6bb602 Mon Sep 17 00:00:00 2001
From: Anastasia Karachaliou <anastasia.karachaliou@cern.ch>
Date: Tue, 9 Jan 2018 15:03:16 +0100
Subject: [PATCH] transferring ConfigurationFileTest and SourcedParameterTest
 and file from tapeserver/daemon to common directory

---
 common/CMakeLists.txt                                    | 9 ++++++---
 {tapeserver/daemon => common}/ConfigurationFileTests.cpp | 0
 {tapeserver/daemon => common}/SourcedParameter.cpp       | 4 ++--
 {tapeserver/daemon => common}/SourcedParameter.hpp       | 0
 {tapeserver/daemon => common}/SourcedParameterTests.cpp  | 4 ++--
 tapeserver/daemon/CMakeLists.txt                         | 5 +----
 tapeserver/daemon/TapedConfiguration.hpp                 | 2 +-
 tapeserver/daemon/Tpconfig.hpp                           | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)
 rename {tapeserver/daemon => common}/ConfigurationFileTests.cpp (100%)
 rename {tapeserver/daemon => common}/SourcedParameter.cpp (98%)
 rename {tapeserver/daemon => common}/SourcedParameter.hpp (100%)
 rename {tapeserver/daemon => common}/SourcedParameterTests.cpp (91%)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index c0ce21437c..51a936c8b1 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -128,7 +128,8 @@ set (COMMON_LIB_SRC_FILES
   utils/strerror_r_wrapper.cpp
   CreationLog.cpp
   Configuration.cpp
-  ConfigurationFile.cpp  
+  ConfigurationFile.cpp
+  SourcedParameter.cpp   
   TapePool.cpp
   Timer.cpp
   UserIdentity.cpp
@@ -150,6 +151,8 @@ target_link_libraries (ctacommon
 
 set (COMMON_UNIT_TESTS_LIB_SRC_FILES
   checksum/ChecksumTest.cpp
+  ConfigurationFileTests.cpp
+  SourcedParameterTests.cpp
   dataStructures/ArchiveFileTest.cpp
   dataStructures/StorageClassTest.cpp
   processCap/SmartCapTest.cpp
@@ -183,6 +186,6 @@ set_property(TARGET ctacommonunittests PROPERTY SOVERSION "${CTA_SOVERSION}")
 set_property(TARGET ctacommonunittests PROPERTY   VERSION "${CTA_LIBVERSION}")
 
 install(TARGETS ctacommonunittests DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
-
 add_executable(mutexLtrace threading/MutexLtrace.cpp)
-target_link_libraries (mutexLtrace ctacommon)
+target_link_libraries(mutexLtrace ctacommon)
+
diff --git a/tapeserver/daemon/ConfigurationFileTests.cpp b/common/ConfigurationFileTests.cpp
similarity index 100%
rename from tapeserver/daemon/ConfigurationFileTests.cpp
rename to common/ConfigurationFileTests.cpp
diff --git a/tapeserver/daemon/SourcedParameter.cpp b/common/SourcedParameter.cpp
similarity index 98%
rename from tapeserver/daemon/SourcedParameter.cpp
rename to common/SourcedParameter.cpp
index e1acc54747..cc360c1745 100644
--- a/tapeserver/daemon/SourcedParameter.cpp
+++ b/common/SourcedParameter.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tapeserver/daemon/SourcedParameter.hpp"
+#include "SourcedParameter.hpp"
 #include "tapeserver/daemon/FetchReportOrFlushLimits.hpp"
 #include "tapeserver/daemon/TpconfigLine.hpp"
 #include <algorithm>
@@ -123,4 +123,4 @@ void SourcedParameter<TpconfigLine>::addLogParamForValue(log::LogContext & lc) {
   lc.pushOrReplace({"librarySlot", m_value.rawLibrarySlot});
 }
 
-}}} // namespace cta::tape::daemon
\ No newline at end of file
+}}} // namespace cta::tape::daemon
diff --git a/tapeserver/daemon/SourcedParameter.hpp b/common/SourcedParameter.hpp
similarity index 100%
rename from tapeserver/daemon/SourcedParameter.hpp
rename to common/SourcedParameter.hpp
diff --git a/tapeserver/daemon/SourcedParameterTests.cpp b/common/SourcedParameterTests.cpp
similarity index 91%
rename from tapeserver/daemon/SourcedParameterTests.cpp
rename to common/SourcedParameterTests.cpp
index f66771bde8..24af579949 100644
--- a/tapeserver/daemon/SourcedParameterTests.cpp
+++ b/common/SourcedParameterTests.cpp
@@ -18,8 +18,8 @@
 
 #include <gtest/gtest.h>
 
-#include "SourcedParameter.hpp"
-#include "FetchReportOrFlushLimits.hpp"
+#include "common/SourcedParameter.hpp"
+#include "tapeserver/daemon/FetchReportOrFlushLimits.hpp"
 
 namespace unitTests {
 
diff --git a/tapeserver/daemon/CMakeLists.txt b/tapeserver/daemon/CMakeLists.txt
index 1168864e9d..269f622ebd 100644
--- a/tapeserver/daemon/CMakeLists.txt
+++ b/tapeserver/daemon/CMakeLists.txt
@@ -17,7 +17,6 @@ add_library(ctatapedaemon
   DriveHandlerProxy.cpp
   GarbageCollectorHandler.cpp
   SignalHandler.cpp
-  SourcedParameter.cpp
   SubprocessHandler.cpp
   ProcessManager.cpp
   TapedConfiguration.cpp
@@ -44,10 +43,8 @@ target_link_libraries(ctatapedaemon
   File)
 
 add_library(ctadaemonunittests SHARED
-  ConfigurationFileTests.cpp
   TapedConfigurationTests.cpp
-  TpconfigTests.cpp
-  SourcedParameterTests.cpp)
+  TpconfigTests.cpp)
 set_property(TARGET ctadaemonunittests PROPERTY SOVERSION "${CTA_SOVERSION}")
 set_property(TARGET ctadaemonunittests PROPERTY   VERSION "${CTA_LIBVERSION}")
 
diff --git a/tapeserver/daemon/TapedConfiguration.hpp b/tapeserver/daemon/TapedConfiguration.hpp
index fa3cad5e93..16702901cb 100644
--- a/tapeserver/daemon/TapedConfiguration.hpp
+++ b/tapeserver/daemon/TapedConfiguration.hpp
@@ -23,7 +23,7 @@
 #include <limits>
 #include "common/log/DummyLogger.hpp"
 #include "common/exception/Exception.hpp"
-#include "SourcedParameter.hpp"
+#include "common/SourcedParameter.hpp"
 #include "FetchReportOrFlushLimits.hpp"
 #include "Tpconfig.hpp"
 
diff --git a/tapeserver/daemon/Tpconfig.hpp b/tapeserver/daemon/Tpconfig.hpp
index 885069cb81..00bb2c626e 100644
--- a/tapeserver/daemon/Tpconfig.hpp
+++ b/tapeserver/daemon/Tpconfig.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "tapeserver/daemon/TpconfigLine.hpp"
-#include "tapeserver/daemon/SourcedParameter.hpp"
+#include "common/SourcedParameter.hpp"
 #include "common/exception/Exception.hpp"
 
 #include <map>
-- 
GitLab