X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftst_record_conv.c;h=33ede53b269829815b3e2432eca7788b6ca60ed8;hb=c5a81c4eb35bcab571d42f4e02a69e4ed76dc20b;hp=ac8162099b9dd047e296e3847e9fb6f6a99996f7;hpb=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0;p=yaz-moved-to-github.git

diff --git a/test/tst_record_conv.c b/test/tst_record_conv.c
index ac81620..33ede53 100644
--- a/test/tst_record_conv.c
+++ b/test/tst_record_conv.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
  */
 #include <yaz/record_conv.h>
@@ -7,7 +7,6 @@
 #include <yaz/wrbuf.h>
 #include <string.h>
 #include <yaz/log.h>
-#include <yaz/libxml2_error.h>
 
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -182,10 +181,12 @@ static int conv_convert_test(yaz_record_conv_t p,
             else if (strcmp(output_expect_record, wrbuf_cstr(output_record)))
             {
                 ret = 0;
-                printf("got-output_record len=%d: %s\n", 
-                       wrbuf_len(output_record),wrbuf_cstr(output_record));
-                printf("output_expect_record len=%d %s\n",
-                       strlen(output_expect_record), output_expect_record);
+                printf("got-output_record len=%ld: %s\n", 
+                       (long) wrbuf_len(output_record),
+                       wrbuf_cstr(output_record));
+                printf("output_expect_record len=%ld %s\n",
+                       (long) strlen(output_expect_record),
+                       output_expect_record);
             }
             else
             {
@@ -197,6 +198,22 @@ static int conv_convert_test(yaz_record_conv_t p,
     return ret;
 }
 
+static int conv_convert_test_iter(yaz_record_conv_t p,
+                                  const char *input_record,
+                                  const char *output_expect_record,
+                                  int num_iter)
+{
+    int i;
+    int ret;
+    for (i = 0; i < num_iter; i++)
+    {
+        ret = conv_convert_test(p, input_record, output_expect_record);
+        if (!ret)
+            break;
+    }
+    return ret;
+}
+
 static void tst_convert1(void)
 {
     yaz_record_conv_t p = 0;
@@ -307,7 +324,7 @@ static void tst_convert2(void)
                                   "/>"
                                   "</backend>",
                                   0, &p));
-    YAZ_CHECK(conv_convert_test(p, marcxml_rec, iso2709_rec));
+    YAZ_CHECK(conv_convert_test_iter(p, marcxml_rec, iso2709_rec, 100));
     yaz_record_conv_destroy(p);
 }
 
@@ -316,7 +333,7 @@ static void tst_convert2(void)
 int main(int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
-    libxml2_error_to_yazlog(0 /* disable log */, 0);
+    yaz_log_xml_errors(0, 0 /* disable log */);
 #if YAZ_HAVE_XML2
     tst_configure();
 #endif
@@ -330,6 +347,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab