X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_xml_include.c;h=aec8308f0a2f4d6104df1bebff2a291dde9a5e96;hp=3e9b34d9e0e164517e98fa17d80308e531594c8c;hb=d1b8a1c1647ebb00401f6b6e8f992cca7480b5f9;hpb=0c46d2e66bdeea1600e700124a81a5d0a65d349e

diff --git a/test/test_xml_include.c b/test/test_xml_include.c
index 3e9b34d..aec8308 100644
--- a/test/test_xml_include.c
+++ b/test/test_xml_include.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 #if HAVE_CONFIG_H
@@ -13,7 +13,7 @@
 #include <yaz/xml_include.h>
 #include <yaz/test.h>
 
-static void tst_xml_include(void)
+static void tst_xml_include1(void)
 {
 #if YAZ_HAVE_XML2
     const char *srcdir = getenv("srcdir");
@@ -63,12 +63,97 @@ static void tst_xml_include(void)
 #endif
 }
 
+static void tst_xml_include2(void)
+{
+#if YAZ_HAVE_XML2
+    const char *srcdir = getenv("srcdir");
+    xmlDocPtr doc;
+    xmlNodePtr node;
+    const char *xml_in = "<x><include src=\"test_xml_no.xml\"/></x>";
+
+    if (srcdir == 0)
+        srcdir = ".";
+
+    doc = xmlParseMemory(xml_in, strlen(xml_in));
+    YAZ_CHECK(doc);
+    if (!doc)
+        return;
+    node = xmlDocGetRootElement(doc);
+    YAZ_CHECK(node);
+    if (node)
+    {
+        int ret = yaz_xml_include_glob(node, srcdir,
+                                       YAZ_FILE_GLOB_FAIL_NOTEXIST);
+        YAZ_CHECK_EQ(ret, -1);
+    }
+    if (node)
+    {
+        int ret = yaz_xml_include_glob(node, srcdir,
+                                       0);
+        YAZ_CHECK_EQ(ret, 0);
+    }
+    xmlFreeDoc(doc);
+#endif
+}
+
+static void tst_xml_include3(void)
+{
+#if YAZ_HAVE_XML2
+    const char *srcdir = getenv("srcdir");
+    xmlDocPtr doc;
+    xmlNodePtr node;
+    const char *xml_in = "<x><include src=\"test_xml_no*.xml\"/></x>";
+
+    if (srcdir == 0)
+        srcdir = ".";
+
+    doc = xmlParseMemory(xml_in, strlen(xml_in));
+    YAZ_CHECK(doc);
+    if (!doc)
+        return;
+    node = xmlDocGetRootElement(doc);
+    YAZ_CHECK(node);
+    if (node)
+    {
+        const char *expect =
+            "<?xml version=\"1.0\"?>\n"
+            "<x><!-- begin include src=\"test_xml_no*.xml\" -->"
+            "<!-- end include src=\"test_xml_no*.xml\" --></x>\n";
+
+        xmlChar *xml_out;
+        int len_out;
+        int ret = yaz_xml_include_simple(node, srcdir);
+        YAZ_CHECK(ret == 0);
+        xmlDocDumpMemory(doc, &xml_out, &len_out);
+        YAZ_CHECK(xml_out && len_out > 0);
+        if (xml_out && len_out > 0)
+        {
+            YAZ_CHECK(strlen(expect) == len_out);
+            if (strlen(expect) == len_out)
+            {
+                YAZ_CHECK(memcmp(expect, xml_out, len_out) == 0);
+            }
+            else
+            {
+                fwrite(xml_out, 1, len_out, stdout);
+                fflush(stdout);
+            }
+            xmlFree(xml_out);
+        }
+    }
+    xmlFreeDoc(doc);
+#endif
+}
+
+
 
 int main (int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
     YAZ_CHECK_LOG();
-    tst_xml_include();
+    tst_xml_include1();
+    tst_xml_include2();
+    tst_xml_include3();
     YAZ_CHECK_TERM;
 }