refactor

Author: Tsche

include/rsl/testing/_testing_impl/expand.hpp

@@ -8,23 +8,11 @@
 #include <rsl/assert>
 #include <libassert/assert.hpp>
 
-#include <rsl/testing/fuzz.hpp>
+#include <rsl/testing/test_case.hpp>
 
 #include "fixture.hpp"
 #include "annotations.hpp"
 
-namespace rsl::testing {
-// TODO move to testing/test.hpp
-struct TestResult;
-struct TestRun {
-  class Test const* test;
-  std::function<void()> fnc;
-  std::string name;
-
-  [[nodiscard]] TestResult run() const;
-};
-}  // namespace rsl::testing
-
 namespace rsl::testing::_testing_impl {
 template <std::meta::info R, std::meta::info Target>
 struct FuzzRunner {
@@ -94,14 +82,14 @@ struct TestRunner {
   }
 
   template <typename... Ts>
-  static TestRun bind(Test const* group, std::tuple<Ts...> args) {
+  static TestCase bind(Test const* group, std::tuple<Ts...> args) {
     return {group, std::bind_front(run_one<std::tuple<Ts...>>, args), get_name(args)};
   }
 };
 
 template <std::meta::info R, _testing_impl::Annotations A>
 struct Expand {
-  std::vector<TestRun> runs;
+  std::vector<TestCase> runs;
   Test const* group;
 
   template <typename Runner, annotations::Params Generator>

include/rsl/testing/output.hpp

@@ -28,7 +28,7 @@ struct Reporter : _testing_impl::Factory<Reporter> {
   virtual void before_test_group(Test const& test) {}
   virtual void after_test_group(std::span<TestResult> results) {}
 
-  virtual void before_test(TestRun const& test) = 0;
+  virtual void before_test(TestCase const& test) = 0;
   virtual void after_test(TestResult const& result)   = 0;
 
   virtual void list_tests(TestNamespace const& tests);

include/rsl/testing/test.hpp

@@ -8,6 +8,8 @@
 #include <set>
 #include <algorithm>
 
+#include "test_case.hpp"
+
 #include "_testing_impl/util.hpp"
 #include "_testing_impl/expand.hpp"
 #include "_testing_impl/fixture.hpp"
@@ -30,11 +32,11 @@ struct TestResult {
 
 
 class Test {
-  using runner_type = std::vector<TestRun> (Test::*)() const;
+  using runner_type = std::vector<TestCase> (Test::*)() const;
   runner_type get_tests_impl;
 
   template <std::meta::info R, _testing_impl::Annotations Ann>
-  std::vector<TestRun> expand_test() const {
+  std::vector<TestCase> expand_test() const {
     return _testing_impl::Expand<R, Ann>{this}.runs;
   }
 public:
@@ -70,7 +72,7 @@ class Test {
     full_name = define_static_array(meta_name);
   }
 
-  std::vector<TestRun> get_tests() const { return (this->*get_tests_impl)(); }
+  std::vector<TestCase> get_tests() const { return (this->*get_tests_impl)(); }
 };
 
 using TestDef = Test (*)();

include/rsl/testing/fuzz.hpp include/rsl/testing/test_case.hppinclude/rsl/testing/fuzz.hpp renamed to include/rsl/testing/test_case.hpp

@@ -1,13 +1,22 @@
 #pragma once
+#include <functional>
 
 namespace rsl::testing {
+struct TestResult;
 class Test;
+
+struct TestCase {
+  Test const* test;
+  std::function<void()> fnc;
+  std::string name;
+
+  [[nodiscard]] TestResult run() const;
+};
+
 struct FuzzTarget {
   // stringifying name is pointless here, perhaps do it after failure
-  
+  Test const* test;
   int (*run)(uint8_t const*, size_t);
   size_t (*mutate)(uint8_t*, size_t, size_t, unsigned int);
-
-  Test const* test;
 };
 }  // namespace rsl::testing

src/reporters/catch2xml.cpp

@@ -115,7 +115,7 @@ class[[= rename("xml")]] Catch2XmlReporter : public Reporter::Registrar<Catch2Xm
   Catch2TestRun report;
 
 public:
-  void before_test(TestRun const& run) override {}
+  void before_test(rsl::testing::TestCase const& run) override {}
   void after_test(TestResult const& result) override {
     TestCase& tc = report.get_tc(result.test->full_name[0]);
     Section* section = nullptr;

src/reporters/terminal.cpp

@@ -8,7 +8,7 @@ namespace rsl::testing::_impl {
 class [[=rename("plain")]] ConsoleReporter : public Reporter::Registrar<ConsoleReporter> {
 public:
   void before_run(TestNamespace const& tests) override { std::print("Running {} tests...\n", tests.count()); }
-  void before_test(TestRun const& test) override { std::print("[ RUN      ] {}\n", test.name); }
+  void before_test(TestCase const& test) override { std::print("[ RUN      ] {}\n", test.name); }
   void after_test(TestResult const& result) override {
     bool const must_colorize = true;
     auto const color = std::array{must_colorize ? "\033[32m" : "", must_colorize ? "\033[31m" : ""};

src/reporters/xml.cpp

@@ -19,7 +19,7 @@ struct testsuite {
 class [[=rename("junit")]] JUnitXmlReporter : public Reporter::Registrar<JUnitXmlReporter> {
   testsuite suite;
 public:
-  void before_test(TestRun const& test) override {}
+  void before_test(TestCase const& test) override {}
   void after_test(TestResult const& result) override {
     auto node = testcase{.name=std::string(result.name), .time=result.duration_ms / 1000.};
     if (!result.passed) {

src/test.cpp

@@ -24,7 +24,7 @@ namespace rsl::testing {
 namespace _testing_impl {
 std::set<TestDef>& registry();
 }
-TestResult TestRun::run() const {
+TestResult TestCase::run() const {
   auto ret = TestResult{.test = test, .name = name};
   try {
     auto t0 = std::chrono::steady_clock::now();