#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);
-/* register a driver */
+EC_LOG_TYPE_REGISTER(test);
+
+/* register a test case */
void ec_test_register(struct ec_test *test)
{
TAILQ_INSERT_TAIL(&test_list, test, next);
+ // XXX check if already exist, like for type
}
-int ec_test_check_tk_parse(const 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;
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;
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);
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) {
ret = 0;
} else {
- ec_log(EC_LOG_ERR,
+ EC_LOG(EC_LOG_ERR,
"tk parsed len (%d) does not match expected (%d)\n",
match, expected);
}
- ec_parsed_tk_free(p);
+ ec_parsed_free(p);
out:
ec_strvec_free(vec);
return ret;
}
-int ec_test_check_tk_complete(const struct ec_tk *tk, ...)
+int ec_test_check_complete(struct ec_node *tk, enum ec_completed_type type, ...)
{
- 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;
- va_start(ap, tk);
+ va_start(ap, type);
/* 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;
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, 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)
break;
}
- if (elt == NULL) {
- ec_log(EC_LOG_ERR,
+ 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_match(c)) {
- ec_log(EC_LOG_ERR,
+ /* check if we have more completions (or less) than expected */
+ if (count != ec_completed_count(c, type)) {
+ EC_LOG(EC_LOG_ERR,
"nb_completion (%d) does not match (%d)\n",
- count, ec_completed_tk_count_match(c));
- ec_completed_tk_dump(stdout, c);
+ count, ec_completed_count(c, type));
+ 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);
- }
-
out:
ec_strvec_free(vec);
- ec_completed_tk_free(c);
+ ec_completed_free(c);
va_end(ap);
return ret;
}
-int ec_test_all(void)
+static int launch_test(const char *name)
{
struct ec_test *test;
int ret = 0;
+ unsigned int count = 0;
TAILQ_FOREACH(test, &test_list, next) {
- ec_log(EC_LOG_INFO, "== starting test %-20s\n", test->name);
+ if (name != NULL && strcmp(name, test->name))
+ continue;
+
+ EC_LOG(EC_LOG_INFO, "== starting test %-20s\n",
+ test->name);
+ count++;
if (test->test() == 0) {
- ec_log(EC_LOG_INFO, "== test %-20s success\n",
+ EC_LOG(EC_LOG_INFO,
+ "== test %-20s success\n",
test->name);
} else {
- ec_log(EC_LOG_INFO, "== test %-20s failed\n",
+ EC_LOG(EC_LOG_INFO,
+ "== test %-20s failed\n",
test->name);
ret = -1;
}
}
+ if (name != NULL && count == 0) {
+ EC_LOG(EC_LOG_WARNING,
+ "== test %s not found\n", name);
+ ret = -1;
+ }
+
return ret;
}
+
+int ec_test_all(void)
+{
+ return launch_test(NULL);
+}
+
+int ec_test_one(const char *name)
+{
+ return launch_test(name);
+}
git.droids-corp.org / protos / libecoli.git / blobdiff