Moving to simpler, faster, and safer ut (#1041)

stephenberry · May 30, 2024 · acae67b · acae67b
1 parent 2a59b71
commit acae67b
Show file tree

Hide file tree

Showing 17 changed files with 179 additions and 160 deletions.
diff --git a/include/glaze/util/for_each.hpp b/include/glaze/util/for_each.hpp
@@ -25,4 +25,13 @@ namespace glz
          (f(std::integral_constant<std::size_t, I>{}) || ...);
       }(std::make_index_sequence<N>{});
    }
+
+   template <class Func, class Tuple>
+   constexpr void for_each_apply(Func&& f, Tuple&& t)
+   {
+      constexpr size_t N = glz::tuple_size_v<std::decay_t<Tuple>>;
+      [&]<std::size_t... I>(std::index_sequence<I...>) constexpr {
+         (f(std::get<I>(t)), ...);
+      }(std::make_index_sequence<N>{});
+   }
 }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -5,8 +5,8 @@ set(BOOST_UT_DISABLE_MODULE ON CACHE INTERNAL "")
 
 FetchContent_Declare(
   ut
-  GIT_REPOSITORY https://github.com/boost-ext/ut
-  GIT_TAG master
+  GIT_REPOSITORY https://github.com/openalgz/ut
+  GIT_TAG v0.0.3
   GIT_SHALLOW TRUE
 )
 
@@ -23,7 +23,7 @@ add_code_coverage_all_targets()
 
 add_library(glz_test_common INTERFACE)
 target_compile_features(glz_test_common INTERFACE cxx_std_20)
-target_link_libraries(glz_test_common INTERFACE Boost::ut glaze::glaze)
+target_link_libraries(glz_test_common INTERFACE ut::ut glaze::glaze)
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
     target_compile_options(glz_test_common INTERFACE -fno-exceptions -fno-rtti)
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -43,7 +43,7 @@ endif()
 
 add_library(glz_test_exceptions INTERFACE)
 target_compile_features(glz_test_exceptions INTERFACE cxx_std_20)
-target_link_libraries(glz_test_exceptions INTERFACE Boost::ut glaze::glaze)
+target_link_libraries(glz_test_exceptions INTERFACE ut::ut glaze::glaze)
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
     target_compile_options(glz_test_exceptions INTERFACE)
     target_compile_options(glz_test_exceptions INTERFACE -Wall -Wextra -pedantic)

diff --git a/tests/api_test/api_test.cpp b/tests/api_test/api_test.cpp
@@ -4,7 +4,7 @@
 #include <iostream>
 #include <tuple>
 
-#include "boost/ut.hpp"
+#include "ut/ut.hpp"
 #include "glaze/api/impl.hpp"
 #include "glaze/api/std/deque.hpp"
 #include "glaze/api/std/span.hpp"
