X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftst_retrieval.c;h=aecb773808a8e8931678a97e1c3ae73e538d88ec;hp=7482535ad915ab25bdb405edb67cca674dfe1ae5;hb=0de95154d8512ee46d6b706fe019f8d1ffc18827;hpb=c43225b3038c3fa459ac60202abf35183ad4f923

diff --git a/test/tst_retrieval.c b/test/tst_retrieval.c
index 7482535..aecb773 100644
--- a/test/tst_retrieval.c
+++ b/test/tst_retrieval.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2005-2006, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tst_retrieval.c,v 1.1 2006-05-04 20:00:45 adam Exp $
+ * $Id: tst_retrieval.c,v 1.2 2006-05-05 18:37:08 adam Exp $
  *
  */
 #include <yaz/retrieval.h>
@@ -104,22 +104,36 @@ int conv_configure_test(const char *xmlstring, const char *expect_error,
 
 static void tst_configure()
 {
-    YAZ_CHECK(conv_configure_test("<bad", "xmlParseMemory", 0));
-#if 0
-    YAZ_CHECK(conv_configure_test("<bad/>", "Missing 'convert' element", 0));
-    YAZ_CHECK(conv_configure_test("<convert/>", 0, 0));
-    YAZ_CHECK(conv_configure_test("<convert><bad/></convert>",
+    YAZ_CHECK(conv_configure_test("<bad", 
+                                  "xmlParseMemory", 0));
+
+    YAZ_CHECK(conv_configure_test("<bad/>", 
+                                  "Missing 'retrievalinfo' element", 0));
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo/>", 0, 0));
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo><bad/></retrievalinfo>",
                                   "Bad element 'bad'."
-                                  "Expected marc, xslt, ..", 0));
-    YAZ_CHECK(conv_configure_test("<convert>"
+                                  " Expected 'retrieval'", 0));
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo>"
+                                  "<retrieval>"
+                                  "<convert>"
                                   "<xslt stylesheet=\"tst_record_conv.xsl\"/>"
                                   "<marc"
-                                  " inputcharset=\"marc-8\""
+                                  " inputcharset=\"utf-8\""
                                   " outputcharset=\"marc-8\""
+                                  " inputformat=\"xml\""
+                                  " outputformat=\"marc\""
                                   "/>"
-                                  "</convert>",
-                                  "Attribute 'inputformat' required", 0));
-    YAZ_CHECK(conv_configure_test("<convert>"
+                                  "</convert>"
+                                  "</retrieval>"
+                                  "</retrievalinfo>",
+                                  0, 0));
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo>"
+                                  "<retrieval>"
+                                  "<convert>"
                                   "<xslt stylesheet=\"tst_record_conv.xsl\"/>"
                                   "<marc"
                                   " inputcharset=\"utf-8\""
@@ -127,9 +141,21 @@ static void tst_configure()
                                   " inputformat=\"xml\""
                                   " outputformat=\"marc\""
                                   "/>"
-                                  "</convert>",
+                                  "</convert>"
+                                  "</retrieval>"
+                                  "<retrieval>"
+                                  "<convert>"
+                                  "<xslt stylesheet=\"tst_record_conv.xsl\"/>"
+                                  "<marc"
+                                  " inputcharset=\"utf-8\""
+                                  " outputcharset=\"marc-8\""
+                                  " inputformat=\"xml\""
+                                  " outputformat=\"marc\""
+                                  "/>"
+                                  "</convert>"
+                                  "</retrieval>"
+                                  "</retrievalinfo>",
                                   0, 0));
-#endif
 }
 
 #endif