diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | benchmark/benchmark_test.go | 4 | ||||
| -rw-r--r-- | errors_test.go | 2 | ||||
| -rw-r--r-- | internal/testhelpers/assert/assert.go (renamed from internal/assert/assert.go) | 0 | ||||
| -rw-r--r-- | internal/testhelpers/mock/mock.go (renamed from internal/mock/mock.go) | 0 | ||||
| -rw-r--r-- | internal/testhelpers/must/must.go (renamed from internal/must/must.go) | 0 | ||||
| -rw-r--r-- | plan_test.go | 2 | ||||
| -rw-r--r-- | query_test.go | 6 | ||||
| -rw-r--r-- | select_test.go | 6 |
9 files changed, 11 insertions, 11 deletions
@@ -15,7 +15,7 @@ static-check: FORCE benchmark: FORCE @cd benchmark && go test -bench . -benchmem . -GO_COVERPKGS := $(shell go list ./... | tr '\n' , | sed 's/,$$//') +GO_COVERPKGS := $(shell go list ./... | grep -vw testhelpers | tr '\n' , | sed 's/,$$//') GO_TESTPKGS := $(shell go list -f '{{if or .TestGoFiles .XTestGoFiles}}{{.ImportPath}}{{end}}' ./...) build/cover.out: FORCE diff --git a/benchmark/benchmark_test.go b/benchmark/benchmark_test.go index d18c0cb..7cf94b7 100644 --- a/benchmark/benchmark_test.go +++ b/benchmark/benchmark_test.go @@ -14,8 +14,8 @@ import ( "github.com/go-gorp/gorp/v3" _ "github.com/mattn/go-sqlite3" "go.xyrillian.de/oblast" - "go.xyrillian.de/oblast/internal/assert" - "go.xyrillian.de/oblast/internal/must" + "go.xyrillian.de/oblast/internal/testhelpers/assert" + "go.xyrillian.de/oblast/internal/testhelpers/must" "gorm.io/driver/sqlite" "gorm.io/gorm" ) diff --git a/errors_test.go b/errors_test.go index c39cf67..81ee395 100644 --- a/errors_test.go +++ b/errors_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - "go.xyrillian.de/oblast/internal/assert" + "go.xyrillian.de/oblast/internal/testhelpers/assert" ) type fooError struct{} diff --git a/internal/assert/assert.go b/internal/testhelpers/assert/assert.go index 6e641ca..6e641ca 100644 --- a/internal/assert/assert.go +++ b/internal/testhelpers/assert/assert.go diff --git a/internal/mock/mock.go b/internal/testhelpers/mock/mock.go index 6265166..6265166 100644 --- a/internal/mock/mock.go +++ b/internal/testhelpers/mock/mock.go diff --git a/internal/must/must.go b/internal/testhelpers/must/must.go index 7a137c6..7a137c6 100644 --- a/internal/must/must.go +++ b/internal/testhelpers/must/must.go diff --git a/plan_test.go b/plan_test.go index b3eeac5..5279a13 100644 --- a/plan_test.go +++ b/plan_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "go.xyrillian.de/oblast/internal/assert" + "go.xyrillian.de/oblast/internal/testhelpers/assert" ) func TestPlanFieldTraversal(t *testing.T) { diff --git a/query_test.go b/query_test.go index 29cb015..2809f6e 100644 --- a/query_test.go +++ b/query_test.go @@ -9,9 +9,9 @@ import ( "testing" "go.xyrillian.de/oblast" - "go.xyrillian.de/oblast/internal/assert" - "go.xyrillian.de/oblast/internal/mock" - "go.xyrillian.de/oblast/internal/must" + "go.xyrillian.de/oblast/internal/testhelpers/assert" + "go.xyrillian.de/oblast/internal/testhelpers/mock" + "go.xyrillian.de/oblast/internal/testhelpers/must" ) func TestInsertBasic(t *testing.T) { diff --git a/select_test.go b/select_test.go index 51b0912..f38fbdd 100644 --- a/select_test.go +++ b/select_test.go @@ -10,9 +10,9 @@ import ( "time" "go.xyrillian.de/oblast" - "go.xyrillian.de/oblast/internal/assert" - "go.xyrillian.de/oblast/internal/mock" - "go.xyrillian.de/oblast/internal/must" + "go.xyrillian.de/oblast/internal/testhelpers/assert" + "go.xyrillian.de/oblast/internal/testhelpers/mock" + "go.xyrillian.de/oblast/internal/testhelpers/must" ) func TestSelectReturningSomeRecords(t *testing.T) { |