X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftsticonv.c;h=843df377a6729f3fac2cee083e5a09dc74c6fd65;hb=3db79025b276f232a4ab672f1ba996a0ccc64608;hp=609a6b94cdcaab8abc802e17fbdfb5d42ddd9df9;hpb=6278560ff2c1d116cb6c06c7c145573d8d155a4f;p=yaz-moved-to-github.git diff --git a/test/tsticonv.c b/test/tsticonv.c index 609a6b9..843df37 100644 --- a/test/tsticonv.c +++ b/test/tsticonv.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: tsticonv.c,v 1.31 2007-09-22 18:56:22 adam Exp $ + * $Id: tsticonv.c,v 1.33 2007-11-16 08:01:47 adam Exp $ */ #if HAVE_CONFIG_H @@ -125,16 +125,16 @@ static int tst_convert(yaz_iconv_t cd, const char *buf, const char *cmpbuf) WRBUF w = wrbuf_alloc(); 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)); - yaz_log(YLOG_LOG, "expected %s", wrbuf_cstr(w)); + wrbuf_puts_escaped(w, cmpbuf); + yaz_log(YLOG_LOG, "exp %s", wrbuf_cstr(w)); wrbuf_destroy(w); } @@ -515,7 +515,15 @@ static void tst_utf8_to_marc8(void) "(\033p0\x1bs)")); - + /** bug #1778 */ + YAZ_CHECK(tst_convert(cd, + /* offset 0x530 in UTF-8 rec marccol4.u8.marc */ + "\xE3\x83\xB3" "\xE3\x82\xBF" + "\xCC\x84" "\xCC\x84" "\xE3\x83\xBC" /* UTF-8 */, + "\x1B\x24\x31" "\x69\x25\x73" + "\x1B\x28\x42" "\xE5\xE5" "\x1B\x24\x31" + "\x69\x25\x3F" + "\x69\x21\x3C" "\x1B\x28\x42")); { char *inbuf0 = "\xe2\x81\xb0";