X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/bcf9ed7f5b44c177d927d147f87c5c08e377adfa..71b90230c575ecd1d2f85f8fb22c7e875bca8d3a:/lib/test.c diff --git a/lib/test.c b/lib/test.c index 6249444..5aa9f57 100644 --- a/lib/test.c +++ b/lib/test.c @@ -30,6 +30,8 @@ #include #include #include +#include +#include #include "utf8.h" #include "mem.h" @@ -38,11 +40,16 @@ #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" +#include "filepart.h" +#include "hash.h" +#include "selection.h" +#include "syscalls.h" static int tests, errors; static int fail_first; @@ -88,12 +95,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; @@ -106,15 +109,31 @@ static const char *format_utf32(const uint32_t *s) { if(w == 0) { \ fprintf(stderr, "%s:%d: %s returned 0\n", \ __FILE__, __LINE__, #GOT); \ - count_error(); \ + count_error(); \ } else if(strcmp(w, g)) { \ fprintf(stderr, "%s:%d: %s returned:\n%s\nexpected:\n%s\n", \ __FILE__, __LINE__, #GOT, format(g), format(w)); \ - count_error(); \ + count_error(); \ } \ ++tests; \ } while(0) +#define check_string_prefix(GOT, WANT) do { \ + const char *g = GOT; \ + const char *w = WANT; \ + \ + if(w == 0) { \ + fprintf(stderr, "%s:%d: %s returned 0\n", \ + __FILE__, __LINE__, #GOT); \ + count_error(); \ + } else if(strncmp(w, g, strlen(w))) { \ + fprintf(stderr, "%s:%d: %s returned:\n%s\nexpected:\n%s...\n", \ + __FILE__, __LINE__, #GOT, format(g), format(w)); \ + count_error(); \ + } \ + ++tests; \ + } while(0) + static uint32_t *ucs4parse(const char *s) { struct dynstr_ucs4 d; char *e; @@ -139,15 +158,16 @@ static void test_utf8(void) { char *u8; \ \ insist(validutf8(CHARS)); \ - ucs = utf82ucs4(CHARS); \ + ucs = utf8_to_utf32(CHARS, strlen(CHARS), 0); \ insist(ucs != 0); \ - insist(!ucs4cmp(w, ucs)); \ - u8 = ucs42utf8(ucs); \ + insist(!utf32_cmp(w, ucs)); \ + u8 = utf32_to_utf8(ucs, utf32_len(ucs), 0); \ insist(u8 != 0); \ insist(!strcmp(u8, CHARS)); \ } while(0) fprintf(stderr, "test_utf8\n"); +#define validutf8(S) utf8_valid((S), strlen(S)) /* empty string */ @@ -218,6 +238,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")); @@ -392,8 +413,10 @@ static void test_casefold(void) { break; } if(l) { + uint32_t *d; /* Case-folded data is now normalized */ - canon_expected = ucs42utf8(utf32_decompose_canon(&l, 1, 0)); + d = utf32_decompose_canon(&l, 1, 0); + canon_expected = utf32_to_utf8(d, utf32_len(d), 0); if(strcmp(canon_folded, canon_expected)) { fprintf(stderr, "%s:%d: canon-casefolding %#lx got '%s', expected '%s'\n", __FILE__, __LINE__, (unsigned long)c, @@ -401,7 +424,8 @@ static void test_casefold(void) { count_error(); } ++tests; - compat_expected = ucs42utf8(utf32_decompose_compat(&l, 1, 0)); + d = utf32_decompose_compat(&l, 1, 0); + compat_expected = utf32_to_utf8(d, utf32_len(d), 0); if(strcmp(compat_folded, compat_expected)) { fprintf(stderr, "%s:%d: compat-casefolding %#lx got '%s', expected '%s'\n", __FILE__, __LINE__, (unsigned long)c, @@ -411,7 +435,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 */ @@ -467,7 +554,7 @@ static FILE *open_unicode_test(const char *path) { return fp; } -/** @brief Run breaking tests for utf32_is_gcb() etc */ +/** @brief Run breaking tests for utf32_grapheme_boundary() etc */ static void breaktest(const char *path, int (*breakfn)(const uint32_t *, size_t, size_t)) { FILE *fp = open_unicode_test(path); @@ -510,8 +597,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; @@ -527,7 +616,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"); @@ -560,6 +649,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; \ @@ -567,9 +658,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(); \ } \ @@ -584,6 +677,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]); @@ -591,8 +694,124 @@ static void test_unicode(void) { xfree(l); } fclose(fp); - breaktest("auxiliary/GraphemeBreakTest.txt", utf32_is_gcb); + 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); +} + +static void test_filepart(void) { + fprintf(stderr, "test_filepart\n"); + check_string(d_dirname("/"), "/"); + check_string(d_dirname("/spong"), "/"); + check_string(d_dirname("/foo/bar"), "/foo"); + check_string(d_dirname("./bar"), "."); + check_string(d_dirname("."), "."); + check_string(d_dirname(".."), "."); + check_string(d_dirname("../blat"), ".."); + check_string(d_dirname("wibble"), "."); + check_string(extension("foo.c"), ".c"); + check_string(extension(".c"), ".c"); + check_string(extension("."), "."); + check_string(extension("foo"), ""); + check_string(extension("./foo"), ""); + check_string(extension("./foo.c"), ".c"); +} + +static void test_selection(void) { + hash *h; + fprintf(stderr, "test_selection\n"); + insist((h = selection_new()) != 0); + selection_set(h, "one", 1); + selection_set(h, "two", 1); + selection_set(h, "three", 0); + selection_set(h, "four", 1); + insist(selection_selected(h, "one") == 1); + insist(selection_selected(h, "two") == 1); + insist(selection_selected(h, "three") == 0); + insist(selection_selected(h, "four") == 1); + insist(selection_selected(h, "five") == 0); + insist(hash_count(h) == 3); + selection_flip(h, "one"); + selection_flip(h, "three"); + insist(selection_selected(h, "one") == 0); + insist(selection_selected(h, "three") == 1); + insist(hash_count(h) == 3); + selection_live(h, "one"); + selection_live(h, "two"); + selection_live(h, "three"); + selection_cleanup(h); + insist(selection_selected(h, "one") == 0); + insist(selection_selected(h, "two") == 1); + insist(selection_selected(h, "three") == 1); + insist(selection_selected(h, "four") == 0); + insist(selection_selected(h, "five") == 0); + insist(hash_count(h) == 2); + selection_empty(h); + insist(selection_selected(h, "one") == 0); + insist(selection_selected(h, "two") == 0); + insist(selection_selected(h, "three") == 0); + insist(selection_selected(h, "four") == 0); + insist(selection_selected(h, "five") == 0); + insist(hash_count(h) == 0); +} + +static void test_wstat(void) { + pid_t pid; + int w; + + fprintf(stderr, "test_wstat\n"); + if(!(pid = xfork())) { + _exit(1); + } + while(waitpid(pid, &w, 0) < 0 && errno == EINTR) + ; + check_string(wstat(w), "exited with status 1"); + if(!(pid = xfork())) { + kill(getpid(), SIGTERM); + _exit(-1); + } + while(waitpid(pid, &w, 0) < 0 && errno == EINTR) + ; + check_string_prefix(wstat(w), "terminated by signal 15"); } int main(void) { @@ -614,6 +833,8 @@ int main(void) { /* client.c */ /* configuration.c */ /* event.c */ + /* filepart.c */ + test_filepart(); /* fprintf.c */ /* heap.c */ test_heap(); @@ -641,8 +862,15 @@ int main(void) { /* vector.c */ /* words.c */ test_casefold(); - /* XXX words() */ + test_words(); /* wstat.c */ + test_wstat(); + /* signame.c */ + test_signame(); + /* cache.c */ + test_cache(); + /* selection.c */ + test_selection(); fprintf(stderr, "%d errors out of %d tests\n", errors, tests); return !!errors; }