@@ -97,7 +97,7 @@ glz::iface_fn glz_iface() noexcept { return glz::make_iface<my_api, my_api2>();
 
 void tests()
 {
-   using namespace boost::ut;
+   using namespace ut;
 
    std::shared_ptr<glz::iface> iface{glz_iface()()};
    auto io = (*iface)["my_api"]();

diff --git a/tests/binary_test/binary_test.cpp b/tests/binary_test/binary_test.cpp
@@ -1,9 +1,8 @@
 // Glaze Library
 // For the license information refer to glaze.hpp
 
-#ifndef BOOST_UT_DISABLE_MODULE
-#define BOOST_UT_DISABLE_MODULE
-#endif
+#define UT_RUN_TIME_ONLY
+
 #include <bit>
 #include <chrono>
 #include <complex>
@@ -15,7 +14,7 @@
 #include <set>
 #include <unordered_set>
 
-#include "boost/ut.hpp"
+#include "ut/ut.hpp"
 #include "glaze/api/impl.hpp"
 #include "glaze/binary/beve_to_json.hpp"
 #include "glaze/binary/read.hpp"
@@ -202,7 +201,7 @@ struct glz::meta<Thing>
 
 void write_tests()
 {
-   using namespace boost::ut;
+   using namespace ut;
 
    "round_trip"_test = [] {
       {
@@ -413,7 +412,7 @@ void write_tests()
 
 void bench()
 {
-   using namespace boost::ut;
+   using namespace ut;
    "bench"_test = [] {
       glz::trace_begin("bench");
       std::cout << "\nPerformance regresion test: \n";
@@ -452,7 +451,7 @@ void bench()
    };
 }
 
-using namespace boost::ut;
+using namespace ut;
 
 suite binary_helpers = [] {
    "binary_helpers"_test = [] {
@@ -592,7 +591,7 @@ void file_include_test()
 
 void container_types()
 {
-   using namespace boost::ut;
+   using namespace ut;
    "vector int roundtrip"_test = [] {
       std::vector<int> vec(100);
       for (auto& item : vec) item = rand();
@@ -2134,11 +2133,10 @@ int main()
    file_include_test();
    container_types();
 
-   auto result = boost::ut::cfg<>.run({.report_errors = true});
    glz::trace_end("binary_test");
    const auto ec = glz::write_file_trace("binary_test.trace.json", std::string{});
    if (ec) {
       std::cerr << "trace output failed\n";
    }
-   return result;
+   return 0;
 }
diff --git a/tests/compare_test/compare_test.cpp b/tests/compare_test/compare_test.cpp
@@ -1,16 +1,14 @@
 // Glaze Library
 // For the license information refer to glaze.hpp
 
-#ifndef BOOST_UT_DISABLE_MODULE
-#define BOOST_UT_DISABLE_MODULE
-#endif
+#define UT_RUN_TIME_ONLY
 
 #include "glaze/compare/compare.hpp"
 
-#include "boost/ut.hpp"
+#include "ut/ut.hpp"
 #include "glaze/compare/approx.hpp"
 
-using namespace boost::ut;
+using namespace ut;
 
 struct float_compare_t
 {
@@ -61,6 +59,5 @@ suite equality = [] {
 
 int main()
 {
-   const auto result = boost::ut::cfg<>.run({.report_errors = true});
-   return result;
+   return 0;
 }
diff --git a/tests/csv_test/csv_test.cpp b/tests/csv_test/csv_test.cpp
@@ -1,15 +1,17 @@
+#define UT_RUN_TIME_ONLY
+
 #include <deque>
 #include <map>
 #include <unordered_map>
 
-#include "boost/ut.hpp"
+#include "ut/ut.hpp"
 #include "glaze/csv/read.hpp"
 #include "glaze/csv/write.hpp"
 #include "glaze/record/recorder.hpp"
 
 // Specification: https://datatracker.ietf.org/doc/html/rfc4180
 
-using namespace boost::ut;
+using namespace ut;
 
 struct my_struct
 {
@@ -587,4 +589,4 @@ suite fish_record = [] {
    };
 };
 
-int main() { return boost::ut::cfg<>.run({.report_errors = true}); }
+int main() { return 0; }
diff --git a/tests/eigen_test/eigen_test.cpp b/tests/eigen_test/eigen_test.cpp
@@ -1,6 +1,8 @@
 // Glaze Library
 // For the license information refer to glaze.hpp
 
+#define UT_RUN_TIME_ONLY
+
 #include "glaze/ext/eigen.hpp"
 
 #include <Eigen/Core>
@@ -10,7 +12,7 @@
 #include <iterator>
 #include <random>
 
-#include "boost/ut.hpp"
+#include "ut/ut.hpp"
 #include "glaze/binary/beve_to_json.hpp"
 #include "glaze/json/json_ptr.hpp"
 #include "glaze/json/ptr.hpp"
@@ -19,7 +21,7 @@
 
 int main()
 {
-   using namespace boost::ut;
+   using namespace ut;
    "write_json"_test = [] {
       Eigen::Matrix<double, 2, 2> m{};
       m << 5, 1, 1, 7;

diff --git a/tests/exceptions_test/exceptions_test.cpp b/tests/exceptions_test/exceptions_test.cpp
@@ -1,11 +1,13 @@
 // Glaze Library
 // For the license information refer to glaze.hpp
 
-#include "boost/ut.hpp"
+#define UT_RUN_TIME_ONLY
+
+#include "ut/ut.hpp"
 #include "glaze/glaze_exceptions.hpp"
 #include "glaze/thread/threadpool.hpp"
 
-using namespace boost::ut;
+using namespace ut;
 
 struct my_struct
 {
@@ -48,7 +50,7 @@ suite starter = [] {
 };
 
 suite basic_types = [] {
-   using namespace boost::ut;
+   using namespace ut;
 
    "double write"_test = [] {
       std::string buffer{};
@@ -160,8 +162,5 @@ suite read_file_test = [] {
 
 int main()
 {
-   // Explicitly run registered test suites and report errors
-   // This prevents potential issues with thread local variables
-   const auto result = boost::ut::cfg<>.run({.report_errors = true});
-   return result;
+   return 0;
 }
diff --git a/tests/json_conformance/json_conformance.cpp b/tests/json_conformance/json_conformance.cpp
@@ -1,13 +1,15 @@
+#define UT_RUN_TIME_ONLY
+
 #include <deque>
 #include <iostream>
 #include <map>
 #include <random>
 #include <unordered_map>
 
-#include "boost/ut.hpp"
+#include "ut/ut.hpp"
 #include "glaze/glaze.hpp"
 
-using namespace boost::ut;
+using namespace ut;
 
 using sv = glz::sv;
 
@@ -110,7 +112,7 @@ inline void should_fail()
 
    if constexpr (Opts.force_conformance) {
       // TODO: Add force_conformance testing after parse
-      skip / "comma after close"_test = [] {
+      /*skip / "comma after close"_test = [] {
          constexpr sv s = R"(["Comma after the close"],)";
          {
             std::vector<std::string> v;
@@ -132,7 +134,7 @@ inline void should_fail()
             bool_object obj{};
             expect(glz::read_json(obj, s));
          }
-      };
+      };*/
    }
 
    "illegal expression"_test = [] {
@@ -160,7 +162,7 @@ inline void should_fail()
    };
 
    // TODO: Support this error in all cases
-   skip / "numbers cannot have leading zeroes"_test = [] {
+   /*skip / "numbers cannot have leading zeroes"_test = [] {
       constexpr sv s = R"({"i": 013})";
       {
          int_object obj{};
@@ -170,7 +172,7 @@ inline void should_fail()
          glz::json_t obj{};
          expect(glz::read_json(obj, s));
       }
-   };
+   };*/
 
    "numbers cannot be hex"_test = [] {
       constexpr sv s = R"({"i": 0x14})";
@@ -289,7 +291,7 @@ inline void should_fail()
    };
 
    // TODO: This should be an error
-   skip / "0e"_test = [] {
+   /*skip / "0e"_test = [] {
       constexpr sv s = R"(0e)";
       {
          double v{};
@@ -303,9 +305,9 @@ inline void should_fail()
          int v{};
          expect(glz::read_json(v, s));
       }
-   };
+   };*/
 
-   skip / "0e+"_test = [] {
+   /*skip / "0e+"_test = [] {
       constexpr sv s = R"(0e+)";
       {
          double v{};
@@ -319,7 +321,7 @@ inline void should_fail()
          int v{};
          expect(glz::read_json(v, s));
       }
-   };
+   };*/
 }
 
 template <glz::opts Opts>
@@ -362,8 +364,6 @@ suite json_conformance = [] {
 };
 
 int main()
-{ // Explicitly run registered test suites and report errors
-   // This prevents potential issues with thread local variables
-   const auto result = boost::ut::cfg<>.run({.report_errors = true});
-   return result;
+{
+   return 0;
 }
diff --git a/tests/json_performance/json_performance.cpp b/tests/json_performance/json_performance.cpp
@@ -1,13 +1,15 @@
+#define UT_RUN_TIME_ONLY
+
 #include <deque>
 #include <iostream>
 #include <map>
 #include <random>
 #include <unordered_map>
 
-#include "boost/ut.hpp"
+#include "ut/ut.hpp"
 #include "glaze/glaze.hpp"
 
-using namespace boost::ut;
+using namespace ut;
 
 std::mt19937 gen{};
 
@@ -64,8 +66,6 @@ suite string_performance = [] {
 };
 
 int main()
-{ // Explicitly run registered test suites and report errors
-   // This prevents potential issues with thread local variables
-   const auto result = boost::ut::cfg<>.run({.report_errors = true});
-   return result;
+{
+   return 0;
 }