reinstate catch2 into module test file, cleanup test

Author: JeffGarland

tests/module.test.cpp

@@ -1,34 +1,36 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#define CATCH_CONFIG_MAIN
+#include <catch2/catch_all.hpp>
+
+// for g++-15 the order is important -- import after includes
 import beman.scope;
-// #include <stdexcept>
-// #include <string>
-#include <cassert>
-
-// #define CATCH_CONFIG_MAIN
-// #include <catch2/catch_all.hpp>
-
-// clang-format off
-// struct noisy_resource {
-//     noisy_resource()  { std::print( "construct noisy\n" ); }
-//     ~noisy_resource() { std::print( "destroy noisy\n"   ); }
-// };
-
-//TEST_CASE("module-test", "[scope_module_test]") {
-int main()
-{
-    bool exit_ran, success_ran, fail_ran = false;
+
+struct DummyResource {
+    bool& cleaned;
+
+    DummyResource(bool& flag) : cleaned(flag) { cleaned = false; }
+
+    bool is_clean() const { return cleaned; }
+};
+
+TEST_CASE("module-test", "[scope_module_test]") {
+    bool exit_ran, success_ran, fail_ran, cleaned = true;
     {
-        beman::scope::scope_exit    _([&exit_ran]    { exit_ran = true;    });
-        beman::scope::scope_success _([&success_ran] { success_ran = true; });
-        beman::scope::scope_fail    _([&fail_ran]    { fail_ran = true;    });
-        // auto                        resource_ptr = beman::scope::unique_resource(new noisy_resource(),
-        //                                                   // Cleanup function
-        //                                                   [](noisy_resource* ptr) { delete ptr; });
+        // clang-format off
+        beman::scope::scope_exit    _se([&exit_ran]    { exit_ran = true;    });
+        beman::scope::scope_success _ss([&success_ran] { success_ran = true; });
+        beman::scope::scope_fail    _sf([&fail_ran]    { fail_ran = true;    });
+        auto                        resource_ptr = beman::scope::unique_resource(new DummyResource(cleaned),
+										 [](DummyResource* ptr) { ptr->cleaned =true; delete ptr; });
+	REQUIRE(cleaned == false);
+	REQUIRE(resource_ptr->is_clean() == false);
+        //  clang-format on
     } // Normal scope exit
 
-    assert(exit_ran == true);
-    assert(success_ran == true);
-    assert(fail_ran == false);
+    REQUIRE(exit_ran == true);
+    REQUIRE(success_ran == true);
+    REQUIRE(fail_ran == false);
+    REQUIRE(cleaned == true);
 
- }
+}