added tui + disabled constexpr

Author: machine-moon

include/predicates/predicate_config.h

@@ -11,7 +11,7 @@
 #define TUNIT_MODE 1 
 #endif
 
-#if TUNIT_MODE
+#if 0   // TUNIT_MODE
 #define TUNIT_CONSTEXPR constexpr
 #define TUNIT_TRACE_PREDICATE(name) ((void)0)
 #else

include/tUnit.h

@@ -1,16 +1,13 @@
 /**
- * @file tUnit.h
- * @brief Single-header include for the complete tUnit testing framework.
- *
- * This header aggregates all core components of the tUnit testing framework:
- *   - Predicates:         predicates/all_predicates.h
- *   - Assertions:         tUnit/assertion.h
- *   - Test cases:         tUnit/test_case.h
- *   - Test orchestrator:  tUnit/test_orchestrator.h
- *   - Test suites:        tUnit/test_suite.h
- *   - release asserts:    utils/release_asserts.h
- *   - Trace utilities:    utils/trace_support.h
- *   - Core evaluator:     evaluator.h
+ * Single-header include for the complete tUnit testing framework.
+ * Predicates:         predicates/all_predicates.h
+ * Assertions:         tUnit/assertion.h
+ * Test cases:         tUnit/test_case.h
+ * Test orchestrator:  tUnit/test_orchestrator.h
+ * Test suites:        tUnit/test_suite.h
+ * Release asserts:    utils/release_asserts.h
+ * Trace utilities:    utils/trace_support.h
+ * Evaluator:     evaluator.h
  */
 #pragma once
 

include/utils/trace_support.h

@@ -16,29 +16,29 @@ namespace tUnit
 namespace trace
 {
 
-#define TUNIT_SCOPED_TRACE(message) \
-  tUnit::trace::ScopedTrace _scoped_trace_##__LINE__(__FILE__, __LINE__, (message))
+#define TUNIT_SCOPED_TRACE(msg) \
+  tUnit::trace::ScopedTrace _scoped_trace_##__LINE__(__FILE__, __LINE__, (msg))
 
 #define TUNIT_TRACE_FUNCTION() TUNIT_SCOPED_TRACE(__func__)
 
 struct TraceInfo
 {
-  std::string file;
-  std::int32_t line;
-  std::string message;
+  std::string file_;
+  std::int32_t line_;
+  std::string msg_;
 
-  TraceInfo(const std::string &file_path, std::int32_t line_num, const std::string &msg) : file(file_path), line(line_num), message(msg) {}
+  TraceInfo(const std::string &file, std::int32_t line, const std::string &msg) : file_(file), line_(line), msg_(msg) {}
 
   std::string to_string() const
   {
     std::ostringstream oss;
-    if (!file.empty())
+    if (!file_.empty())
     {
-      oss << file << ":" << line << ": " << message;
+      oss << file_ << ":" << line_ << ": " << msg_;
     }
     else
     {
-      oss << message;
+      oss << msg_;
     }
     return oss.str();
   }

src/tUnit/test_orchestrator.cpp

@@ -130,28 +130,71 @@ void Orchestrator::print_summary() const
   size_t failed = failed_assertions();
   size_t passed = total - failed;
 
-  std::cout << "\n=== Test Summary ===" << "\n";
-  std::cout << "Total assertions: " << total << "\n";
-  std::cout << "Passed: " << passed << "\n";
-  std::cout << "Failed: " << failed << "\n";
+  std::cout << "\n";
 
-  if (failed > 0)
+  // Group tests by suite
+  std::unordered_map<std::string, std::vector<std::pair<std::string, const Test *>>> suites_map;
+  for (const auto &[test_key, test] : tests_)
+  {
+    suites_map[test->suite_name()].emplace_back(test->name(), test.get());
+  }
+
+  for (const auto &[suite_name, suite_tests] : suites_map)
   {
-    std::cout << "===================" << "\n";
-    std::cout << "Failed assertions:" << "\n";
-    for (const auto &[test_key, assertions] : assertions_)
+    std::cout << "--- " << suite_name << " ---\n";
+
+    for (const auto &[test_name, test] : suite_tests)
     {
-      for (const auto &assertion : assertions)
+      std::string test_key = test->suite_name() + "::" + test->name();
+      auto assertions_it = assertions_.find(test_key);
+
+      bool test_has_failures = false;
+      std::vector<std::string> failed_descriptions;
+
+      if (assertions_it != assertions_.end())
       {
-        if (!assertion.result_)
+        const auto &assertions = assertions_it->second;
+        for (const auto &assertion : assertions)
         {
-          std::cout << "  [" << test_key << "] " << assertion.description_ << "\n";
+          if (!assertion.result_)
+          {
+            test_has_failures = true;
+            failed_descriptions.push_back(assertion.description_);
+          }
         }
       }
+
+      if (test_has_failures)
+      {
+        std::cout << "[FAIL] " << test_name << "\n";
+        for (const auto &desc : failed_descriptions)
+        {
+          std::cout << "       " << desc << "\n";
+        }
+      }
+      else
+      {
+        std::cout << "[PASS] " << test_name << "\n";
+      }
     }
+    std::cout << "\n";
+  }
+
+  std::cout << "--- Total Summary ---\n";
+  std::cout << "Total assertions: " << total << "\n";
+  std::cout << "Passed: " << passed << "\n";
+  std::cout << "Failed: " << failed << "\n";
+
+  if (failed == 0)
+  {
+    std::cout << "All tests passed!\n";
+  }
+  else
+  {
+    std::cout << failed << " assertion(s) failed\n";
   }
 
-  std::cout << "===================" << std::endl;
+  std::cout << "====================\n" << std::endl;
 }
 
 void Orchestrator::parse_args(int argc, char *argv[])
@@ -172,9 +215,10 @@ void Orchestrator::parse_args(int argc, char *argv[])
 
 void Orchestrator::write_xml_output() const
 {
+  // No XML output requested
   if (xml_output_path_.empty())
   {
-    return; // No XML output requested
+    return; 
   }
 
   std::ofstream xml_file(xml_output_path_);

tests/main.cpp

@@ -2,11 +2,9 @@
 
 int main(int argc, char *argv[])
 {
-  // Run all test suites
-
+  // All test suites self register
   tUnit::Orchestrator::instance().parse_args(argc, argv);
-  tUnit::Orchestrator::instance().print_summary();
   tUnit::Orchestrator::instance().write_xml_output();
-
+  tUnit::Orchestrator::instance().print_summary();
   return tUnit::Orchestrator::instance().all_tests_passed() ? 0 : 1;
 }