X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/caecd4f412422d8130d616da33325e03557218e7..c35e83d9a431ffca75fe6901acce082d84059ed3:/lib/test.c diff --git a/lib/test.c b/lib/test.c index 4b073a8..3b1eca3 100644 --- a/lib/test.c +++ b/lib/test.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "utf8.h" #include "mem.h" @@ -38,11 +39,12 @@ #include "charset.h" #include "mime.h" #include "hex.h" -#include "words.h" #include "heap.h" #include "unicode.h" #include "inputline.h" #include "wstat.h" +#include "signame.h" +#include "cache.h" static int tests, errors; static int fail_first; @@ -88,12 +90,8 @@ static const char *format_utf32(const uint32_t *s) { dynstr_init(&d); while((c = *s++)) { - if(c >= 32 && c <= 127) - dynstr_append(&d, c); - else { - sprintf(buf, "\\x%04lX", (unsigned long)c); - dynstr_append_string(&d, buf); - } + sprintf(buf, " %04lX", (long)c); + dynstr_append_string(&d, buf); } dynstr_terminate(&d); return d.vec; @@ -219,6 +217,7 @@ static void test_utf8(void) { U8("\xF4\x80\x80\x80", "0x100000"); U8("\xF4\x8F\xBF\xBF", "0x10FFFF"); insist(!validutf8("\xF4\x90\x80\x80")); + insist(!validutf8("\xF4\x80\xFF\x80")); /* miscellaneous non-UTF-8 rubbish */ insist(!validutf8("\x80")); @@ -415,7 +414,70 @@ static void test_casefold(void) { ++tests; } } - check_string(casefold(""), ""); + check_string(utf8_casefold_canon("", 0, 0), ""); +} + +struct { + const char *in; + const char *expect[10]; +} wtest[] = { + /* Empty string */ + { "", { 0 } }, + /* Only whitespace and punctuation */ + { " ", { 0 } }, + { " ' ", { 0 } }, + { " ! ", { 0 } }, + { " \"\" ", { 0 } }, + { " @ ", { 0 } }, + /* Basics */ + { "wibble", { "wibble", 0 } }, + { " wibble", { "wibble", 0 } }, + { " wibble ", { "wibble", 0 } }, + { "wibble ", { "wibble", 0 } }, + { "wibble spong", { "wibble", "spong", 0 } }, + { " wibble spong", { "wibble", "spong", 0 } }, + { " wibble spong ", { "wibble", "spong", 0 } }, + { "wibble spong ", { "wibble", "spong", 0 } }, + { "wibble spong splat foo zot ", { "wibble", "spong", "splat", "foo", "zot", 0 } }, + /* Apostrophes */ + { "wibble 'spong", { "wibble", "spong", 0 } }, + { " wibble's", { "wibble's", 0 } }, + { " wibblespong' ", { "wibblespong", 0 } }, + { "wibble sp''ong ", { "wibble", "sp", "ong", 0 } }, +}; +#define NWTEST (sizeof wtest / sizeof *wtest) + +static void test_words(void) { + size_t t, nexpect, ngot, i; + int right; + + fprintf(stderr, "test_words\n"); + for(t = 0; t < NWTEST; ++t) { + char **got = utf8_word_split(wtest[t].in, strlen(wtest[t].in), &ngot, 0); + + for(nexpect = 0; wtest[t].expect[nexpect]; ++nexpect) + ; + if(nexpect == ngot) { + for(i = 0; i < ngot; ++i) + if(strcmp(wtest[t].expect[i], got[i])) + break; + right = i == ngot; + } else + right = 0; + if(!right) { + fprintf(stderr, "word split %zu failed\n", t); + fprintf(stderr, "input: %s\n", wtest[t].in); + fprintf(stderr, " | %-30s | %-30s\n", + "expected", "got"); + for(i = 0; i < nexpect || i < ngot; ++i) { + const char *e = i < nexpect ? wtest[t].expect[i] : ""; + const char *g = i < ngot ? got[i] : ""; + fprintf(stderr, " %2zu | %-30s | %-30s\n", i, e, g); + } + count_error(); + } + ++tests; + } } /** @brief Less-than comparison function for integer heap */ @@ -514,8 +576,10 @@ static void breaktest(const char *path, for(n = 0; n <= bn; ++n) { if(breakfn(buffer, bn, n) != break_allowed[n]) { fprintf(stderr, - "%s:%d: offset %zu: mismatch\n", - path, lineno, n); + "%s:%d: offset %zu: mismatch\n" + "%s\n" + "\n", + path, lineno, n, l); count_error(); } ++tests; @@ -531,7 +595,7 @@ static void test_unicode(void) { int lineno = 0; char *l, *lp; uint32_t buffer[1024]; - uint32_t *c[6], *NFD_c[6], *NFKD_c[6]; /* 1-indexed */ + uint32_t *c[6], *NFD_c[6], *NFKD_c[6], *NFC_c[6], *NFKC_c[6]; /* 1-indexed */ int cn, bn; fprintf(stderr, "test_unicode\n"); @@ -564,6 +628,8 @@ static void test_unicode(void) { for(cn = 1; cn <= 5; ++cn) { NFD_c[cn] = utf32_decompose_canon(c[cn], utf32_len(c[cn]), 0); NFKD_c[cn] = utf32_decompose_compat(c[cn], utf32_len(c[cn]), 0); + NFC_c[cn] = utf32_compose_canon(c[cn], utf32_len(c[cn]), 0); + NFKC_c[cn] = utf32_compose_compat(c[cn], utf32_len(c[cn]), 0); } #define unt_check(T, A, B) do { \ ++tests; \ @@ -571,9 +637,11 @@ static void test_unicode(void) { fprintf(stderr, \ "NormalizationTest.txt:%d: c%d != "#T"(c%d)\n", \ lineno, A, B); \ - fprintf(stderr, " c%d: %s\n", \ + fprintf(stderr, " c%d:%s\n", \ A, format_utf32(c[A])); \ - fprintf(stderr, "%4s(c%d): %s\n", \ + fprintf(stderr, " c%d:%s\n", \ + B, format_utf32(c[B])); \ + fprintf(stderr, "%4s(c%d):%s\n", \ #T, B, format_utf32(T##_c[B])); \ count_error(); \ } \ @@ -588,6 +656,16 @@ static void test_unicode(void) { unt_check(NFKD, 5, 3); unt_check(NFKD, 5, 4); unt_check(NFKD, 5, 5); + unt_check(NFC, 2, 1); + unt_check(NFC, 2, 2); + unt_check(NFC, 2, 3); + unt_check(NFC, 4, 4); + unt_check(NFC, 4, 5); + unt_check(NFKC, 4, 1); + unt_check(NFKC, 4, 2); + unt_check(NFKC, 4, 3); + unt_check(NFKC, 4, 4); + unt_check(NFKC, 4, 5); for(cn = 1; cn <= 5; ++cn) { xfree(NFD_c[cn]); xfree(NFKD_c[cn]); @@ -597,6 +675,46 @@ static void test_unicode(void) { fclose(fp); breaktest("auxiliary/GraphemeBreakTest.txt", utf32_is_grapheme_boundary); breaktest("auxiliary/WordBreakTest.txt", utf32_is_word_boundary); + insist(utf32_combining_class(0x40000) == 0); + insist(utf32_combining_class(0xE0000) == 0); +} + +static void test_signame(void) { + fprintf(stderr, "test_signame\n"); + insist(find_signal("SIGTERM") == SIGTERM); + insist(find_signal("SIGHUP") == SIGHUP); + insist(find_signal("SIGINT") == SIGINT); + insist(find_signal("SIGQUIT") == SIGQUIT); + insist(find_signal("SIGKILL") == SIGKILL); + insist(find_signal("SIGYOURMUM") == -1); +} + +static void test_cache(void) { + const struct cache_type t1 = { 1 }, t2 = { 10 }; + const char v11[] = "spong", v12[] = "wibble", v2[] = "blat"; + fprintf(stderr, "test_cache\n"); + cache_put(&t1, "1_1", v11); + cache_put(&t1, "1_2", v12); + cache_put(&t2, "2", v2); + insist(cache_count() == 3); + insist(cache_get(&t2, "2") == v2); + insist(cache_get(&t1, "1_1") == v11); + insist(cache_get(&t1, "1_2") == v12); + insist(cache_get(&t1, "2") == 0); + insist(cache_get(&t2, "1_1") == 0); + insist(cache_get(&t2, "1_2") == 0); + insist(cache_get(&t1, "2") == 0); + insist(cache_get(&t2, "1_1") == 0); + insist(cache_get(&t2, "1_2") == 0); + sleep(2); + cache_expire(); + insist(cache_count() == 1); + insist(cache_get(&t1, "1_1") == 0); + insist(cache_get(&t1, "1_2") == 0); + insist(cache_get(&t2, "2") == v2); + cache_clean(0); + insist(cache_count() == 0); + insist(cache_get(&t2, "2") == 0); } int main(void) { @@ -645,8 +763,12 @@ int main(void) { /* vector.c */ /* words.c */ test_casefold(); - /* XXX words() */ + test_words(); /* wstat.c */ + /* signame.c */ + test_signame(); + /* cache.c */ + test_cache(); fprintf(stderr, "%d errors out of %d tests\n", errors, tests); return !!errors; }