From dfc161e286e2cfa3544f76d95e71743d1bd9c24a Mon Sep 17 00:00:00 2001
From: matt <matthias-baumann@hotmail.com>
Date: Tue, 13 Aug 2024 10:29:38 +0200
Subject: [PATCH 1/2] Add exception handling to with test macro

---
 ut | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/ut b/ut
index d8d46e1..c444c20 100644
--- a/ut
+++ b/ut
@@ -641,6 +641,13 @@ template <class...> inline auto cfg = default_cfg{};
 <!--
 #endif
 
+#if __cpp_exceptions < 199711L
+#define UT_NO_EXCEPTIONS
+#else
+#include <exception>
+#include <stdexcept>
+#endif
+
 #pragma once
 
 namespace ut::inline v2_1_2 {
@@ -673,6 +680,7 @@ template<mode Mode> struct test_begin { const char* file_name{}; int line{}; con
 template<mode Mode> struct test_end { const char* file_name{}; int line{}; const char* name{}; enum { FAILED, PASSED, COMPILE_TIME } result{}; };
 template<class TExpr> struct assert_pass { const char* file_name{}; int line{}; TExpr expr{}; };
 template<class TExpr> struct assert_fail { const char* file_name{}; int line{}; TExpr expr{}; };
+struct exception_fail { const char* file_name{}; int line{}; const char* name{}; const char* except{}; };
 struct fatal { };
 template<class TMsg> struct log { const TMsg& msg; bool result{}; };
 struct summary { enum { FAILED, PASSED, COMPILE_TIME }; unsigned asserts[2]{}; /* FAILED, PASSED */ unsigned tests[3]{}; /* FAILED, PASSED, COMPILE_TIME */ };
@@ -691,6 +699,10 @@ class outputter {
       os << event.file_name << ':' << event.line << ':' << "FAILED:" << '\"' << current_test.name << "\": " << event.expr;
     }
   }
+  constexpr auto on(const events::exception_fail& event) {
+    if (initial_new_line == '\n') { os << initial_new_line; } else { initial_new_line = '\n'; }
+    os << event.file_name << ':' <<event.line << ':' << "EXCEPTION: " << '\"' << current_test.name << "\": " << event.except << "\n";
+  }
   constexpr auto on(const events::fatal&) { }
   template<class TMsg> constexpr auto on(const events::log<TMsg>& event) {
     if (!__builtin_is_constant_evaluated() && !event.result) {
@@ -744,6 +756,10 @@ struct reporter {
     ++summary.asserts[events::summary::FAILED];
     outputter.on(event);
   }
+  constexpr auto on(const events::exception_fail& event) {
+    ++summary.asserts[events::summary::FAILED];
+    outputter.on(event);
+  }
   constexpr auto on(const events::fatal& event) {
     ++summary.tests[events::summary::FAILED];
     outputter.on(event);
@@ -787,9 +803,21 @@ struct runner {
 
       #ifndef UT_COMPILE_TIME_ONLY
         reporter.on(events::test_begin<events::mode::run_time>{file_name, line, name});
-        test();
-        reporter.on(events::test_end<events::mode::run_time>{file_name, line, name});
-      #endif
+#ifndef UT_NO_EXCEPTIONS
+        try {
+#endif
+          test();
+#ifndef UT_NO_EXCEPTIONS
+        } catch (const char* string) {
+          reporter.on(events::exception_fail{ file_name, line, name, string });
+        } catch(...) {
+          try {
+            std::rethrow_exception(std::current_exception());
+          } catch (const std::exception& ex) {
+            reporter.on(events::exception_fail{ file_name, line, name, ex.what() });
+          }
+        }
+#endif
     }
     return true;
   }

From d2bb62ea71d76e366fc1855cd5bc8d68ec8b3eb6 Mon Sep 17 00:00:00 2001
From: matt <matthias-baumann@hotmail.com>
Date: Tue, 13 Aug 2024 10:43:57 +0200
Subject: [PATCH 2/2] Fix forgotten test_end event raising

---
 ut | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ut b/ut
index c444c20..8c68449 100644
--- a/ut
+++ b/ut
@@ -818,6 +818,8 @@ struct runner {
           }
         }
 #endif
+        reporter.on(events::test_end<events::mode::run_time>{file_name, line, name});
+      #endif
     }
     return true;
   }