#include "charset.h"
#include "mime.h"
#include "hex.h"
-#include "words.h"
#include "heap.h"
#include "unicode.h"
#include "inputline.h"
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;
"\x04\x10\x41" "\x04\x10");
}
+static void test_cookies(void) {
+ struct cookiedata cd[1];
+
+ fprintf(stderr, "test_cookies\n");
+
+ /* These are the examples from RFC2109 */
+ insist(!parse_cookie("$Version=\"1\"; Customer=\"WILE_E_COYOTE\"; $Path=\"/acme\"", cd));
+ insist(!strcmp(cd->version, "1"));
+ insist(cd->ncookies = 1);
+ insist(find_cookie(cd, "Customer") == &cd->cookies[0]);
+ check_string(cd->cookies[0].value, "WILE_E_COYOTE");
+ check_string(cd->cookies[0].path, "/acme");
+ insist(cd->cookies[0].domain == 0);
+ insist(!parse_cookie("$Version=\"1\";\n"
+ "Customer=\"WILE_E_COYOTE\"; $Path=\"/acme\";\n"
+ "Part_Number=\"Rocket_Launcher_0001\"; $Path=\"/acme\"",
+ cd));
+ insist(cd->ncookies = 2);
+ insist(find_cookie(cd, "Customer") == &cd->cookies[0]);
+ insist(find_cookie(cd, "Part_Number") == &cd->cookies[1]);
+ check_string(cd->cookies[0].value, "WILE_E_COYOTE");
+ check_string(cd->cookies[0].path, "/acme");
+ insist(cd->cookies[0].domain == 0);
+ check_string(cd->cookies[1].value, "Rocket_Launcher_0001");
+ check_string(cd->cookies[1].path, "/acme");
+ insist(cd->cookies[1].domain == 0);
+ insist(!parse_cookie("$Version=\"1\";\n"
+ "Customer=\"WILE_E_COYOTE\"; $Path=\"/acme\";\n"
+ "Part_Number=\"Rocket_Launcher_0001\"; $Path=\"/acme\";\n"
+ "Shipping=\"FedEx\"; $Path=\"/acme\"",
+ cd));
+ insist(cd->ncookies = 3);
+ insist(find_cookie(cd, "Customer") == &cd->cookies[0]);
+ insist(find_cookie(cd, "Part_Number") == &cd->cookies[1]);
+ insist(find_cookie(cd, "Shipping") == &cd->cookies[2]);
+ check_string(cd->cookies[0].value, "WILE_E_COYOTE");
+ check_string(cd->cookies[0].path, "/acme");
+ insist(cd->cookies[0].domain == 0);
+ check_string(cd->cookies[1].value, "Rocket_Launcher_0001");
+ check_string(cd->cookies[1].path, "/acme");
+ insist(cd->cookies[1].domain == 0);
+ check_string(cd->cookies[2].value, "FedEx");
+ check_string(cd->cookies[2].path, "/acme");
+ insist(cd->cookies[2].domain == 0);
+}
+
static void test_hex(void) {
unsigned n;
static const unsigned char h[] = { 0x00, 0xFF, 0x80, 0x7F };
++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] : "<none>";
+ const char *g = i < ngot ? got[i] : "<none>";
+ fprintf(stderr, " %2zu | %-30s | %-30s\n", i, e, g);
+ }
+ count_error();
+ }
+ ++tests;
+ }
}
/** @brief Less-than comparison function for integer heap */
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");
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; \
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(); \
} \
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]);
/* mem.c */
/* mime.c */
test_mime();
+ test_cookies();
/* mixer.c */
/* plugin.c */
/* printf.c */
/* vector.c */
/* words.c */
test_casefold();
+ test_words();
/* XXX words() */
/* wstat.c */
fprintf(stderr, "%d errors out of %d tests\n", errors, tests);
~mdw / disorder / blobdiff