X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftsticonv.c;h=20424d622b0a51ddbafb2d37e077d838bb1b1e88;hb=bc4b50939a936dbb214c783c18a44039ea048fdd;hp=14129dbaeaba76e8d1292cd8a8dd6a26fd11d8c4;hpb=c7899589e137fd6848870b45f692ab0832b7069a;p=yaz-moved-to-github.git

diff --git a/test/tsticonv.c b/test/tsticonv.c
index 14129db..20424d6 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
@@ -89,11 +87,12 @@ 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];
+    char outbuf[16];
     size_t inbytesleft = strlen(buf);
     const char *inp = buf;
     int rounds = 0;
@@ -108,7 +107,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
         {
@@ -116,16 +120,20 @@ 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_puts_escaped(w, buf);
         yaz_log(YLOG_LOG, "input %s", wrbuf_cstr(w));
@@ -145,6 +153,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[] = {
@@ -388,19 +400,29 @@ static void tst_marc8_to_utf8(void)
     if (!cd)
         return;
 
-    /* bug #2115 */
-    YAZ_CHECK(tst_convert(cd, ESC "(N" ESC ")Qp" ESC "(B", "\xd0\x9f"));
-
-
     YAZ_CHECK(tst_convert(cd, "Cours de math", 
                           "Cours de math"));
     /* 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, "\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_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_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);
 }
@@ -465,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)
@@ -578,6 +600,7 @@ static void tst_utf8_to_marc8(void)
 #endif
         YAZ_CHECK(strcmp("\033p0\x1bs", outbuf0) == 0);
     }
+    yaz_iconv(cd, 0, 0, 0, 0);
     yaz_iconv_close(cd);
 }
 
@@ -673,7 +696,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();