From 038337fd076aa861d7a48521c2dbbb8030bae9b8 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sun, 2 May 2021 00:10:00 +0200 Subject: [PATCH] Port core:sys/win32 tests to test runner. --- core/sys/win32/tests/general.odin | 63 +++++++++++++++---------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/core/sys/win32/tests/general.odin b/core/sys/win32/tests/general.odin index 80cf33a9c..1a5fc911a 100644 --- a/core/sys/win32/tests/general.odin +++ b/core/sys/win32/tests/general.odin @@ -1,44 +1,41 @@ package win32_tests -import "core:fmt" import "core:sys/win32" +import "core:testing" -main :: proc(){ - test_utf16_to_utf8 :: proc(str: []u16, comparison: string, expected_result: bool, loc := #caller_location) { - result := win32.utf16_to_utf8(str[:]); - fmt.assertf((result == comparison) == expected_result, - "Incorrect utf16_to_utf8 conversion: %q %s %q\nloc = %#v\n", - result, "!=" if expected_result else "==", comparison, loc); - } +utf16_to_utf8 :: proc(t: ^testing.T, str: []u16, comparison: string, expected_result: bool, loc := #caller_location) { + result := win32.utf16_to_utf8(str[:]); + testing.expect(t, (result == comparison) == expected_result, "Incorrect utf16_to_utf8 conversion", loc); +} - test_utf16_to_utf8([]u16{}, "", true); - test_utf16_to_utf8([]u16{0}, "", true); - test_utf16_to_utf8([]u16{0, 't', 'e', 's', 't'}, "", true); - test_utf16_to_utf8([]u16{0, 't', 'e', 's', 't', 0}, "", true); - test_utf16_to_utf8([]u16{'t', 'e', 's', 't'}, "test", true); - test_utf16_to_utf8([]u16{'t', 'e', 's', 't', 0}, "test", true); - test_utf16_to_utf8([]u16{'t', 'e', 0, 's', 't'}, "te", true); - test_utf16_to_utf8([]u16{'t', 'e', 0, 's', 't', 0}, "te", true); +wstring_to_utf8 :: proc(t: ^testing.T, str: []u16, comparison: string, expected_result: bool, loc := #caller_location) { + result := win32.wstring_to_utf8(nil if len(str) == 0 else cast(win32.Wstring)&str[0], -1); + testing.expect(t, (result == comparison) == expected_result, "Incorrect wstring_to_utf8 conversion", loc); +} - test_wstring_to_utf8 :: proc(str: []u16, comparison: string, expected_result: bool, loc := #caller_location) { - result := win32.wstring_to_utf8(nil if len(str) == 0 else cast(win32.Wstring)&str[0], -1); - fmt.assertf((result == comparison) == expected_result, - "Incorrect wstring_to_utf8 conversion: %q %s %q\nloc = %#v\n", - result, "!=" if expected_result else "==", comparison, loc); - } +@test +test_utf :: proc(t: ^testing.T) { + utf16_to_utf8(t, []u16{}, "", true); + utf16_to_utf8(t, []u16{0}, "", true); + utf16_to_utf8(t, []u16{0, 't', 'e', 's', 't'}, "", true); + utf16_to_utf8(t, []u16{0, 't', 'e', 's', 't', 0}, "", true); + utf16_to_utf8(t, []u16{'t', 'e', 's', 't'}, "test", true); + utf16_to_utf8(t, []u16{'t', 'e', 's', 't', 0}, "test", true); + utf16_to_utf8(t, []u16{'t', 'e', 0, 's', 't'}, "te", true); + utf16_to_utf8(t, []u16{'t', 'e', 0, 's', 't', 0}, "te", true); - test_wstring_to_utf8([]u16{}, "", true); - test_wstring_to_utf8([]u16{0}, "", true); - test_wstring_to_utf8([]u16{0, 't', 'e', 's', 't'}, "", true); - test_wstring_to_utf8([]u16{0, 't', 'e', 's', 't', 0}, "", true); - test_wstring_to_utf8([]u16{'t', 'e', 's', 't', 0}, "test", true); - test_wstring_to_utf8([]u16{'t', 'e', 0, 's', 't'}, "te", true); - test_wstring_to_utf8([]u16{'t', 'e', 0, 's', 't', 0}, "te", true); + wstring_to_utf8(t, []u16{}, "", true); + wstring_to_utf8(t, []u16{0}, "", true); + wstring_to_utf8(t, []u16{0, 't', 'e', 's', 't'}, "", true); + wstring_to_utf8(t, []u16{0, 't', 'e', 's', 't', 0}, "", true); + wstring_to_utf8(t, []u16{'t', 'e', 's', 't', 0}, "test", true); + wstring_to_utf8(t, []u16{'t', 'e', 0, 's', 't'}, "te", true); + wstring_to_utf8(t, []u16{'t', 'e', 0, 's', 't', 0}, "te", true); // WARNING: Passing a non-zero-terminated string to wstring_to_utf8 is dangerous, // as it will go out of bounds looking for a zero. // It will "fail" or "succeed" by having a zero just after the end of the input string or not. - test_wstring_to_utf8([]u16{'t', 'e', 's', 't'}, "test", false); - test_wstring_to_utf8([]u16{'t', 'e', 's', 't', 0}[:4], "test", true); - test_wstring_to_utf8([]u16{'t', 'e', 's', 't', 'q'}[:4], "test", false); -} + wstring_to_utf8(t, []u16{'t', 'e', 's', 't'}, "test", false); + wstring_to_utf8(t, []u16{'t', 'e', 's', 't', 0}[:4], "test", true); + wstring_to_utf8(t, []u16{'t', 'e', 's', 't', 'q'}[:4], "test", false); +} \ No newline at end of file