1 files changed, 42 insertions, 33 deletions

diff --git a/tests/trie.c b/tests/trie.c
index e687f96..59bde40 100644
--- a/tests/trie.c
+++ b/tests/trie.c
@@ -1,13 +1,16 @@
 // Copyright © Tavian Barnes <tavianator@tavianator.com>
 // SPDX-License-Identifier: 0BSD
 
-#include "../src/trie.h"
-#include "../src/config.h"
-#include "../src/diag.h"
+#include "tests.h"
+
+#include "bfs.h"
+#include "diag.h"
+#include "trie.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-const char *keys[] = {
+static const char *keys[] = {
 	"foo",
 	"bar",
 	"baz",
@@ -17,9 +20,11 @@ const char *keys[] = {
 	"quuuux",
 
 	"pre",
-	"pref",
 	"prefi",
+	"pref",
 	"prefix",
+	"p",
+	"pRefix",
 
 	"AAAA",
 	"AADD",
@@ -34,16 +39,20 @@ const char *keys[] = {
 	">>>>>>",
 	">>><<<",
 	">>>",
+
+	"AAAAAAA",
+	"AAAAAAAB",
+	"AAAAAAAa",
 };
 
-const size_t nkeys = countof(keys);
+static const size_t nkeys = countof(keys);
 
-int main(void) {
+void check_trie(void) {
 	struct trie trie;
 	trie_init(&trie);
 
 	for (size_t i = 0; i < nkeys; ++i) {
-		bfs_verify(!trie_find_str(&trie, keys[i]));
+		bfs_check(!trie_find_str(&trie, keys[i]));
 
 		const char *prefix = NULL;
 		for (size_t j = 0; j < i; ++j) {
@@ -57,37 +66,38 @@ int main(void) {
 		struct trie_leaf *leaf = trie_find_prefix(&trie, keys[i]);
 		if (prefix) {
 			bfs_verify(leaf);
-			bfs_verify(strcmp(prefix, leaf->key) == 0);
+			bfs_check(strcmp(prefix, leaf->key) == 0);
 		} else {
-			bfs_verify(!leaf);
+			bfs_check(!leaf);
 		}
 
 		leaf = trie_insert_str(&trie, keys[i]);
 		bfs_verify(leaf);
-		bfs_verify(strcmp(keys[i], leaf->key) == 0);
-		bfs_verify(leaf->length == strlen(keys[i]) + 1);
+		bfs_check(strcmp(keys[i], leaf->key) == 0);
+		bfs_check(leaf->length == strlen(keys[i]) + 1);
 	}
 
 	{
 		size_t i = 0;
-		TRIE_FOR_EACH(&trie, leaf) {
-			bfs_verify(leaf == trie_find_str(&trie, keys[i]));
-			bfs_verify(!leaf->prev || leaf->prev->next == leaf);
-			bfs_verify(!leaf->next || leaf->next->prev == leaf);
+		for_trie (leaf, &trie) {
+			bfs_check(leaf == trie_find_str(&trie, keys[i]));
+			bfs_check(leaf == trie_insert_str(&trie, keys[i]));
+			bfs_check(!leaf->prev || leaf->prev->next == leaf);
+			bfs_check(!leaf->next || leaf->next->prev == leaf);
 			++i;
 		}
-		bfs_verify(i == nkeys);
+		bfs_check(i == nkeys);
 	}
 
 	for (size_t i = 0; i < nkeys; ++i) {
 		struct trie_leaf *leaf = trie_find_str(&trie, keys[i]);
 		bfs_verify(leaf);
-		bfs_verify(strcmp(keys[i], leaf->key) == 0);
-		bfs_verify(leaf->length == strlen(keys[i]) + 1);
+		bfs_check(strcmp(keys[i], leaf->key) == 0);
+		bfs_check(leaf->length == strlen(keys[i]) + 1);
 
 		trie_remove(&trie, leaf);
 		leaf = trie_find_str(&trie, keys[i]);
-		bfs_verify(!leaf);
+		bfs_check(!leaf);
 
 		const char *postfix = NULL;
 		for (size_t j = i + 1; j < nkeys; ++j) {
@@ -101,14 +111,14 @@ int main(void) {
 		leaf = trie_find_postfix(&trie, keys[i]);
 		if (postfix) {
 			bfs_verify(leaf);
-			bfs_verify(strcmp(postfix, leaf->key) == 0);
+			bfs_check(strcmp(postfix, leaf->key) == 0);
 		} else {
-			bfs_verify(!leaf);
+			bfs_check(!leaf);
 		}
 	}
 
-	TRIE_FOR_EACH(&trie, leaf) {
-		bfs_verify(false);
+	for_trie (leaf, &trie) {
+		bfs_check(false, "trie should be empty");
 	}
 
 	// This tests the "jump" node handling on 32-bit platforms
@@ -117,18 +127,17 @@ int main(void) {
 	bfs_verify(longstr);
 
 	memset(longstr, 0xAC, longsize);
-	bfs_verify(!trie_find_mem(&trie, longstr, longsize));
-	bfs_verify(trie_insert_mem(&trie, longstr, longsize));
+	bfs_check(!trie_find_mem(&trie, longstr, longsize));
+	bfs_check(trie_insert_mem(&trie, longstr, longsize));
 
-	memset(longstr + longsize/2, 0xAB, longsize/2);
-	bfs_verify(!trie_find_mem(&trie, longstr, longsize));
-	bfs_verify(trie_insert_mem(&trie, longstr, longsize));
+	memset(longstr + longsize / 2, 0xAB, longsize / 2);
+	bfs_check(!trie_find_mem(&trie, longstr, longsize));
+	bfs_check(trie_insert_mem(&trie, longstr, longsize));
 
-	memset(longstr, 0xAA, longsize/2);
-	bfs_verify(!trie_find_mem(&trie, longstr, longsize));
-	bfs_verify(trie_insert_mem(&trie, longstr, longsize));
+	memset(longstr, 0xAA, longsize / 2);
+	bfs_check(!trie_find_mem(&trie, longstr, longsize));
+	bfs_check(trie_insert_mem(&trie, longstr, longsize));
 
 	free(longstr);
 	trie_destroy(&trie);
-	return EXIT_SUCCESS;
 }