Fix a few broken tests around serialization

emirpasic · Oct 18, 2023 · 6708ddd · 6708ddd
1 parent f190ab9
commit 6708ddd
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 37 deletions.
diff --git a/maps/treebidimap/serialization.go b/maps/treebidimap/serialization.go
@@ -16,7 +16,7 @@ var _ containers.JSONDeserializer = (*Map[string, int])(nil)
 
 // ToJSON outputs the JSON representation of the map.
 func (m *Map[K, V]) ToJSON() ([]byte, error) {
-	return json.Marshal(m.forwardMap)
+	return m.forwardMap.ToJSON()
 }
 
 // FromJSON populates the map from the input JSON representation.

diff --git a/maps/treebidimap/treebidimap_test.go b/maps/treebidimap/treebidimap_test.go
@@ -578,20 +578,26 @@ func TestMapSerialization(t *testing.T) {
 		original.Put("b", "2")
 		original.Put("a", "1")
 
-		assertSerialization(original, "A", t)
-
 		serialized, err := original.ToJSON()
 		if err != nil {
 			t.Errorf("Got error %v", err)
 		}
-		assertSerialization(original, "B", t)
 
 		deserialized := New[string, string]()
 		err = deserialized.FromJSON(serialized)
 		if err != nil {
 			t.Errorf("Got error %v", err)
 		}
-		assertSerialization(deserialized, "C", t)
+
+		if original.Size() != deserialized.Size() {
+			t.Errorf("Got map of size %d, expected %d", original.Size(), deserialized.Size())
+		}
+		original.Each(func(key string, expected string) {
+			actual, ok := deserialized.Get(key)
+			if !ok || actual != expected {
+				t.Errorf("Did not find expected value %v for key %v in deserialied map (got %q)", expected, key, actual)
+			}
+		})
 	}
 
 	m := New[string, float64]()
@@ -618,29 +624,6 @@ func TestMapString(t *testing.T) {
 	}
 }
 
