diff options
| author | Benoit Germain <benoit.germain@ubisoft.com> | 2025-10-27 08:43:22 +0100 |
|---|---|---|
| committer | Benoit Germain <benoit.germain@ubisoft.com> | 2025-10-27 08:43:22 +0100 |
| commit | 5e5bcf37450d07f7f2812255bbd1df35d8e6ce75 (patch) | |
| tree | 14cac4a19d4e35b60f0a56c948f45b158881daa5 /unit_tests | |
| parent | 3b4848ca1c4ea40d0e052cdc81bb9f66ce882a8a (diff) | |
| download | lanes-5e5bcf37450d07f7f2812255bbd1df35d8e6ce75.tar.gz lanes-5e5bcf37450d07f7f2812255bbd1df35d8e6ce75.tar.bz2 lanes-5e5bcf37450d07f7f2812255bbd1df35d8e6ce75.zip | |
verbose_errors improvement
* Use std::format instead of sprintf for verbose errors when decoding table keys
* Add a unit test for the different table key types
Diffstat (limited to 'unit_tests')
| -rw-r--r-- | unit_tests/UnitTests.vcxproj | 1 | ||||
| -rw-r--r-- | unit_tests/UnitTests.vcxproj.filters | 3 | ||||
| -rw-r--r-- | unit_tests/legacy_tests.cpp | 3 | ||||
| -rw-r--r-- | unit_tests/misc_tests.cpp | 9 | ||||
| -rw-r--r-- | unit_tests/scripts/misc/verbose_errors.lua | 34 |
5 files changed, 49 insertions, 1 deletions
diff --git a/unit_tests/UnitTests.vcxproj b/unit_tests/UnitTests.vcxproj index 300eb9b..bb0a2af 100644 --- a/unit_tests/UnitTests.vcxproj +++ b/unit_tests/UnitTests.vcxproj | |||
| @@ -1163,6 +1163,7 @@ | |||
| 1163 | <None Include="scripts\linda\send_receive_tables.lua" /> | 1163 | <None Include="scripts\linda\send_receive_tables.lua" /> |
| 1164 | <None Include="scripts\linda\wake_period.lua" /> | 1164 | <None Include="scripts\linda\wake_period.lua" /> |
| 1165 | <None Include="scripts\misc\deeptest.lua" /> | 1165 | <None Include="scripts\misc\deeptest.lua" /> |
| 1166 | <None Include="scripts\misc\verbose_errors.lua" /> | ||
| 1166 | <None Include="scripts\_utils54.lua" /> | 1167 | <None Include="scripts\_utils54.lua" /> |
| 1167 | <None Include="UnitTests.makefile" /> | 1168 | <None Include="UnitTests.makefile" /> |
| 1168 | <None Include="scripts\coro\index_suspended.lua" /> | 1169 | <None Include="scripts\coro\index_suspended.lua" /> |
diff --git a/unit_tests/UnitTests.vcxproj.filters b/unit_tests/UnitTests.vcxproj.filters index 57d8918..9b3d023 100644 --- a/unit_tests/UnitTests.vcxproj.filters +++ b/unit_tests/UnitTests.vcxproj.filters | |||
| @@ -159,5 +159,8 @@ | |||
| 159 | <None Include="scripts\linda\send_receive_tables.lua"> | 159 | <None Include="scripts\linda\send_receive_tables.lua"> |
| 160 | <Filter>Scripts\linda</Filter> | 160 | <Filter>Scripts\linda</Filter> |
| 161 | </None> | 161 | </None> |
| 162 | <None Include="scripts\misc\verbose_errors.lua"> | ||
| 163 | <Filter>Scripts\misc</Filter> | ||
| 164 | </None> | ||
| 162 | </ItemGroup> | 165 | </ItemGroup> |
| 163 | </Project> \ No newline at end of file | 166 | </Project> \ No newline at end of file |
diff --git a/unit_tests/legacy_tests.cpp b/unit_tests/legacy_tests.cpp index 84581d2..d66937c 100644 --- a/unit_tests/legacy_tests.cpp +++ b/unit_tests/legacy_tests.cpp | |||
| @@ -33,7 +33,8 @@ MAKE_TEST_CASE(func_is_string) | |||
| 33 | MAKE_TEST_CASE(irayo_closure) | 33 | MAKE_TEST_CASE(irayo_closure) |
| 34 | MAKE_TEST_CASE(irayo_recursive) | 34 | MAKE_TEST_CASE(irayo_recursive) |
| 35 | MAKE_TEST_CASE(keeper) | 35 | MAKE_TEST_CASE(keeper) |
| 36 | //MAKE_TEST_CASE(linda_perf) | 36 | MAKE_TEST_CASE(lanes_as_upvalue) |
| 37 | // MAKE_TEST_CASE(linda_perf) | ||
| 37 | MAKE_TEST_CASE(manual_register) | 38 | MAKE_TEST_CASE(manual_register) |
| 38 | MAKE_TEST_CASE(nameof) | 39 | MAKE_TEST_CASE(nameof) |
| 39 | MAKE_TEST_CASE(objects) | 40 | MAKE_TEST_CASE(objects) |
diff --git a/unit_tests/misc_tests.cpp b/unit_tests/misc_tests.cpp index a2199aa..3848a75 100644 --- a/unit_tests/misc_tests.cpp +++ b/unit_tests/misc_tests.cpp | |||
| @@ -191,3 +191,12 @@ TEST_CASE("misc.convert_max_attempts.is_respected") | |||
| 191 | " l:send('k', t)" // send the table, it should raise an error because the converter retries too many times | 191 | " l:send('k', t)" // send the table, it should raise an error because the converter retries too many times |
| 192 | ); | 192 | ); |
| 193 | } | 193 | } |
| 194 | |||
| 195 | #define MAKE_TEST_CASE(DIR, FILE, CONDITION) \ | ||
| 196 | TEST_CASE("scripted_tests." #DIR "." #FILE) \ | ||
| 197 | { \ | ||
| 198 | FileRunner _runner(R"(.\unit_tests\scripts)"); \ | ||
| 199 | _runner.performTest(FileRunnerParam{ #DIR "/" #FILE, TestType::CONDITION }); \ | ||
| 200 | } | ||
| 201 | |||
| 202 | MAKE_TEST_CASE(misc, verbose_errors, AssertNoLuaError) | ||
diff --git a/unit_tests/scripts/misc/verbose_errors.lua b/unit_tests/scripts/misc/verbose_errors.lua new file mode 100644 index 0000000..40948ca --- /dev/null +++ b/unit_tests/scripts/misc/verbose_errors.lua | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | local fixture = require "fixture" -- require fixture before lanes so that it is not registered and will cause transfer errors | ||
| 2 | local lanes = require("lanes").configure{verbose_errors = true} | ||
| 3 | local l = lanes.linda{name = "my linda"} | ||
| 4 | |||
| 5 | |||
| 6 | local do_test = function(key_) | ||
| 7 | local t = {[key_] = fixture.newuserdata()} | ||
| 8 | local b, e = pcall(l.send, l, "k", t) | ||
| 9 | assert(b == false and type(e) == "string") | ||
| 10 | local t_key = type(key_) | ||
| 11 | if t_key == "string" then | ||
| 12 | local x, y = string.find(e, "arg#2." .. key_, 1, true) | ||
| 13 | assert(x and y, "got " .. e) | ||
| 14 | elseif t_key == "boolean" then | ||
| 15 | local x, y = string.find(e, "arg#2[" .. tostring(key_) .. "]", 1, true) | ||
| 16 | assert(x and y, "got " .. e) | ||
| 17 | elseif t_key == "number" then | ||
| 18 | local x, y = string.find(e, "arg#2[" .. key_ .. "]", 1, true) | ||
| 19 | assert(x and y, "got " .. e) | ||
| 20 | elseif t_key == "userdata" then | ||
| 21 | local t_name | ||
| 22 | -- light userdata is formatted by std::format, where the pointer is written as a lowercase hex literal | ||
| 23 | local expected = "arg#2[U:0x" .. string.lower(string.match(tostring(key_), "userdata: (%x+)")) .. "]" | ||
| 24 | local x, y = string.find(e, expected, 1, true) | ||
| 25 | assert(x and y, "expecting " .. expected .. " got " .. e) | ||
| 26 | end | ||
| 27 | end | ||
| 28 | |||
| 29 | do_test("bob") | ||
| 30 | do_test(true) | ||
| 31 | do_test(false) | ||
| 32 | do_test(42) | ||
| 33 | do_test(42.44) | ||
| 34 | do_test(lanes.null) | ||
