Fix for latest jlog

Also remove having to include event directly as it gets passed up from jlog.

CMakeLists.txt

@@ -1,6 +1,6 @@
 # 2024 Josh O'Leary @ Redacted Software
 
-cmake_minimum_required(VERSION 3.18...3.25)
+cmake_minimum_required(VERSION 3.18...3.27)
 project(
         jtest
         VERSION 1.0
@@ -24,15 +24,9 @@ include(cmake/CPM.cmake)
 file(GLOB_RECURSE jtest_HEADERS "include/jtest/*.h" "include/jtest/*.hpp")
 file(GLOB_RECURSE jtest_SRC     "src/jtest/*.c"     "src/jtest/*.cpp")
 
-# TODO: Fix Event needing to be included too, it should be an automatically-managed depencency of jlog!!!
-CPMAddPackage(
-        NAME Event
-        URL https://git.redacted.cc/josh/Event/archive/Release-6.zip
-)
-
 CPMAddPackage(
         NAME jlog
-        URL https://git.redacted.cc/josh/jlog/archive/Prerelease-12.zip
+        URL https://git.redacted.cc/josh/jlog/archive/Prerelease-16.zip
 )
 
 
@@ -66,4 +60,4 @@ target_link_libraries(jtest PUBLIC Event jlog)
 add_executable(TestSuiteDemo main.cpp)
 
 # link the new library target with the binary target
-target_link_libraries(TestSuiteDemo PUBLIC jtest)
+target_link_libraries(TestSuiteDemo PUBLIC jtest)

include/jtest/Test.hpp

@@ -0,0 +1,28 @@
+/// Josh's Test Library
+/// A no-frills, straightforward unit testing module in and for Modern C++.
+/// Created by Joshua O'Leary @ Redacted Software, June 2024
+/// Maintained by Maxine Hayes @ Redacted Software.
+/// This work is dedicated to the public domain.
+/// Contact: josh@redacted.cc, maxi@redacted.cc
+
+/// @file UnitLogger.hpp
+/// @desc
+/// @edit 2024-08-21
+
+#pragma once
+#include <jlog/Logger.hpp>
+
+namespace jtest {
+    class Test {
+    public:
+        explicit Test(const std::string& name, std::function<void()> callback, std::source_location = std::source_location::current());
+    public:
+        void operator()() { callback(); };
+        std::string Name() { return name; };
+        std::source_location Location() { return location; };
+    protected:
+        std::string name;
+        std::function<void()> callback;
+        std::source_location location;
+    };
+}

include/jtest/Unit.hpp

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <Event.h>
+
+#include <jtest/Test.hpp>
+#include <jtest/UnitLogger.hpp>
+
+namespace jtest {
+    class Unit : public BasicEvent<Test>, protected UnitLogger {
+        using event_base = BasicEvent<Test>;
+    public:
+        Unit(const std::string& name);
+    public:
+        std::string Name();
+        void Invoke() override;
+        int TestCount() { return this->listeners.size();}
+        void RunAll()
+        {
+            Invoke();
+        }
+        void RunNext();
+    private:
+        std::string name;
+    };
+}

include/jtest/UnitLogger.hpp

@@ -0,0 +1,35 @@
+/// Josh's Test Library
+/// A no-frills, straightforward unit testing module in and for Modern C++.
+/// Created by Joshua O'Leary @ Redacted Software, June 2024
+/// Maintained by Maxine Hayes @ Redacted Software.
+/// This work is dedicated to the public domain.
+/// Contact: josh@redacted.cc, maxi@redacted.cc
+
+/// @file UnitLogger.hpp
+/// @desc
+/// @edit 2024-08-21
+
+#pragma once
+#include <jlog/Logger.hpp>
+#include <jtest/Test.hpp>
+
+namespace jtest
+{
+    class UnitLogger : protected jlog::ConsoleLogger {
+    protected:
+        UnitLogger(const std::string& name);
+    protected:
+        void Log(const std::string message);
+        void LogTimestamp(jlog::Timestamp ts =jlog::Timestamp());
+        void LogLocation(std::source_location l);
+        void LogTestResult(Test& t, bool passed, int index, int total);
+        // TODO: I suggest float percentage_passed.
+        void LogUnitResult(int tests_total, int tests_ran, int tests_passed, int tests_failed);
+    protected:
+        Color4 failColor;
+        Color4 passColor;
+        Color4 healthGoodColor;
+        Color4 healthWarningColor;
+        Color4 healthCriticalColor;
+    };
+}

include/jtest/jtest.hpp

@@ -1,73 +1,108 @@
-/// Josh Unit Test Library
+/// Josh's Test Library
+/// A no-frills, straightforward unit testing module in and for Modern C++.
+/// Created by Joshua O'Leary @ Redacted Software, June 2024
+/// Maintained by Maxine Hayes @ Redacted Software.
+/// This work is dedicated to the public domain.
+/// Contact: josh@redacted.cc, maxi@redacted.cc
+
+/// @file jtest.hpp
+/// @desc
+/// @edit 2024-08-21
 
 #pragma once
-#include <functional>
+
 #include <string>
-#include <vector>
-#include <jlog/jlog.hpp>
-
-//#define NDEBUG for disabling assert, but tests still end up passing.
-
-// TODO: Move implementation to jtest::detail
-// have this file primarily expose the macros intended for users
+#include <functional>
 
 namespace jtest {
-
-    /// Structure to store test meta-data, as tests are initially registered, and ran later.
-    struct testdef
-    {
-        std::string testname;
-        std::function<void()> callback;
-        std::string file;
-        int line;
-        bool passed;
+    class check_fail {
     };
 
-    /// jlog log wrapper for jtest
-    void log(std::vector<jlog::token> tokens);
+    class check_eq_fail : public check_fail {
+    };
 
-    /// Generates and returns a sequence of logger tokens pre-formatted to the test data.
-    std::vector<jlog::token> log_test_format(const std::string& testname, const std::string& file, int line, bool passed);
+    class check_ne_fail : public check_fail {
+    };
 
-    /// Generates and returns a sequence of logger tokens for the test summary printed at the end of testing.
-    std::vector<jlog::token> log_test_tracking_format();
-
-    /// Registers a test internally.
-    void definetest(const std::string& testname, const std::function<void()>& callback, const std::string& file, int line);
-
-
-    // TODO: implement streaming a custom failure message with << operator on check statements
-
-    /// Raises an exception if the given condition is false, otherwise returns true.
-    bool check(bool condition);
-
-    /// Raises an exception of the given values evaluate to not-equal, otherwise returns true.
-    template <typename T>
-    bool check_eq(T a, T b) {
-        if (a != b)
-            throw std::runtime_error("Test check failed!!");
-        return true;
+    /// Raises an exception if the given condition is false.
+    void check(bool condition) {
+        if (!condition)
+            throw check_fail();
     }
 
-    /// Raises an exception if the given floats are not equal, up to the given epsilon. Otherwise returns true.
-    /// @param epsilon The accuracy required to pass the test.
-    bool check_float_eq(float a, float b, float epsilon = 1e-3f);
+    /// Raises an exception if the given types do not evaluate as equal.
+    template<typename T>
+    void check_eq(T a, T b) {
+        if (a != b)
+            throw check_eq_fail();
+    }
 
-    /// Raises an exception if the given doubles are not equal, up to the given epsilon. Otherwise returns true.
-    /// @param epsilon The accuracy required to pass the test.
-    bool check_double_eq(double a, double b, double epsilon = 1e-3f);
+    /// Raises an exception if the given types do evaluate as equal.
+    template<typename T>
+    void check_ne(T a, T b) {
+        if (a == b)
+            throw check_ne_fail();
+    }
 
-    /// Raises an exception if the given strings are not equal, otherwise returns true.
-    bool check_string_eq(const std::string& a, const std::string& b);
+    /// Raises an exception of the given float values are not equal (up to the given epsilon).
+    void check_float_eq(float a, float b, float epsilon = 1e-3f) {
+        if (!(std::abs(a - b) <= epsilon))
+            throw check_eq_fail();
+    }
 
-    /// Runs a given test, generates a report, and returns the test result as a boolean.
-    bool test(const std::string& testname, const std::function<void()>& callback, const std::string& file, int line);
+    void check_float_ne(float a, float b, float epsilon = 1e-3f) {
+        if ((std::abs(a - b) <= epsilon))
+            throw check_ne_fail();
+    }
 
-    /// Runs all tests that have been registered, and generates a final summary report for the testing suite.
-    void run_tests();
-}
+    void check_float_eq_exact(float a, float b) {
+        if (a != b)
+            throw check_eq_fail();
+    }
 
-/// TEST macro to be used by API consumers. Automatically grabs reflection data such as current file, line, function name, etc.
-#define TEST(a, b) jtest::definetest(a, b, __FILE__, __LINE__);
 
-/// TODO: Implement check macros
+    void check_string_eq(std::string a, std::string b) {
+        if (a != b)
+            throw check_eq_fail();
+    }
+
+    void check_string_ne(std::string a, std::string b) {
+        if (a == b)
+            throw check_ne_fail();
+    }
+
+    void check_throws(std::function<void()> callback)
+    {
+        try {
+            callback();
+            throw check_fail();
+        } catch(...)
+        {
+            // Do nothing, the callback threw as expected...
+        }
+    }
+    void check_nothrows(std::function<void()> callback)
+    {
+        try {
+            callback();
+        } catch(...)
+        {
+            throw check_fail();
+        }
+    }
+
+    // TODO: Implement death check:
+    // Spawn a new process, and execute the callback in that process.
+    // This verifies that a piece of code would cause the process to terminate.
+    void check_death(std::function<void()> callback)
+    {
+        check_throws(callback);
+    }
+
+
+    /// Raises an exception, which causes the test to fail.
+    void fail_test()
+    {
+        throw check_fail();
+    }
+}

main.cpp

@@ -1,58 +1,43 @@
-// Josh's Test Library
-// A no-frills, straightforward unit testing module in and for Modern C++.
-// Created by Joshua O'Leary @ Redacted Software, June 2024
-// This work is dedicated to the public domain.
-// Contact: josh@redacted.cc, git.redacted.cc/josh
+/// Josh's Test Library
+/// A no-frills, straightforward unit testing module in and for Modern C++.
+/// Created by Joshua O'Leary @ Redacted Software, June 2024
+/// Maintained by Maxine Hayes @ Redacted Software.
+/// This work is dedicated to the public domain.
+/// Contact: josh@redacted.cc, maxi@redacted.cc
 
 // TODO: Provide introspection insofar as which assertion check failed.
 // TODO: Provide alternate checks (google test has specific assertations for handling floats, for example) (Are these actually necessary??)
-// TODO: Implement log-file-specification-capability in jlog so we can log to test_results.txt specifically.
 // TODO: Provide benchmarking on test running-time
 
+#include <jtest/Unit.hpp>
+#include <jlog/Logger.hpp>
 #include <jtest/jtest.hpp>
 #include <cassert>
 
-void TestA() { jtest::check("Bruh" == "Bruh"); }
-void TestB() { jtest::check(6*6 == 36); }
-void TestC() { jtest::check(6+9 == 69); }
-
 int main(int argc, char** argv)
 {
+    jtest::Unit u{"jtest-demo"};
+    u += jtest::Test{"check_true", [] () {
+        jtest::check(true);
+    }};
+    u += jtest::Test{"check_false", [] () {
+        jtest::check(false);
+    }};
+    u += jtest::Test{"check floats", [] () {
+        jtest::check_float_eq(5.01, 5.09, 0.1);
+    }};
+    u += jtest::Test{"balls", [] () {
+        //jlog::Debug("ass");
+    }};
+    u += jtest::Test{"balls", [] () {
+        //jlog::Debug("ass");
+    }};
+    u += jtest::Test{"balls", [] () {
+        //jlog::Debug("ass");
+    }};
 
-    TEST("Test1", []{
-        jtest::check(2+2 == 4);
-    });
-
-    TEST("Test2", [] {
-        //jtest::check(2+2 == 5);
-        jtest::check(2+2 == 4);
-    });
-
-    TEST("Test3", []
-    {
-        jtest::check(6+9 == 69);
-        //jtest::check(2+2 == 4);
-    });
+    u += jtest::Test{"dsads", [](){throw("thisdick");}};
 
 
-    TEST("Test4", []
-    {
-       //assert(69 == 9);//, "FUCKING COCK"); stil figuring out
-    });
-
-    TEST("Test5", []
-    {
-       throw std::runtime_error("HOLY SHIT");
-    });
-
-    TEST("Test6", []
-    {
-       throw std::exception();
-    });
-
-    TEST("TestGroup::A", TestA);
-    TEST("TestGroup::B", TestB);
-    TEST("TestGroup::C", TestC);
-
-    jtest::run_tests();
+    u.Invoke();
 }

src/jtest/Test.cpp

@@ -0,0 +1,10 @@
+#include <jtest/Test.hpp>
+
+namespace jtest
+{
+    Test::Test(const std::string &name, std::function<void()> callback, std::source_location location) {
+        this->name = name;
+        this->callback = callback;
+        this->location = location;
+    }
+}

src/jtest/Unit.cpp

@@ -0,0 +1,51 @@
+#include <jtest/Unit.hpp>
+
+namespace jtest {
+    Unit::Unit(const std::string& name) : event_base(), UnitLogger(name) { //, //ulog(name, jlog::GlobalLogFile) {
+        //ulog.IncludeLocation(false);
+        this->name = name;
+    }
+
+    std::string Unit::Name() { return name; }
+
+    void Unit::Invoke()
+    {
+
+
+
+        int tests_total = TestCount();
+        int tests_ran = 0;
+        int tests_passed = 0;
+        int tests_failed = 0;
+
+        // TODO: output "Running Test Unit <name> with <N> tests.
+        Log(std::format("Running test unit with {} tests...", tests_total));
+
+        for (EventPtr &connection_ptr: this->listeners) {
+            //ulog(std::format("Running Test <{}> [{}/{}]", connection_ptr->callback.Name(), tcnt, this->listeners.size()));
+
+            bool this_test_passed = false;
+
+            //LogTestResult(connection_ptr->callback, true);
+            //LogTestResult(connection_ptr->callback, false);
+
+            try {
+                connection_ptr->Invoke();
+                tests_passed++;
+                this_test_passed = true;
+            } catch(...) {
+                tests_failed++;
+                this_test_passed = false;
+            }
+
+            tests_ran++;
+
+            // TODO: Suffix with [N/M] test index.
+            LogTestResult(connection_ptr->callback, this_test_passed, tests_ran, tests_total);
+
+            //tests_ran++;
+        }
+
+        LogUnitResult(tests_total, tests_ran, tests_passed, tests_failed);
+    }
+}

src/jtest/UnitLogger.cpp

@@ -0,0 +1,120 @@
+#include <jtest/UnitLogger.hpp>
+
+namespace jtest
+{
+    UnitLogger::UnitLogger(const std::string& name) : ConsoleLogger(name) {
+        this->timestampColor = Colors::Gray;
+        this->contextColor = Colors::White;
+        this->locationColor = Colors::Gray;
+        this->pointerColor = Colors::White;
+        this->messageColor = Colors::Gray;
+        this->failColor = Colors::Red;
+        this->passColor = Colors::Green;
+        this->healthGoodColor = Colors::Green;
+        this->healthWarningColor = Colors::Yellow;
+        this->healthCriticalColor = Colors::Red;
+#ifdef WIN32
+        IncludeColor = false;
+#endif
+    }
+
+    void UnitLogger::Log(const std::string message) {
+        //LogTimestamp();
+        os << jlog::token(context, "[]", contextColor).Stringer(IncludeColor);
+        os << jlog::token{"*", "", pointerColor}.Stringer(IncludeColor)
+           << jlog::token(message, "", messageColor).Stringer(IncludeColor) << "\n";
+    }
+
+    void UnitLogger::LogTimestamp(jlog::Timestamp ts) {
+        os << jlog::token{std::format(
+                "{}-{}-{} {}:{}:{}.{}",
+                ts.Year(),
+                ts.Month(),
+                ts.Day(),
+                ts.Hour().count(),
+                ts.Minute().count(),
+                ts.Second().count(),
+                ts.Millisecond().count()), "[]", timestampColor}.Stringer(IncludeColor);
+    }
+
+    void UnitLogger::LogTestResult(Test& t, bool passed, int index, int total) {
+        Color4 stateColor;
+        std::string state;
+
+        if (passed) {
+            stateColor = passColor;
+            state = "PASSED";
+        } else {
+            stateColor = failColor;
+            state = "FAILED";
+        }
+
+        auto l = t.Location();
+
+        const auto tally = jlog::token(std::format("{}/{}", index, total), "[]", stateColor);
+        const auto status = jlog::token(state, "[]", stateColor);
+        const auto testname = jlog::token(std::format("{}::{}", context, t.Name()), "[]", stateColor).Stringer(IncludeColor);
+        const auto source = jlog::token{std::format("{}:{}", l.file_name(), l.line()), "[]", locationColor}.Stringer(IncludeColor);
+
+        os << tally
+           << status
+           << testname
+           << source
+           << "\n";
+    }
+    void UnitLogger::LogUnitResult(int tests_total, int tests_ran, int tests_passed, int tests_failed) {
+        float tests_ran_percentage = (float)tests_ran / (float)tests_total;
+        float tests_passed_percentage = (float)tests_passed / (float)tests_ran;
+        float tests_failed_percentage = (float)tests_failed / (float)tests_ran;
+
+        Color4 stateColor;
+        std::string state;
+
+
+        float health = tests_passed_percentage * 100;
+
+        // health levels
+        // 100 - PERFECT
+        // 99  - EXCELLENT
+        // 95  - GOOD
+        // 75  - WARNING
+        // 50  - CRITICAL
+        // 25  - DISASTER
+
+
+        if (health >= 100.f)
+        {
+            stateColor = healthGoodColor;
+            state = "PERFECT";
+        } else if (health >= 99.f ) {
+            stateColor = healthGoodColor;
+            state = "EXCELLENT";
+        } else if (health >= 95.f ) {
+            stateColor = healthGoodColor;
+            state = "GOOD";
+        } else if (health >= 75.f) {
+            stateColor = healthWarningColor;
+            state = "OKAY";
+        } else if (health >= 50.f) {
+            stateColor = healthWarningColor;
+            state = "WARNING";
+        } else if (health >= 25.f) {
+            stateColor = healthCriticalColor;
+            state = "CRITICAL";
+        } else {
+            stateColor = healthCriticalColor;
+            state = "DISASTER";
+        }
+
+        // UnitName: X tests ran of Y, W passed, Z failed. Health Score: W / X;
+
+        os << jlog::token(context, "[]", stateColor).Stringer(IncludeColor);
+        os << std::format("Results: {}/{} tests ran, {}/{} passed, {}/{} failed.", tests_ran, tests_total, tests_passed, tests_ran, tests_failed, tests_ran);
+        os << std::format(" Report Card: {:.0f}% ", health);
+        os << jlog::token(state, "[]", stateColor);
+        os << "\n";
+
+
+
+    };
+}

src/jtest/jtest.cpp

@@ -1,120 +1 @@
-//
-// Created by dawsh on 6/16/24.
-//
-#include <jtest/jtest.hpp>
-namespace jtest {
-
-    // Globals for test tracking
-    std::vector<testdef> testlist;
-    int rantests;
-    int passedtests;
-    int failedtests;
-
-    void log(std::vector<jlog::token> tokens)
-    {
-        std::vector<jlog::token> wtokens;
-        auto head = jlog::token{.colorCode = jlog::ansi_escape_codes::FG_WHITE, .content ="JTEST"};
-
-        wtokens.push_back(head);
-        wtokens.insert(wtokens.end(), tokens.begin(), tokens.end());
-
-        jlog::log(wtokens, "test_results.log");
-    }
-
-    std::vector<jlog::token> log_test_format(const std::string &testname, const std::string &file, int line,
-        bool passed) {
-        std::vector<jlog::token> wtokens;
-
-        auto filedata = jlog::token{.content = std::format("{}:{}", file, line)};
-
-        std::vector<jlog::token> teststate;
-        if (passed)
-        {
-            teststate.push_back(jlog::token{.colorCode = jlog::ansi_escape_codes::FG_GREEN, .content = testname});
-            teststate.push_back(jlog::token{.content = "Passed:", .delimiter = ""});
-        } else
-        {
-            teststate.push_back(jlog::token{.colorCode = jlog::ansi_escape_codes::FG_RED, .content = testname});
-            teststate.push_back(jlog::token{.content = "Failed:", .delimiter = ""});
-        }
-
-        auto raninfo = jlog::token{.content = std::format("{}/{}", rantests, testlist.size())};
-
-        wtokens.push_back(filedata);
-        wtokens.insert(wtokens.end(), teststate.begin(), teststate.end());
-        wtokens.push_back(raninfo);
-
-        return wtokens;
-    }
-
-    std::vector<jlog::token> log_test_tracking_format() {
-        auto ran = jlog::token{.content = std::format("Tests Ran: [{}/{}]", rantests, testlist.size()), .delimiter = ""};
-        auto failed = jlog::token{.content = std::format("Failed: [{}/{}]", failedtests, rantests), .delimiter = ""};
-        auto passed = jlog::token{.content = std::format("Passed: [{}/{}]", passedtests, rantests), .delimiter = ""};
-
-        return {ran, failed, passed};
-    }
-
-    void definetest(const std::string &testname, const std::function<void()> &callback, const std::string &file,
-        int line) {
-        testlist.push_back(testdef(testname, callback, file, line));
-    }
-
-    bool check(bool condition) {
-        if (!condition)
-            throw std::runtime_error("Test check failed!!");
-        return condition;
-    }
-
-    bool check_float_eq(float a, float b, float epsilon) {
-        if (std::abs(a - b) > epsilon) {
-            throw std::runtime_error ("Test check failed!!");
-        }
-        return true;
-    }
-
-    bool check_double_eq(double a, double b, double epsilon) {
-        if (std::abs(a - b) > epsilon) {
-            throw std::runtime_error ("Test check failed!!");
-        }
-        return true;
-    }
-
-    bool check_string_eq(const std::string &a, const std::string &b) {
-        if (a == b) // This is valid and recommended C++2x.
-            throw std::runtime_error("Test check failed!!");
-        return true;
-    }
-
-    bool test(const std::string &testname, const std::function<void()> &callback, const std::string &file, int line) {
-        bool passed = true;
-
-        try { callback(); }
-        catch(const std::exception& e)
-        { passed = false; }
-        catch(...) // <- Basically covers all exception cases. GTest does something similar
-        { passed = false; }
-
-        rantests++;
-
-        if (passed) { passedtests++; }
-        else        { failedtests++; }
-
-        jtest::log(log_test_format(testname, file, line, passed));
-
-        return passed;
-
-    }
-
-    void run_tests() {
-
-        for (testdef& td : testlist)
-        {
-            td.passed = test(td.testname, td.callback, td.file, td.line);
-        }
-
-        jtest::log(log_test_tracking_format());
-    }
-}
-
-
+#include <jtest/jtest.hpp>