refactor test structure, implement annotation surrogates, implement skip, prepare for property testing and fuzz testing

Author: Tsche

CMakeLists.txt

@@ -26,7 +26,9 @@ target_link_libraries(rsltest_main PUBLIC rsltest)
 
 find_package(rsl-config REQUIRED)
 find_package(rsl-serialize REQUIRED)
+find_package(rsl-assert REQUIRED)
 
+target_link_libraries(rsltest PUBLIC rsl::assert)
 target_link_libraries(rsltest PUBLIC rsl::config)
 target_link_libraries(rsltest PUBLIC rsl::serialize)
 

conanfile.py

@@ -40,7 +40,8 @@ def requirements(self):
         self.requires("libassert/2.1.5", transitive_headers=True, transitive_libs=True)
         self.requires("rsl-config/0.1", transitive_headers=False, transitive_libs=True)
         self.requires("rsl-serialize/0.1", transitive_headers=False, transitive_libs=True)
-    
+        self.requires("rsl-assert/0.1", transitive_headers=True, transitive_libs=True)
+
     def layout(self):
         cmake_layout(self)
 
@@ -67,6 +68,7 @@ def package(self):
         cmake.install()
 
     def package_info(self):
+        self.cpp_info.set_property("cmake_file_name", "rsl-test")
         self.cpp_info.components["test"].set_property("cmake_target_name", "rsl::test")
         self.cpp_info.components["test"].includedirs = ["include"]
         self.cpp_info.components["test"].libdirs = ["lib"]
@@ -76,7 +78,7 @@ def package_info(self):
         self.cpp_info.components["test_main"].set_property("cmake_target_name", "rsl::test_main")
         self.cpp_info.components["test_main"].includedirs = ["include"]
         self.cpp_info.components["test_main"].libdirs = ["lib"]
-        self.cpp_info.components["test_main"].requires = ["test", "rsl-config::config", "rsl-serialize::serialize"] # depend on primary component
+        self.cpp_info.components["test_main"].requires = ["test", "rsl-config::config", "rsl-serialize::serialize", "rsl-assert::assert"] # depend on primary component
         self.cpp_info.components["test_main"].libs = ["rsltest_main"]
 
 

example/CMakeLists.txt

@@ -3,4 +3,7 @@ target_sources(example_test PRIVATE
     tparams.cpp
     params.cpp
     fixtures.cpp
-)
+)
+
+add_executable(params_debug params_debug.cpp)
+target_link_libraries(params_debug PUBLIC rsltest)

example/always_passes.cpp

@@ -11,4 +11,4 @@ void always_passes() {
 void always_fails() {
     ASSERT(false, "oh no");
 }
-}  // namespace testing
+}  // namespace testing

example/params.cpp

@@ -8,8 +8,8 @@ std::vector<std::tuple<char, int>> make_params() {
 }
 
 [[=rsl::test]]
