From 6db3ab0d050397e57bff654ca183b92d67b1b704 Mon Sep 17 00:00:00 2001 From: Gareth Francis Date: Sat, 12 Sep 2020 16:57:44 +0100 Subject: Add test for wchar_t members to li_std_string.i --- Examples/test-suite/csharp/li_std_wstring_runme.cs | 7 +++++++ Examples/test-suite/li_std_wstring.i | 5 +++++ Examples/test-suite/python/li_std_wstring_runme.py | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/Examples/test-suite/csharp/li_std_wstring_runme.cs b/Examples/test-suite/csharp/li_std_wstring_runme.cs index 8b7ba1b30..c96c8c723 100644 --- a/Examples/test-suite/csharp/li_std_wstring_runme.cs +++ b/Examples/test-suite/csharp/li_std_wstring_runme.cs @@ -75,6 +75,13 @@ public class runme check_equal(li_std_wstring.test_ccvalue(x), "abc"); check_equal(li_std_wstring.test_wchar_overload(x), "abc"); + // Member variables + var s = new wchar_test_struct(); + s.wchar_t_member = h; + check_equal(s.wchar_t_member, h); + s.wchar_t_ptr_member = x; + check_equal(s.wchar_t_ptr_member, "abc"); + { // Unicode strings string[] test_strings = { diff --git a/Examples/test-suite/li_std_wstring.i b/Examples/test-suite/li_std_wstring.i index 55d45383e..a790ca7e0 100644 --- a/Examples/test-suite/li_std_wstring.i +++ b/Examples/test-suite/li_std_wstring.i @@ -70,6 +70,11 @@ size_t size_wstring(const std::wstring& s) { return s.size(); } +struct wchar_test_struct { + wchar_t wchar_t_member; + wchar_t* wchar_t_ptr_member; +}; + %} #endif diff --git a/Examples/test-suite/python/li_std_wstring_runme.py b/Examples/test-suite/python/li_std_wstring_runme.py index ef2085c66..ca8dc3184 100644 --- a/Examples/test-suite/python/li_std_wstring_runme.py +++ b/Examples/test-suite/python/li_std_wstring_runme.py @@ -54,6 +54,12 @@ check_equal(li_std_wstring.test_value(x), x) check_equal(li_std_wstring.test_ccvalue(x), "abc") check_equal(li_std_wstring.test_wchar_overload(x), "abc") +ts = li_std_wstring.wchar_test_struct() +ts.wchar_t_member = h +check_equal(ts.wchar_t_member, h) +ts.wchar_t_ptr_member = s +check_equal(ts.wchar_t_ptr_member, s) + ################### Python specific # Byte strings only converted in Python 2 -- cgit v1.2.1