X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftsticonv.c;h=200c5b9f6dea1208b1bfa14af955caea8279ca42;hb=2cfddf92bc0688daa308a66f393ce7e2000f0762;hp=f31b6d659b8f99e55cea9785a7c0d318c77c2e3d;hpb=af3fd923edc18c8ba6a0b629632e4a11ea30e8eb;p=yaz-moved-to-github.git

diff --git a/test/tsticonv.c b/test/tsticonv.c
index f31b6d6..200c5b9 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-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tsticonv.c,v 1.35 2008-03-12 08:53:28 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -94,7 +92,7 @@ static int tst_convert_x(yaz_iconv_t cd, const char *buf, const char *cmpbuf,
 {
     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;
@@ -423,6 +421,9 @@ static void tst_marc8_to_utf8(void)
     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_iconv_close(cd);
 }
 
@@ -486,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)
@@ -694,7 +695,9 @@ 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_latin1_to_marc8();