Move tests to 'tests' subdirectory per [DIRECTORY.TESTS].

bemanproject · Nov 13, 2024 · 3b97077 · 3b97077
1 parent dac2342
commit 3b97077
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Coverage
         run: |
           lcov --directory ./build --capture --output-file ./build/coverage_all.info
-          lcov --remove ./build/coverage_all.info -o ./build/coverage.info '/usr/include/*' "$PWD/src/utf_view/tests/*"
+          lcov --remove ./build/coverage_all.info -o ./build/coverage.info '/usr/include/*' "$PWD/tests/utf_view/*"
       - name: Coveralls
         uses: coverallsapp/github-action@master
         with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,3 +40,7 @@ add_subdirectory(src/utf_view)
 if (UTF_VIEW_BUILD_PAPER)
   add_subdirectory(paper)
 endif()
+
+if(UTF_VIEW_BUILD_TESTING)
+    add_subdirectory(tests/utf_view)
+endif()
diff --git a/src/utf_view/CMakeLists.txt b/src/utf_view/CMakeLists.txt
@@ -8,7 +8,6 @@
 add_library(utf_view INTERFACE)
 
 include(GNUInstallDirs)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 target_include_directories(
   utf_view
@@ -29,8 +28,3 @@ install(
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}
   FILES_MATCHING
   PATTERN "*.hpp")
