diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-05-14 00:04:39 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-05-21 10:57:23 +0200 |
commit | 9743846e2342e35ab66671e69753811b638a0161 (patch) | |
tree | 2699b27ceaa9102221d321a4036b65dbc0eecd4b /src/test/test-utf8.c | |
parent | 21c491e106feb7d4caa7f4b9503b7e9de6e8af23 (diff) | |
download | systemd-9743846e2342e35ab66671e69753811b638a0161.tar.gz |
test-utf8: add function headers and rename tests after functions they test
Diffstat (limited to 'src/test/test-utf8.c')
-rw-r--r-- | src/test/test-utf8.c | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c index d1e48da2a6..343cbf4ced 100644 --- a/src/test/test-utf8.c +++ b/src/test/test-utf8.c @@ -7,6 +7,8 @@ #include "util.h" static void test_utf8_is_printable(void) { + log_info("/* %s */", __func__); + assert_se(utf8_is_printable("ascii is valid\tunicode", 22)); assert_se(utf8_is_printable("\342\204\242", 3)); assert_se(!utf8_is_printable("\341\204", 2)); @@ -14,18 +16,24 @@ static void test_utf8_is_printable(void) { } static void test_utf8_is_valid(void) { + log_info("/* %s */", __func__); + assert_se(utf8_is_valid("ascii is valid unicode")); assert_se(utf8_is_valid("\342\204\242")); assert_se(!utf8_is_valid("\341\204")); } static void test_ascii_is_valid(void) { + log_info("/* %s */", __func__); + assert_se( ascii_is_valid("alsdjf\t\vbarr\nba z")); assert_se(!ascii_is_valid("\342\204\242")); assert_se(!ascii_is_valid("\341\204")); } static void test_ascii_is_valid_n(void) { + log_info("/* %s */", __func__); + assert_se( ascii_is_valid_n("alsdjf\t\vbarr\nba z", 17)); assert_se( ascii_is_valid_n("alsdjf\t\vbarr\nba z", 16)); assert_se(!ascii_is_valid_n("alsdjf\t\vbarr\nba z", 18)); @@ -36,6 +44,8 @@ static void test_ascii_is_valid_n(void) { } static void test_utf8_encoded_valid_unichar(void) { + log_info("/* %s */", __func__); + assert_se(utf8_encoded_valid_unichar("\342\204\242", 1) == -EINVAL); /* truncated */ assert_se(utf8_encoded_valid_unichar("\342\204\242", 2) == -EINVAL); /* truncated */ assert_se(utf8_encoded_valid_unichar("\342\204\242", 3) == 3); @@ -53,9 +63,11 @@ static void test_utf8_encoded_valid_unichar(void) { assert_se(utf8_encoded_valid_unichar("\341\204\341\204", 5) == -EINVAL); } -static void test_utf8_escaping(void) { +static void test_utf8_escape_invalid(void) { _cleanup_free_ char *p1, *p2, *p3; + log_info("/* %s */", __func__); + p1 = utf8_escape_invalid("goo goo goo"); puts(p1); assert_se(utf8_is_valid(p1)); @@ -69,9 +81,11 @@ static void test_utf8_escaping(void) { assert_se(utf8_is_valid(p3)); } -static void test_utf8_escaping_printable(void) { +static void test_utf8_escape_non_printable(void) { _cleanup_free_ char *p1, *p2, *p3, *p4, *p5, *p6; + log_info("/* %s */", __func__); + p1 = utf8_escape_non_printable("goo goo goo"); puts(p1); assert_se(utf8_is_valid(p1)); @@ -103,6 +117,8 @@ static void test_utf16_to_utf8(void) { _cleanup_free_ char16_t *b = NULL; _cleanup_free_ char *a = NULL; + log_info("/* %s */", __func__); + /* Convert UTF-16 to UTF-8, filtering embedded bad chars */ a = utf16_to_utf8(utf16, sizeof(utf16)); assert_se(a); @@ -120,6 +136,8 @@ static void test_utf16_to_utf8(void) { } static void test_utf8_n_codepoints(void) { + log_info("/* %s */", __func__); + assert_se(utf8_n_codepoints("abc") == 3); assert_se(utf8_n_codepoints("zażółcić gęślą jaźń") == 19); assert_se(utf8_n_codepoints("串") == 1); @@ -129,6 +147,8 @@ static void test_utf8_n_codepoints(void) { } static void test_utf8_console_width(void) { + log_info("/* %s */", __func__); + assert_se(utf8_console_width("abc") == 3); assert_se(utf8_console_width("zażółcić gęślą jaźń") == 19); assert_se(utf8_console_width("串") == 2); @@ -140,6 +160,8 @@ static void test_utf8_console_width(void) { static void test_utf8_to_utf16(void) { const char *p; + log_info("/* %s */", __func__); + FOREACH_STRING(p, "abc", "zażółcić gęślą jaźń", @@ -165,8 +187,8 @@ int main(int argc, char *argv[]) { test_ascii_is_valid(); test_ascii_is_valid_n(); test_utf8_encoded_valid_unichar(); - test_utf8_escaping(); - test_utf8_escaping_printable(); + test_utf8_escape_invalid(); + test_utf8_escape_non_printable(); test_utf16_to_utf8(); test_utf8_n_codepoints(); test_utf8_console_width(); |