Make VS Test Explorer happy by absorbing the text output of legacy tests

3 files changed, 26 insertions, 7 deletions

diff --git a/tests/error.lua b/tests/error.lua
index a1ba1ce..243dd57 100644
--- a/tests/error.lua
+++ b/tests/error.lua
@@ -1,9 +1,19 @@
 --

 -- Error reporting

 --

+local function PRINT(...)

+    local str=""

+    for i=1,select('#',...) do

+        str= str..tostring(select(i,...)).."\t"

+    end

+    if io then

+        io.stderr:write(str.."\n")

+    end

+end

+

 local which_tests, remaining_tests = {}, {}

 for k,v in ipairs{...} do

-    print("got arg:", type(v), tostring(v))

+    PRINT("got arg:", type(v), tostring(v))

     which_tests[v] = true

     remaining_tests[v] = true

 end

@@ -27,7 +37,7 @@ local WR = function(...)
         if type(v) == "function" then

             local infos = debug.getinfo(v)

             --[[for k,v in pairs(infos) do

-                print(k,v)

+                PRINT(k,v)

             end]]

             v = infos.source..":"..infos.linedefined

         end

@@ -115,7 +125,7 @@ local configure_tests = function()
             (lane_error and tostring(lane_error) or "no error") .. " in lane",

             (finalizer and "with" or "without").. " finalizer" .. ((finalizer and finalizer_error) and " raising " .. tostring(finalizer_error) or "")

         }, ", ")

-        print(test_header)

+        PRINT(test_header)

         test_settings[test_header] = { level, lane_error, finalizer, finalizer_error }

     end

     -- can't store nil in tables, use null instead

@@ -240,4 +250,4 @@ end
 local unknown_test, val = next(remaining_tests)

 assert(not unknown_test, tostring(unknown_test) .. " test is unknown")

 

-print "\nTHE END"

+PRINT "\nTHE END"

diff --git a/unit_tests/Catch2.runsettings b/unit_tests/Catch2.runsettings
index 9360bfb..c8e32ee 100644
--- a/unit_tests/Catch2.runsettings
+++ b/unit_tests/Catch2.runsettings
@@ -22,9 +22,6 @@
                 <!-- Combine: A single test executable is started to run multiple test cases. (Single: instance per test case) -->
                 <ExecutionMode>Combine</ExecutionMode>
 
-                <!-- In Milliseconds -->
-                <TestCaseTimeout>10000</TestCaseTimeout>
-
                 <!-- Working directory -->
                 <WorkingDirectoryRoot>Solution</WorkingDirectoryRoot>
                 <WorkingDirectory>Lanes</WorkingDirectory>
diff --git a/unit_tests/shared.cpp b/unit_tests/shared.cpp
index d2b4ef7..c2b8bf0 100644
--- a/unit_tests/shared.cpp
+++ b/unit_tests/shared.cpp
@@ -389,6 +389,18 @@ TEST_CASE("LuaState.doString")
 FileRunner::FileRunner(std::string_view const& where_)
 : LuaState{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } }
 {
+    // _G.print = _nullprint
+    // because the VS Test Explorer doesn't appreciate the text output of some scripts, so absorb them
+    if constexpr (1) {
+        auto const _nullprint = +[](lua_State* const L_) { return 0; };
+        luaG_pushglobaltable(L);
+        lua_pushcfunction(L, _nullprint);
+        luaG_setfield(L, StackIndex{ -2 }, std::string_view{ "print" });
+        lua_pop(L, 1);
+        stackCheck(0);
+    }
+    // TODO: do the same with io.stderr:write?
+
     [[maybe_unused]] std::filesystem::path const _current{ std::filesystem::current_path() };
     std::filesystem::path _path{ where_ };
     root = std::filesystem::canonical(_path).generic_string();