Clean-up test artefacts from core library

ecmwf · Dec 20, 2023 · ec5841a · ec5841a
2 parents d285a46 + 9b72375
commit ec5841a
Show file tree

Hide file tree

Showing 20 changed files with 198 additions and 180 deletions.
diff --git a/ACore/CMakeLists.txt b/ACore/CMakeLists.txt
@@ -49,11 +49,9 @@ set(srcs
   src/ecflow/core/PrintStyle.hpp
   src/ecflow/core/SState.hpp
   src/ecflow/core/Serialization.hpp
-  src/ecflow/core/SerializationTest.hpp
   src/ecflow/core/Stl.hpp
   src/ecflow/core/Str.hpp
   src/ecflow/core/StringSplitter.hpp
-  src/ecflow/core/TestUtil.hpp
   src/ecflow/core/TimeSeries.hpp
   src/ecflow/core/TimeSlot.hpp
   src/ecflow/core/TimeStamp.hpp
@@ -120,6 +118,22 @@ ecbuild_add_library(
 )
 target_clangformat(core)
 
+##
+## Notice: test_support is an INTERFACE-only test utility library.
+##
+
+ecbuild_add_library(
+  TARGET
+    test_support
+  NOINSTALL
+  TYPE INTERFACE
+  SOURCES
+    test/TestSerialisation.hpp
+  PUBLIC_INCLUDES
+    test
+)
+target_clangformat(test_support)
+
 set(test_srcs
   # Headers
   test/TestVersioning.hpp
@@ -164,6 +178,7 @@ ecbuild_add_test(
   SOURCES
     ${test_srcs}
   LIBS
+    test_support
     core
     Boost::boost # Boost header-only libraries must be available (namely unit_test_framework)
 #

diff --git a/ACore/src/ecflow/core/Str.hpp b/ACore/src/ecflow/core/Str.hpp
@@ -23,8 +23,8 @@ namespace ecf {
 
 namespace algorithm {
 
-template <typename Sequence1, typename Sequence2>
-inline static auto join(const Sequence1& strings, const Sequence2& separator) {
+template <typename Sequence1, typename Sequence2 = std::string>
+inline static auto join(const Sequence1& strings, const Sequence2& separator = std::string(", ")) {
     return ::boost::algorithm::join(strings, separator);
 }
 
@@ -48,6 +48,14 @@ inline static void trim(Sequence& input) {
     ::boost::algorithm::trim(input);
 }
 
+template <typename T>
+static std::vector<std::string> transform_to_name_vector(const std::vector<T>& i) {
+    std::vector<std::string> o;
+    o.reserve(i.size());
+    std::transform(std::begin(i), std::end(i), std::back_inserter(o), [](const auto& v) { return v->name(); });
+    return o;
+}
+
 } // namespace algorithm
 
 class Str {

diff --git a/ACore/src/ecflow/core/TestUtil.hpp b/ACore/src/ecflow/core/TestUtil.hpp
diff --git a/ACore/test/TestCereal.cpp b/ACore/test/TestCereal.cpp
@@ -12,8 +12,8 @@
 
 #include <boost/test/unit_test.hpp>
 
+#include "TestSerialisation.hpp"
 #include "ecflow/core/Filesystem.hpp"
-#include "ecflow/core/SerializationTest.hpp"
 
 using namespace ecf;
 using namespace boost;

diff --git a/ACore/test/TestCerealOptionalNVP.cpp b/ACore/test/TestCerealOptionalNVP.cpp
@@ -13,7 +13,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include "ecflow/core/Filesystem.hpp"
-#include "ecflow/core/SerializationTest.hpp"
+#include "ecflow/core/Serialization.hpp"
 
 using namespace ecf;
 using namespace boost;

diff --git a/ACore/test/TestMigration.cpp b/ACore/test/TestMigration.cpp
@@ -10,12 +10,12 @@
 
 #include <boost/test/unit_test.hpp>
 
+#include "TestSerialisation.hpp"
 #include "ecflow/core/Calendar.hpp"
 #include "ecflow/core/DState.hpp"
 #include "ecflow/core/Ecf.hpp"
 #include "ecflow/core/File.hpp"
 #include "ecflow/core/NState.hpp"
-#include "ecflow/core/SerializationTest.hpp"
 #include "ecflow/core/TimeSeries.hpp"
 
 using namespace std;

diff --git a/ACore/test/TestSerialisation.cpp b/ACore/test/TestSerialisation.cpp
@@ -8,10 +8,11 @@
  * nor does it submit to any jurisdiction.
  */
 
+#include "TestSerialisation.hpp"
+
 #include <boost/test/unit_test.hpp>
 
 #include "ecflow/core/Calendar.hpp"
-#include "ecflow/core/SerializationTest.hpp"
 #include "ecflow/core/TimeSeries.hpp"
 
 using namespace std;

diff --git a/ACore/src/ecflow/core/SerializationTest.hpp → ACore/test/TestSerialisation.hpp b/ACore/src/ecflow/core/SerializationTest.hpp → ACore/test/TestSerialisation.hpp
@@ -8,16 +8,15 @@
  * nor does it submit to any jurisdiction.
  */
 
-#ifndef ecflow_core_SerializationTest_HPP
-#define ecflow_core_SerializationTest_HPP
+#ifndef ecflow_core_TestSerialisation_HPP
+#define ecflow_core_TestSerialisation_HPP
 
 #include <boost/test/unit_test.hpp>
 
 #include "ecflow/core/Serialization.hpp"
 
 namespace ecf {
 
-// The following template  functions are used test/debug only
 template <typename T>
 void do_restore(const std::string& fileName, const T& saved) {
     T restored;
@@ -66,4 +65,4 @@ void doSaveAndRestore(const std::string& fileName) {
 
 } // namespace ecf
 
-#endif /* ecflow_core_SerializationTest_HPP */
+#endif /* ecflow_core_TestSerialisation_HPP */
diff --git a/ACore/test/TestVersioning.hpp b/ACore/test/TestVersioning.hpp
@@ -11,8 +11,8 @@
 #ifndef ecflow_core_test_TestVersioning_HPP
 #define ecflow_core_test_TestVersioning_HPP
 
+#include "TestSerialisation.hpp"
 #include "ecflow/core/Converter.hpp"
-#include "ecflow/core/SerializationTest.hpp"
 
 /// To simulate changing of data model over time, we will
 /// namespace's. The actual serialisation does not appears to

diff --git a/ANattr/CMakeLists.txt b/ANattr/CMakeLists.txt
@@ -90,6 +90,7 @@ ecbuild_add_test(
   SOURCES
     ${test_srcs}
   LIBS
+    test_support
     nodeattr
   TEST_DEPENDS
     u_acore

diff --git a/ANattr/test/TestAttrSerialization.cpp b/ANattr/test/TestAttrSerialization.cpp
@@ -10,6 +10,7 @@
 
 #include <boost/test/unit_test.hpp>
 
+#include "TestSerialisation.hpp"
 #include "ecflow/attribute/AutoArchiveAttr.hpp"
 #include "ecflow/attribute/AutoCancelAttr.hpp"
 #include "ecflow/attribute/ClockAttr.hpp"
@@ -27,7 +28,6 @@
 #include "ecflow/attribute/VerifyAttr.hpp"
 #include "ecflow/attribute/ZombieAttr.hpp"
 #include "ecflow/core/Calendar.hpp"
-#include "ecflow/core/SerializationTest.hpp"
 
 using namespace std;
 using namespace ecf;

diff --git a/ANattr/test/TestMigration.cpp b/ANattr/test/TestMigration.cpp
@@ -11,6 +11,7 @@
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/test/unit_test.hpp>
 
+#include "TestSerialisation.hpp"
 #include "ecflow/attribute/AutoArchiveAttr.hpp"
 #include "ecflow/attribute/AutoCancelAttr.hpp"
 #include "ecflow/attribute/ClockAttr.hpp"
@@ -28,7 +29,6 @@
 #include "ecflow/attribute/VerifyAttr.hpp"
 #include "ecflow/attribute/ZombieAttr.hpp"
 #include "ecflow/core/File.hpp"
-#include "ecflow/core/SerializationTest.hpp"
 #include "ecflow/core/TimeSlot.hpp"
 #include "ecflow/core/cereal_boost_time.hpp"
 

diff --git a/ANode/CMakeLists.txt b/ANode/CMakeLists.txt
@@ -233,6 +233,7 @@ ecbuild_add_test(
   SOURCES
     ${test_srcs}
   LIBS
+    test_support
     node
     Boost::boost # Boost header-only libraries must be available (namely unit_test_framework)
   TEST_DEPENDS

diff --git a/ANode/test/TestInLimit.cpp b/ANode/test/TestInLimit.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include "ecflow/core/SerializationTest.hpp"
+#include "TestSerialisation.hpp"
 #include "ecflow/node/InLimit.hpp"
 #include "ecflow/node/Task.hpp"
 

diff --git a/ANode/test/TestLimit.cpp b/ANode/test/TestLimit.cpp
@@ -12,9 +12,9 @@
 
 #include <boost/test/unit_test.hpp>
 
+#include "TestSerialisation.hpp"
 #include "ecflow/core/Converter.hpp"
 #include "ecflow/core/Ecf.hpp"
-#include "ecflow/core/SerializationTest.hpp"
 #include "ecflow/node/Limit.hpp"
 
 using namespace std;

diff --git a/ANode/test/TestMigration.cpp b/ANode/test/TestMigration.cpp
@@ -11,9 +11,9 @@
 #include <boost/test/unit_test.hpp>
 
 #include "MyDefsFixture.hpp"
+#include "TestSerialisation.hpp"
 #include "ecflow/core/Ecf.hpp"
 #include "ecflow/core/File.hpp"
-#include "ecflow/core/SerializationTest.hpp"
 #include "ecflow/node/Defs.hpp"
 #include "ecflow/node/Family.hpp"
 #include "ecflow/node/Suite.hpp"