Merge branch 'release/debian/1%5.2.0Beta2.1-1' into masterdebian/1%5.2.0Beta2.1-1

2 files changed, 76 insertions, 0 deletions

diff --git a/app/wlib/mswlib/unittest/CMakeLists.txt b/app/wlib/mswlib/unittest/CMakeLists.txt
new file mode 100644
index 0000000..b91c1ff
--- /dev/null
+++ b/app/wlib/mswlib/unittest/CMakeLists.txt
@@ -0,0 +1,11 @@
+# build unit tests for the xtrkcad Windows library
+
+add_executable(utf8test
+  		utf8test.c
+		../utf8conv.c
+		)
+
+target_link_libraries(utf8test
+  		 ${LIBS})
+
+add_test(UTF8ConversionTest utf8test)
diff --git a/app/wlib/mswlib/unittest/utf8test.c b/app/wlib/mswlib/unittest/utf8test.c
new file mode 100644
index 0000000..5b00371
--- /dev/null
+++ b/app/wlib/mswlib/unittest/utf8test.c
@@ -0,0 +1,65 @@
+/** \file utf8test.c
+* Unit tests for utf 8 conversion routines on Windows
+*/
+
+#include <setjmp.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include <cmocka.h>
+
+#include <wlib.h>
+
+#define SIMPLEASCIITEXT "The quick brown fox jumps over the lazy dog."
+#define UMLAUTTEXT "äöüÄÖÜß"
+
+static void
+ASCIIText(void **state)
+{
+	char output[100];
+	char result[100];
+	bool success;
+	(void)state;
+
+	success = wSystemToUTF8(SIMPLEASCIITEXT, output, 100);
+	assert_true((void *)success);
+
+	success = wUTF8ToSystem(output, result, 100);
+	assert_true((void *)success);
+
+	assert_false(strcmp(SIMPLEASCIITEXT, result));
+}
+
+static void
+Umlauts(void **state)
+{
+	char output[100];
+	char result[100];
+	bool success;
+	(void)state;
+
+	success = wIsUTF8(UMLAUTTEXT);
+	assert_false((void *)success);
+
+	success = wSystemToUTF8(UMLAUTTEXT, output, 100);
+	assert_true((void *)success);
+
+	success = wIsUTF8(output);
+	assert_true((void *)success);
+
+	success = wUTF8ToSystem(output, result, 100);
+	assert_true((void *)success);
+
+	assert_false(strcmp(UMLAUTTEXT, result));
+}
+
+
+int main(void)
+{
+    const struct CMUnitTest tests[] = {
+		cmocka_unit_test(ASCIIText),
+		cmocka_unit_test(Umlauts),
+    };
+
+    return cmocka_run_group_tests(tests, NULL, NULL);
+}
\ No newline at end of file