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

diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index f0182ee9a..b7d988f22 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -41,22 +41,6 @@ static void test_ascii_is_valid(void) {
         assert_se(!ascii_is_valid("\341\204"));
 }
 
-static void test_ascii_filter(void) {
-        char *f;
-
-        f = ascii_filter("alsdjf\t\vbarr\nba z");
-        assert_se(streq(f, "alsdjf\t\vbarr\nba z"));
-        free(f);
-
-        f = ascii_filter("\342\204\242");
-        assert_se(streq(f, ""));
-        free(f);
-
-        f = ascii_filter("foo\341\204bar");
-        assert_se(streq(f, "foobar"));
-        free(f);
-}
-
 static void test_utf8_encoded_valid_unichar(void) {
         assert_se(utf8_encoded_valid_unichar("\342\204\242") == 3);
         assert_se(utf8_encoded_valid_unichar("\302\256") == 2);
@@ -66,12 +50,28 @@ static void test_utf8_encoded_valid_unichar(void) {
 
 }
 
+static void test_utf8_escaping(void) {
+        _cleanup_free_ char *p1, *p2, *p3;
+
+        p1 = utf8_escape_invalid("goo goo goo");
+        puts(p1);
+        assert_se(utf8_is_valid(p1));
+
+        p2 = utf8_escape_invalid("\341\204\341\204");
+        puts(p2);
+        assert_se(utf8_is_valid(p2));
+
+        p3 = utf8_escape_invalid("\341\204");
+        puts(p3);
+        assert_se(utf8_is_valid(p3));
+}
+
 int main(int argc, char *argv[]) {
         test_utf8_is_valid();
         test_utf8_is_printable();
         test_ascii_is_valid();
-        test_ascii_filter();
         test_utf8_encoded_valid_unichar();
+        test_utf8_escaping();
 
         return 0;
 }