Move test utility out of base package

albin-johansson · Aug 2, 2024 · 3cdfd1a · 3cdfd1a
1 parent dc87599
commit 3cdfd1a
Show file tree

Hide file tree

Showing 28 changed files with 59 additions and 55 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -83,6 +83,11 @@ endif ()
 
 add_subdirectory("source/proto")
 add_subdirectory("source/base")
+
+if (TACTILE_BUILD_TESTS)
+  add_subdirectory("source/test_util")
+endif ()
+
 add_subdirectory("source/core")
 add_subdirectory("source/runtime")
 add_subdirectory("source/json_util")

diff --git a/source/base/CMakeLists.txt b/source/base/CMakeLists.txt
@@ -80,5 +80,4 @@ target_sources(tactile-base
 
 if (TACTILE_BUILD_TESTS)
   add_subdirectory("test")
-  add_subdirectory("test_util")
 endif ()
diff --git a/source/base/test_util/CMakeLists.txt b/source/base/test_util/CMakeLists.txt
diff --git a/source/core/test/CMakeLists.txt b/source/core/test/CMakeLists.txt
@@ -58,7 +58,7 @@ tactile_prepare_target(tactile-core-test)
 target_link_libraries(tactile-core-test
                       PRIVATE
                       tactile::core
-                      tactile::base_test_util
+                      tactile::test_util
                       tactile::null_renderer
                       GTest::gtest
                       )
diff --git a/source/core/test/src/layer/layer_common_test.cpp b/source/core/test/src/layer/layer_common_test.cpp
@@ -4,12 +4,12 @@
 
 #include <gtest/gtest.h>
 
-#include "tactile/base/test_util/ir_presets.hpp"
 #include "tactile/core/entity/registry.hpp"
 #include "tactile/core/layer/group_layer.hpp"
 #include "tactile/core/layer/object_layer.hpp"
 #include "tactile/core/layer/tile_layer.hpp"
 #include "tactile/core/test/ir_comparison.hpp"
+#include "tactile/test_util/ir_presets.hpp"
 
 namespace tactile::test {
 

diff --git a/source/core/test/src/layer/object_test.cpp b/source/core/test/src/layer/object_test.cpp
@@ -4,10 +4,10 @@
 
 #include <gtest/gtest.h>
 
-#include "tactile/base/test_util/ir_presets.hpp"
 #include "tactile/core/entity/registry.hpp"
 #include "tactile/core/meta/meta.hpp"
 #include "tactile/core/test/ir_comparison.hpp"
+#include "tactile/test_util/ir_presets.hpp"
 
 namespace tactile::test {
 

diff --git a/source/core/test/src/map/map_test.cpp b/source/core/test/src/map/map_test.cpp
@@ -4,8 +4,6 @@
 
 #include <gtest/gtest.h>
 
-#include "tactile/base/test_util/ir.hpp"
-#include "tactile/base/test_util/ir_presets.hpp"
 #include "tactile/core/entity/registry.hpp"
 #include "tactile/core/layer/group_layer.hpp"
 #include "tactile/core/layer/layer.hpp"
@@ -16,6 +14,8 @@
 #include "tactile/core/tile/tileset_spec.hpp"
 #include "tactile/core/ui/viewport.hpp"
 #include "tactile/null_renderer/null_renderer.hpp"
+#include "tactile/test_util/ir.hpp"
+#include "tactile/test_util/ir_presets.hpp"
 
 namespace tactile::test {
 

diff --git a/source/core/test/src/meta/meta_test.cpp b/source/core/test/src/meta/meta_test.cpp
@@ -5,9 +5,9 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "tactile/base/test_util/ir_presets.hpp"
 #include "tactile/core/entity/registry.hpp"
 #include "tactile/core/test/ir_comparison.hpp"
+#include "tactile/test_util/ir_presets.hpp"
 
 namespace tactile::test {
 

diff --git a/source/core/test/src/tile/tile_test.cpp b/source/core/test/src/tile/tile_test.cpp
@@ -4,12 +4,12 @@
 
 #include <gtest/gtest.h>
 
-#include "tactile/base/test_util/ir_presets.hpp"
 #include "tactile/core/entity/registry.hpp"
 #include "tactile/core/layer/object.hpp"
 #include "tactile/core/meta/meta.hpp"
 #include "tactile/core/test/ir_comparison.hpp"
 #include "tactile/core/tile/animation.hpp"
+#include "tactile/test_util/ir_presets.hpp"
 
 namespace tactile::test {
 

diff --git a/source/core/test/src/tile/tileset_test.cpp b/source/core/test/src/tile/tileset_test.cpp
@@ -5,7 +5,6 @@
 #include <gtest/gtest.h>
 
 #include "tactile/base/numeric/saturate_cast.hpp"
-#include "tactile/base/test_util/ir_presets.hpp"
 #include "tactile/core/entity/registry.hpp"
 #include "tactile/core/io/texture.hpp"
 #include "tactile/core/meta/meta.hpp"
@@ -15,6 +14,7 @@
 #include "tactile/core/tile/tileset_spec.hpp"
 #include "tactile/core/ui/viewport.hpp"
 #include "tactile/null_renderer/null_renderer.hpp"
+#include "tactile/test_util/ir_presets.hpp"
 
 namespace tactile::test {
 

diff --git a/source/base/test_util/.clang-tidy → source/test_util/.clang-tidy b/source/base/test_util/.clang-tidy → source/test_util/.clang-tidy
diff --git a/source/test_util/CMakeLists.txt b/source/test_util/CMakeLists.txt
@@ -0,0 +1,27 @@
+project(tactile-test-util CXX)
+
+add_library(tactile-test-util STATIC)
+add_library(tactile::test_util ALIAS tactile-test-util)
+
+target_sources(tactile-test-util
+               PRIVATE
+               "src/document_view_mocks.cpp"
+               "src/ir.cpp"
+               "src/ir_eq.cpp"
+               "src/ir_presets.cpp"
+
+               PUBLIC FILE_SET "HEADERS" BASE_DIRS "inc" FILES
+               "inc/tactile/test_util/document_view_mocks.hpp"
+               "inc/tactile/test_util/ir.hpp"
+               "inc/tactile/test_util/ir_eq.hpp"
+               "inc/tactile/test_util/ir_presets.hpp"
+               )
+
+tactile_prepare_target(tactile-test-util)
+
+target_link_libraries(tactile-test-util
+                      PUBLIC
+                      tactile::base
+                      GTest::gtest
+                      GTest::gmock
+                      )
diff --git a/...le/base/test_util/document_view_mocks.hpp → ...tactile/test_util/document_view_mocks.hpp b/...le/base/test_util/document_view_mocks.hpp → ...tactile/test_util/document_view_mocks.hpp
diff --git a/...st_util/inc/tactile/base/test_util/ir.hpp → ...ce/test_util/inc/tactile/test_util/ir.hpp b/...st_util/inc/tactile/base/test_util/ir.hpp → ...ce/test_util/inc/tactile/test_util/ir.hpp
diff --git a/...util/inc/tactile/base/test_util/ir_eq.hpp → ...test_util/inc/tactile/test_util/ir_eq.hpp b/...util/inc/tactile/base/test_util/ir_eq.hpp → ...test_util/inc/tactile/test_util/ir_eq.hpp
diff --git a/...inc/tactile/base/test_util/ir_presets.hpp → ...util/inc/tactile/test_util/ir_presets.hpp b/...inc/tactile/base/test_util/ir_presets.hpp → ...util/inc/tactile/test_util/ir_presets.hpp
diff --git a/...ase/test_util/src/document_view_mocks.cpp → source/test_util/src/document_view_mocks.cpp b/...ase/test_util/src/document_view_mocks.cpp → source/test_util/src/document_view_mocks.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/base/test_util/document_view_mocks.hpp"
+#include "tactile/test_util/document_view_mocks.hpp"
 
 #include <utility>  // move
 

diff --git a/source/base/test_util/src/ir.cpp → source/test_util/src/ir.cpp b/source/base/test_util/src/ir.cpp → source/test_util/src/ir.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/base/test_util/ir.hpp"
+#include "tactile/test_util/ir.hpp"
 
 #include <format>   // format
 #include <utility>  // move

diff --git a/source/base/test_util/src/ir_eq.cpp → source/test_util/src/ir_eq.cpp b/source/base/test_util/src/ir_eq.cpp → source/test_util/src/ir_eq.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/base/test_util/ir_eq.hpp"
+#include "tactile/test_util/ir_eq.hpp"
 
 #include <algorithm>  // find_if
 #include <format>     // format

diff --git a/source/base/test_util/src/ir_presets.cpp → source/test_util/src/ir_presets.cpp b/source/base/test_util/src/ir_presets.cpp → source/test_util/src/ir_presets.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/base/test_util/ir_presets.hpp"
+#include "tactile/test_util/ir_presets.hpp"
 
 #include <utility>  // move
 
-#include "tactile/base/test_util/ir.hpp"
+#include "tactile/test_util/ir.hpp"
 
 namespace tactile::test {
 

diff --git a/source/tiled_tmj_format/test/CMakeLists.txt b/source/tiled_tmj_format/test/CMakeLists.txt
@@ -24,7 +24,7 @@ tactile_prepare_target(tactile-tiled-tmj-format-test)
 target_link_libraries(tactile-tiled-tmj-format-test
                       PRIVATE
                       tactile::tiled_tmj_format
-                      tactile::base_test_util
+                      tactile::test_util
                       tactile::null_renderer
                       $<$<BOOL:TACTILE_BUILD_ZLIB_COMPRESSION>:tactile::zlib_compression>
                       $<$<BOOL:TACTILE_BUILD_ZSTD_COMPRESSION>:tactile::zstd_compression>

diff --git a/source/tiled_tmj_format/test/src/tmj_format_layer_emitter_test.cpp b/source/tiled_tmj_format/test/src/tmj_format_layer_emitter_test.cpp
@@ -7,9 +7,9 @@
 
 #include "tactile/base/io/tile_io.hpp"
 #include "tactile/base/platform/bits.hpp"
-#include "tactile/base/test_util/document_view_mocks.hpp"
-#include "tactile/base/test_util/ir.hpp"
 #include "tactile/runtime/runtime.hpp"
+#include "tactile/test_util/document_view_mocks.hpp"
+#include "tactile/test_util/ir.hpp"
 
 #ifdef TACTILE_HAS_ZLIB_COMPRESSION
   #include "tactile/zlib_compression/zlib_compression_plugin.hpp"

diff --git a/source/tiled_tmj_format/test/src/tmj_format_map_emitter_test.cpp b/source/tiled_tmj_format/test/src/tmj_format_map_emitter_test.cpp
@@ -5,8 +5,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "tactile/base/test_util/document_view_mocks.hpp"
-#include "tactile/base/test_util/ir.hpp"
+#include "tactile/test_util/document_view_mocks.hpp"
+#include "tactile/test_util/ir.hpp"
 
 namespace tactile::test {
 

diff --git a/source/tiled_tmj_format/test/src/tmj_format_meta_emitter_test.cpp b/source/tiled_tmj_format/test/src/tmj_format_meta_emitter_test.cpp
@@ -6,7 +6,7 @@
 #include <gtest/gtest.h>
 
 #include "tactile/base/meta/attribute.hpp"
-#include "tactile/base/test_util/document_view_mocks.hpp"
+#include "tactile/test_util/document_view_mocks.hpp"
 
 namespace tactile::test {
 

diff --git a/source/tiled_tmj_format/test/src/tmj_format_object_emitter_test.cpp b/source/tiled_tmj_format/test/src/tmj_format_object_emitter_test.cpp
@@ -6,7 +6,7 @@
 #include <gtest/gtest.h>
 
 #include "tactile/base/meta/attribute.hpp"
-#include "tactile/base/test_util/document_view_mocks.hpp"
+#include "tactile/test_util/document_view_mocks.hpp"
 
 namespace tactile::test {
 

diff --git a/source/tiled_tmj_format/test/src/tmj_format_roundtrip_test.cpp b/source/tiled_tmj_format/test/src/tmj_format_roundtrip_test.cpp
@@ -8,10 +8,10 @@
 
 #include "tactile/base/container/maybe.hpp"
 #include "tactile/base/container/string.hpp"
-#include "tactile/base/test_util/document_view_mocks.hpp"
-#include "tactile/base/test_util/ir.hpp"
-#include "tactile/base/test_util/ir_eq.hpp"
-#include "tactile/base/test_util/ir_presets.hpp"
+#include "tactile/test_util/document_view_mocks.hpp"
+#include "tactile/test_util/ir.hpp"
+#include "tactile/test_util/ir_eq.hpp"
+#include "tactile/test_util/ir_presets.hpp"
 #include "tactile/runtime/runtime.hpp"
 #include "tactile/tiled_tmj_format/tmj_format_plugin.hpp"
 

diff --git a/source/tiled_tmj_format/test/src/tmj_format_tile_emitter_test.cpp b/source/tiled_tmj_format/test/src/tmj_format_tile_emitter_test.cpp
@@ -5,8 +5,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "tactile/base/test_util/document_view_mocks.hpp"
-#include "tactile/base/test_util/ir.hpp"
+#include "tactile/test_util/document_view_mocks.hpp"
+#include "tactile/test_util/ir.hpp"
 
 namespace tactile::test {
 

diff --git a/source/tiled_tmj_format/test/src/tmj_format_tileset_emitter_test.cpp b/source/tiled_tmj_format/test/src/tmj_format_tileset_emitter_test.cpp
@@ -5,7 +5,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "tactile/base/test_util/document_view_mocks.hpp"
+#include "tactile/test_util/document_view_mocks.hpp"
 
 namespace tactile::test {