updated test results

Author: ThoSe1990

src/asserts.hpp

@@ -9,17 +9,20 @@
 
 namespace cuke::internal
 {
+
 inline void internal_assert(bool condition, std::string_view error_msg)
 {
   if (condition == false)
   {
     cuke::results::set_step_to(cuke::results::test_status::failed);
+    cuke::results::steps_back().error_msg = error_msg;
     if (!program_arguments().get_options().quiet)
     {
       println(color::red, error_msg);
     }
   }
 }
+
 }  // namespace cuke::internal
 
 namespace cuke

src/get_args.hpp

@@ -6,6 +6,7 @@
 #include <type_traits>
 
 #include "param_info.hpp"
+#include "util.hpp"
 #include "value.hpp"
 #include "registry.hpp"
 
@@ -61,17 +62,7 @@ class string_or_vector
 
   operator std::string() const
   {
-    std::ostringstream oss;
-    for (const auto& str : m_data)
-    {
-      oss << str << ' ';
-    }
-    std::string result = oss.str();
-    if (!result.empty())
-    {
-      result.pop_back();
-    }
-    return result;
+    return to_string(m_data);
   }
 
   operator std::vector<std::string>() const { return m_data; }

src/test_results.cpp

@@ -1,4 +1,5 @@
 #include "test_results.hpp"
+#include "ast.hpp"
 #include "util.hpp"
 
 namespace cuke::results
@@ -263,4 +264,68 @@ std::string step_prefix(test_status status)
   }
 }
 
+void new_feature(const cuke::ast::feature_node& current)
+{
+  feature result;
+  result.id = current.name();
+  result.uri = std::format("{}:{}", current.file(), current.line());
+  result.tags = current.tags();
+  result.keyword = current.keyword();
+  test_results().data().push_back(result);
+}
+void new_scenario(const cuke::ast::scenario_node& current)
+{
+  scenario result;
+  result.id = std::format("{};{}", test_results().back().id, current.name());
+  result.line = current.line();
+  result.file = current.file();
+  result.name = current.name();
+  result.keyword = current.keyword();
+  result.tags = current.tags();
+  test_results().back().scenarios.push_back(result);
+}
+void new_scenario_outline(const cuke::ast::scenario_outline_node& current)
+{
+  scenario result;
+  result.id = std::format("{};{}", test_results().back().id, current.name());
+  result.line = current.line();
+  result.file = current.file();
+  result.name = current.name();
+  result.keyword = current.keyword();
+  result.tags = current.tags();
+  test_results().back().scenarios.push_back(result);
+}
+void new_step(const cuke::ast::step_node& current)
+{
+  step result;
+  result.line = current.line();
+  result.id = std::format("{};{}", test_results().back().scenarios.back().id,
+                          current.name());
+  result.name = current.name();
+  result.file = current.file();
+  result.keyword = current.keyword();
+  result.doc_string = cuke::internal::to_string(current.doc_string());
+  result.table = current.data_table();
+
+  test_results().back().scenarios.back().steps.emplace_back();
+}
+
+void set_source_location(const std::string& location)
+{
+  test_results().back().scenarios.back().steps.back().source_location =
+      location;
+}
+
+void set_feature_to(test_status status)
+{
+  test_results().back().status = status;
+}
+void set_scenario_to(test_status status)
+{
+  test_results().back().scenarios.back().status = status;
+}
+void set_step_to(test_status status)
+{
+  test_results().back().scenarios.back().steps.back().status = status;
+}
 }  // namespace cuke::results

src/test_results.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <memory>
 #include <vector>
 #include <string>
 
+#include "ast.hpp"
 #include "util.hpp"
 #include "table.hpp"
 
@@ -27,6 +27,7 @@ struct step
   std::string keyword;
   std::string source_location;
   std::string doc_string;
+  std::string error_msg;
   cuke::table table;
 };
 struct scenario
@@ -38,7 +39,7 @@ struct scenario
   std::string file;
   std::string keyword;
   std::vector<step> steps{};
