Test suite for idhash, fix symbol errors, and value changing.

3 files changed, 128 insertions, 4 deletions

diff --git a/src/core/idhash.c b/src/core/idhash.c
index 85759b93..050ba4fb 100644
--- a/src/core/idhash.c
+++ b/src/core/idhash.c
@@ -113,7 +113,7 @@ nni_hash_resize(nni_idhash *h)
 
 
 int
-nni_hash_remove(nni_idhash *h, uint32_t id)
+nni_idhash_remove(nni_idhash *h, uint32_t id)
 {
 	uint32_t index = id & (h->ih_cap - 1);
 
@@ -138,7 +138,7 @@ nni_hash_remove(nni_idhash *h, uint32_t id)
 
 
 int
-nni_hash_insert(nni_idhash *h, uint32_t id, void *val)
+nni_idhash_insert(nni_idhash *h, uint32_t id, void *val)
 {
 	uint32_t index;
 
@@ -149,10 +149,13 @@ nni_hash_insert(nni_idhash *h, uint32_t id, void *val)
 	}
 	index = id & (h->ih_cap - 1);
 	for (;;) {
-		if (h->ih_entries[index].ihe_val == NULL) {
+		if ((h->ih_entries[index].ihe_val == NULL) ||
+		    (h->ih_entries[index].ihe_key == id)) {
+			if (h->ih_entries[index].ihe_val == NULL) {
+				h->ih_count++;
+			}
 			h->ih_entries[index].ihe_key = id;
 			h->ih_entries[index].ihe_val = val;
-			h->ih_count++;
 			return (0);
 		}
 		index = NNI_IDHASH_NEXTPROBE(h, index);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e8f6706e..0a225c7e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -52,6 +52,7 @@ else ()
     endmacro (add_nng_perf)
 endif ()
 
+add_nng_test(idhash 5)
 add_nng_test(list 5)
 add_nng_test(platform 5)
 add_nng_test(sock 5)
diff --git a/tests/idhash.c b/tests/idhash.c
new file mode 100644
index 00000000..de3f28f4
--- /dev/null
+++ b/tests/idhash.c
@@ -0,0 +1,120 @@
+//
+// Copyright 2016 Garrett D'Amore <garrett@damore.org>
+//
+// This software is supplied under the terms of the MIT License, a
+// copy of which should be located in the distribution where this
+// file was obtained (LICENSE.txt).  A copy of the license may also be
+// found online at https://opensource.org/licenses/MIT.
+//
+
+#include "core/idhash.c"
+#include "convey.h"
+
+Main({
+	Test("General ID Hash", {
+		int rv;
+
+		Convey("Given an id hash", {
+			nni_idhash h;
+
+			rv = nni_idhash_init(&h);
+			So(rv == 0);
+			So(h.ih_cap == 8);
+			So(h.ih_entries != NULL);
+			So(h.ih_count == 0);
+
+			Reset({
+				nni_idhash_fini(&h);
+			})
+
+			Convey("We can insert an element", {
+				char *five = "five";
+				char *four = "four";
+				rv = nni_idhash_insert(&h, 5, five);
+				So(rv == 0);
+				Convey("And we can find it", {
+					void *ptr;
+					rv = nni_idhash_find(&h, 5, &ptr);
+					So(rv == 0);
+					So(ptr == five);
+				})
+				Convey("We can delete it", {
+					void *ptr;
+					rv = nni_idhash_remove(&h, 5);
+					So(rv == 0);
+					rv = nni_idhash_find(&h, 5, &ptr);
+					So(rv == NNG_ENOENT);
+				})
+				Convey("We can change the value", {
+					void *ptr;
+					rv = nni_idhash_insert(&h, 5, four);
+					So(rv == 0);
+					So(h.ih_count == 1);
+					rv = nni_idhash_find(&h, 5, &ptr);
+					So(rv == 0);
+					So(ptr == four);
+				})
+				Convey("We can insert a hash collision", {
+					void *ptr;
+					rv = nni_idhash_insert(&h, 13, four);
+					So(h.ih_count == 2);
+					rv = nni_idhash_find(&h, 5, &ptr);
+					So(rv == 0);
+					So(ptr == five);
+					rv = nni_idhash_find(&h, 13, &ptr);
+					So(rv == 0);
+					So(ptr == four);
+				})
+
+			})
+			Convey("We cannot find bogus values", {
+				void *ptr = NULL;
+				rv = nni_idhash_find(&h, 42, &ptr);
+				So(rv == NNG_ENOENT);
+				So(ptr == NULL);
+			})
+		})
+	})
+
+	Test("Resize ID Hash", {
+		int expect[1024];
+		int actual[1024];
+		int rv;
+
+		for (int i = 0; i < 1024; i++) {
+			expect[i] = i;
+		}
+		Convey("Given an id hash", {
+			nni_idhash h;
+
+			rv = nni_idhash_init(&h);
+			So(rv == 0);
+			So(h.ih_cap == 8);
+			So(h.ih_entries != NULL);
+			So(h.ih_count == 0);
+
+			Reset({
+				nni_idhash_fini(&h);
+			})
+
+			Convey("We can insert 1024 items", {
+				uint32_t count;
+				for (int i = 0; i < 1024; i++) {
+					nni_idhash_insert(&h, i, &expect[i]);
+				}
+				So(nni_idhash_count(&h, &count) == 0);
+				So(count == 1024);
+				So(h.ih_cap = 2048);
+				So(h.ih_count == 1024);
+
+				Convey("We can remove them", {
+					for (int i = 0; i < 1024; i++) {
+						nni_idhash_remove(&h, i);
+					}
+					So(h.ih_count == 0);
+					So(h.ih_cap == 8);
+				})
+			})
+		})
+	})
+})