X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftstsoap1.c;h=eb2ba11d7974f13fb85d1728724ef44343b031f6;hp=a7488403194f3c0756185978f39c20067d68f1a6;hb=88d3bedf772316f87e1996f655ccf8d1e2589755;hpb=ec00e8cfc23cb7d04a9b13730607d6c094446f36

diff --git a/test/tstsoap1.c b/test/tstsoap1.c
index a748840..eb2ba11 100644
--- a/test/tstsoap1.c
+++ b/test/tstsoap1.c
@@ -1,42 +1,62 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstsoap1.c,v 1.2 2005-05-08 07:33:12 adam Exp $
  */
 
 #include <stdlib.h>
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
 #include <libxml/parser.h>
 #endif
+#include <yaz/test.h>
 
-int main(int argc, char **argv)
+void tst(void)
 {
-#if HAVE_XML2
-    LIBXML_TEST_VERSION;
-
-    if (argc <= 1)
-    {
-	xmlChar *buf_out;
-	int len_out;
-	xmlDocPtr doc = xmlNewDoc("1.0");
+#if YAZ_HAVE_XML2
+    xmlChar *buf_out;
+    int len_out;
+    xmlDocPtr doc;
+    xmlNodePtr top;
 #if 0
-	const char *val = "jordbær"; /* makes xmlDocDumpMemory hang .. */
+    const char *val = "jordb" "\xe6" "r"; /* makes xmlDocDumpMemory hang .. */
 #else
-	const char *val = "jordbaer"; /* OK */
+    const char *val = "jordbaer"; /* OK */
 #endif
-	xmlNodePtr top = xmlNewNode(0, "top");
-	
-	xmlNewTextChild(top, 0, "sub", val);
-	xmlDocSetRootElement(doc, top);
-	
-	xmlDocDumpMemory(doc, &buf_out, &len_out);
+    doc = xmlNewDoc(BAD_CAST "1.0");
+    YAZ_CHECK(doc);
+
+    top = xmlNewNode(0, BAD_CAST "top");
+    YAZ_CHECK(top);
+    
+    xmlNewTextChild(top, 0, BAD_CAST "sub", BAD_CAST val);
+    xmlDocSetRootElement(doc, top);
+    
+    xmlDocDumpMemory(doc, &buf_out, &len_out);
 #if 0
-	printf("%*s", len_out, buf_out);
+    printf("%*s", len_out, buf_out);
+#endif
+
+
+/* YAZ_HAVE_XML2 */
 #endif
-    }
+}
+
+int main(int argc, char **argv)
+{
+    YAZ_CHECK_INIT(argc, argv);
+#if YAZ_HAVE_XML2
+    LIBXML_TEST_VERSION;
 #endif
-    return 0;
+    tst();
+    YAZ_CHECK_TERM;
 }
 
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+