X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_embed_record.c;h=5472c7363eb6d9dd71dcae76fa4d2deffc854237;hb=7fb0d7639df297cd23ac4494b3c5001b41b595d0;hp=aac2987d106b2f9127bb3a3d38ab5241950f601a;hpb=c78f61142413410e88ed2a83627516bb4fa24b33;p=yaz-moved-to-github.git

diff --git a/test/test_embed_record.c b/test/test_embed_record.c
index aac2987..5472c73 100644
--- a/test/test_embed_record.c
+++ b/test/test_embed_record.c
@@ -13,18 +13,40 @@
 #include <yaz/log.h>
 #include <yaz/record_render.h>
 
-#if YAZ_HAVE_XML2
-
 #include <yaz/base64.h>
 #include <yaz/marcdisp.h>
 #include <yaz/proto.h>
 #include <yaz/prt-ext.h>
 
+#if YAZ_HAVE_XML2
+
 #include <libxml/parser.h>
 #include <libxml/tree.h>
+#endif
 
 void test1(void)
 {
+    int buflen;
+    for (buflen = 0; buflen < 256; buflen++)
+    {
+        char buf[256];
+        char buf_a[1024];
+        char buf_b[1024];
+        int i;
+        for (i = 0; i < buflen; i++)
+            buf[i] = 1 + i;
+        buf[i] = 0;
+
+        yaz_base64encode(buf, buf_a);
+
+        YAZ_CHECK(yaz_base64decode(buf_a, buf_b) == 0);
+
+        YAZ_CHECK(strcmp(buf, buf_b) == 0);
+    }
+}
+
+void test2(void)
+{
   char base_enc[] = 
     "MDA3NjZuYW0gIDIyMDAyNjU4YSA0NTAwMDAxMDAxMjAwMDAwMDAzMDAwNjAwMDEyMDA1MDAx"
     "NzAwMDE4MDA4MDA0MTAwMDM1MDEwMDAxNzAwMDc2MDIwMDAxNTAwMDkzMDM1MDAxODAwMTA4"
@@ -61,7 +83,6 @@ void test1(void)
     wrbuf_destroy(buf);
 
 }
-#endif
 
 static int test_render(const char *type_spec, int is_marc, const char *input,
                     const char *expected_output)
@@ -115,8 +136,9 @@ int main(int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
     YAZ_CHECK_LOG();
-#if YAZ_HAVE_XML2
     test1();
+    test2();
+#if YAZ_HAVE_XML2
     YAZ_CHECK(test_render("xml", 0, "<my/>", "<my/>"));
 
     YAZ_CHECK(test_render(
@@ -145,7 +167,7 @@ int main(int argc, char **argv)
     YAZ_CHECK(test_render("xml", 0, "<my/>", "<my/>"));
 
     YAZ_CHECK(test_render(
-                  "xml; base64(/my/text(),xml)", 0,
+                  "xml; base64=/my/text()", 0,
                   "<my>"
                   "MDAxMzhuYW0gIDIyMDAwNzM4YSA0NTAwMDAxMDAxMzAwMDAwMDAzMDAwNDAwMDEzMTAwMDAxNzAw"
                   "MDE3MjQ1MDAzMDAwMDM0HiAgIDExMjI0NDY2IB5ETEMeMTAfYUphY2sgQ29sbGlucx4xMB9hSG93"
@@ -165,7 +187,7 @@ int main(int argc, char **argv)
                   "</record></my>\n"));
 
     YAZ_CHECK(test_render(
-                  "xml; charset=utf-8; base64(/my/text(),xml)", 0,
+                  "xml; charset=utf-8; base64=/my/text()", 0,
                   "<my>"
                   "MDAxMzhuYW0gIDIyMDAwNzM4YSA0NTAwMDAxMDAxMzAwMDAwMDAzMDAwNDAwMDEzMTAwMDAxNzAw"
                   "MDE3MjQ1MDAzMDAwMDM0HiAgIDExMjI0NDY2IB5ETEMeMTAfYUphY2sgQ29sbGlucx4xMB9hSG93"
@@ -185,7 +207,7 @@ int main(int argc, char **argv)
                   "</record></my>\n"));
 
     YAZ_CHECK(test_render(
-                  "xml; base64(/my/text(),xml);charset=utf-8", 0,
+                  "xml; base64=/my/text();charset=utf-8", 0,
                   "<my>"
                   "MDAxMzhuYW0gIDIyMDAwNzM4YSA0NTAwMDAxMDAxMzAwMDAwMDAzMDAwNDAwMDEzMTAwMDAxNzAw"
                   "MDE3MjQ1MDAzMDAwMDM0HiAgIDExMjI0NDY2IB5ETEMeMTAfYUphY2sgQ29sbGlucx4xMB9hSG93"
@@ -205,7 +227,7 @@ int main(int argc, char **argv)
                   "</record></my>\n"));
 
     YAZ_CHECK(test_render(
-                  "xml; base64(/my/text(),txml;charset=utf-8)", 0,
+                  "txml;base64=/my/text();charset=utf-8", 0,
                   "<my>"
                   "MDAxMzhuYW0gIDIyMDAwNzM4YSA0NTAwMDAxMDAxMzAwMDAwMDAzMDAwNDAwMDEzMTAwMDAxNzAw"
                   "MDE3MjQ1MDAzMDAwMDM0HiAgIDExMjI0NDY2IB5ETEMeMTAfYUphY2sgQ29sbGlucx4xMB9hSG93"