summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2014-09-23 14:46:06 +0800
committerSamuel Mendoza-Jonas <sam.mj@au1.ibm.com>2014-09-23 16:47:58 +1000
commit3aef1b6d1f465596ebf7883a50efcf4d6f0ffcf4 (patch)
treec1ff2d5ccb4ba0d5b0ef1af0f02bcad528ce7d5b /test
parent73ee21af6d0a379a104a21b7569331284b3659b7 (diff)
downloadtalos-petitboot-3aef1b6d1f465596ebf7883a50efcf4d6f0ffcf4.zip
talos-petitboot-3aef1b6d1f465596ebf7883a50efcf4d6f0ffcf4.tar.gz
lib/fold: Add support for multibyte strings
Currently, the fold_text function doesn't understand multibyte strings, so may break a line in the middle of a multibyte sequence. This change adds multibyte-awareness to the fold code, and uses proper width calculations for the contents of the folded string. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'test')
-rw-r--r--test/lib/test-fold.c54
1 files changed, 50 insertions, 4 deletions
diff --git a/test/lib/test-fold.c b/test/lib/test-fold.c
index 1f58fdf..474892d 100644
--- a/test/lib/test-fold.c
+++ b/test/lib/test-fold.c
@@ -1,7 +1,12 @@
+#define _GNU_SOURCE
+
#include <stdlib.h>
#include <string.h>
#include <assert.h>
+#include <locale.h>
+#include <wchar.h>
+#include <langinfo.h>
#include <fold/fold.h>
#include <list/list.h>
@@ -72,8 +77,19 @@ struct test test_break = {
},
};
+struct test test_mbs = {
+ .in = "從主功能表畫面中,選取啟動選項。",
+ .linelen = 15,
+ .out = {
+ "從主功能表畫面",
+ "中,選取啟動選",
+ "項。",
+ NULL,
+ },
+};
+
static struct test *tests[] = {
- &test_split, &test_fold_line, &test_break,
+ &test_split, &test_fold_line, &test_break, &test_mbs,
};
static void __attribute__((noreturn)) fail(struct ctx *ctx,
@@ -83,7 +99,7 @@ static void __attribute__((noreturn)) fail(struct ctx *ctx,
int i;
fprintf(stderr, "%s\n", msg);
- fprintf(stderr, "input:\n%s\n", test->in);
+ fprintf(stderr, "input, split at %d:\n%s\n", test->linelen, test->in);
fprintf(stderr, "expected:\n");
for (i = 0; test->out[i]; i++)
@@ -116,19 +132,39 @@ static void run_test(struct test *test)
{
struct line *line;
struct ctx *ctx;
- int i;
+ wchar_t *wcs;
+ int i, n;
ctx = talloc(NULL, struct ctx);
+ n = strlen(test->in) + 1;
list_init(&ctx->lines);
fold_text(test->in, test->linelen, fold_line_cb, ctx);
+
i = 0;
list_for_each_entry(&ctx->lines, line, list) {
+ size_t wcslen;
+ char *buf;
+ int width;
+
if (!test->out[i])
fail(ctx, test,
"fold_text returned more lines than expected");
- if (line->len > test->linelen)
+ buf = talloc_strndup(ctx, line->buf, line->len);
+ wcslen = mbstowcs(NULL, buf, 0);
+
+ if (wcslen == (size_t)-1)
+ fail(ctx, test, "invalid mutlibyte sequence");
+
+ wcs = talloc_array(ctx, wchar_t, wcslen + 1);
+ wcslen = mbstowcs(wcs, buf, n);
+
+ width = wcswidth(wcs, wcslen);
+ if (width == -1)
+ fail(ctx, test, "nonprintable characters present");
+
+ if (width > (signed int)test->linelen)
fail(ctx, test, "line too long");
if (line->len != strlen(test->out[i]))
@@ -149,6 +185,16 @@ static void run_test(struct test *test)
int main(void)
{
unsigned int i;
+ char *charset;
+
+ setlocale(LC_CTYPE, "");
+
+ charset = nl_langinfo(CODESET);
+ if (strcmp(charset, "UTF-8")) {
+ fprintf(stderr, "Current charset is %s, tests require UTF-8\n",
+ charset);
+ return EXIT_FAILURE;
+ }
for (i = 0; i < ARRAY_SIZE(tests); i++)
run_test(tests[i]);
OpenPOWER on IntegriCloud