X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftsticonv.c;h=352033a9e95651fe7c7f77fee1a712d613b879f2;hp=f1883b96cc0a8c532d2d6c5ab8504888740dad9f;hb=f03f934986cd3ff1fbb98f8b1432d70c46f6809e;hpb=02ba601656652e2362aee6fd23d1b2ac5c35bcca diff --git a/test/tsticonv.c b/test/tsticonv.c index f1883b9..352033a 100644 --- a/test/tsticonv.c +++ b/test/tsticonv.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. - * - * $Id: tsticonv.c,v 1.32 2007-10-15 20:45:05 adam Exp $ */ #if HAVE_CONFIG_H @@ -17,6 +15,8 @@ #include #include +#define ESC "\x1b" + static int compare_buffers(char *msg, int no, int expect_len, const char *expect_buf, int got_len, const char *got_buf) @@ -87,15 +87,16 @@ static int tst_convert_l(yaz_iconv_t cd, size_t in_len, const char *in_buf, outbuf - outbuf0, outbuf0); } -static int tst_convert(yaz_iconv_t cd, const char *buf, const char *cmpbuf) +static int tst_convert_x(yaz_iconv_t cd, const char *buf, const char *cmpbuf, + int expect_error) { - int ret = 0; + int ret = 1; WRBUF b = wrbuf_alloc(); - char outbuf[12]; + char outbuf[16]; size_t inbytesleft = strlen(buf); const char *inp = buf; int rounds = 0; - for (rounds = 0; inbytesleft && rounds < sizeof(outbuf); rounds++) + for (rounds = 0; inbytesleft && rounds < (int) sizeof(outbuf); rounds++) { size_t outbytesleft = sizeof(outbuf); char *outp = outbuf; @@ -106,7 +107,12 @@ static int tst_convert(yaz_iconv_t cd, const char *buf, const char *cmpbuf) { int e = yaz_iconv_error(cd); if (e != YAZ_ICONV_E2BIG) + { + if (expect_error != -1) + if (e != expect_error) + ret = 0; break; + } } else { @@ -114,26 +120,30 @@ static int tst_convert(yaz_iconv_t cd, const char *buf, const char *cmpbuf) char *outp = outbuf; r = yaz_iconv(cd, 0, 0, &outp, &outbytesleft); wrbuf_write(b, outbuf, outp - outbuf); + if (expect_error != -1) + if (expect_error) + ret = 0; break; } } if (wrbuf_len(b) == strlen(cmpbuf) && !memcmp(cmpbuf, wrbuf_buf(b), wrbuf_len(b))) - ret = 1; + ; else { WRBUF w = wrbuf_alloc(); + ret = 0; wrbuf_rewind(w); - wrbuf_verbose_str(w, buf, strlen(buf)); + wrbuf_puts_escaped(w, buf); yaz_log(YLOG_LOG, "input %s", wrbuf_cstr(w)); wrbuf_rewind(w); - wrbuf_verbose_str(w, wrbuf_buf(b), wrbuf_len(b)); + wrbuf_write_escaped(w, wrbuf_buf(b), wrbuf_len(b)); yaz_log(YLOG_LOG, "got %s", wrbuf_cstr(w)); wrbuf_rewind(w); - wrbuf_verbose_str(w, cmpbuf, strlen(cmpbuf)); + wrbuf_puts_escaped(w, cmpbuf); yaz_log(YLOG_LOG, "exp %s", wrbuf_cstr(w)); wrbuf_destroy(w); @@ -143,6 +153,10 @@ static int tst_convert(yaz_iconv_t cd, const char *buf, const char *cmpbuf) return ret; } +static int tst_convert(yaz_iconv_t cd, const char *buf, const char *cmpbuf) +{ + return tst_convert_x(cd, buf, cmpbuf, 0); +} /* some test strings in ISO-8859-1 format */ static const char *iso_8859_1_a[] = { @@ -392,10 +406,24 @@ static void tst_marc8_to_utf8(void) YAZ_CHECK(tst_convert(cd, "Cours de mathâe", "Cours de mathe\xcc\x81")); + YAZ_CHECK(tst_convert(cd, "\xea" "a", "a\xcc\x8a")); + YAZ_CHECK(tst_convert(cd, "a" "\xea" "\x1e", "a" "\x1e\xcc\x8a")); + YAZ_CHECK(tst_convert(cd, "a" "\xea" "p", "a" "p\xcc\x8a")); + + YAZ_CHECK(tst_convert_x(cd, "a\xea", "a", YAZ_ICONV_EINVAL)); + YAZ_CHECK(tst_convert(cd, "p", "\xcc\x8a")); /* note: missing p */ + yaz_iconv(cd, 0, 0, 0, 0); /* incomplete. so we have to reset */ - YAZ_CHECK(tst_convert(cd, "a\xea\x1e", "a\x1e\xcc\x8a")); + /* bug #2115 */ + YAZ_CHECK(tst_convert(cd, ESC "(N" ESC ")Qp" ESC "(B", "\xd0\x9f")); + + YAZ_CHECK(tst_convert_x(cd, ESC , "", YAZ_ICONV_EINVAL)); + YAZ_CHECK(tst_convert_x(cd, ESC "(", "", YAZ_ICONV_EINVAL)); + YAZ_CHECK(tst_convert_x(cd, ESC "(B", "", 0)); + + YAZ_CHECK(tst_convert(cd, ESC "(B" "\x31", "1")); /* ASCII in G0 */ + YAZ_CHECK(tst_convert(cd, ESC ")B" "\xB1", "1")); /* ASCII in G1 */ - YAZ_CHECK(tst_convert(cd, "a\xea", "a")); yaz_iconv_close(cd); } @@ -459,9 +487,9 @@ static void tst_marc8_to_latin1(void) yaz_iconv_close(cd); } -static void tst_utf8_to_marc8(void) +static void tst_utf8_to_marc8(const char *marc8_type) { - yaz_iconv_t cd = yaz_iconv_open("MARC8", "UTF-8"); + yaz_iconv_t cd = yaz_iconv_open(marc8_type, "UTF-8"); YAZ_CHECK(cd); if (!cd) @@ -524,6 +552,18 @@ static void tst_utf8_to_marc8(void) "\x1B\x28\x42" "\xE5\xE5" "\x1B\x24\x31" "\x69\x25\x3F" "\x69\x21\x3C" "\x1B\x28\x42")); + + + /** bug #2120 */ + YAZ_CHECK(tst_convert(cd, + "\xCE\x94\xCE\xB5\xCF\x84" + "\xCE\xBF\xCF\x81\xCE\xB1" + "\xCE\xBA\xCE\xB7\xCF\x82\x2C", + + "\x1B\x28\x53\x45\x66\x78\x72\x75" + "\x61\x6D\x6A\x77" + "\x1B\x28\x42\x2C" + )); { char *inbuf0 = "\xe2\x81\xb0"; @@ -560,6 +600,7 @@ static void tst_utf8_to_marc8(void) #endif YAZ_CHECK(strcmp("\033p0\x1bs", outbuf0) == 0); } + yaz_iconv(cd, 0, 0, 0, 0); yaz_iconv_close(cd); } @@ -640,6 +681,27 @@ static void tst_utf8_codes(void) YAZ_CHECK(utf8_check(100000000)); } +static void tst_danmarc_to_latin1(void) +{ + yaz_iconv_t cd = yaz_iconv_open("iso-8859-1", "danmarc"); + + YAZ_CHECK(cd); + if (!cd) + return; + + YAZ_CHECK(tst_convert(cd, "ax", "ax")); + + YAZ_CHECK(tst_convert(cd, "a@@b", "a@b")); + YAZ_CHECK(tst_convert(cd, "a@@@@b", "a@@b")); + YAZ_CHECK(tst_convert(cd, "@000ab", "\nb")); + + YAZ_CHECK(tst_convert(cd, "@\xe5", "aa")); + YAZ_CHECK(tst_convert(cd, "@\xc5.", "Aa.")); + + yaz_iconv_close(cd); +} + + int main (int argc, char **argv) { YAZ_CHECK_INIT(argc, argv); @@ -655,7 +717,11 @@ int main (int argc, char **argv) tst_advance_to_utf8(); tst_utf8_to_advance(); - tst_utf8_to_marc8(); + tst_utf8_to_marc8("marc8"); + tst_utf8_to_marc8("marc8lossy"); + tst_utf8_to_marc8("marc8lossless"); + + tst_danmarc_to_latin1(); tst_latin1_to_marc8(); @@ -673,7 +739,9 @@ int main (int argc, char **argv) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +