Move things around and renaming

Author: Hind-M

tests/CMakeLists.txt

@@ -4,14 +4,25 @@ find_package(doctest CONFIG REQUIRED)
 
 set(test_target "test_sparrow_ipc_lib")
 
-add_executable(${test_target} main.cpp test_utils.cpp test_primitive_array.cpp test_serialize_null_array.cpp)
+set(
+    SPARROW_IPC_TESTS_SRC
+    include/sparrow_ipc_tests_helpers.hpp
+    # TODO move all the files below under src?
+    main.cpp
+    test_utils.cpp
+    test_primitive_array_serialization.cpp
+    test_null_array_serialization.cpp
+)
+
+add_executable(${test_target} ${SPARROW_IPC_TESTS_SRC})
 target_link_libraries(${test_target}
     PRIVATE
         sparrow-ipc
         doctest::doctest
 )
 target_include_directories(${test_target}
     PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
         ${CMAKE_BINARY_DIR}/generated
         ${CMAKE_SOURCE_DIR}/include
 )

tests/include/sparrow_ipc_tests_helpers.hpp

@@ -0,0 +1,33 @@
+#pragma once
+
+#include "sparrow.hpp"
+#include "doctest/doctest.h"
+
+namespace sparrow_ipc
+{
+    namespace sp = sparrow;
+
+    template <typename T1, typename T2>
+    void compare_metadata(T1& arr1, T2& arr2)
+    {
+        if (!arr1.metadata().has_value())
+        {
+            CHECK(!arr2.metadata().has_value());
+            return;
+        }
+
+        CHECK(arr2.metadata().has_value());
+        sp::key_value_view kvs1_view = arr1.metadata().value();
+        sp::key_value_view kvs2_view = arr2.metadata().value();
+
+        CHECK_EQ(kvs1_view.size(), kvs2_view.size());
+        auto kvs1_it = kvs1_view.cbegin();
+        auto kvs2_it = kvs2_view.cbegin();
+        for (auto i = 0; i < kvs1_view.size(); ++i)
+        {
+            CHECK_EQ(*kvs1_it, *kvs2_it);
+            ++kvs1_it;
+            ++kvs2_it;
+        }
+    }
+}

tests/test_serialize_null_array.cpp renamed to tests/test_null_array_serialization.cpp

@@ -2,34 +2,12 @@
 #include "sparrow.hpp"
 
 #include "serialize_null_array.hpp"
+#include "sparrow_ipc_tests_helpers.hpp"
 
 namespace sparrow_ipc
 {
     namespace sp = sparrow;
-    // TODO have a generic compare_metadata in tests/helpers.hpp, cpp
-    // taking pa and na
-    void compare_metadata(sp::null_array& na1, sp::null_array& na2)
-    {
-        if (!na1.metadata().has_value())
-        {
-            CHECK(!na2.metadata().has_value());
-            return;
-        }
-
-        CHECK(na2.metadata().has_value());
-        sp::key_value_view kvs1_view = *(na1.metadata());
-        sp::key_value_view kvs2_view = *(na2.metadata());
 
-        CHECK_EQ(kvs1_view.size(), kvs2_view.size());
-        auto kvs1_it = kvs1_view.cbegin();
-        auto kvs2_it = kvs2_view.cbegin();
-        for (auto i = 0; i < kvs1_view.size(); ++i)
-        {
-            CHECK_EQ(*kvs1_it, *kvs2_it);
-            ++kvs1_it;
-            ++kvs2_it;
-        }
-    }
 
     TEST_CASE("Serialize and deserialize null_array")
     {

tests/test_primitive_array.cpp renamed to tests/test_primitive_array_serialization.cpp

@@ -7,6 +7,7 @@
 #include "sparrow.hpp"
 
 #include "serialize.hpp"
+#include "sparrow_ipc_tests_helpers.hpp"
 
 namespace sparrow_ipc
 {
@@ -119,30 +120,6 @@ namespace sparrow_ipc
         }
     }
 
-    template <typename T>
-    void compare_metadata(sp::primitive_array<T>& pa1, sp::primitive_array<T>& pa2)
-    {
-        if (!pa1.metadata().has_value())
-        {
-            CHECK(!pa2.metadata().has_value());
-            return;
-        }
-
-        CHECK(pa2.metadata().has_value());
-        sp::key_value_view kvs1_view = *(pa1.metadata());
-        sp::key_value_view kvs2_view = *(pa2.metadata());
-
-        CHECK_EQ(kvs1_view.size(), kvs2_view.size());
-        auto kvs1_it = kvs1_view.cbegin();
-        auto kvs2_it = kvs2_view.cbegin();
-        for (auto i = 0; i < kvs1_view.size(); ++i)
-        {
-            CHECK_EQ(*kvs1_it, *kvs2_it);
-            ++kvs1_it;
-            ++kvs2_it;
-        }
-    }
-
     template <typename T>
     void compare_primitive_arrays(sp::primitive_array<T>& ar, sp::primitive_array<T>& deserialized_ar)
     {
@@ -161,7 +138,7 @@ namespace sparrow_ipc
 
 //         compare_values<T>(ar, deserialized_ar);
         compare_bitmap<T>(ar, deserialized_ar);
-        compare_metadata<T>(ar, deserialized_ar);
+        compare_metadata(ar, deserialized_ar);
     }
 
     TEST_CASE_TEMPLATE_DEFINE("Serialize and Deserialize primitive_array", T, primitive_array_types)