X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_test.c;h=b090bd3a86097bce01be7671b8505ebc926fcafa;hb=51028779e0a8772091aec5ab96bcf2519cf2f1ad;hp=6b4a43fed4f5feba0c51ef982b1e2a9352aa27a9;hpb=ca89e4f7548cb64e3dd1b67ea9ebb75ace33a754;p=protos%2Flibecoli.git diff --git a/lib/ecoli_test.c b/lib/ecoli_test.c index 6b4a43f..b090bd3 100644 --- a/lib/ecoli_test.c +++ b/lib/ecoli_test.c @@ -1,115 +1,217 @@ -/* - * Copyright (c) 2016, Olivier MATZ - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the University of California, Berkeley nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2016, Olivier MATZ */ #include #include #include +#include +#include +#include +#include #include -#include +#include +#include +#include +#include +#include static struct ec_test_list test_list = TAILQ_HEAD_INITIALIZER(test_list); -/* register a driver */ -void ec_test_register(struct ec_test *test) +EC_LOG_TYPE_REGISTER(test); + +static struct ec_test *ec_test_lookup(const char *name) +{ + struct ec_test *test; + + TAILQ_FOREACH(test, &test_list, next) { + if (!strcmp(name, test->name)) + return test; + } + + errno = EEXIST; + return NULL; +} + +int ec_test_register(struct ec_test *test) { + if (ec_test_lookup(test->name) != NULL) + return -1; + TAILQ_INSERT_TAIL(&test_list, test, next); + + return 0; } -int ec_test_check_tk_parse(const struct ec_tk *tk, const char *input, - const char *expected) +int ec_test_check_parse(struct ec_node *tk, int expected, ...) { - struct ec_parsed_tk *p; + struct ec_parse *p; + struct ec_strvec *vec = NULL; const char *s; - int ret = -1; + int ret = -1, match; + va_list ap; - p = ec_tk_parse(tk, input, 0); - s = ec_parsed_tk_to_string(p); - if (s == NULL && expected == NULL) - ret = 0; - else if (s != NULL && expected != NULL && - !strcmp(s, expected)) - ret = 0; + va_start(ap, expected); - if (expected == NULL && ret != 0) - printf("tk should not match but matches <%s>\n", s); - if (expected != NULL && ret != 0) - printf("tk should match <%s> but matches <%s>\n", - expected, s); + /* build a string vector */ + vec = ec_strvec(); + if (vec == NULL) + goto out; - ec_parsed_tk_free(p); + for (s = va_arg(ap, const char *); + s != EC_NODE_ENDLIST; + s = va_arg(ap, const char *)) { + if (s == NULL) + goto out; + if (ec_strvec_add(vec, s) < 0) + goto out; + } + + p = ec_node_parse_strvec(tk, vec); + if (p == NULL) { + EC_LOG(EC_LOG_ERR, "parse is NULL\n"); + } + if (ec_parse_matches(p)) + match = ec_parse_len(p); + else + match = -1; + if (expected == match) { + ret = 0; + } else { + EC_LOG(EC_LOG_ERR, + "parse len (%d) does not match expected (%d)\n", + match, expected); + } + + ec_parse_free(p); + +out: + ec_strvec_free(vec); + va_end(ap); return ret; } -int ec_test_check_tk_complete(const struct ec_tk *tk, const char *input, - const char *expected) +int ec_test_check_complete(struct ec_node *tk, enum ec_comp_type type, ...) { - struct ec_completed_tk *p; + struct ec_comp *c = NULL; + struct ec_strvec *vec = NULL; const char *s; - int ret = -1; + int ret = 0; + unsigned int count = 0; + va_list ap; - p = ec_tk_complete(tk, input, 0); - s = ec_completed_tk_smallest_start(p); - if (s == NULL && expected == NULL) - ret = 0; - else if (s != NULL && expected != NULL && - !strcmp(s, expected)) - ret = 0; + va_start(ap, type); + + /* build a string vector */ + vec = ec_strvec(); + if (vec == NULL) + goto out; + + for (s = va_arg(ap, const char *); + s != EC_NODE_ENDLIST; + s = va_arg(ap, const char *)) { + if (s == NULL) + goto out; + + if (ec_strvec_add(vec, s) < 0) + goto out; + } - if (expected == NULL && ret != 0) - printf("tk should not complete but completes with <%s>\n", s); - if (expected != NULL && ret != 0) - printf("tk should complete with <%s> but completes with <%s>\n", - expected, s); + 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_NODE_ENDLIST; + s = va_arg(ap, const char *)) { + struct ec_comp_iter *iter; + const struct ec_comp_item *item; + + if (s == NULL) { + ret = -1; + goto out; + } + + count++; + + /* only check matching completions */ + iter = ec_comp_iter(c, type); + while ((item = ec_comp_iter_next(iter)) != NULL) { + const char *str = ec_comp_item_get_str(item); + if (str != NULL && strcmp(str, s) == 0) + break; + } - ec_completed_tk_free(p); + if (item == NULL) { + EC_LOG(EC_LOG_ERR, + "completion <%s> not in list\n", s); + ret = -1; + } + ec_comp_iter_free(iter); + } + /* check if we have more completions (or less) than expected */ + if (count != ec_comp_count(c, type)) { + EC_LOG(EC_LOG_ERR, + "nb_completion (%d) does not match (%d)\n", + count, ec_comp_count(c, type)); + ec_comp_dump(stdout, c); + ret = -1; + } + +out: + ec_strvec_free(vec); + ec_comp_free(c); + va_end(ap); return ret; } -/* int ec_test_check_tk_complete_list(const struct ec_tk *tk, */ -/* const char *input, ...) */ - -int ec_test_all(void) +static int launch_test(const char *name) { struct ec_test *test; int ret = 0; - - // XXX register a new malloc to trac memleaks + unsigned int count = 0; TAILQ_FOREACH(test, &test_list, next) { + if (name != NULL && strcmp(name, test->name)) + continue; + + EC_LOG(EC_LOG_INFO, "== starting test %-20s\n", + test->name); + + count++; if (test->test() == 0) { - printf("== test %-20s success\n", test->name); + EC_LOG(EC_LOG_INFO, + "== test %-20s success\n", + test->name); } else { - printf("== test %-20s failed\n", test->name); + 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); +}