-  std::vector<std::pair<std::string, std::size_t>> tags;
+  std::vector<std::string> tags;
 };
 struct feature
 {
@@ -47,7 +48,7 @@ struct feature
   std::string keyword;
   std::string name;
   std::string uri;
-  std::vector<std::pair<std::string, std::size_t>> tags;
+  std::vector<std::string> tags;
   std::vector<scenario> scenarios{};
 };
 
@@ -104,29 +105,14 @@ class test_result
   return test_status::failed;
 }
 
-static void new_feature() { test_results().data().emplace_back(); }
-static void new_scenario() { test_results().back().scenarios.emplace_back(); }
-static void new_scenario_outline()
-{
-  test_results().back().scenarios.emplace_back();
-}
-static void new_step()
-{
-  test_results().back().scenarios.back().steps.emplace_back();
-}
-
-static void set_feature_to(test_status status)
-{
-  test_results().back().status = status;
-}
-static void set_scenario_to(test_status status)
-{
-  test_results().back().scenarios.back().status = status;
-}
-static void set_step_to(test_status status)
-{
-  test_results().back().scenarios.back().steps.back().status = status;
-}
+void new_feature(const cuke::ast::feature_node& current);
+void new_scenario(const cuke::ast::scenario_node& current);
+void new_scenario_outline(const cuke::ast::scenario_outline_node& current);
+void new_step(const cuke::ast::step_node& current);
+void set_source_location(const std::string& location);
+void set_feature_to(test_status status);
+void set_scenario_to(test_status status);
+void set_step_to(test_status status);
 
 [[nodiscard]] static feature& features_back() { return test_results().back(); }
 [[nodiscard]] static scenario& scenarios_back()

src/test_runner.hpp

@@ -84,18 +84,19 @@ static void execute_step(cuke::ast::step_node step, OptionalRow&&... row)
 {
   if (skip_step())
   {
-    results::new_step();
+    results::new_step(step);
     results::steps_back().status = results::test_status::skipped;
     update_step_status();
     return;
   }
-  results::new_step();
+  results::new_step(step);
   cuke::internal::step_finder finder(step.name(),
                                      std::forward<OptionalRow>(row)...);
   auto it = finder.find(cuke::registry().steps().begin(),
                         cuke::registry().steps().end());
   if (it != cuke::registry().steps().end())
   {
+    results::set_source_location(it->source_location());
     cuke::registry().run_hook_before_step();
     it->call(finder.values(), step.doc_string(), step.data_table());
     cuke::registry().run_hook_after_step();
@@ -244,7 +245,7 @@ class test_runner
   void visit(const cuke::ast::feature_node& feature)
   {
     push_tags(feature.tags());
-    results::new_feature();
+    results::new_feature(feature);
     m_printer->print(feature);
     if (feature.has_background())
     {
@@ -255,7 +256,7 @@ class test_runner
   {
     push_tags(scenario.tags());
     cuke::registry().run_hook_before(m_tags.container);
-    results::new_scenario();
+    results::new_scenario(scenario);
     if (skip_scenario(m_lines, scenario.line()) || !tags_valid())
     {
       results::scenarios_back().status = results::test_status::skipped;
@@ -288,7 +289,7 @@ class test_runner
       }
       for (std::size_t row = 1; row < example.table().row_count(); ++row)
       {
-        results::new_scenario();
+        results::new_scenario_outline(scenario_outline);
         std::size_t row_file_line = example.line_table_begin() + row;
         cuke::registry().run_hook_before(m_tags.container);
         if (skip_scenario(m_lines, row_file_line))

src/util.hpp

@@ -11,6 +11,21 @@
 namespace cuke::internal
 {
 
+[[nodiscard]] static std::string to_string(const std::vector<std::string>& data)
+{
+  std::ostringstream oss;
+  for (const auto& str : data)
+  {
+    oss << str << ' ';
+  }
+  std::string result = oss.str();
+  if (!result.empty())
+  {
+    result.pop_back();
+  }
+  return result;
+}
+
 enum class color
 {
   standard,