-// noinspection GoBoolExpressions
-func assertSerialization(m *Map[string, string], txt string, t *testing.T) {
-	if actualValue := m.Keys(); false ||
-		actualValue[0] != "a" ||
-		actualValue[1] != "b" ||
-		actualValue[2] != "c" ||
-		actualValue[3] != "d" ||
-		actualValue[4] != "e" {
-		t.Errorf("[%s] Got %v expected %v", txt, actualValue, "[a,b,c,d,e]")
-	}
-	if actualValue := m.Values(); false ||
-		actualValue[0] != "1" ||
-		actualValue[1] != "2" ||
-		actualValue[2] != "3" ||
-		actualValue[3] != "4" ||
-		actualValue[4] != "5" {
-		t.Errorf("[%s] Got %v expected %v", txt, actualValue, "[1,2,3,4,5]")
-	}
-	if actualValue, expectedValue := m.Size(), 5; actualValue != expectedValue {
-		t.Errorf("[%s] Got %v expected %v", txt, actualValue, expectedValue)
-	}
-}
-
 func benchmarkGet(b *testing.B, m *Map[int, int], size int) {
 	for i := 0; i < b.N; i++ {
 		for n := 0; n < size; n++ {

diff --git a/queues/arrayqueue/arrayqueue_test.go b/queues/arrayqueue/arrayqueue_test.go
@@ -377,10 +377,11 @@ func TestQueueSerialization(t *testing.T) {
 		t.Errorf("Got error %v", err)
 	}
 
-	err = json.Unmarshal([]byte(`[1,2,3]`), &queue)
+	err = json.Unmarshal([]byte(`["a","b","c"]`), &queue)
 	if err != nil {
 		t.Errorf("Got error %v", err)
 	}
+	assert()
 }
 
 func TestQueueString(t *testing.T) {

diff --git a/queues/circularbuffer/circularbuffer_test.go b/queues/circularbuffer/circularbuffer_test.go
@@ -512,10 +512,11 @@ func TestQueueSerialization(t *testing.T) {
 		t.Errorf("Got error %v", err)
 	}
 
-	err = json.Unmarshal([]byte(`[1,2,3]`), &queue)
+	err = json.Unmarshal([]byte(`["a","b","c"]`), &queue)
 	if err != nil {
 		t.Errorf("Got error %v", err)
 	}
+	assert()
 }
 
 func TestQueueString(t *testing.T) {

diff --git a/queues/linkedlistqueue/linkedlistqueue_test.go b/queues/linkedlistqueue/linkedlistqueue_test.go
@@ -240,10 +240,11 @@ func TestQueueSerialization(t *testing.T) {
 		t.Errorf("Got error %v", err)
 	}
 
-	err = json.Unmarshal([]byte(`[1,2,3]`), &queue)
+	err = json.Unmarshal([]byte(`["a","b","c"]`), &queue)
 	if err != nil {
 		t.Errorf("Got error %v", err)
 	}
+	assert()
 }
 
 func TestQueueString(t *testing.T) {

diff --git a/queues/priorityqueue/priorityqueue_test.go b/queues/priorityqueue/priorityqueue_test.go
@@ -456,10 +456,11 @@ func TestBinaryQueueSerialization(t *testing.T) {
 		t.Errorf("Got error %v", err)
 	}
 
-	err = json.Unmarshal([]byte(`[1,2,3]`), &queue)
+	err = json.Unmarshal([]byte(`["a","b","c"]`), &queue)
 	if err != nil {
 		t.Errorf("Got error %v", err)
 	}
+	assert()
 }
 
 func TestBTreeString(t *testing.T) {

diff --git a/sets/hashset/hashset_test.go b/sets/hashset/hashset_test.go
@@ -111,10 +111,11 @@ func TestSetSerialization(t *testing.T) {
 		t.Errorf("Got error %v", err)
 	}
 
-	err = json.Unmarshal([]byte(`[1,2,3]`), &set)
+	err = json.Unmarshal([]byte(`["a","b","c"]`), &set)
 	if err != nil {
 		t.Errorf("Got error %v", err)
 	}
+	assert()
 }
 
 func TestSetString(t *testing.T) {

diff --git a/sets/linkedhashset/linkedhashset_test.go b/sets/linkedhashset/linkedhashset_test.go
@@ -467,10 +467,11 @@ func TestSetSerialization(t *testing.T) {
 		t.Errorf("Got error %v", err)
 	}
 
-	err = json.Unmarshal([]byte(`[1,2,3]`), &set)
+	err = json.Unmarshal([]byte(`["a","b","c"]`), &set)
 	if err != nil {
 		t.Errorf("Got error %v", err)
 	}
+	assert()
 }
 
 func TestSetString(t *testing.T) {

diff --git a/stacks/arraystack/arraystack_test.go b/stacks/arraystack/arraystack_test.go
@@ -377,10 +377,11 @@ func TestStackSerialization(t *testing.T) {
 		t.Errorf("Got error %v", err)
 	}
 
-	err = json.Unmarshal([]byte(`[1,2,3]`), &stack)
+	err = json.Unmarshal([]byte(`["a","b","c"]`), &stack)
 	if err != nil {
 		t.Errorf("Got error %v", err)
 	}
+	assert()
 }
 
 func TestStackString(t *testing.T) {

diff --git a/stacks/linkedliststack/linkedliststack_test.go b/stacks/linkedliststack/linkedliststack_test.go
@@ -233,16 +233,17 @@ func TestStackSerialization(t *testing.T) {
 		t.Errorf("Got error %v", err)
 	}
 
-	err = json.Unmarshal([]byte(`[1,2,3]`), &stack)
+	err = json.Unmarshal([]byte(`["a","b","c"]`), &stack)
 	if err != nil {
 		t.Errorf("Got error %v", err)
 	}
+	assert()
 }
 
 func TestStackString(t *testing.T) {
 	c := New[int]()
 	c.Push(1)
-	if !strings.HasPrefix(c.String(), "ArrayStack") {
+	if !strings.HasPrefix(c.String(), "LinkedListStack") {
 		t.Errorf("String should start with container name")
 	}
 }