1 files changed, 29 insertions, 31 deletions

diff --git a/unit_tests/lane_tests.cpp b/unit_tests/lane_tests.cpp
index 7f5f112..498c96e 100644
--- a/unit_tests/lane_tests.cpp
+++ b/unit_tests/lane_tests.cpp
@@ -89,35 +89,6 @@ TEST_CASE("lanes.gen")
 
     // ---------------------------------------------------------------------------------------------
 
-    SECTION("lanes.finally") // TODO: move this section somewhere else, in a dedicated finally TEST_CASE
-    {
-        // prepare a callback for lanes.finally()
-        static bool _wasCalled{};
-        static bool _allLanesTerminated{};
-        auto _finallyCB{ +[](lua_State* const L_) { _wasCalled = true; _allLanesTerminated = lua_toboolean(L_, 1); return 0; } };
-        lua_pushcfunction(S, _finallyCB);
-        lua_setglobal(S, "finallyCB");
-        // start a lane that lasts a long time
-        std::string_view const _script{
-            " lanes.finally(finallyCB)"
-            " g = lanes.gen('*',"
-            "     {name = 'auto'},"
-            "     function()"
-            "         for i = 1,1e37 do end" // no cooperative cancellation checks here!
-            "     end)"
-            " g()"
-        };
-        S.requireSuccess(_script);
-        // close the state before the lane ends.
-        // since we don't wait at all, it is possible that the OS thread for the lane hasn't even started at that point
-        S.close();
-        // the finally handler should have been called, and told all lanes are stopped
-        REQUIRE(_wasCalled);
-        REQUIRE(_allLanesTerminated);
-    }
-
-    // ---------------------------------------------------------------------------------------------
-
     SECTION("default thread name is '<unnamed>'")
     {
         std::string_view const _script{
@@ -172,7 +143,7 @@ TEST_CASE("lanes.gen")
 // #################################################################################################
 // #################################################################################################
 
-TEST_CASE("lane:cancel")
+TEST_CASE("lane.cancel")
 {
     LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
 
@@ -252,7 +223,33 @@ TEST_CASE("lane:cancel")
 // #################################################################################################
 // #################################################################################################
 
-TEST_CASE("lane scripted tests")
+// unfortunately, VS Test adapter does not list individual sections,
+// so let's create a separate test case for each file with an ugly macro...
+
+#define MAKE_TEST_CASE(DIR, FILE, CONDITION)\
+TEST_CASE("scripted tests." #DIR "." #FILE) \
+{ \
+    FileRunner _runner(R"(.\lanes\unit_tests\scripts)"); \
+    _runner.performTest(FileRunnerParam{ #DIR "/" #FILE, TestType::CONDITION }); \
+}
+
+#if LUAJIT_FLAVOR() == 0
+MAKE_TEST_CASE(lane, cooperative_shutdown, AssertNoLuaError)
+#endif // LUAJIT_FLAVOR
+MAKE_TEST_CASE(lane, uncooperative_shutdown, AssertThrows)
+MAKE_TEST_CASE(lane, tasking_basic, AssertNoLuaError)
+MAKE_TEST_CASE(lane, tasking_cancelling, AssertNoLuaError)
+MAKE_TEST_CASE(lane, tasking_comms_criss_cross, AssertNoLuaError)
+MAKE_TEST_CASE(lane, tasking_communications, AssertNoLuaError)
+MAKE_TEST_CASE(lane, tasking_error, AssertNoLuaError)
+MAKE_TEST_CASE(lane, tasking_join_test, AssertNoLuaError)
+MAKE_TEST_CASE(lane, tasking_send_receive_code, AssertNoLuaError)
+MAKE_TEST_CASE(lane, stdlib_naming, AssertNoLuaError)
+MAKE_TEST_CASE(coro, basics, AssertNoLuaError)
+MAKE_TEST_CASE(coro, error_handling, AssertNoLuaError)
+
+/*
+TEST_CASE("lanes.scripted tests")
 {
     auto const& _testParam = GENERATE(
         FileRunnerParam{ PUC_LUA_ONLY("lane/cooperative_shutdown"), TestType::AssertNoLuaError }, // 0
@@ -272,3 +269,4 @@ TEST_CASE("lane scripted tests")
     FileRunner _runner(R"(.\lanes\unit_tests\scripts)");
     _runner.performTest(_testParam);
 }
+*/