change add to full str

[protos/libecoli.git] / lib / ecoli_test.c

diff --git a/lib/ecoli_test.c b/lib/ecoli_test.c
index 2ac659b..291417d 100644 (file)
--- a/lib/ecoli_test.c
+++ b/lib/ecoli_test.c
@@ -34,7 +34,10 @@
 #include <ecoli_malloc.h>
 #include <ecoli_test.h>
 #include <ecoli_strvec.h>
-#include <ecoli_tk.h>
+#include <ecoli_node.h>
+#include <ecoli_parsed.h>
+#include <ecoli_completed.h>
+#include <ecoli_parsed.h>
 
 static struct ec_test_list test_list = TAILQ_HEAD_INITIALIZER(test_list);
 
@@ -45,9 +48,9 @@ void ec_test_register(struct ec_test *test)
        // XXX check if already exist, like for type
 }
 
-int ec_test_check_tk_parse(struct ec_tk *tk, int expected, ...)
+int ec_test_check_parse(struct ec_node *tk, int expected, ...)
 {
-       struct ec_parsed_tk *p;
+       struct ec_parsed *p;
        struct ec_strvec *vec = NULL;
        const char *s;
        int ret = -1, match;
@@ -56,12 +59,12 @@ int ec_test_check_tk_parse(struct ec_tk *tk, int expected, ...)
        va_start(ap, expected);
 
        /* build a string vector */
-       vec = ec_strvec_new();
+       vec = ec_strvec();
        if (vec == NULL)
                goto out;
 
        for (s = va_arg(ap, const char *);
-            s != EC_TK_ENDLIST;
+            s != EC_NODE_ENDLIST;
             s = va_arg(ap, const char *)) {
                if (s == NULL)
                        goto out;
@@ -70,14 +73,13 @@ int ec_test_check_tk_parse(struct ec_tk *tk, int expected, ...)
                        goto out;
        }
 
-       p = ec_tk_parse_tokens(tk, vec);
-       /* XXX only for debug */
-       ec_parsed_tk_dump(stdout, p);
+       p = ec_node_parse_strvec(tk, vec);
+       ec_parsed_dump(stdout, p); /* XXX only for debug */
        if (p == NULL) {
-               ec_log(EC_LOG_ERR, "parsed_tk is NULL\n");
+               ec_log(EC_LOG_ERR, "parsed is NULL\n");
        }
-       if (ec_parsed_tk_matches(p))
-               match = ec_parsed_tk_len(p);
+       if (ec_parsed_matches(p))
+               match = ec_parsed_len(p);
        else
                match = -1;
        if (expected == match) {
@@ -88,7 +90,7 @@ int ec_test_check_tk_parse(struct ec_tk *tk, int expected, ...)
                        match, expected);
        }
 
-       ec_parsed_tk_free(p);
+       ec_parsed_free(p);
 
 out:
        ec_strvec_free(vec);
@@ -96,12 +98,11 @@ out:
        return ret;
 }
 
-int ec_test_check_tk_complete(struct ec_tk *tk, ...)
+int ec_test_check_complete(struct ec_node *tk, ...)
 {
-       struct ec_completed_tk *c = NULL;
-       struct ec_completed_tk_elt *elt;
+       struct ec_completed *c = NULL;
        struct ec_strvec *vec = NULL;
-       const char *s, *expected;
+       const char *s;
        int ret = 0;
        unsigned int count = 0;
        va_list ap;
@@ -109,12 +110,12 @@ int ec_test_check_tk_complete(struct ec_tk *tk, ...)
        va_start(ap, tk);
 
        /* build a string vector */
-       vec = ec_strvec_new();
+       vec = ec_strvec();
        if (vec == NULL)
                goto out;
 
        for (s = va_arg(ap, const char *);
-            s != EC_TK_ENDLIST;
+            s != EC_NODE_ENDLIST;
             s = va_arg(ap, const char *)) {
                if (s == NULL)
                        goto out;
@@ -123,55 +124,54 @@ int ec_test_check_tk_complete(struct ec_tk *tk, ...)
                        goto out;
        }
 
-       c = ec_tk_complete_tokens(tk, vec);
+       c = ec_node_complete_strvec(tk, vec);
        if (c == NULL) {
                ret = -1;
                goto out;
        }
 
+       /* for each expected completion, check it is there */
        for (s = va_arg(ap, const char *);
-            s != EC_TK_ENDLIST;
+            s != EC_NODE_ENDLIST;
             s = va_arg(ap, const char *)) {
+               struct ec_completed_iter *iter;
+               const struct ec_completed_item *item;
+
                if (s == NULL) {
                        ret = -1;
                        goto out;
                }
 
                count++;
-               TAILQ_FOREACH(elt, &c->elts, next) {
-                       /* only check matching completions */
-                       if (elt->add != NULL && strcmp(elt->add, s) == 0)
+
+               /* only check matching completions */
+               iter = ec_completed_iter(c, EC_MATCH);
+               while ((item = ec_completed_iter_next(iter)) != NULL) {
+                       if (item->str != NULL && strcmp(item->str, s) == 0)
                                break;
                }
 
-               if (elt == NULL) {
+               if (item == NULL) {
                        ec_log(EC_LOG_ERR,
                                "completion <%s> not in list\n", s);
                        ret = -1;
                }
+               ec_completed_iter_free(iter);
        }
 
-       if (count != ec_completed_tk_count(c, EC_MATCH)) {
+       /* check if we have more completions (or less) than expected */
+       if (count != ec_completed_count(c, EC_MATCH)) {
                ec_log(EC_LOG_ERR,
                        "nb_completion (%d) does not match (%d)\n",
-                       count, ec_completed_tk_count(c, EC_MATCH));
-               ec_completed_tk_dump(stdout, c);
+                       count, ec_completed_count(c, EC_MATCH));
+               ec_completed_dump(stdout, c);
                ret = -1;
-       }
-
-
-       expected = va_arg(ap, const char *);
-       s = ec_completed_tk_smallest_start(c);
-       if (strcmp(s, expected)) {
-               ret = -1;
-               ec_log(EC_LOG_ERR,
-                       "should complete with <%s> but completes with <%s>\n",
-                       expected, s);
-       }
+       } else
+               ec_completed_dump(stdout, c); //XXX
 
 out:
        ec_strvec_free(vec);
-       ec_completed_tk_free(c);
+       ec_completed_free(c);
        va_end(ap);
        return ret;
 }
@@ -199,8 +199,10 @@ static int launch_test(const char *name)
                }
        }
 
-       if (name != NULL && count == 0)
+       if (name != NULL && count == 0) {
                ec_log(EC_LOG_WARNING, "== test %s not found\n", name);
+               ret = -1;
+       }
 
        return ret;
 }