X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_test.c;h=4a7de26dd909c94c711cc1bc1336348032ad1dfd;hb=538ee5ebd89490777cf1022e89438bde7d3adcdb;hp=3f1c4fdb357cf0c2fa5449b3f6cdb2e530f7d5e2;hpb=047b9599fed749e245c735c98c6840ad4fe8d422;p=protos%2Flibecoli.git

diff --git a/lib/ecoli_test.c b/lib/ecoli_test.c
index 3f1c4fd..4a7de26 100644
--- a/lib/ecoli_test.c
+++ b/lib/ecoli_test.c
@@ -28,10 +28,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 
 #include <ecoli_log.h>
 #include <ecoli_malloc.h>
 #include <ecoli_test.h>
+#include <ecoli_strvec.h>
 #include <ecoli_tk.h>
 
 static struct ec_test_list test_list = TAILQ_HEAD_INITIALIZER(test_list);
@@ -42,213 +44,145 @@ void ec_test_register(struct ec_test *test)
 	TAILQ_INSERT_TAIL(&test_list, test, next);
 }
 
-int ec_test_check_tk_parse(const struct ec_tk *tk, const char *input,
-	const char *expected)
+int ec_test_check_tk_parse(const struct ec_tk *tk, int expected, ...)
 {
 	struct ec_parsed_tk *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);
-	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)
-		ec_log(EC_LOG_ERR, "tk should not match but matches <%s>\n", s);
-	if (expected != NULL && ret != 0)
-		ec_log(EC_LOG_ERR, "tk should match <%s> but matches <%s>\n",
-			expected, s);
+	/* build a string vector */
+	vec = ec_strvec_new();
+	if (vec == NULL)
+		goto out;
 
