test(query): be thurough

Author: Stebalien

query/filter_test.go

@@ -6,6 +6,7 @@ import (
 )
 
 func testKeyFilter(t *testing.T, f Filter, keys []string, expect []string) {
+	t.Helper()
 	e := make([]Entry, len(keys))
 	for i, k := range keys {
 		e[i] = Entry{Key: k}
@@ -37,6 +38,8 @@ func TestFilterKeyCompare(t *testing.T) {
 	testKeyFilter(t, FilterKeyCompare{GreaterThan, "/ab"}, sampleKeys, []string{
 		"/ab/c",
 		"/ab/cd",
+		"/ab/ef",
+		"/ab/fg",
 		"/abce",
 		"/abcf",
 	})
@@ -51,6 +54,8 @@ func TestFilterKeyPrefix(t *testing.T) {
 	testKeyFilter(t, FilterKeyPrefix{"/a"}, sampleKeys, []string{
 		"/ab/c",
 		"/ab/cd",
+		"/ab/ef",
+		"/ab/fg",
 		"/a",
 		"/abce",
 		"/abcf",
@@ -59,5 +64,7 @@ func TestFilterKeyPrefix(t *testing.T) {
 	testKeyFilter(t, FilterKeyPrefix{"/ab/"}, sampleKeys, []string{
 		"/ab/c",
 		"/ab/cd",
+		"/ab/ef",
+		"/ab/fg",
 	})
 }

query/order_test.go

@@ -6,6 +6,8 @@ import (
 )
 
 func testKeyOrder(t *testing.T, f Order, keys []string, expect []string) {
+	t.Helper()
+
 	e := make([]Entry, len(keys))
 	for i, k := range keys {
 		e[i] = Entry{Key: k}
@@ -39,12 +41,16 @@ func TestOrderByKey(t *testing.T) {
 		"/ab",
 		"/ab/c",
 		"/ab/cd",
+		"/ab/ef",
+		"/ab/fg",
 		"/abce",
 		"/abcf",
 	})
 	testKeyOrder(t, OrderByKeyDescending{}, sampleKeys, []string{
 		"/abcf",
 		"/abce",
+		"/ab/fg",
+		"/ab/ef",
 		"/ab/cd",
 		"/ab/c",
 		"/ab",

query/query_test.go

@@ -9,6 +9,8 @@ import (
 var sampleKeys = []string{
 	"/ab/c",
 	"/ab/cd",
+	"/ab/ef",
+	"/ab/fg",
 	"/a",
 	"/abce",
 	"/abcf",
@@ -60,8 +62,8 @@ func TestNaiveQueryApply(t *testing.T) {
 
 	q = Query{Offset: 3, Limit: 2}
 	testNaiveQueryApply(t, q, sampleKeys, []string{
-		"/abce",
-		"/abcf",
+		"/ab/fg",
+		"/a",
 	})
 
 	f := &FilterKeyCompare{Op: Equal, Key: "/ab"}
@@ -74,31 +76,37 @@ func TestNaiveQueryApply(t *testing.T) {
 	testNaiveQueryApply(t, q, sampleKeys, []string{
 		"/ab/c",
 		"/ab/cd",
+		"/ab/ef",
+		"/ab/fg",
 	})
 
 	q = Query{Orders: []Order{OrderByKeyDescending{}}}
 	testNaiveQueryApply(t, q, sampleKeys, []string{
 		"/abcf",
 		"/abce",
+		"/ab/fg",
+		"/ab/ef",
 		"/ab/cd",
 		"/ab/c",
 		"/ab",
 		"/a",
 	})
 
 	q = Query{
-		Limit:  3,
+		Limit:  2,
 		Offset: 1,
 		Prefix: "/ab",
 		Orders: []Order{OrderByKey{}},
 	}
 	testNaiveQueryApply(t, q, sampleKeys, []string{
 		"/ab/cd",
+		"/ab/ef",
 	})
 }
 
 func TestLimit(t *testing.T) {
 	testKeyLimit := func(t *testing.T, limit int, keys []string, expect []string) {
+		t.Helper()
 		e := make([]Entry, len(keys))
 		for i, k := range keys {
 			e[i] = Entry{Key: k}
@@ -112,6 +120,8 @@ func TestLimit(t *testing.T) {
 	testKeyLimit(t, 0, sampleKeys, []string{ // none
 		"/ab/c",
 		"/ab/cd",
+		"/ab/ef",
+		"/ab/fg",
 		"/a",
 		"/abce",
 		"/abcf",
@@ -121,6 +131,8 @@ func TestLimit(t *testing.T) {
 	testKeyLimit(t, 10, sampleKeys, []string{ // large
 		"/ab/c",
 		"/ab/cd",
+		"/ab/ef",
+		"/ab/fg",
 		"/a",
 		"/abce",
 		"/abcf",
@@ -136,6 +148,7 @@ func TestLimit(t *testing.T) {
 func TestOffset(t *testing.T) {
 
 	testOffset := func(t *testing.T, offset int, keys []string, expect []string) {
+		t.Helper()
 		e := make([]Entry, len(keys))
 		for i, k := range keys {
 			e[i] = Entry{Key: k}
@@ -149,6 +162,8 @@ func TestOffset(t *testing.T) {
 	testOffset(t, 0, sampleKeys, []string{ // none
 		"/ab/c",
 		"/ab/cd",
+		"/ab/ef",
+		"/ab/fg",
 		"/a",
 		"/abce",
 		"/abcf",
@@ -159,6 +174,8 @@ func TestOffset(t *testing.T) {
 	})
 
 	testOffset(t, 2, sampleKeys, []string{
+		"/ab/ef",
+		"/ab/fg",
 		"/a",
 		"/abce",
 		"/abcf",