ttxml: removed cruft from tests

[ccan] / ccan / ttxml / test / run.c

diff --git a/ccan/ttxml/test/run.c b/ccan/ttxml/test/run.c
index 682bf35db53e4913783d614df9b14439eeeba9d5..486b61c904ca342537e5328d96aca5e191e4bc61 100644 (file)
--- a/ccan/ttxml/test/run.c
+++ b/ccan/ttxml/test/run.c
@@ -1,29 +1,10 @@
 #include <ccan/ttxml/ttxml.h>
 /* Include the C files directly. */
-#include <ccan/ttxml/ttxml.c>
-#include <ccan/tap/tap.h>
 
-/* print out the heirarchy of an XML file, useful for debugging */
-
-static void xp(XmlNode *x, int level, int max)
-{
-       int i;
-       char text[] = "text";
-       char *name = text;
-       if(level > max)return;
-       if(!x)return;
-       if(x->name)name = x->name;
-       for(i=0; i<level; i++)printf("    ");
-       printf("%s:", name);
-       if(x->name)
-       for(i=0; i<x->nattrib; i++)
-               printf("%s=\"%s\",", x->attrib[i*2], x->attrib[i*2+1]);
-       else printf("%s", x->attrib[0]);
-       printf("\n");
-       if(x->child)xp(x->child, level+1, max);
-       if(x->next)xp(x->next, level, max);
-}
+#define BUFFER 40      /* use a stupidly small buffer to stomp out bugs */
 
+#include <ccan/ttxml/ttxml.c>
+#include <ccan/tap/tap.h>
 
 
 static int test_load(const char * filename)
@@ -35,41 +16,13 @@ static int test_load(const char * filename)
        return 1;
 }
 
-static int test_find(void)
-{
-       char *ctmp;
-       XmlNode *xtmp, *xml = xml_load("./test/test.xml2");
-       if(!xml)return 0;
-
-       xp(xml, 0, 20);
-
-
-       xtmp = xml_find(xml, "one");
-       if(!xtmp)
-       {
-               printf("Failed to find node\n");        
-               return 0;
-       }
-       printf("node is...\n");
-       xp(xtmp, 0, 20);
-
-       ctmp = xml_attr(xtmp, "barfoo");
-       if(!ctmp)
-       {
-               printf("Failed to find attribute\n");
-               return 0;
-       }
-
-       return 1;
-}
-
 int main(void)
 {
        XmlNode *x, *t;
        /* This is how many tests you plan to run */
-       plan_tests(13);
+       plan_tests(12);
 
-       ok1(x = xml_load("./test/test.xml2"));
+       ok1(x = xml_load("./test/test.xml1"));
        ok1(!xml_find(x, "Doesn't Exist"));
        ok1(t = xml_find(x, "one"));
        ok1(xml_find(t, "two"));
@@ -79,11 +32,10 @@ int main(void)
        xml_free(x);
        /* Simple thing we expect to succeed */
        ok1(!test_load("does not exist")); /* A file that doesn't exist */
-       ok1(test_load("./test/test.xml")); /* A very large xml file. */
-       ok1(test_load("./test/test.xml2")); /* A basic xml file. */
-       ok1(test_load("./test/test.xml3")); /* Very small well-formed xml file. */
-       ok1(test_load("./test/test.xml4")); /* Smallest well-formed xml file. */
-       ok1(test_load("./test/test.xml5")); /* A single unclosed tag. */
+       ok1(test_load("./test/test.xml1")); /* A basic xml file. */
+       ok1(test_load("./test/test.xml2")); /* Very small well-formed xml file. */
+       ok1(test_load("./test/test.xml3")); /* Smallest well-formed xml file. */
+       ok1(test_load("./test/test.xml4")); /* A single unclosed tag. */
        /* Same, with an explicit description of the test. */
 //     ok(some_test(), "%s with no args should return 1", "some_test")
        /* How to print out messages for debugging. */