-	ec_parsed_tk_free(p);
-
-	return ret;
-}
+	for (s = va_arg(ap, const char *);
+	     s != EC_TK_ENDLIST;
+	     s = va_arg(ap, const char *)) {
+		if (s == NULL)
+			goto out;
 
-int ec_test_check_tk_complete(const struct ec_tk *tk, const char *input,
-	const char *expected)
-{
-	struct ec_completed_tk *p;
-	const char *s;
-	int ret = -1;
+		if (ec_strvec_add(vec, s) < 0)
+			goto out;
+	}
 
-	p = ec_tk_complete(tk, input);
-	s = ec_completed_tk_smallest_start(p);
-	if (s == NULL && expected == NULL)
-		ret = 0;
-	else if (s != NULL && expected != NULL &&
-		!strcmp(s, expected))
+	p = ec_tk_parse_tokens(tk, vec);
+	/* XXX only for debug */
+	ec_parsed_tk_dump(stdout, p);
+	if (p == NULL) {
+		ec_log(EC_LOG_ERR, "parsed_tk is NULL\n");
+	}
+	if (ec_parsed_tk_matches(p))
+		match = ec_parsed_tk_len(p);
+	else
+		match = -1;
+	if (expected == match) {
 		ret = 0;
-
-	if (expected == NULL && ret != 0)
-		ec_log(EC_LOG_ERR,
-			"tk should not complete but completes with <%s>\n", s);
-	if (expected != NULL && ret != 0)
-		ec_log(EC_LOG_ERR,
-			"tk should complete with <%s> but completes with <%s>\n",
-			expected, s);
-
-	ec_completed_tk_free(p);
-
-	return ret;
-}
-
-TAILQ_HEAD(debug_alloc_hdr_list, debug_alloc_hdr);
-static struct debug_alloc_hdr_list debug_alloc_hdr_list =
-	TAILQ_HEAD_INITIALIZER(debug_alloc_hdr_list);
-
-struct debug_alloc_hdr {
-	TAILQ_ENTRY(debug_alloc_hdr) next;
-	const char *file;
-	unsigned int line;
-	size_t size;
-	unsigned int cookie;
-};
-
-static void *debug_malloc(size_t size, const char *file, unsigned int line)
-{
-	struct debug_alloc_hdr *hdr;
-	size_t new_size = size + sizeof(*hdr) + sizeof(unsigned int);
-	void *ret;
-
-	hdr = malloc(new_size);
-	if (hdr == NULL) {
-		ret = NULL;
 	} else {
-		hdr->file = file;
-		hdr->line = line;
-		hdr->size = size;
-		hdr->cookie = 0x12345678;
-		TAILQ_INSERT_TAIL(&debug_alloc_hdr_list, hdr, next);
-		ret = hdr + 1;
+		ec_log(EC_LOG_ERR,
+			"tk parsed len (%d) does not match expected (%d)\n",
+			match, expected);
 	}
 
-	ec_log(EC_LOG_INFO, "%s:%d: info: malloc(%zd) -> %p\n",
-		file, line, size, ret);
+	ec_parsed_tk_free(p);
 
+out:
+	ec_strvec_free(vec);
+	va_end(ap);
 	return ret;
 }
 
-static void debug_free(void *ptr, const char *file, unsigned int line)
+int ec_test_check_tk_complete(const struct ec_tk *tk, ...)
 {
-	struct debug_alloc_hdr *hdr, *h;
-
-	(void)file;
-	(void)line;
+	struct ec_completed_tk *c = NULL;
+	struct ec_completed_tk_elt *elt;
+	struct ec_strvec *vec = NULL;
+	const char *s, *expected;
+	int ret = 0;
+	unsigned int count = 0;
+	va_list ap;
 
-	ec_log(EC_LOG_INFO, "%s:%d: info: free(%p)\n", file, line, ptr);
+	va_start(ap, tk);
 
-	if (ptr == NULL)
-		return;
+	/* build a string vector */
+	vec = ec_strvec_new();
+	if (vec == NULL)
+		goto out;
 
-	hdr = (ptr - sizeof(*hdr));
-	if (hdr->cookie != 0x12345678) {
-		ec_log(EC_LOG_ERR, "%s:%d: error: free(%p): bad start cookie\n",
-			file, line, ptr);
-		abort();
-	}
+	for (s = va_arg(ap, const char *);
+	     s != EC_TK_ENDLIST;
+	     s = va_arg(ap, const char *)) {
+		if (s == NULL)
+			goto out;
 
-	TAILQ_FOREACH(h, &debug_alloc_hdr_list, next) {
-		if (h == hdr)
-			break;
+		if (ec_strvec_add(vec, s) < 0)
+			goto out;
 	}
 
-	if (h == NULL) {
-		ec_log(EC_LOG_ERR, "%s:%d: error: free(%p): bad ptr\n",
-			file, line, ptr);
-		abort();
+	c = ec_tk_complete_tokens(tk, vec);
+	if (c == NULL) {
+		ret = -1;
+		goto out;
 	}
 
-	TAILQ_REMOVE(&debug_alloc_hdr_list, hdr, next);
-	free(hdr);
-}
-
-void *debug_realloc(void *ptr, size_t size, const char *file, unsigned int line)
-{
-	struct debug_alloc_hdr *hdr = (ptr - sizeof(*hdr));
-	struct debug_alloc_hdr *h;
-	size_t new_size = size + sizeof(*hdr) + sizeof(unsigned int);
-	void *ret;
-
-	if (ptr != NULL) {
-		if (hdr->cookie != 0x12345678) {
-			ec_log(EC_LOG_ERR, "%s:%d: error: realloc(%p): bad start cookie\n",
-				file, line, ptr);
-			abort();
+	for (s = va_arg(ap, const char *);
+	     s != EC_TK_ENDLIST;
+	     s = va_arg(ap, const char *)) {
+		if (s == NULL) {
+			ret = -1;
+			goto out;
 		}
 
-		TAILQ_FOREACH(h, &debug_alloc_hdr_list, next) {
-			if (h == hdr)
+		count++;
+		TAILQ_FOREACH(elt, &c->elts, next) {
+			/* only check matching completions */
+			if (elt->add != NULL && strcmp(elt->add, s) == 0)
 				break;
 		}
 
-		if (h == NULL) {
-			ec_log(EC_LOG_ERR, "%s:%d: error: realloc(%p): bad ptr\n",
-				file, line, ptr);
-			abort();
-		}
-
-		TAILQ_REMOVE(&debug_alloc_hdr_list, h, next);
-		hdr = realloc(hdr, new_size);
-		if (hdr == NULL) {
-			TAILQ_INSERT_TAIL(&debug_alloc_hdr_list, h, next);
-			ret = NULL;
-		} else {
-			ret = hdr + 1;
+		if (elt == NULL) {
+			ec_log(EC_LOG_ERR,
+				"completion <%s> not in list\n", s);
+			ret = -1;
 		}
-	} else {
-		hdr = realloc(NULL, new_size);
-		if (hdr == NULL)
-			ret = NULL;
-		else
-			ret= hdr + 1;
 	}
 
-	if (hdr != NULL) {
-		hdr->file = file;
-		hdr->line = line;
-		hdr->size = size;
-		hdr->cookie = 0x12345678;
-		TAILQ_INSERT_TAIL(&debug_alloc_hdr_list, hdr, next);
+	if (count != ec_completed_tk_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);
+		ret = -1;
 	}
 
-	ec_log(EC_LOG_INFO, "%s:%d: info: realloc(%p, %zd) -> %p\n",
-		file, line, ptr, size, ret);
-
-	return ret;
-}
-
-void debug_alloc_dump(void)
-{
-	struct debug_alloc_hdr *hdr;
 
-	TAILQ_FOREACH(hdr, &debug_alloc_hdr_list, next) {
-		ec_log(EC_LOG_ERR, "%s:%d: error: memory leak size=%zd ptr=%p\n",
-			hdr->file, hdr->line, hdr->size, hdr + 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);
 	}
-}
 
-/* XXX todo */
-/* int ec_test_check_tk_complete_list(const struct ec_tk *tk, */
-/*	const char *input, ...) */
+out:
+	ec_strvec_free(vec);
+	ec_completed_tk_free(c);
+	va_end(ap);
+	return ret;
+}
 
 int ec_test_all(void)
 {
 	struct ec_test *test;
 	int ret = 0;
 
-	TAILQ_INIT(&debug_alloc_hdr_list);
-
-	/* register a new malloc to trac memleaks */
-	if (ec_malloc_register(debug_malloc, debug_free, debug_realloc) < 0) {
-		ec_log(EC_LOG_ERR, "cannot register new malloc\n");
-		return -1;
-	}
-
 	TAILQ_FOREACH(test, &test_list, next) {
+		ec_log(EC_LOG_INFO, "== starting test %-20s\n", test->name);
+
 		if (test->test() == 0) {
 			ec_log(EC_LOG_INFO, "== test %-20s success\n",
 				test->name);
@@ -259,8 +193,5 @@ int ec_test_all(void)
 		}
 	}
 
-	ec_malloc_unregister();
-	debug_alloc_dump();
-
 	return ret;
 }