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

diff --git a/test/tsticonv.c b/test/tsticonv.c
index f1883b9..f31b6d6 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.32 2007-10-15 20:45:05 adam Exp $
+ * $Id: tsticonv.c,v 1.35 2008-03-12 08:53:28 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -17,6 +17,8 @@
 #include <yaz/yaz-util.h>
 #include <yaz/test.h>
 
+#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,9 +89,10 @@ 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];
     size_t inbytesleft = strlen(buf);
@@ -106,7 +109,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 +122,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 +155,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 +408,21 @@ 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(cd, "a\xea\x1e", "a\x1e\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 */
+
+    /* 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, "a\xea", "a"));
     yaz_iconv_close(cd);
 }
 
@@ -524,6 +551,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";