Remove the testgen package

tie · May 10, 2021 · fe5c174 · fe5c174
1 parent 4b46dd6
commit fe5c174
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 31 deletions.
diff --git a/dev/gensqltest/test.go.gold b/dev/gensqltest/test.go.gold
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/genjidb/genji"
-	"github.com/genjidb/genji/testutil/testgen"
+	"github.com/genjidb/genji/testutil"
 	"github.com/stretchr/testify/require"
 )
 
@@ -46,7 +46,7 @@ SELECT * FROM foo;
   "a": 1
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 		t.Run(`SELECT a, b FROM foo;`, func(t *testing.T) {
@@ -62,7 +62,7 @@ SELECT a, b FROM foo;
   "b": null
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 		t.Run(`SELECT z FROM foo;`, func(t *testing.T) {
@@ -75,7 +75,7 @@ SELECT z FROM foo;
 			raw := `
 {"z": null}
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -99,7 +99,7 @@ SELECT * FROM foo;
 			raw := `
 {"c": 3}
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 		t.Run(`SELECTARRRR z FROM foo;`, func(t *testing.T) {

diff --git a/dev/gensqltest/test_template.go.tmpl b/dev/gensqltest/test_template.go.tmpl
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/genjidb/genji"
-	"github.com/genjidb/genji/testutil/testgen"
+	"github.com/genjidb/genji/testutil"
 	"github.com/stretchr/testify/require"
 )
 
@@ -61,7 +61,7 @@ func Test{{ .TestName }}(t *testing.T) {
 {{ escapeBackticks . }}
 {{- end}}
 `
-            testgen.RequireStreamEq(t, raw, res)
+            testutil.RequireStreamEq(t, raw, res)
             {{- end }}
             {{- end }}
         })

diff --git a/query/gen_insert_statements_test.go b/query/gen_insert_statements_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/genjidb/genji"
-	"github.com/genjidb/genji/testutil/testgen"
+	"github.com/genjidb/genji/testutil"
 	"github.com/stretchr/testify/require"
 )
 
@@ -70,7 +70,7 @@ SELECT pk(), * FROM test;
   "c":"c"
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -136,7 +136,7 @@ SELECT pk(), * FROM test;
   "foo bar": "d"
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -165,7 +165,7 @@ SELECT pk(), * FROM test;
   "c": [1 , 2, 3]
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -197,7 +197,7 @@ SELECT pk(), * FROM test;
   }
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -226,7 +226,7 @@ SELECT pk(), * FROM test;
   "c": true
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -258,7 +258,7 @@ SELECT pk(), * FROM test;
   ]
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -312,7 +312,7 @@ SELECT pk(), * FROM test;
   "a": "b"
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -336,7 +336,7 @@ SELECT pk(), * FROM test;
 			raw := `
 {"pk()":1,"a":400,"b":1600}
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -383,7 +383,7 @@ SELECT pk(), * FROM test_idx;
   "c":"c"
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -449,7 +449,7 @@ SELECT pk(), * FROM test_idx;
   "foo bar": "d"
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -478,7 +478,7 @@ SELECT pk(), * FROM test_idx;
   "c": [1 , 2, 3]
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -510,7 +510,7 @@ SELECT pk(), * FROM test_idx;
   }
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -539,7 +539,7 @@ SELECT pk(), * FROM test_idx;
   "c": true
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -571,7 +571,7 @@ SELECT pk(), * FROM test_idx;
   ]
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -625,7 +625,7 @@ SELECT pk(), * FROM test_idx;
   "a": "b"
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -649,7 +649,7 @@ SELECT pk(), * FROM test_idx;
 			raw := `
 {"pk()":1,"a":400,"b":1600}
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -765,7 +765,7 @@ SELECT * FROM test_tc;
   }
 }
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})

diff --git a/query/gen_insert_with_select_test.go b/query/gen_insert_with_select_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/genjidb/genji"
-	"github.com/genjidb/genji/testutil/testgen"
+	"github.com/genjidb/genji/testutil"
 	"github.com/stretchr/testify/require"
 )
 
@@ -62,7 +62,7 @@ SELECT pk(), * FROM foo;
 			raw := `
 {"pk()":1, "a":1, "b":10}
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -86,7 +86,7 @@ SELECT pk(), * FROM foo;
 			raw := `
 {"pk()":1, "a":1}
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -110,7 +110,7 @@ SELECT pk(), * FROM foo;
 			raw := `
 {"pk()":1, "a":1, "b":10}
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})
@@ -134,7 +134,7 @@ SELECT pk(), * FROM foo;
 			raw := `
 {"pk()":1, "c":1, "d":10}
 `
-			testgen.RequireStreamEq(t, raw, res)
+			testutil.RequireStreamEq(t, raw, res)
 		})
 
 	})

diff --git a/testutil/testgen/gen.go → testutil/gen.go b/testutil/testgen/gen.go → testutil/gen.go
@@ -1,4 +1,4 @@
-package testgen
+package testutil
 
 import (
 	"strings"