Add a new test for removal of keys from the ht, and fix up API naming.

2 files changed, 74 insertions, 0 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b59663a..55a3d20 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,6 +22,7 @@ AM_CFLAGS = $(WARN_CFLAGS) -I..
 LDADD = ../libhash_table.la
 
 TESTS = \
+	delete_and_lookup \
 	insert_and_lookup \
 	null_destroy \
 	$()
diff --git a/tests/delete_and_lookup.c b/tests/delete_and_lookup.c
new file mode 100644
index 0000000..c4fe555
--- /dev/null
+++ b/tests/delete_and_lookup.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Eric Anholt <eric@anholt.net>
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include "hash_table.h"
+#include "fnv_hash.h"
+
+/* Return collisions, so we can test the deletion behavior for chained
+ * objects.
+ */
+static uint32_t
+badhash(const void *key)
+{
+	return 1;
+}
+
+int
+main(int argc, char **argv)
+{
+	struct hash_table *ht;
+	const char *str1 = "test1";
+	const char *str2 = "test2";
+	struct hash_entry *entry;
+
+	ht = hash_table_create(badhash, string_key_equals);
+
+	hash_table_insert(ht, str1, NULL);
+	hash_table_insert(ht, str2, NULL);
+
+	entry = hash_table_search(ht, str1);
+	assert(strcmp(entry->key, str1) == 0);
+
+	entry = hash_table_search(ht, str2);
+	assert(strcmp(entry->key, str2) == 0);
+
+	hash_table_remove(ht, hash_table_search(ht, str1));
+
+	entry = hash_table_search(ht, str1);
+	assert(entry == NULL);
+
+	entry = hash_table_search(ht, str2);
+	assert(strcmp(entry->key, str2) == 0);
+
+	hash_table_destroy(NULL, NULL);
+
+	return 0;
+}