X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-utf8.c;h=1ce5a5a24d0b18fd1ad366c36cd3cb7f023c06c4;hb=b0118a799cb47c331d976d9d43ce0c5130b13cdc;hp=b7d988f22d8f1e2d35ab7a8d3a65a75ca3458cf1;hpb=550a40eceb7d1917152fc9317bf2696708d52bc2;p=elogind.git

diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index b7d988f22..1ce5a5a24 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
@@ -19,6 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "alloc-util.h"
+#include "string-util.h"
 #include "utf8.h"
 #include "util.h"
 
@@ -47,7 +47,6 @@ static void test_utf8_encoded_valid_unichar(void) {
         assert_se(utf8_encoded_valid_unichar("a") == 1);
         assert_se(utf8_encoded_valid_unichar("\341\204") < 0);
         assert_se(utf8_encoded_valid_unichar("\341\204\341\204") < 0);
-
 }
 
 static void test_utf8_escaping(void) {
@@ -66,12 +65,54 @@ static void test_utf8_escaping(void) {
         assert_se(utf8_is_valid(p3));
 }
 
+static void test_utf8_escaping_printable(void) {
+        _cleanup_free_ char *p1, *p2, *p3, *p4, *p5, *p6;
+
+        p1 = utf8_escape_non_printable("goo goo goo");
+        puts(p1);
+        assert_se(utf8_is_valid(p1));
+
+        p2 = utf8_escape_non_printable("\341\204\341\204");
+        puts(p2);
+        assert_se(utf8_is_valid(p2));
+
+        p3 = utf8_escape_non_printable("\341\204");
+        puts(p3);
+        assert_se(utf8_is_valid(p3));
+
+        p4 = utf8_escape_non_printable("ąę\n가너도루\n1234\n\341\204\341\204\n\001 \019\20\a");
+        puts(p4);
+        assert_se(utf8_is_valid(p4));
+
+        p5 = utf8_escape_non_printable("\001 \019\20\a");
+        puts(p5);
+        assert_se(utf8_is_valid(p5));
+
+        p6 = utf8_escape_non_printable("\xef\xbf\x30\x13");
+        puts(p6);
+        assert_se(utf8_is_valid(p6));
+}
+
+static void test_utf16_to_utf8(void) {
+        char *a = NULL;
+        const uint16_t utf16[] = { htole16('a'), htole16(0xd800), htole16('b'), htole16(0xdc00), htole16('c'), htole16(0xd801), htole16(0xdc37) };
+        const char utf8[] = { 'a', 'b', 'c', 0xf0, 0x90, 0x90, 0xb7, 0 };
+
+        a = utf16_to_utf8(utf16, 14);
+        assert_se(a);
+        assert_se(streq(a, utf8));
+
+        free(a);
+}
+
 int main(int argc, char *argv[]) {
         test_utf8_is_valid();
         test_utf8_is_printable();
         test_ascii_is_valid();
         test_utf8_encoded_valid_unichar();
         test_utf8_escaping();
+        test_utf8_escaping_printable();
+        test_utf16_to_utf8();
 
         return 0;
 }