-[[=rsl::params({std::tuple{'a', 10}, {'c', 12}})]]
-[[=rsl::params(rsl::cartesian_product({'a', 'c'}, {10, 15, 20}))]]
+[[=rsl::params({{'a', 10}, {'c', 12}})]]
+// [[=rsl::params(rsl::cartesian_product({'a', 'c'}, {10, 15, 20}))]]
 [[=rsl::params(make_params)]]
 void test_with_params(char foo, int bar){
     ASSERT(bar > 5);

example/params_debug.cpp

@@ -0,0 +1,31 @@
+#include <rsl/testing/all.hpp>
+#include <iostream>
+
+std::vector<std::tuple<int, char>> bar() { return {{42, 'd'}, {2, 'c'}}; }
+
+consteval std::vector<rsl::testing::ParamSet> foo() { return {{42, '3'}}; }
+
+[[= rsl::tparams{{^^int, 3}}]]
+[[= rsl::params{foo}]]
+constexpr static auto test =
+    []
+    <typename T, int V>
+    (int, char) static {  };
+
+namespace Zoinks {
+template <typename T, int V>
+void foo(int, char) {
+  std::cout << "\ntest\n";
+}
+}
+
+
+
+
+int main() {
+  // auto runs = expand_test<^^Zoinks::foo, ^^test>();
+  // std::cout << '\n' << runs.size();
+  // for (auto r : runs) {
+  //   std::cout << r.name << '\n';
+  // }
+}

example/tparams.cpp

@@ -3,14 +3,14 @@
 
 namespace demo::params {
 
-consteval std::vector<std::tuple<std::meta::info, int>> make_tparams() {
+consteval std::vector<rsl::testing::ParamSet> make_tparams() {
     return {{^^double, 13}, {^^short, 14}};
 }
 
 [[=rsl::test]]
 [[=rsl::tparams(make_tparams)]]
-[[=rsl::tparams({std::tuple{^^int, 10}, {^^float, 21}})]]
-[[=rsl::params({std::tuple{42, 'c'}, {12, 'b'}})]]
+[[=rsl::tparams({{^^int, 10}, {^^float, 21}})]]
+[[=rsl::params({{42, 'c'}, {12, 'b'}})]]
 constexpr inline auto tparam_gt_5 = []<typename T, int I>(int a, char b) static {
     ASSERT(I > 5);
 };

include/rsl/testing/_impl/params.hpp

@@ -35,4 +35,22 @@ constexpr std::uint32_t fnv1a(std::string_view str) {
   return fnv1a(str.begin(), str.size());
 }
 
+consteval bool has_parent(std::meta::info R) {
+  // HACK remove this once `std::meta::has_parent` is supported in libc++
+  return R != ^^::;
+}
+
+consteval std::vector<std::string_view> get_fully_qualified_name(std::meta::info R) {
+  std::vector<std::string_view> name{identifier_of(R)};
+  auto current = R;
+  while (has_parent(current)) {
+    current = parent_of(current);
+    if (!has_identifier(current)) {
+      continue;
+    }
+    name.emplace_back(define_static_string(identifier_of(current)));
+  }
+  std::ranges::reverse(name);
+  return name;
+}
 }  // namespace rsl::_testing_impl

include/rsl/testing/_impl/util.hpp

@@ -9,11 +9,11 @@
 #include <rsl/testing/util.hpp>
 
 namespace rsl {
-using testing::annotations::fixture;
-using testing::annotations::test;
-using testing::annotations::expect_failure;
-using testing::annotations::params;
-using testing::annotations::tparams;
+using testing::fixture;
+using testing::test;
+using testing::expect_failure;
+using testing::params;
+using testing::tparams;
 
 }  // namespace rsl::testing
 
@@ -39,4 +39,22 @@ using testing::annotations::tparams;
 namespace RSL_TEST_NAMESPACE {}
 #endif
 
-#define RSLTEST_ENABLE RSLTEST_ENABLE_NS(RSL_TEST_NAMESPACE)
+#define RSLTEST_ENABLE RSLTEST_ENABLE_NS(RSL_TEST_NAMESPACE)
+
+namespace rsl::testing {
+template <typename T, T V>
+  requires (!std::is_reference_v<T>)
+struct Anchor {
+  constexpr static auto value = 
+    std::is_object_v<T> ? std::meta::reflect_constant(V) : std::meta::reflect_function(*V);
+};
+
+template <std::meta::info V> 
+struct Anchor <std::meta::info, V>{ constexpr static auto value = V; };
+}
+
+#define RSLTEST_ANCHOR_IMPL(TYPE, VALUE) \
+consteval std::meta::info _rsl_test_anchor(rsl::testing::Anchor<TYPE, VALUE> anchor={}) { return anchor.value; }
+
+#define RSLTEST_ANCHOR(...) RSLTEST_ANCHOR_IMPL(std::meta::info, (^^__VA_ARGS__))
+#define RSLTEST_ANCHOR_OVERLOAD(TYPE, VALUE) RSLTEST_ANCHOR_IMPL(TYPE, VALUE)