X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftsticonv.c;h=7c69c0b4661b7004736a663bd52648d7e44e59e6;hb=fd3e0c80b9b344777ef337909d197a14b69f251b;hp=d1ce8ccfee6bc1dc7de3b399656ed50e4fc71562;hpb=8d691989077a0addcbd840d769dce6700f3d9622;p=yaz-moved-to-github.git

diff --git a/test/tsticonv.c b/test/tsticonv.c
index d1ce8cc..7c69c0b 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.24 2007-01-03 08:42:16 adam Exp $
+ * $Id: tsticonv.c,v 1.26 2007-03-12 10:59:59 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -90,19 +90,20 @@ static int tst_convert(yaz_iconv_t cd, const char *buf, const char *cmpbuf)
     char outbuf[12];
     size_t inbytesleft = strlen(buf);
     const char *inp = buf;
-    while (inbytesleft)
+    int rounds = 0;
+    for (rounds = 0; inbytesleft && rounds < sizeof(outbuf); rounds++)
     {
         size_t outbytesleft = sizeof(outbuf);
         char *outp = outbuf;
         size_t r = yaz_iconv(cd, (char**) &inp,  &inbytesleft,
                              &outp, &outbytesleft);
+        wrbuf_write(b, outbuf, outp - outbuf);
         if (r == (size_t) (-1))
         {
             int e = yaz_iconv_error(cd);
             if (e != YAZ_ICONV_E2BIG)
                 break;
         }
-        wrbuf_write(b, outbuf, outp - outbuf);
     }
     if (wrbuf_len(b) == strlen(cmpbuf) 
         && !memcmp(cmpbuf, wrbuf_buf(b), wrbuf_len(b)))
@@ -350,6 +351,11 @@ static void tst_marc8_to_utf8(void)
     /* COMBINING ACUTE ACCENT */
     YAZ_CHECK(tst_convert(cd, "Cours de mathâe", 
                           "Cours de mathe\xcc\x81"));
+
+
+    YAZ_CHECK(tst_convert(cd, "a\xea\x1e", "a\x1e\xcc\x8a"));
+
+    YAZ_CHECK(tst_convert(cd, "a\xea", "a"));
     yaz_iconv_close(cd);
 }
 
@@ -467,6 +473,29 @@ static void tst_utf8_to_marc8(void)
     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)
 {
@@ -533,6 +562,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();