fix: rework tests in order to make the dedicated module work without …

…replacements
omissis · Oct 4, 2023 · e8a51ed · e8a51ed
1 parent b0ec161
commit e8a51ed
Show file tree

Hide file tree

Showing 118 changed files with 563 additions and 585 deletions.
diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
@@ -33,7 +33,7 @@ jobs:
           version: v1.53.3
           args: -v --color=always --config=.rules/.golangci.yml ./...
       - name: Run tests
-        run: go test -v -race -covermode=atomic -coverpkg=./... -coverprofile=coverage.out ./...
+        run: ./scripts/test.sh
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
       - name: Build binaries

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -36,7 +36,7 @@ jobs:
           version: v1.53.3
           args: -v --color=always --config=.rules/.golangci.yml ./...
       - name: Run tests
-        run: go test -v -race ./...
+        run: ./scripts/test.sh
       - name: Log in to Docker Hub
         if: ${{ !contains(github.ref_name, '-') }}
         uses: docker/login-action@v3

diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 .envrc
 .idea
 coverage.out
+coverage/
 bin/
 dist/
 vendor/
+go.work
diff --git a/go.mod b/go.mod
@@ -3,15 +3,12 @@ module github.com/atombender/go-jsonschema
 go 1.21
 
 require (
-	github.com/atombender/go-jsonschema/tests/data v0.0.0-20231004081121-f58c06ae3d14
 	github.com/goccy/go-yaml v1.11.2
-	github.com/magiconair/properties v1.8.7
 	github.com/mitchellh/go-wordwrap v1.0.1
 	github.com/pkg/errors v0.9.1
 	github.com/sanity-io/litter v1.5.5
 	github.com/spf13/cobra v1.7.0
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9
-	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -23,5 +20,3 @@ require (
 	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 )
-
-replace github.com/atombender/go-jsonschema/tests/data => ./tests/data
diff --git a/go.sum b/go.sum
@@ -17,8 +17,6 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
-github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
@@ -52,7 +50,5 @@ golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/go.work.dist b/go.work.dist
@@ -0,0 +1,6 @@
+go 1.21.1
+
+use (
+    .
+    ./tests
+)
diff --git a/go.work.sum b/go.work.sum
@@ -0,0 +1,2 @@
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
diff --git a/scripts/lint-golang.sh b/scripts/lint-golang.sh
@@ -4,3 +4,5 @@ set -e
 set -o errexit -o nounset
 
 golangci-lint -v run --color=always --config=.rules/.golangci.yml ./...
+golangci-lint -v run --color=always --config=.rules/.golangci.yml tests/*.go
+golangci-lint -v run --color=always --config=.rules/.golangci.yml tests/helpers/*.go
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -3,4 +3,10 @@
 set -e
 set -o errexit -o nounset
 
-go test -v -race -covermode=atomic -coverpkg=./... -coverprofile=coverage.out ./...
+mkdir -p "${PWD}/coverage/pkg"
+mkdir -p "${PWD}/coverage/tests"
+
+go test -v -race -mod=readonly -covermode=atomic -coverpkg=./... -cover ./... -args -test.gocoverdir="${PWD}/coverage/pkg"
+go test -v -race -mod=readonly -covermode=atomic -coverpkg=./... -cover ./tests -args -test.gocoverdir="${PWD}/coverage/tests"
+
+go tool covdata textfmt -i=./coverage/tests,./coverage/pkg -o coverage.out
diff --git a/tests/data/core/4.2.1_array.go → tests/data/core/array/array.go b/tests/data/core/4.2.1_array.go → tests/data/core/array/array.go
diff --git a/tests/data/core/4.2.1_array.json → tests/data/core/array/array.json b/tests/data/core/4.2.1_array.json → tests/data/core/array/array.json
diff --git a/tests/data/core/ip.go → tests/data/core/ip/ip.go b/tests/data/core/ip.go → tests/data/core/ip/ip.go
diff --git a/tests/data/core/ip.json → tests/data/core/ip/ip.json b/tests/data/core/ip.json → tests/data/core/ip/ip.json
diff --git a/tests/data/core/nullableType.go → tests/data/core/nullableType/nullableType.go b/tests/data/core/nullableType.go → tests/data/core/nullableType/nullableType.go
diff --git a/tests/data/core/nullableType.json → .../data/core/nullableType/nullableType.json b/tests/data/core/nullableType.json → .../data/core/nullableType/nullableType.json
diff --git a/tests/data/core/object.go → tests/data/core/object/object.go b/tests/data/core/object.go → tests/data/core/object/object.go
diff --git a/tests/data/core/object.json → tests/data/core/object/object.json b/tests/data/core/object.json → tests/data/core/object/object.json
diff --git a/...s/data/core/objectAdditionalProperties.go → ...lProperties/objectAdditionalProperties.go b/...s/data/core/objectAdditionalProperties.go → ...lProperties/objectAdditionalProperties.go
diff --git a/...data/core/objectAdditionalProperties.json → ...roperties/objectAdditionalProperties.json b/...data/core/objectAdditionalProperties.json → ...roperties/objectAdditionalProperties.json
diff --git a/tests/data/core/objectEmpty.go → tests/data/core/objectEmpty/objectEmpty.go b/tests/data/core/objectEmpty.go → tests/data/core/objectEmpty/objectEmpty.go
diff --git a/tests/data/core/objectEmpty.json → tests/data/core/objectEmpty/objectEmpty.json b/tests/data/core/objectEmpty.json → tests/data/core/objectEmpty/objectEmpty.json
diff --git a/tests/data/core/objectNested.go → tests/data/core/objectNested/objectNested.go b/tests/data/core/objectNested.go → tests/data/core/objectNested/objectNested.go
diff --git a/tests/data/core/objectNested.json → .../data/core/objectNested/objectNested.json b/tests/data/core/objectNested.json → .../data/core/objectNested/objectNested.json
diff --git a/tests/data/core/primitives.go → tests/data/core/primitives/primitives.go b/tests/data/core/primitives.go → tests/data/core/primitives/primitives.go
diff --git a/tests/data/core/primitives.json → tests/data/core/primitives/primitives.json b/tests/data/core/primitives.json → tests/data/core/primitives/primitives.json
diff --git a/tests/data/core/ref.go → tests/data/core/ref/ref.go b/tests/data/core/ref.go → tests/data/core/ref/ref.go
diff --git a/tests/data/core/ref.json → tests/data/core/ref/ref.json b/tests/data/core/ref.json → tests/data/core/ref/ref.json
diff --git a/tests/data/core/refExternalFile.go → ...a/core/refExternalFile/refExternalFile.go b/tests/data/core/refExternalFile.go → ...a/core/refExternalFile/refExternalFile.go
diff --git a/tests/data/core/refExternalFile.json → ...core/refExternalFile/refExternalFile.json b/tests/data/core/refExternalFile.json → ...core/refExternalFile/refExternalFile.json
diff --git a/tests/data/core/refExternalFileWithDupe.go → ...alFileWithDupe/refExternalFileWithDupe.go b/tests/data/core/refExternalFileWithDupe.go → ...alFileWithDupe/refExternalFileWithDupe.go
diff --git a/tests/data/core/refExternalFileWithDupe.json → ...FileWithDupe/refExternalFileWithDupe.json b/tests/data/core/refExternalFileWithDupe.json → ...FileWithDupe/refExternalFileWithDupe.json
diff --git a/tests/data/core/refOld.go → tests/data/core/refOld/refOld.go b/tests/data/core/refOld.go → tests/data/core/refOld/refOld.go
diff --git a/tests/data/core/refOld.json → tests/data/core/refOld/refOld.json b/tests/data/core/refOld.json → tests/data/core/refOld/refOld.json
diff --git a/tests/data/core/refToEnum.go → tests/data/core/refToEnum/refToEnum.go b/tests/data/core/refToEnum.go → tests/data/core/refToEnum/refToEnum.go
diff --git a/tests/data/core/refToEnum.json → tests/data/core/refToEnum/refToEnum.json b/tests/data/core/refToEnum.json → tests/data/core/refToEnum/refToEnum.json
diff --git a/tests/data/core/refToPrimitiveString.go → ...ToPrimitiveString/refToPrimitiveString.go b/tests/data/core/refToPrimitiveString.go → ...ToPrimitiveString/refToPrimitiveString.go
diff --git a/tests/data/core/refToPrimitiveString.json → ...PrimitiveString/refToPrimitiveString.json b/tests/data/core/refToPrimitiveString.json → ...PrimitiveString/refToPrimitiveString.json
diff --git a/tests/data/crossPackage/other.go → tests/data/crossPackage/other/other.go b/tests/data/crossPackage/other.go → tests/data/crossPackage/other/other.go
diff --git a/tests/data/crossPackage/other.json → tests/data/crossPackage/other/other.json b/tests/data/crossPackage/other.json → tests/data/crossPackage/other/other.json
diff --git a/tests/data/crossPackageNoOutput/schema.go → tests/data/crossPackage/schema/schema.go b/tests/data/crossPackageNoOutput/schema.go → tests/data/crossPackage/schema/schema.go
diff --git a/tests/data/crossPackage/schema.json → tests/data/crossPackage/schema/schema.json b/tests/data/crossPackage/schema.json → tests/data/crossPackage/schema/schema.json
@@ -7,7 +7,7 @@
       "$ref": "#/$defs/Thing"
     },
     "defInOtherSchema": {
-      "$ref": "other.json#/$defs/Thing"
+      "$ref": "../other/other.json#/$defs/Thing"
     }
   },
   "$defs": {

diff --git a/tests/data/crossPackageNoOutput/other.json → ...ata/crossPackageNoOutput/other/other.json b/tests/data/crossPackageNoOutput/other.json → ...ata/crossPackageNoOutput/other/other.json
diff --git a/tests/data/crossPackage/schema.go → ...ata/crossPackageNoOutput/schema/schema.go b/tests/data/crossPackage/schema.go → ...ata/crossPackageNoOutput/schema/schema.go
diff --git a/tests/data/crossPackageNoOutput/schema.json → ...a/crossPackageNoOutput/schema/schema.json b/tests/data/crossPackageNoOutput/schema.json → ...a/crossPackageNoOutput/schema/schema.json
@@ -7,7 +7,7 @@
       "$ref": "#/$defs/Thing"
     },
     "defInOtherSchema": {
-      "$ref": "other.json#/$defs/Thing"
+      "$ref": "../other/other.json#/$defs/Thing"
     }
   },
   "$defs": {

diff --git a/tests/data/extraImports/gopkgYAMLv3.go → ...a/extraImports/gopkgYAMLv3/gopkgYAMLv3.go b/tests/data/extraImports/gopkgYAMLv3.go → ...a/extraImports/gopkgYAMLv3/gopkgYAMLv3.go
diff --git a/tests/data/extraImports/gopkgYAMLv3.json → ...extraImports/gopkgYAMLv3/gopkgYAMLv3.json b/tests/data/extraImports/gopkgYAMLv3.json → ...extraImports/gopkgYAMLv3/gopkgYAMLv3.json
diff --git a/tests/data/extraImports/gopkgYAMLv3.yaml → ...extraImports/gopkgYAMLv3/gopkgYAMLv3.yaml b/tests/data/extraImports/gopkgYAMLv3.yaml → ...extraImports/gopkgYAMLv3/gopkgYAMLv3.yaml
diff --git a/tests/data/go.mod b/tests/data/go.mod
diff --git a/tests/data/go.sum b/tests/data/go.sum
diff --git a/tests/data/misc/boolean-as-schema.go → ...a/misc/booleanAsSchema/booleanAsSchema.go b/tests/data/misc/boolean-as-schema.go → ...a/misc/booleanAsSchema/booleanAsSchema.go
diff --git a/tests/data/misc/boolean-as-schema.json → ...misc/booleanAsSchema/booleanAsSchema.json b/tests/data/misc/boolean-as-schema.json → ...misc/booleanAsSchema/booleanAsSchema.json
diff --git a/tests/data/misc/capitalization.go → ...ata/misc/capitalization/capitalization.go b/tests/data/misc/capitalization.go → ...ata/misc/capitalization/capitalization.go
diff --git a/tests/data/misc/capitalization.json → ...a/misc/capitalization/capitalization.json b/tests/data/misc/capitalization.json → ...a/misc/capitalization/capitalization.json
diff --git a/tests/data/misc/special-characters.go → ...sc/specialCharacters/specialCharacters.go b/tests/data/misc/special-characters.go → ...sc/specialCharacters/specialCharacters.go
diff --git a/tests/data/misc/special-characters.json → .../specialCharacters/specialCharacters.json b/tests/data/misc/special-characters.json → .../specialCharacters/specialCharacters.json
diff --git a/tests/data/misc/tags.go → tests/data/misc/tags/tags.go b/tests/data/misc/tags.go → tests/data/misc/tags/tags.go
diff --git a/tests/data/misc/tags.json → tests/data/misc/tags/tags.json b/tests/data/misc/tags.json → tests/data/misc/tags/tags.json
diff --git a/tests/data/miscWithDefaults/case.go → tests/data/miscWithDefaults/case/case.go b/tests/data/miscWithDefaults/case.go → tests/data/miscWithDefaults/case/case.go
diff --git a/tests/data/miscWithDefaults/case.json → tests/data/miscWithDefaults/case/case.json b/tests/data/miscWithDefaults/case.json → tests/data/miscWithDefaults/case/case.json
diff --git a/tests/data/miscWithDefaults/caseDupes.go → ...a/miscWithDefaults/caseDupes/caseDupes.go b/tests/data/miscWithDefaults/caseDupes.go → ...a/miscWithDefaults/caseDupes/caseDupes.go
diff --git a/tests/data/miscWithDefaults/caseDupes.json → ...miscWithDefaults/caseDupes/caseDupes.json b/tests/data/miscWithDefaults/caseDupes.json → ...miscWithDefaults/caseDupes/caseDupes.json
diff --git a/tests/data/miscWithDefaults/cyclic.go → tests/data/miscWithDefaults/cyclic/cyclic.go b/tests/data/miscWithDefaults/cyclic.go → tests/data/miscWithDefaults/cyclic/cyclic.go
diff --git a/tests/data/miscWithDefaults/cyclic.json → .../data/miscWithDefaults/cyclic/cyclic.json b/tests/data/miscWithDefaults/cyclic.json → .../data/miscWithDefaults/cyclic/cyclic.json
diff --git a/...ta/miscWithDefaults/cyclicAndRequired1.go → .../cyclicAndRequired1/cyclicAndRequired1.go b/...ta/miscWithDefaults/cyclicAndRequired1.go → .../cyclicAndRequired1/cyclicAndRequired1.go
diff --git a/.../miscWithDefaults/cyclicAndRequired1.json → ...yclicAndRequired1/cyclicAndRequired1.json b/.../miscWithDefaults/cyclicAndRequired1.json → ...yclicAndRequired1/cyclicAndRequired1.json
diff --git a/tests/data/miscWithDefaults/cyclicAndRequired2.go b/tests/data/miscWithDefaults/cyclicAndRequired2.go
diff --git a/tests/data/miscWithDefaults/cyclicAndRequired2.json b/tests/data/miscWithDefaults/cyclicAndRequired2.json
diff --git a/...cWithDefaults/rootEmptyJustDefinitions.go → ...stDefinitions/rootEmptyJustDefinitions.go b/...cWithDefaults/rootEmptyJustDefinitions.go → ...stDefinitions/rootEmptyJustDefinitions.go
diff --git a/...ithDefaults/rootEmptyJustDefinitions.json → ...Definitions/rootEmptyJustDefinitions.json b/...ithDefaults/rootEmptyJustDefinitions.json → ...Definitions/rootEmptyJustDefinitions.json
diff --git a/...a/miscWithDefaults/rootIsArrayOfString.go → ...ootIsArrayOfString/rootIsArrayOfString.go b/...a/miscWithDefaults/rootIsArrayOfString.go → ...ootIsArrayOfString/rootIsArrayOfString.go
diff --git a/...miscWithDefaults/rootIsArrayOfString.json → ...tIsArrayOfString/rootIsArrayOfString.json b/...miscWithDefaults/rootIsArrayOfString.json → ...tIsArrayOfString/rootIsArrayOfString.json
diff --git a/tests/data/nameFromTitle/ref.go → tests/data/nameFromTitle/ref/ref.go b/tests/data/nameFromTitle/ref.go → tests/data/nameFromTitle/ref/ref.go
diff --git a/tests/data/nameFromTitle/ref.json → tests/data/nameFromTitle/ref/ref.json b/tests/data/nameFromTitle/ref.json → tests/data/nameFromTitle/ref/ref.json
diff --git a/tests/data/nameFromTitle/refExternalFile.go → ...mTitle/refExternalFile/refExternalFile.go b/tests/data/nameFromTitle/refExternalFile.go → ...mTitle/refExternalFile/refExternalFile.go
diff --git a/...s/data/nameFromTitle/refExternalFile.json → ...itle/refExternalFile/refExternalFile.json b/...s/data/nameFromTitle/refExternalFile.json → ...itle/refExternalFile/refExternalFile.json
diff --git a/tests/data/regressions/issue.32.go → tests/data/regressions/issue32/issue32.go b/tests/data/regressions/issue.32.go → tests/data/regressions/issue32/issue32.go
diff --git a/tests/data/regressions/issue.32.json → tests/data/regressions/issue32/issue32.json b/tests/data/regressions/issue.32.json → tests/data/regressions/issue32/issue32.json
diff --git a/tests/data/regressions/issue.51.go → tests/data/regressions/issue51/issue51.go b/tests/data/regressions/issue.51.go → tests/data/regressions/issue51/issue51.go
diff --git a/tests/data/regressions/issue.51.json → tests/data/regressions/issue51/issue51.json b/tests/data/regressions/issue.51.json → tests/data/regressions/issue51/issue51.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
     .envrc
     .idea
     coverage.out
+    coverage/
     bin/
     dist/
     vendor/
+    go.work
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
		golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=