X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/22f6160352ba22bd2e759dba6a91c311e0641fc7..3d853cec0b8148a64a2adbee19cf7a38270aa075:/lib/test.c?ds=sidebyside diff --git a/lib/test.c b/lib/test.c index 07d09a7..e55545a 100644 --- a/lib/test.c +++ b/lib/test.c @@ -32,6 +32,8 @@ #include #include #include +#include +#include #include "utf8.h" #include "mem.h" @@ -51,6 +53,8 @@ #include "selection.h" #include "syscalls.h" #include "kvp.h" +#include "sink.h" +#include "printf.h" static int tests, errors; static int fail_first; @@ -103,38 +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 *g = GOT; \ - const char *w = WANT; \ + const char *got = GOT; \ + const char *want = WANT; \ \ - if(w == 0) { \ + if(want == 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(); \ + 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; @@ -164,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"); @@ -265,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"); @@ -408,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; } @@ -817,8 +956,10 @@ static void test_wstat(void) { 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); @@ -837,7 +978,148 @@ static void test_kvp(void) { check_string(kvp_get(k, "bar"), "spong"); insist(kvp_get(k, "ONE") == 0); insist(k->next->next == 0); - /* TODO test encoding too */ + /* 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) { @@ -876,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 */