start result cleanup

Author: Tsche

example/CMakeLists.txt

@@ -5,6 +5,7 @@ target_sources(example_test PRIVATE
     fixtures.cpp
     conditional.cpp
 )
-
-add_executable(params_debug params_debug.cpp)
-target_link_libraries(params_debug PUBLIC rsltest)
+# add_executable(params_debug params_debug.cpp)
+# target_compile_options(example_test PUBLIC -fprofile-instr-generate -fcoverage-mapping)
+# target_link_options(example_test PUBLIC -fprofile-instr-generate -fcoverage-mapping)
+# target_link_libraries(params_debug PUBLIC rsltest)

include/rsl/testing/output.hpp

@@ -23,13 +23,13 @@ struct Reporter : _testing_impl::Factory<Reporter> {
 
   virtual ~Reporter() = default;
   virtual void before_run(TestNamespace const& tests) {}
-  virtual void after_run(std::span<TestResult> results) {}
+  virtual void after_run(std::span<Result> results) {}
 
   virtual void before_test_group(Test const& test) {}
-  virtual void after_test_group(std::span<TestResult> results) {}
+  virtual void after_test_group(std::span<Result> results) {}
 
   virtual void before_test(TestCase const& test) = 0;
-  virtual void after_test(TestResult const& result)   = 0;
+  virtual void after_test(Result const& result)   = 0;
 
   virtual void list_tests(TestNamespace const& tests);
 

include/rsl/testing/result.hpp

@@ -11,7 +11,7 @@ enum class TestOutcome: uint8_t {
   SKIP
 };
 
-struct TestResult {
+struct Result {
   class Test const* test;
   std::string name;
 
@@ -26,12 +26,17 @@ struct TestResult {
   std::vector<AssertionInfo> assertions;
 };
 
+struct TestResult {
+  class Test const* test;
+  std::vector<Result> results;
+};
+
 struct ResultNamespace {
   std::string_view name;
   std::vector<TestResult> tests;
   std::vector<ResultNamespace> children;
 
-  void insert(TestResult const& test, size_t i = 0);
+  void insert(Result const& test, size_t i = 0);
   [[nodiscard]] std::size_t count() const;
 };
 }  // namespace rsl::testing

include/rsl/testing/test.hpp

@@ -19,7 +19,7 @@ struct TestCase {
   std::function<void()> fnc;
   std::string name;
 
-  [[nodiscard]] TestResult run() const;
+  [[nodiscard]] Result run() const;
 };
 
 struct FuzzTarget {

src/main/reporters/catch2xml.cpp

@@ -170,7 +170,7 @@ class[[= rename("xml")]] Catch2XmlReporter : public Reporter::Registrar<Catch2Xm
 
 public:
   void before_test(rsl::testing::TestCase const& run) override {}
-  void after_test(TestResult const& result) override {
+  void after_test(Result const& result) override {
     TestCase& tc     = report.get_tc(result.test->full_name[0]);
     Section* section = nullptr;
 
@@ -227,7 +227,7 @@ class[[= rename("xml")]] Catch2XmlReporter : public Reporter::Registrar<Catch2Xm
     // </Expression>
   }
 
-  void after_run(std::span<TestResult> results) override { report.update_results(); }
+  void after_run(std::span<Result> results) override { report.update_results(); }
 
   void list_tests(TestNamespace const& tests) override {
     MatchingTests matching{};

src/main/reporters/terminal.cpp

@@ -9,7 +9,7 @@ class [[=rename("plain")]] ConsoleReporter : public Reporter::Registrar<ConsoleR
 public:
   void before_run(TestNamespace const& tests) override { std::print("Running {} tests...\n", tests.count()); }
   void before_test(TestCase const& test) override { std::print("[ RUN      ] {}\n", test.name); }
-  void after_test(TestResult const& result) override {
+  void after_test(Result const& result) override {
     bool const must_colorize = true;
     auto const color = std::array{must_colorize ? "\033[32m" : "", must_colorize ? "\033[31m" : ""};
     const char* const reset = must_colorize ? "\033[0m" : "";
@@ -31,7 +31,7 @@ class [[=rename("plain")]] ConsoleReporter : public Reporter::Registrar<ConsoleR
       std::print("==== {}stderr{} ====\n{}\n", color[1], reset, result.stderr);
     }
   }
-  void after_run(std::span<TestResult> results) override {
+  void after_run(std::span<Result> results) override {
     auto passed = std::ranges::count_if(results, [](auto& r) { return r.outcome == TestOutcome::PASS; });
     std::print("=== Summary ===\n{} / {} tests passed.\n", passed, results.size());
   }

src/main/reporters/xml.cpp

@@ -20,7 +20,7 @@ class [[=rename("junit")]] JUnitXmlReporter : public Reporter::Registrar<JUnitXm
   testsuite suite;
 public:
   void before_test(TestCase const& test) override {}
-  void after_test(TestResult const& result) override {
+  void after_test(Result const& result) override {
     auto node = testcase{.name=std::string(result.name), .time=result.duration_ms / 1000.};
     if (result.outcome == TestOutcome::FAIL) {
       node.failure = result.failure->message + "\n";

src/test.cpp

@@ -83,9 +83,9 @@ bool TestNamespace::run(Reporter* reporter) {
   for (auto& test : tests) {
     auto runs = test.get_tests();
     reporter->before_test_group(test);
-    std::vector<TestResult> results;
+    std::vector<Result> results;
     if (!test.skip()) {
-      std::vector<TestResult> results;
+      std::vector<Result> results;
       for (auto const& test_run : test.get_tests()) {
         auto& tracker      = _testing_impl::assertion_counter();
         tracker.assertions = {};
@@ -102,7 +102,7 @@ bool TestNamespace::run(Reporter* reporter) {
       reporter->before_test(TestCase{&test, +[]{}, std::string(test.name)});
 
       // TODO stringify skipped tests properly
-      auto result = TestResult{&test, std::string(test.name) + "(...)", TestOutcome::SKIP};
+      auto result = Result{&test, std::string(test.name) + "(...)", TestOutcome::SKIP};
       reporter->after_test(result);
       results.push_back(result);
     }
@@ -115,8 +115,8 @@ bool TestNamespace::run(Reporter* reporter) {
   return status;
 }
 
-TestResult TestCase::run() const {
-  auto ret = TestResult{.test = test, .name = name};
+Result TestCase::run() const {
+  auto ret = Result{.test = test, .name = name};
   try {
     Capture _out(stdout, ret.stdout);
     Capture _err(stderr, ret.stderr);
@@ -184,33 +184,6 @@ bool TestNamespace::iterator::operator==(iterator const& other) const {
   return elements == other.elements;
 }
 
-// TODO get rid of duplicated code
-void ResultNamespace::insert(TestResult const& test, std::size_t i) {
-  if (i == test.test->full_name.size() - 1) {
-    tests.push_back(test);
-    return;
-  }
-
-  auto it = std::ranges::find_if(children, [&](const ResultNamespace& ns) {
-    return ns.name == test.test->full_name[i];
-  });
-
-  if (it == children.end()) {
-    children.emplace_back(test.test->full_name[i]);
-    it = std::prev(children.end());
-  }
-
-  it->insert(test, i + 1);
-}
-
-std::size_t ResultNamespace::count() const {
-  std::size_t total = tests.size();
-  for (auto const& ns : children) {
-    total += ns.count();
-  }
-  return total;
-}
-
 void TestNamespace::insert(Test const& test, std::size_t i) {
   if (i == test.full_name.size() - 1) {
     tests.push_back(test);