1 files changed, 53 insertions, 36 deletions

diff --git a/unit_tests/init_and_shutdown.cpp b/unit_tests/init_and_shutdown.cpp
index bd72157..69e4f1b 100644
--- a/unit_tests/init_and_shutdown.cpp
+++ b/unit_tests/init_and_shutdown.cpp
@@ -3,7 +3,7 @@
 
 // #################################################################################################
 
-TEST_CASE("lanes.require 'lanes'")
+TEST_CASE("Lua.require_lanes")
 {
     LuaState L{ LuaState::WithBaseLibs{ false }, LuaState::WithFixture{ false } };
 
@@ -58,7 +58,7 @@ TEST_CASE("lanes.require 'lanes'")
 // #################################################################################################
 
 // allocator should be "protected", a C function returning a suitable userdata, or nil
-TEST_CASE("lanes.configure.allocator")
+TEST_CASE("lanes.configure.allocator/bool_number_table_string")
 {
     LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
 
@@ -90,49 +90,33 @@ TEST_CASE("lanes.configure.allocator")
 
     // ---------------------------------------------------------------------------------------------
 
-    SECTION("allocator = <Lua function>")
-    {
-        L.requireFailure("require 'lanes'.configure{allocator = function() return {}, 12, 'yoy' end}");
-    }
-
-    // ---------------------------------------------------------------------------------------------
-
-    SECTION("allocator = <bad C function>")
-    {
-        // a C function that doesn't return what we expect should cause an error too
-        // TODO: for some reason, we use os.getenv here because using 'print' as the culprit, the tests deadlock in Release builds
-        L.requireFailure("return type(require 'lanes'.configure{allocator = os.getenv})");
-    }
-
-    // ---------------------------------------------------------------------------------------------
-
     SECTION("allocator = <string with a typo>")
     {
         // oops, a typo
         L.requireFailure("require 'lanes'.configure{allocator = 'Protected'}");
     }
+}
+
+// #################################################################################################
+
+TEST_CASE("lanes.configure.allocator/bad_functions")
+{
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
 
     // ---------------------------------------------------------------------------------------------
 
-    SECTION("allocator = 'protected'")
+    SECTION("allocator = <Lua function>")
     {
-        // no typo, should work
-        L.requireSuccess("require 'lanes'.configure{allocator = 'protected'}");
+        L.requireFailure("require 'lanes'.configure{allocator = function() return {}, 12, 'yoy' end}");
     }
 
     // ---------------------------------------------------------------------------------------------
 
-    SECTION("allocator = <good custom C allocator>")
+    SECTION("allocator = <bad C function>")
     {
-        // a function that provides what we expect is fine
-        static constexpr lua_CFunction _provideAllocator = +[](lua_State* const L_) {
-            lanes::AllocatorDefinition* const _def{ new (L_) lanes::AllocatorDefinition{} };
-            _def->initFrom(L_);
-            return 1;
-        };
-        lua_pushcfunction(L, _provideAllocator);
-        lua_setglobal(L, "ProvideAllocator");
-        L.requireSuccess("require 'lanes'.configure{allocator = ProvideAllocator}");
+        // a C function that doesn't return what we expect should cause an error too
+        // TODO: for some reason, we use os.getenv here because using 'print' as the culprit, the tests deadlock in Release builds
+        L.requireFailure("return type(require 'lanes'.configure{allocator = os.getenv})");
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -191,6 +175,39 @@ TEST_CASE("lanes.configure.allocator")
 
 // #################################################################################################
 
+TEST_CASE("lanes.configure.allocator/good_function")
+{
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+
+    SECTION("allocator = <good custom C allocator>")
+    {
+        // a function that provides what we expect is fine
+        static constexpr lua_CFunction _provideAllocator = +[](lua_State* const L_) {
+            lanes::AllocatorDefinition* const _def{ new (L_) lanes::AllocatorDefinition{} };
+            _def->initFrom(L_);
+            return 1;
+        };
+        lua_pushcfunction(L, _provideAllocator);
+        lua_setglobal(L, "ProvideAllocator");
+        L.requireSuccess("require 'lanes'.configure{allocator = ProvideAllocator}");
+    }
+}
+
+// #################################################################################################
+
+// TODO: investigate why this test crashes under AppVerifier on lanes_core.dll unload when running against Lua 5.1, 5.2 and 5.4 RELEASE ONLY!
+// apparently, the mutex of ProtectedAllocator is deemed still in use. Crash goes away if I don't use it in protected_lua_Alloc
+TEST_CASE(("lanes.configure.allocator/protected"))
+{
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+
+    // no typo, should work
+    L.requireSuccess("require 'lanes'.configure{allocator = 'protected'}");
+}
+
+
+// #################################################################################################
+
 TEST_CASE("lanes.configure.internal_allocator")
 {
     LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
@@ -401,7 +418,7 @@ TEST_CASE("lanes.configure.nb_user_keepers")
 
 // #################################################################################################
 
-TEST_CASE("lanes.configure.on_state_create")
+TEST_CASE("lanes.configure.on_state_create/configuration")
 {
     LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
 
@@ -758,7 +775,7 @@ TEST_CASE("lanes.configure.unknown_setting")
 
 #if LUAJIT_FLAVOR() == 0
 // TODO: this test crashes inside S.close() against LuaJIT. to be investigated
-TEST_CASE("lanes.finally.no fixture")
+TEST_CASE("lanes.finally.no_fixture")
 {
     LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
     // we need Lanes to be up. Since we run several 'scripts', we store it as a global
@@ -779,7 +796,7 @@ TEST_CASE("lanes.finally.no fixture")
 
 // #################################################################################################
 
-TEST_CASE("lanes.finally.with fixture")
+TEST_CASE("lanes.finally.with_fixture")
 {
     LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
 
@@ -797,7 +814,7 @@ TEST_CASE("lanes.finally.with fixture")
 
 // #################################################################################################
 
-TEST_CASE("lanes.finally.shutdown with an uncooperative lane")
+TEST_CASE("lanes.finally.shutdown_with_an_uncooperative_lane")
 {
     LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
     S.requireSuccess("lanes = require 'lanes'.configure()");
@@ -846,7 +863,7 @@ namespace
 
 // #################################################################################################
 
-TEST_CASE("lanes.on_state_create setting")
+TEST_CASE("lanes.configure.on_state_create/details")
 {
     LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };