improve test coverage

metalim · Jul 14, 2024 · ba01d2e · ba01d2e
1 parent dab0916
commit ba01d2e
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -18,30 +18,25 @@ Inspired by [wk8/go-ordered-map](https://github.com/wk8/go-ordered-map) and [ian
 
 ## Performance
 
-Similar to Go native map, `jsonmap` has O(1) time for Get, Set, Delete. Additionally it has Push, First, Last, Next, Prev operations, which are also O(1)
+Similar to Go native map, `jsonmap` has O(1) time for Get, Set, Delete. Additionally it has Push, First, Last, Next, Prev operations, which are also O(1). Suite benchmark does 10k of Set and Get, and 1k of Delete operations. `jsonmap` performance is on par with native Go map
 
 ```
-➜ go test -bench . -benchmem
-...
-
-Benchmark/Ops/Get/gomap-10             10916256               110.7 ns/op             0 B/op          0 allocs/op
-Benchmark/Ops/Get/jsonmap-10           10133562               118.1 ns/op             0 B/op          0 allocs/op
-
-Benchmark/Ops/SetExisting/gomap-10      7771100               144.1 ns/op             7 B/op          0 allocs/op
-Benchmark/Ops/SetExisting/jsonmap-10    3813949               278.3 ns/op            25 B/op          1 allocs/op
-
-Benchmark/Ops/SetNew/gomap-10           6028083               168.5 ns/op            15 B/op          1 allocs/op
-Benchmark/Ops/SetNew/jsonmap-10         3636994               292.2 ns/op            55 B/op          1 allocs/op
-
-Benchmark/Ops/Delete/gomap-10           9750571               114.8 ns/op             0 B/op          0 allocs/op
-Benchmark/Ops/Delete/jsonmap-10         5974435               192.0 ns/op             0 B/op          0 allocs/op
-```
-
-Suite benchmark does 10k of Set and Get, and 1k of Delete operations. `jsonmap` performance is on par with native Go map
-
-```
-Benchmark/Suite/gomap-10                      38          30634451 ns/op        23947561 B/op     521837 allocs/op
-Benchmark/Suite/jsonmap-10                    33          33939048 ns/op        24056151 B/op     621895 allocs/op
+➜ go test -bench . -benchmem ./test
+goos: darwin
+goarch: arm64
+pkg: github.com/metalim/jsonmap/test
+Benchmark/Suite/jsonmap-10            36          31614692 ns/op        17046302 B/op     623006 allocs/op
+Benchmark/Suite/gomap-10              48          25116164 ns/op        14791564 B/op     522925 allocs/op
+Benchmark/Ops/Get/jsonmap-10            11191284               112.3 ns/op             0 B/op          0 allocs/op
+Benchmark/Ops/Get/gomap-10              11543529                97.88 ns/op            0 B/op          0 allocs/op
+Benchmark/Ops/SetExisting/jsonmap-10     5847512               291.3 ns/op           106 B/op          1 allocs/op
+Benchmark/Ops/SetExisting/gomap-10       7608140               174.6 ns/op            89 B/op          1 allocs/op
+Benchmark/Ops/SetNew/jsonmap-10          2548009               429.3 ns/op           242 B/op          2 allocs/op
+Benchmark/Ops/SetNew/gomap-10            5143821               212.3 ns/op           133 B/op          1 allocs/op
+Benchmark/Ops/Delete/jsonmap-10          7642382               156.0 ns/op             0 B/op          0 allocs/op
+Benchmark/Ops/Delete/gomap-10           10592187               102.4 ns/op             0 B/op          0 allocs/op
+PASS
+ok      github.com/metalim/jsonmap/test 143.577s
 ```
 
 ## Installation

diff --git a/test/jsonmap_test.go b/test/jsonmap_test.go
@@ -18,6 +18,7 @@ func TestJSONMap(t *testing.T) {
 
 func testJSONMapOnce(t *testing.T, i int) {
 	m := jsonmap.New()
+
 	// no elements
 	assert.Equal(t, m.Len(), 0)
 	assert.Equal(t, len(m.Keys()), 0)
@@ -26,17 +27,45 @@ func testJSONMapOnce(t *testing.T, i int) {
 	assert.Nil(t, m.Last())
 
 	// 1 element
-	m.Set("a", 1)
+	m.Set("y", 1)
 	assert.Equal(t, m.Len(), 1)
 	assert.Equal(t, len(m.Keys()), 1)
-	assert.Equal(t, m.Keys()[0], "a")
+	assert.Equal(t, m.Keys()[0], "y")
+	assert.Equal(t, m.First().Key(), m.Keys()[0])
+	assert.Equal(t, m.First().Key(), m.Last().Key())
+	assert.Nil(t, m.First().Next())
+	assert.Nil(t, m.Last().Prev())
+	assert.Equal(t, m.String(), "map[y:1]")
+
+	// delete single element
+	m.Delete("y")
+	assert.Equal(t, m.Len(), 0)
+	assert.Equal(t, len(m.Keys()), 0)
+	assert.Equal(t, m.String(), "map[]")
+	assert.Nil(t, m.First())
+	assert.Nil(t, m.Last())
+
+	// 1 element
+	m.Set("z", 1)
+	assert.Equal(t, m.Len(), 1)
+	assert.Equal(t, len(m.Keys()), 1)
+	assert.Equal(t, m.Keys()[0], "z")
 	assert.Equal(t, m.First().Key(), m.Keys()[0])
 	assert.Equal(t, m.First().Key(), m.Last().Key())
 	assert.Nil(t, m.First().Next())
 	assert.Nil(t, m.Last().Prev())
-	assert.Equal(t, m.String(), "map[a:1]")
+	assert.Equal(t, m.String(), "map[z:1]")
+
+	// clear map
+	m.Clear()
+	assert.Equal(t, m.Len(), 0)
+	assert.Equal(t, len(m.Keys()), 0)
+	assert.Equal(t, m.String(), "map[]")
+	assert.Nil(t, m.First())
+	assert.Nil(t, m.Last())
 
 	// 2 elements
+	m.Set("a", 1)
 	m.Set("d", "2")
 	assert.Equal(t, m.Len(), 2)
 	assert.Equal(t, len(m.Keys()), 2)
@@ -73,7 +102,7 @@ func testJSONMapOnce(t *testing.T, i int) {
 	assert.True(t, ok)
 	assert.Equal(t, vInt, 1)
 	vString, ok := jsonmap.GetAs[string](m, "a")
-	assert.True(t, !ok)
+	assert.False(t, ok)
 	assert.Equal(t, vString, "")
 
 	v, ok = m.Get("d")
@@ -83,16 +112,20 @@ func testJSONMapOnce(t *testing.T, i int) {
 	assert.True(t, ok)
 	assert.Equal(t, vString, "2")
 	vInt, ok = jsonmap.GetAs[int](m, "d")
-	assert.True(t, !ok)
+	assert.False(t, ok)
+	assert.Equal(t, vInt, 0)
+
+	vInt, ok = jsonmap.GetAs[int](m, "nonexistent")
+	assert.False(t, ok)
 	assert.Equal(t, vInt, 0)
 
 	v, ok = m.Get("b")
 	assert.True(t, ok)
 	assert.Equal(t, v.(int), 7)
 	v, ok = m.Get("c")
-	assert.True(t, !ok)
+	assert.False(t, ok)
 	assert.Nil(t, v)
 	v, ok = m.Get("e")
-	assert.True(t, !ok)
+	assert.False(t, ok)
 	assert.Nil(t, v)
 }