X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/9f28e855aad11d25c0a69a7e59825c07bdefcafe..0c740e5956fc1f9d7b714d4a621819f1c96c7254:/lib/test.c diff --git a/lib/test.c b/lib/test.c index e77d994..e55545a 100644 --- a/lib/test.c +++ b/lib/test.c @@ -31,6 +31,9 @@ #include #include #include +#include +#include +#include #include "utf8.h" #include "mem.h" @@ -45,6 +48,13 @@ #include "wstat.h" #include "signame.h" #include "cache.h" +#include "filepart.h" +#include "hash.h" +#include "selection.h" +#include "syscalls.h" +#include "kvp.h" +#include "sink.h" +#include "printf.h" static int tests, errors; static int fail_first; @@ -97,22 +107,48 @@ static const char *format_utf32(const uint32_t *s) { return d.vec; } -#define check_string(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(strcmp(w, g)) { \ - fprintf(stderr, "%s:%d: %s returned:\n%s\nexpected:\n%s\n", \ - __FILE__, __LINE__, #GOT, format(g), format(w)); \ - count_error(); \ - } \ - ++tests; \ +#define check_string(GOT, WANT) do { \ + const char *got = GOT; \ + const char *want = WANT; \ + \ + if(want == 0) { \ + fprintf(stderr, "%s:%d: %s returned 0\n", \ + __FILE__, __LINE__, #GOT); \ + count_error(); \ + } else if(strcmp(want, got)) { \ + fprintf(stderr, "%s:%d: %s returned:\n%s\nexpected:\n%s\n", \ + __FILE__, __LINE__, #GOT, format(got), format(want)); \ + count_error(); \ + } \ + ++tests; \ } while(0) +#define check_string_prefix(GOT, WANT) do { \ + const char *got = GOT; \ + const char *want = WANT; \ + \ + if(want == 0) { \ + fprintf(stderr, "%s:%d: %s returned 0\n", \ + __FILE__, __LINE__, #GOT); \ + count_error(); \ + } else if(strncmp(want, got, strlen(want))) { \ + fprintf(stderr, "%s:%d: %s returned:\n%s\nexpected:\n%s...\n", \ + __FILE__, __LINE__, #GOT, format(got), format(want)); \ + count_error(); \ + } \ + ++tests; \ + } while(0) + +#define check_integer(GOT, WANT) do { \ + const intmax_t got = GOT, want = WANT; \ + if(got != want) { \ + fprintf(stderr, "%s:%d: %s returned: %jd expected: %jd\n", \ + __FILE__, __LINE__, #GOT, got, want); \ + count_error(); \ + } \ + ++tests; \ +} while(0) + static uint32_t *ucs4parse(const char *s) { struct dynstr_ucs4 d; char *e; @@ -142,7 +178,7 @@ static void test_utf8(void) { insist(!utf32_cmp(w, ucs)); \ u8 = utf32_to_utf8(ucs, utf32_len(ucs), 0); \ insist(u8 != 0); \ - insist(!strcmp(u8, CHARS)); \ + check_string(u8, CHARS); \ } while(0) fprintf(stderr, "test_utf8\n"); @@ -217,6 +253,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")); @@ -242,38 +279,163 @@ static void test_utf8(void) { insist(!validutf8("\xF8")); } +static int test_multipart_callback(const char *s, void *u) { + struct vector *parts = u; + + vector_append(parts, (char *)s); + return 0; +} + static void test_mime(void) { char *t, *n, *v; + struct vector parts[1]; fprintf(stderr, "test_mime\n"); t = n = v = 0; insist(!mime_content_type("text/plain", &t, &n, &v)); - insist(!strcmp(t, "text/plain")); + check_string(t, "text/plain"); insist(n == 0); insist(v == 0); + insist(mime_content_type("TEXT ((broken) comment", &t, &n, &v) < 0); + insist(mime_content_type("TEXT ((broken) comment\\", &t, &n, &v) < 0); + t = n = v = 0; - insist(!mime_content_type("TEXT ((nested) comment) /plain", &t, &n, &v)); - insist(!strcmp(t, "text/plain")); + insist(!mime_content_type("TEXT ((nested)\\ comment) /plain", &t, &n, &v)); + check_string(t, "text/plain"); insist(n == 0); insist(v == 0); t = n = v = 0; - insist(!mime_content_type(" text/plain ; Charset=utf-8", &t, &n, &v)); - insist(!strcmp(t, "text/plain")); - insist(!strcmp(n, "charset")); - insist(!strcmp(v, "utf-8")); + insist(!mime_content_type(" text/plain ; Charset=\"utf-\\8\"", &t, &n, &v)); + check_string(t, "text/plain"); + check_string(n, "charset"); + check_string(v, "utf-8"); t = n = v = 0; insist(!mime_content_type("text/plain;charset = ISO-8859-1 ", &t, &n, &v)); - insist(!strcmp(t, "text/plain")); - insist(!strcmp(n, "charset")); - insist(!strcmp(v, "ISO-8859-1")); + check_string(t, "text/plain"); + check_string(n, "charset"); + check_string(v, "ISO-8859-1"); + + t = n = v = 0; + insist(!mime_rfc2388_content_disposition("form-data; name=\"field1\"", &t, &n, &v)); + check_string(t, "form-data"); + check_string(n, "name"); + check_string(v, "field1"); + insist(!mime_rfc2388_content_disposition("inline", &t, &n, &v)); + check_string(t, "inline"); + insist(n == 0); + insist(v == 0); + + /* Current versions of the code only understand a single arg to these + * headers. This is a bug at the level they work at but suffices for + * DisOrder's current purposes. */ + + insist(!mime_rfc2388_content_disposition( + "attachment; filename=genome.jpeg;\n" + "modification-date=\"Wed, 12 Feb 1997 16:29:51 -0500\"", + &t, &n, &v)); + check_string(t, "attachment"); + check_string(n, "filename"); + check_string(v, "genome.jpeg"); + + vector_init(parts); + insist(mime_multipart("--outer\r\n" + "Content-Type: text/plain\r\n" + "Content-Disposition: inline\r\n" + "Content-Description: text-part-1\r\n" + "\r\n" + "Some text goes here\r\n" + "\r\n" + "--outer\r\n" + "Content-Type: multipart/mixed; boundary=inner\r\n" + "Content-Disposition: attachment\r\n" + "Content-Description: multipart-2\r\n" + "\r\n" + "--inner\r\n" + "Content-Type: text/plain\r\n" + "Content-Disposition: inline\r\n" + "Content-Description: text-part-2\r\n" + "\r\n" + "Some more text here.\r\n" + "\r\n" + "--inner\r\n" + "Content-Type: image/jpeg\r\n" + "Content-Disposition: attachment\r\n" + "Content-Description: jpeg-1\r\n" + "\r\n" + "\r\n" + "--inner--\r\n" + "--outer--\r\n", + test_multipart_callback, + "outer", + parts) == 0); + check_integer(parts->nvec, 2); + check_string(parts->vec[0], + "Content-Type: text/plain\r\n" + "Content-Disposition: inline\r\n" + "Content-Description: text-part-1\r\n" + "\r\n" + "Some text goes here\r\n"); + check_string(parts->vec[1], + "Content-Type: multipart/mixed; boundary=inner\r\n" + "Content-Disposition: attachment\r\n" + "Content-Description: multipart-2\r\n" + "\r\n" + "--inner\r\n" + "Content-Type: text/plain\r\n" + "Content-Disposition: inline\r\n" + "Content-Description: text-part-2\r\n" + "\r\n" + "Some more text here.\r\n" + "\r\n" + "--inner\r\n" + "Content-Type: image/jpeg\r\n" + "Content-Disposition: attachment\r\n" + "Content-Description: jpeg-1\r\n" + "\r\n" + "\r\n" + "--inner--"); + /* No trailing CRLF is _correct_ - see RFC2046 5.1.1 note regarding CRLF + * preceding the boundary delimiter line. An implication of this is that we + * must cope with partial lines at the end of the input when recursively + * decomposing a multipart message. */ + vector_init(parts); + insist(mime_multipart("--inner\r\n" + "Content-Type: text/plain\r\n" + "Content-Disposition: inline\r\n" + "Content-Description: text-part-2\r\n" + "\r\n" + "Some more text here.\r\n" + "\r\n" + "--inner\r\n" + "Content-Type: image/jpeg\r\n" + "Content-Disposition: attachment\r\n" + "Content-Description: jpeg-1\r\n" + "\r\n" + "\r\n" + "--inner--", + test_multipart_callback, + "inner", + parts) == 0); + check_integer(parts->nvec, 2); + check_string(parts->vec[0], + "Content-Type: text/plain\r\n" + "Content-Disposition: inline\r\n" + "Content-Description: text-part-2\r\n" + "\r\n" + "Some more text here.\r\n"); + check_string(parts->vec[1], + "Content-Type: image/jpeg\r\n" + "Content-Disposition: attachment\r\n" + "Content-Description: jpeg-1\r\n" + "\r\n" + ""); + /* XXX mime_parse */ - /* XXX mime_multipart */ - /* XXX mime_rfc2388_content_disposition */ check_string(mime_qp(""), ""); check_string(mime_qp("foobar"), "foobar"); @@ -385,8 +547,8 @@ static void test_casefold(void) { l = 0x3BC; /* GREEK SMALL LETTER MU */ break; case 0xDF: /* LATIN SMALL LETTER SHARP S */ - insist(!strcmp(canon_folded, "ss")); - insist(!strcmp(compat_folded, "ss")); + check_string(canon_folded, "ss"); + check_string(compat_folded, "ss"); l = 0; break; } @@ -674,6 +836,8 @@ 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) { @@ -714,6 +878,250 @@ static void test_cache(void) { 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"); +} + +static void test_kvp(void) { + struct kvp *k; + size_t n; + + fprintf(stderr, "test_kvp\n"); + /* decoding */ +#define KVP_URLDECODE(S) kvp_urldecode((S), strlen(S)) + insist(KVP_URLDECODE("=%zz") == 0); + insist(KVP_URLDECODE("=%0") == 0); + insist(KVP_URLDECODE("=%0z") == 0); + insist(KVP_URLDECODE("=%%") == 0); + insist(KVP_URLDECODE("==%") == 0); + insist(KVP_URLDECODE("wibble") == 0); + insist(KVP_URLDECODE("") == 0); + insist(KVP_URLDECODE("wibble&") == 0); + insist((k = KVP_URLDECODE("one=bl%61t+foo")) != 0); + check_string(kvp_get(k, "one"), "blat foo"); + insist(kvp_get(k, "ONE") == 0); + insist(k->next == 0); + insist((k = KVP_URLDECODE("wibble=splat&bar=spong")) != 0); + check_string(kvp_get(k, "wibble"), "splat"); + check_string(kvp_get(k, "bar"), "spong"); + insist(kvp_get(k, "ONE") == 0); + insist(k->next->next == 0); + /* encoding */ + insist(kvp_set(&k, "bar", "spong") == 0); + insist(kvp_set(&k, "bar", "foo") == 1); + insist(kvp_set(&k, "zog", "%") == 1); + insist(kvp_set(&k, "wibble", 0) == 1); + insist(kvp_set(&k, "wibble", 0) == 0); + check_string(kvp_urlencode(k, 0), + "bar=foo&zog=%25"); + check_string(kvp_urlencode(k, &n), + "bar=foo&zog=%25"); + insist(n == strlen("bar=foo&zog=%25")); + check_string(urlencodestring("abc% +\n"), + "abc%25%20%2b%0a"); +} + +static void test_sink(void) { + struct sink *s; + struct dynstr d[1]; + FILE *fp; + char *l; + + fprintf(stderr, "test_sink\n"); + + fp = tmpfile(); + assert(fp != 0); + s = sink_stdio("tmpfile", fp); + insist(sink_printf(s, "test: %d\n", 999) == 10); + insist(sink_printf(s, "wibble: %s\n", "foobar") == 15); + rewind(fp); + insist(inputline("tmpfile", fp, &l, '\n') == 0); + check_string(l, "test: 999"); + insist(inputline("tmpfile", fp, &l, '\n') == 0); + check_string(l, "wibble: foobar"); + insist(inputline("tmpfile", fp, &l, '\n') == -1); + + dynstr_init(d); + s = sink_dynstr(d); + insist(sink_printf(s, "test: %d\n", 999) == 10); + insist(sink_printf(s, "wibble: %s\n", "foobar") == 15); + dynstr_terminate(d); + check_string(d->vec, "test: 999\nwibble: foobar\n"); +} + +static const char *do_printf(const char *fmt, ...) { + va_list ap; + char *s; + int rc; + + va_start(ap, fmt); + rc = byte_vasprintf(&s, fmt, ap); + va_end(ap); + if(rc < 0) + return 0; + return s; +} + +static void test_printf(void) { + char c; + short s; + int i; + long l; + long long ll; + intmax_t m; + ssize_t ssz; + ptrdiff_t p; + + fprintf(stderr, "test_printf\n"); + check_string(do_printf("%d", 999), "999"); + check_string(do_printf("%d", -999), "-999"); + check_string(do_printf("%i", 999), "999"); + check_string(do_printf("%i", -999), "-999"); + check_string(do_printf("%u", 999), "999"); + check_string(do_printf("%2u", 999), "999"); + check_string(do_printf("%10u", 999), " 999"); + check_string(do_printf("%-10u", 999), "999 "); + check_string(do_printf("%010u", 999), "0000000999"); + check_string(do_printf("%-10d", -999), "-999 "); + check_string(do_printf("%-010d", -999), "-999 "); /* "-" beats "0" */ + check_string(do_printf("%66u", 999), " 999"); + check_string(do_printf("%o", 999), "1747"); + check_string(do_printf("%#o", 999), "01747"); + check_string(do_printf("%#o", 0), "0"); + check_string(do_printf("%x", 999), "3e7"); + check_string(do_printf("%#x", 999), "0x3e7"); + check_string(do_printf("%#X", 999), "0X3E7"); + check_string(do_printf("%#x", 0), "0"); + check_string(do_printf("%hd", (short)999), "999"); + check_string(do_printf("%hhd", (short)99), "99"); + check_string(do_printf("%ld", 100000L), "100000"); + check_string(do_printf("%lld", 10000000000LL), "10000000000"); + check_string(do_printf("%qd", 10000000000LL), "10000000000"); + check_string(do_printf("%jd", (intmax_t)10000000000LL), "10000000000"); + check_string(do_printf("%zd", (ssize_t)2000000000), "2000000000"); + check_string(do_printf("%td", (ptrdiff_t)2000000000), "2000000000"); + check_string(do_printf("%hu", (short)999), "999"); + check_string(do_printf("%hhu", (short)99), "99"); + check_string(do_printf("%lu", 100000L), "100000"); + check_string(do_printf("%llu", 10000000000LL), "10000000000"); + check_string(do_printf("%ju", (uintmax_t)10000000000LL), "10000000000"); + check_string(do_printf("%zu", (size_t)2000000000), "2000000000"); + check_string(do_printf("%tu", (ptrdiff_t)2000000000), "2000000000"); + check_string(do_printf("%p", (void *)0x100), "0x100"); + check_string(do_printf("%s", "wibble"), "wibble"); + check_string(do_printf("%s-%s", "wibble", "wobble"), "wibble-wobble"); + check_string(do_printf("%10s", "wibble"), " wibble"); + check_string(do_printf("%010s", "wibble"), " wibble"); /* 0 ignored for %s */ + check_string(do_printf("%-10s", "wibble"), "wibble "); + check_string(do_printf("%2s", "wibble"), "wibble"); + check_string(do_printf("%.2s", "wibble"), "wi"); + check_string(do_printf("%.2s", "w"), "w"); + check_string(do_printf("%4.2s", "wibble"), " wi"); + check_string(do_printf("%c", 'a'), "a"); + check_string(do_printf("%4c", 'a'), " a"); + check_string(do_printf("%-4c", 'a'), "a "); + check_string(do_printf("%*c", 0, 'a'), "a"); + check_string(do_printf("x%hhny", &c), "xy"); + insist(c == 1); + check_string(do_printf("xx%hnyy", &s), "xxyy"); + insist(s == 2); + check_string(do_printf("xxx%nyyy", &i), "xxxyyy"); + insist(i == 3); + check_string(do_printf("xxxx%lnyyyy", &l), "xxxxyyyy"); + insist(l == 4); + check_string(do_printf("xxxxx%llnyyyyy", &ll), "xxxxxyyyyy"); + insist(ll == 5); + check_string(do_printf("xxxxxx%jnyyyyyy", &m), "xxxxxxyyyyyy"); + insist(m == 6); + check_string(do_printf("xxxxxxx%znyyyyyyy", &ssz), "xxxxxxxyyyyyyy"); + insist(ssz == 7); + check_string(do_printf("xxxxxxxx%tnyyyyyyyy", &p), "xxxxxxxxyyyyyyyy"); + insist(p == 8); + check_string(do_printf("%*d", 5, 99), " 99"); + check_string(do_printf("%*d", -5, 99), "99 "); + check_string(do_printf("%.*d", 5, 99), "00099"); + check_string(do_printf("%.*d", -5, 99), "99"); + check_string(do_printf("%.0d", 0), ""); + check_string(do_printf("%.d", 0), ""); + check_string(do_printf("%.d", 0), ""); + check_string(do_printf("%%"), "%"); + check_string(do_printf("wibble"), "wibble"); + insist(do_printf("%") == 0); + insist(do_printf("%=") == 0); +} + int main(void) { fail_first = !!getenv("FAIL_FIRST"); insist('\n' == 0x0A); @@ -733,6 +1141,8 @@ int main(void) { /* client.c */ /* configuration.c */ /* event.c */ + /* filepart.c */ + test_filepart(); /* fprintf.c */ /* heap.c */ test_heap(); @@ -740,6 +1150,7 @@ int main(void) { test_hex(); /* inputline.c */ /* kvp.c */ + test_kvp(); /* log.c */ /* mem.c */ /* mime.c */ @@ -747,8 +1158,10 @@ int main(void) { /* mixer.c */ /* plugin.c */ /* printf.c */ + test_printf(); /* queue.c */ /* sink.c */ + test_sink(); /* snprintf.c */ /* split.c */ /* syscalls.c */ @@ -762,10 +1175,13 @@ int main(void) { test_casefold(); 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; }