better test coverage

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

diff --git a/lib/ecoli_test.c b/lib/ecoli_test.c
index b9b515b..4a915f1 100644 (file)
--- a/lib/ecoli_test.c
+++ b/lib/ecoli_test.c
@@ -76,7 +76,6 @@ int ec_test_check_parse(struct ec_node *tk, int expected, ...)
        }
 
        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 is NULL\n");
        }
@@ -100,7 +99,7 @@ out:
        return ret;
 }
 
-int ec_test_check_complete(struct ec_node *tk, ...)
+int ec_test_check_complete(struct ec_node *tk, enum ec_completed_type type, ...)
 {
        struct ec_completed *c = NULL;
        struct ec_strvec *vec = NULL;
@@ -109,7 +108,7 @@ int ec_test_check_complete(struct ec_node *tk, ...)
        unsigned int count = 0;
        va_list ap;
 
-       va_start(ap, tk);
+       va_start(ap, type);
 
        /* build a string vector */
        vec = ec_strvec();
@@ -147,7 +146,7 @@ int ec_test_check_complete(struct ec_node *tk, ...)
                count++;
 
                /* only check matching completions */
-               iter = ec_completed_iter(c, EC_COMP_FULL);
+               iter = ec_completed_iter(c, type);
                while ((item = ec_completed_iter_next(iter)) != NULL) {
                        const char *str = ec_completed_item_get_str(item);
                        if (str != NULL && strcmp(str, s) == 0)
@@ -163,14 +162,13 @@ int ec_test_check_complete(struct ec_node *tk, ...)
        }
 
        /* check if we have more completions (or less) than expected */
-       if (count != ec_completed_count(c, EC_COMP_FULL)) {
+       if (count != ec_completed_count(c, type)) {
                EC_LOG(EC_LOG_ERR,
                        "nb_completion (%d) does not match (%d)\n",
-                       count, ec_completed_count(c, EC_COMP_FULL));
+                       count, ec_completed_count(c, type));
                ec_completed_dump(stdout, c);
                ret = -1;
-       } else
-               ec_completed_dump(stdout, c); //XXX
+       }
 
 out:
        ec_strvec_free(vec);