X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftsticonv.c;h=37d3bbff0ab664cf779f908ffc4ed78ed91df729;hb=401da56d4a26f687cd42024bdef6f29a29bb7663;hp=43455ad5ea6295e1ac33551bc563262f1cd64e89;hpb=19c0b332044f06ee33eaf66ca92675d9cda8d1b9;p=yaz-moved-to-github.git

diff --git a/test/tsticonv.c b/test/tsticonv.c
index 43455ad..37d3bbf 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.25 2007-03-09 08:39:38 adam Exp $
+ * $Id: tsticonv.c,v 1.28 2007-03-19 14:40:07 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -110,7 +110,7 @@ static int tst_convert(yaz_iconv_t cd, const char *buf, const char *cmpbuf)
         ret = 1;
     else
         yaz_log(YLOG_LOG, "GOT (%.*s)", wrbuf_len(b), wrbuf_buf(b));
-    wrbuf_free(b, 1);
+    wrbuf_destroy(b);
     return ret;
 }
 
@@ -470,9 +470,67 @@ static void tst_utf8_to_marc8(void)
                           "(\033p0\x1bs)"));
     
  
+    {
+        char *inbuf0 = "\xe2\x81\xb0";
+        char *inbuf = inbuf0;
+        size_t inbytesleft = strlen(inbuf);
+        char outbuf0[64];
+        char *outbuf = outbuf0;
+        size_t outbytesleft = sizeof(outbuf0)-1;
+        size_t r;
+#if 0
+        int i;
+#endif
+        r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+        YAZ_CHECK(r != (size_t) (-1));
+
+#if 0
+        *outbuf = '\0';  /* so we know when to stop printing */
+        for (i = 0; outbuf0[i]; i++)
+        {
+            int ch = outbuf0[i] & 0xff;
+            yaz_log(YLOG_LOG, "ch%d %02X %c", i, ch, ch >= ' ' ? ch : '?');
+        }
+#endif
+
+        r = yaz_iconv(cd, 0, 0, &outbuf, &outbytesleft);
+        YAZ_CHECK(r != (size_t) (-1));
+        *outbuf = '\0';  /* for strcmp test below and printing */
+#if 0
+        for (i = 0; outbuf0[i]; i++)
+        {
+            int ch = outbuf0[i] & 0xff;
+            yaz_log(YLOG_LOG, "ch%d %02X %c", i, ch, ch >= ' ' ? ch : '?');
+        }
+#endif
+        YAZ_CHECK(strcmp("\033p0\x1bs", outbuf0) == 0);
+    }
+    yaz_iconv_close(cd);
+}
+
+static void tst_advance_to_utf8(void)
+{
+    yaz_iconv_t cd = yaz_iconv_open("utf-8", "advancegreek");
+
+    YAZ_CHECK(cd);
+    if (!cd)
+        return;
+
+    YAZ_CHECK(tst_convert(cd, "Cours ", "Cours "));
     yaz_iconv_close(cd);
 }
 
+static void tst_utf8_to_advance(void)
+{
+    yaz_iconv_t cd = yaz_iconv_open("advancegreek", "utf-8");
+
+    YAZ_CHECK(cd);
+    if (!cd)
+        return;
+
+    YAZ_CHECK(tst_convert(cd, "Cours ", "Cours "));
+    yaz_iconv_close(cd);
+}
 
 static void tst_latin1_to_marc8(void)
 {
@@ -539,6 +597,9 @@ int main (int argc, char **argv)
 
     tst_marc8_to_latin1();
 
+    tst_advance_to_utf8();
+    tst_utf8_to_advance();
+
     tst_utf8_to_marc8();
 
     tst_latin1_to_marc8();