-
-# Tests
-if(UTF_VIEW_BUILD_TESTING)
-  add_subdirectory(tests)
-endif()
diff --git a/src/utf_view/tests/CMakeLists.txt → tests/utf_view/CMakeLists.txt b/src/utf_view/tests/CMakeLists.txt → tests/utf_view/CMakeLists.txt
@@ -5,6 +5,8 @@
 #    (See accompanying file LICENSE.txt or copy at
 #          https://www.boost.org/LICENSE_1_0.txt)
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
 add_library(
   utf_view_test_lib
   STATIC

diff --git a/src/utf_view/tests/code_unit_view.t.cpp → tests/utf_view/code_unit_view.t.cpp b/src/utf_view/tests/code_unit_view.t.cpp → tests/utf_view/code_unit_view.t.cpp
@@ -7,10 +7,10 @@
 
 #include <utf_view/code_unit_view.hpp>
 #include <utf_view/detail/constexpr_unless_msvc.hpp>
+#include <framework.hpp>
+#include <test_iterators.hpp>
 #include <ranges>
 #include <string_view>
-#include <tests/framework.hpp>
-#include <tests/test_iterators.hpp>
 
 namespace utf_view::tests {
 

diff --git a/src/utf_view/tests/detail/concepts.t.cpp → tests/utf_view/detail/concepts.t.cpp b/src/utf_view/tests/detail/concepts.t.cpp → tests/utf_view/detail/concepts.t.cpp
@@ -6,7 +6,7 @@
 //          https://www.boost.org/LICENSE_1_0.txt)
 
 #include <utf_view/detail/concepts.hpp>
-#include <tests/std_archetypes/iterator.hpp>
+#include <std_archetypes/iterator.hpp>
 
 namespace utf_view::tests {
 

diff --git a/src/utf_view/tests/framework.cpp → tests/utf_view/framework.cpp b/src/utf_view/tests/framework.cpp → tests/utf_view/framework.cpp
diff --git a/src/utf_view/tests/framework.hpp → tests/utf_view/framework.hpp b/src/utf_view/tests/framework.hpp → tests/utf_view/framework.hpp
diff --git a/src/utf_view/tests/main.t.cpp → tests/utf_view/main.t.cpp b/src/utf_view/tests/main.t.cpp → tests/utf_view/main.t.cpp
@@ -5,9 +5,9 @@
 //    (See accompanying file LICENSE.txt or copy at
 //          https://www.boost.org/LICENSE_1_0.txt)
 
+#include <framework.hpp>
 #include <cstdlib>
 #include <iostream>
-#include <tests/framework.hpp>
 
 int main() {
   for (auto& [test_name, test] : utf_view::tests::framework::tests()) {

diff --git a/src/utf_view/tests/null_term.t.cpp → tests/utf_view/null_term.t.cpp b/src/utf_view/tests/null_term.t.cpp → tests/utf_view/null_term.t.cpp
@@ -6,12 +6,12 @@
 //          https://www.boost.org/LICENSE_1_0.txt)
 
 #include <utf_view/null_term.hpp>
+#include <std_archetypes/iterator.hpp>
 #include <concepts>
 #include <cstddef>
 #include <cstdint>
 #include <iterator>
 #include <ranges>
-#include <tests/std_archetypes/iterator.hpp>
 #include <utility>
 
 namespace utf_view::tests {

diff --git a/src/utf_view/tests/readme_examples.t.cpp → tests/utf_view/readme_examples.t.cpp b/src/utf_view/tests/readme_examples.t.cpp → tests/utf_view/readme_examples.t.cpp
@@ -5,6 +5,7 @@
 //    (See accompanying file LICENSE.txt or copy at
 //          https://www.boost.org/LICENSE_1_0.txt)
 
+#include <framework.hpp>
 #include <utf_view/code_unit_view.hpp>
 #include <utf_view/null_term.hpp>
 #include <utf_view/to_utf_view.hpp>
@@ -15,7 +16,6 @@
 #include <stdexcept>
 #include <string>
 #include <string_view>
-#include <tests/framework.hpp>
 #include <vector>
 
 namespace utf_view::tests {

diff --git a/.../tests/std_archetypes/exposition_only.hpp → ...f_view/std_archetypes/exposition_only.hpp b/.../tests/std_archetypes/exposition_only.hpp → ...f_view/std_archetypes/exposition_only.hpp
diff --git a/...ests/std_archetypes/exposition_only.t.cpp → ...view/std_archetypes/exposition_only.t.cpp b/...ests/std_archetypes/exposition_only.t.cpp → ...view/std_archetypes/exposition_only.t.cpp
@@ -5,7 +5,7 @@
 //    (See accompanying file LICENSE.txt or copy at
 //          https://www.boost.org/LICENSE_1_0.txt)
 
-#include <tests/std_archetypes/exposition_only.hpp>
+#include <std_archetypes/exposition_only.hpp>
 
 namespace utf_view::tests::std_archetypes {
 

diff --git a/...tf_view/tests/std_archetypes/iterator.hpp → tests/utf_view/std_archetypes/iterator.hpp b/...tf_view/tests/std_archetypes/iterator.hpp → tests/utf_view/std_archetypes/iterator.hpp
@@ -8,11 +8,11 @@
 #ifndef UTF_VIEW_TESTS_STD_ARCHETYPES_ITERATOR_HPP
 #define UTF_VIEW_TESTS_STD_ARCHETYPES_ITERATOR_HPP
 
+#include <std_archetypes/exposition_only.hpp>
 #include <concepts>
 #include <cstddef>
 #include <cstdint>
 #include <iterator>
-#include <tests/std_archetypes/exposition_only.hpp>
 
 namespace utf_view::tests::std_archetypes {
 

diff --git a/..._view/tests/std_archetypes/iterator.t.cpp → tests/utf_view/std_archetypes/iterator.t.cpp b/..._view/tests/std_archetypes/iterator.t.cpp → tests/utf_view/std_archetypes/iterator.t.cpp
@@ -5,8 +5,8 @@
 //    (See accompanying file LICENSE.txt or copy at
 //          https://www.boost.org/LICENSE_1_0.txt)
 
+#include <std_archetypes/iterator.hpp>
 #include <iterator>
-#include <tests/std_archetypes/iterator.hpp>
 
 namespace utf_view::tests::std_archetypes {
 

diff --git a/src/utf_view/tests/test_iterators.hpp → tests/utf_view/test_iterators.hpp b/src/utf_view/tests/test_iterators.hpp → tests/utf_view/test_iterators.hpp
diff --git a/src/utf_view/tests/to_utf_view.t.cpp → tests/utf_view/to_utf_view.t.cpp b/src/utf_view/tests/to_utf_view.t.cpp → tests/utf_view/to_utf_view.t.cpp
@@ -8,6 +8,8 @@
 #include <utf_view/detail/constexpr_unless_msvc.hpp>
 #include <utf_view/detail/erroneous_behavior_global.hpp>
 #include <utf_view/to_utf_view.hpp>
+#include <framework.hpp>
+#include <test_iterators.hpp>
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
@@ -17,8 +19,6 @@
 #include <ranges>
 #include <sstream>
 #include <string>
-#include <tests/framework.hpp>
-#include <tests/test_iterators.hpp>
 #include <utility>
 
 #include <iostream>