From 16e9c02eddf089a87bba7039d408544e30880fbd Mon Sep 17 00:00:00 2001 From: Frederic BIDON Date: Sun, 16 Aug 2026 19:44:37 +0200 Subject: [PATCH] test: rename the fixtures directory to testdata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test material now lives in testdata/. The Go toolchain gives testdata a defined meaning — package patterns, vet and the build all skip it — whereas fixtures/ was ours alone. update-fixtures.sh, which refreshes the JSON-Schema-Test-Suite copy, is renamed to update-testdata.sh and writes to the new location. Nothing referenced it by name. Comments that name the directory are updated; those using "fixtures" for test material in general keep their wording. The x-go-package in go-swagger/bugs/981 follows the same move upstream, so it now reads go-swagger/testdata/bugs/981. Co-Authored-By: Claude Opus 5 (1M context) Signed-off-by: Frederic BIDON --- benchmark_test.go | 2 +- default_validator_test.go | 4 +- deterministic_test.go | 6 +- doc_test.go | 12 +- example_validator_test.go | 4 +- items_validator_test.go | 2 +- jsonschema_test.go | 6 +- messages_test.go | 8 +- pointer_resolution_test.go | 14 +- pools_leak_test.go | 2 +- pools_test.go | 6 +- post/defaulter_test.go | 2 +- post/prune_test.go | 2 +- spec_test.go | 96 ++++++------- swagger_test.go | 130 +++++++++--------- .../bugs/102/fixture-102.json | 0 .../bugs/123-validate/fixture-123.json | 0 {fixtures => testdata}/bugs/123/swagger.yml | 0 .../bugs/1341/fixture-1341-2.yaml | 0 .../bugs/1341/fixture-1341-3.yaml | 0 .../bugs/1341/fixture-1341-4.yaml | 0 .../bugs/1341/fixture-1341-5.yaml | 0 .../bugs/1341/fixture-1341-good.yaml | 0 .../bugs/1341/fixture-1341.yaml | 0 .../bugs/1429/expand-1429.yaml | 0 .../bugs/1429/flatten-1429.yaml | 0 .../bugs/1429/responses.yaml | 0 {fixtures => testdata}/bugs/1429/swagger.yaml | 0 .../bugs/1614/gitea-expanded.json | 0 {fixtures => testdata}/bugs/1614/gitea.json | 0 .../bugs/1621/1621-flat.yaml | 0 .../bugs/1621/definitions.yaml | 0 .../bugs/1621/fixture-1621.yaml | 0 .../bugs/1621/parameters.yaml | 0 .../bugs/1621/responses.yaml | 0 .../bugs/18/headerItems.json | 0 {fixtures => testdata}/bugs/18/headers.json | 0 .../bugs/18/paramItems.json | 0 .../bugs/18/parameters.json | 0 {fixtures => testdata}/bugs/18/schema.json | 0 .../bugs/2137/fixture-2137.yaml | 0 .../bugs/2527/swagger-fixed.yml | 0 .../bugs/2527/swagger-other.yml | 0 .../bugs/2527/swagger-schema-error.yml | 0 {fixtures => testdata}/bugs/2527/swagger.yml | 0 {fixtures => testdata}/bugs/2649/swagger.yaml | 0 {fixtures => testdata}/bugs/2866/2866.yaml | 0 {fixtures => testdata}/bugs/39/swagger.yml | 0 .../bugs/43/fixture-1456.yaml | 0 .../bugs/43/fixture-43-fail.yaml | 0 .../bugs/43/fixture-43-variants.yaml | 0 .../bugs/43/fixture-43.yaml | 0 {fixtures => testdata}/bugs/52/swagger.json | 0 {fixtures => testdata}/bugs/53/noswagger.json | 0 .../bugs/6/empty-responses.json | 0 .../bugs/6/no-responses.json | 0 .../bugs/61/multiple-refs.json | 0 .../bugs/61/unresolved-ref-for-name.json | 0 {fixtures => testdata}/bugs/62/swagger.json | 0 {fixtures => testdata}/bugs/63/swagger.json | 0 .../bugs/73/fixture-responses-2.yaml | 0 .../bugs/73/fixture-responses-3.yaml | 0 .../bugs/73/fixture-responses.yaml | 0 .../bugs/73/fixture-swagger-2.yaml | 0 .../bugs/73/fixture-swagger-3.yaml | 0 .../bugs/73/fixture-swagger-good.yaml | 0 .../bugs/73/fixture-swagger.yaml | 0 {fixtures => testdata}/defaulting/schema.json | 0 .../formats/extended-format.json | 0 .../go-swagger/bugs/1010/swagger.yml | 0 .../go-swagger/bugs/103/swagger.json | 0 .../go-swagger/bugs/106/swagger.json | 0 .../go-swagger/bugs/1111/arrayParam.json | 0 .../go-swagger/bugs/1171/swagger.yaml | 0 .../go-swagger/bugs/1199/nonEmptyBody.json | 0 .../go-swagger/bugs/1216/swagger.yml | 0 .../go-swagger/bugs/1238/swagger.yaml | 0 .../go-swagger/bugs/1289/fixture-1289-2.yaml | 0 .../go-swagger/bugs/1289/fixture-1289-3.yaml | 0 .../go-swagger/bugs/1289/fixture-1289-4.yaml | 0 .../go-swagger/bugs/1289/fixture-1289.yaml | 0 .../go-swagger/bugs/155/swagger.yml | 0 .../go-swagger/bugs/162/swagger.yml | 0 .../go-swagger/bugs/163/swagger.yml | 0 .../go-swagger/bugs/193/spec1.json | 0 .../go-swagger/bugs/193/spec2.json | 0 .../go-swagger/bugs/195/swagger.json | 0 .../go-swagger/bugs/196/swagger.yml | 0 .../go-swagger/bugs/217/array.yml | 0 .../go-swagger/bugs/217/interface.yml | 0 .../go-swagger/bugs/217/map.yml | 0 .../go-swagger/bugs/217/string.yml | 0 .../go-swagger/bugs/248/swagger.json | 0 .../go-swagger/bugs/249/swagger.json | 0 .../go-swagger/bugs/251/swagger.yml | 0 .../go-swagger/bugs/252/swagger.json | 0 .../go-swagger/bugs/287/swagger.yml | 0 .../go-swagger/bugs/319/swagger.yml | 0 .../go-swagger/bugs/342/fixture-342-2.yaml | 0 .../go-swagger/bugs/342/fixture-342-3.yaml | 0 .../go-swagger/bugs/342/fixture-342.yaml | 0 .../go-swagger/bugs/423/swagger.json | 0 .../go-swagger/bugs/436/swagger.yml | 0 .../go-swagger/bugs/453/swagger.yml | 0 .../go-swagger/bugs/454/swagger.yml | 0 .../go-swagger/bugs/455/swagger.yml | 0 .../go-swagger/bugs/465/swagger.yml | 0 .../go-swagger/bugs/500/swagger.yml | 0 .../go-swagger/bugs/511/swagger.yml | 0 .../go-swagger/bugs/524/swagger.yml | 0 .../go-swagger/bugs/540/swagger.yml | 0 .../go-swagger/bugs/541/swagger.json | 0 .../go-swagger/bugs/628/swagger.yml | 0 .../go-swagger/bugs/727/swagger.json | 0 .../go-swagger/bugs/733/swagger.json | 0 .../go-swagger/bugs/740/swagger.yml | 0 .../go-swagger/bugs/743/swagger.yml | 0 .../go-swagger/bugs/763/swagger.yml | 0 .../go-swagger/bugs/774/swagger.yml | 0 .../go-swagger/bugs/776/error.yaml | 0 .../go-swagger/bugs/776/item.yaml | 0 .../go-swagger/bugs/776/param.yaml | 0 .../go-swagger/bugs/776/spec.yaml | 0 .../go-swagger/bugs/776/swagger-template.yml | 0 .../go-swagger/bugs/786/swagger.yml | 0 .../go-swagger/bugs/789/swagger.yml | 0 .../go-swagger/bugs/809/swagger.yml | 0 .../go-swagger/bugs/811/swagger.json | 0 .../go-swagger/bugs/822/swagger.yml | 0 .../go-swagger/bugs/825/swagger.yml | 0 .../go-swagger/bugs/84/swagger.yml | 0 .../go-swagger/bugs/844/swagger.json | 0 .../go-swagger/bugs/846/swagger.yml | 0 .../go-swagger/bugs/881/deep.yml | 0 .../go-swagger/bugs/881/swagger.yml | 0 .../bugs/890/path/health_check.yaml | 0 .../go-swagger/bugs/890/swagger.yaml | 0 .../go-swagger/bugs/899/swagger.yml | 0 .../go-swagger/bugs/981/swagger.json | 2 +- .../go-swagger/bugs/982/swagger.yaml | 0 .../go-swagger/bugs/987/swagger.yml | 0 .../canary/bitbucket.org/swagger.json | 0 .../go-swagger/canary/docker/swagger.json | 0 .../go-swagger/canary/kubernetes/swagger.json | 0 .../go-swagger/canary/ms-cog-sci/swagger.json | 0 .../go-swagger/canary/petstore/swagger.json | 0 .../go-swagger/canary/quay.io/swagger.json | 0 .../go-swagger/expansion/all-the-things.json | 0 .../go-swagger/expansion/circularRefs.json | 0 .../go-swagger/expansion/circularSpec.json | 0 .../go-swagger/expansion/circularSpec.yaml | 0 .../go-swagger/expansion/clickmeter.json | 0 .../go-swagger/expansion/clickmeter.yaml | 0 .../go-swagger/expansion/invalid-refs.json | 0 .../go-swagger/expansion/params.json | 0 .../go-swagger/expansion/schemas1.json | 0 .../go-swagger/expansion/schemas2.json | 0 .../petstores/petstore-expanded.json | 0 .../go-swagger/petstores/petstore-simple.json | 0 .../petstore-with-external-docs.json | 0 .../go-swagger/petstores/petstore.json | 0 .../remotes/folder/folderInteger.json | 0 .../go-swagger/remotes/integer.json | 0 .../go-swagger/remotes/subSchemas.json | 0 .../go-swagger/specs/deeper/arrayProp.json | 0 .../go-swagger/specs/deeper/stringProp.json | 0 .../go-swagger/specs/refed.json | 0 .../go-swagger/specs/resolution.json | 0 .../go-swagger/specs/resolution2.json | 0 .../go-swagger/specs/response_name.json | 0 .../templates/swagger_json_embed.gotmpl | 0 .../jsonschema_suite/additionalItems.json | 0 .../additionalProperties.json | 0 .../jsonschema_suite/allOf.json | 0 .../jsonschema_suite/anyOf.json | 0 .../jsonschema_suite/default.json | 0 .../jsonschema_suite/definitions.json | 0 .../jsonschema_suite/dependencies.json | 0 .../jsonschema_suite/enum.json | 0 .../jsonschema_suite/format.json | 0 .../jsonschema_suite/items.json | 0 .../jsonschema_suite/maxItems.json | 0 .../jsonschema_suite/maxLength.json | 0 .../jsonschema_suite/maxProperties.json | 0 .../jsonschema_suite/maximum.json | 0 .../jsonschema_suite/minItems.json | 0 .../jsonschema_suite/minLength.json | 0 .../jsonschema_suite/minProperties.json | 0 .../jsonschema_suite/minimum.json | 0 .../jsonschema_suite/multipleOf.json | 0 .../jsonschema_suite/not.json | 0 .../jsonschema_suite/oneOf.json | 0 .../jsonschema_suite/optional/bignum.json | 0 .../optional/ecmascript-regex.json | 0 .../jsonschema_suite/optional/format.json | 0 .../optional/zeroTerminatedFloats.json | 0 .../jsonschema_suite/pattern.json | 0 .../jsonschema_suite/patternProperties.json | 0 .../jsonschema_suite/properties.json | 0 .../jsonschema_suite/ref.json | 0 .../jsonschema_suite/refRemote.json | 0 .../remotes/folder/folderInteger.json | 0 .../jsonschema_suite/remotes/integer.json | 0 .../jsonschema_suite/remotes/name.json | 0 .../jsonschema_suite/remotes/subSchemas.json | 0 .../jsonschema_suite/required.json | 0 .../jsonschema_suite/type.json | 0 .../jsonschema_suite/uniqueItems.json | 0 .../local_expansion/item.yaml | 0 .../local_expansion/spec.yaml | 0 .../petstore/swagger-invalid.json | 0 {fixtures => testdata}/petstore/swagger.json | 0 {fixtures => testdata}/pruning/schema.json | 0 .../recursive_expansion/item.yaml | 0 .../recursive_expansion/spec.yaml | 0 {fixtures => testdata}/schemas/int-enum.json | 0 .../validation/bitbucket.json | 0 ...ue-default-response-PatternProperties.json | 0 ...nvalid-default-value-default-response.json | 0 ...valid-default-value-header-badpattern.json | 0 ...t-value-header-items-default-response.json | 0 ...d-default-value-header-items-response.json | 0 .../invalid-default-value-header-items.json | 0 .../invalid-default-value-header-pattern.json | 0 ...invalid-default-value-header-response.json | 0 .../default/invalid-default-value-header.json | 0 ...invalid-default-value-parameter-items.json | 0 .../invalid-default-value-parameter-ref.json | 0 ...alid-default-value-parameter-required.json | 0 ...nvalid-default-value-parameter-schema.json | 0 .../invalid-default-value-parameter.json | 0 .../invalid-default-value-response-ref.json | 0 ...ult-value-schema-additionalProperties.json | 0 .../invalid-default-value-schema-allOf.json | 0 ...alid-default-value-schema-items-allOf.json | 0 .../invalid-default-value-schema-items.json | 0 ...efault-value-schema-patternProperties.json | 0 .../invalid-default-value-schema-ref.json | 0 .../default/invalid-default-value-schema.json | 0 ...ue-default-response-PatternProperties.json | 0 .../valid-default-value-default-response.json | 0 ...valid-default-value-header-badpattern.json | 0 ...t-value-header-items-default-response.json | 0 ...d-default-value-header-items-response.json | 0 .../valid-default-value-header-items.json | 0 .../valid-default-value-header-pattern.json | 0 .../valid-default-value-header-response.json | 0 .../default/valid-default-value-header.json | 0 .../valid-default-value-parameter-items.json | 0 .../valid-default-value-parameter-ref.json | 0 ...alid-default-value-parameter-required.json | 0 .../valid-default-value-parameter-schema.json | 0 .../valid-default-value-parameter.json | 0 .../valid-default-value-response-ref.json | 0 ...ult-value-schema-additionalProperties.json | 0 .../valid-default-value-schema-allOf.json | 0 ...alid-default-value-schema-items-allOf.json | 0 .../valid-default-value-schema-items.json | 0 ...efault-value-schema-patternProperties.json | 0 .../valid-default-value-schema-ref.json | 0 .../default/valid-default-value-schema.json | 0 .../validation/direct-circular-ancestor.json | 0 .../validation/duplicateprops.json | 0 .../validation/empty-path-param-name.json | 0 ...le-default-response-PatternProperties.json | 0 .../invalid-example-default-response.json | 0 .../invalid-example-header-badpattern.json | 0 ...example-header-items-default-response.json | 0 ...invalid-example-header-items-response.json | 0 .../example/invalid-example-header-items.json | 0 .../invalid-example-header-pattern.json | 0 .../invalid-example-header-response.json | 0 .../example/invalid-example-header.json | 0 .../invalid-example-parameter-items.json | 0 .../invalid-example-parameter-ref.json | 0 .../invalid-example-parameter-required.json | 0 .../invalid-example-parameter-schema.json | 0 .../example/invalid-example-parameter.json | 0 .../example/invalid-example-response-ref.json | 0 .../example/invalid-example-response.json | 0 ...d-example-schema-additionalProperties.json | 0 .../example/invalid-example-schema-allOf.json | 0 .../invalid-example-schema-items-allOf.json | 0 .../example/invalid-example-schema-items.json | 0 ...alid-example-schema-patternProperties.json | 0 .../example/invalid-example-schema-ref.json | 0 .../example/invalid-example-schema.json | 0 ...le-default-response-PatternProperties.json | 0 .../valid-example-default-response.json | 0 .../valid-example-header-badpattern.json | 0 ...example-header-items-default-response.json | 0 .../valid-example-header-items-response.json | 0 .../example/valid-example-header-items.json | 0 .../example/valid-example-header-pattern.json | 0 .../valid-example-header-response.json | 0 .../example/valid-example-header.json | 0 .../valid-example-parameter-items.json | 0 .../example/valid-example-parameter-ref.json | 0 .../valid-example-parameter-required.json | 0 .../valid-example-parameter-schema.json | 0 .../example/valid-example-parameter.json | 0 .../example/valid-example-response-ref.json | 0 .../example/valid-example-response.json | 0 ...d-example-schema-additionalProperties.json | 0 .../example/valid-example-schema-allOf.json | 0 .../valid-example-schema-items-allOf.json | 0 .../example/valid-example-schema-items.json | 0 ...alid-example-schema-patternProperties.json | 0 .../example/valid-example-schema-ref.json | 0 .../example/valid-example-schema.json | 0 .../validation/expected_messages.yaml | 0 .../validation/fixture-1050.yaml | 0 .../validation/fixture-1171.yaml | 0 .../validation/fixture-1231.yaml | 0 .../validation/fixture-1238.yaml | 0 .../validation/fixture-1243-2.yaml | 0 .../validation/fixture-1243-3.yaml | 0 .../validation/fixture-1243-4.yaml | 0 .../validation/fixture-1243-5.json | 0 .../validation/fixture-1243-5.yaml | 0 .../validation/fixture-1243-good.yaml | 0 .../validation/fixture-1243.yaml | 0 .../validation/fixture-1289-donotload.json | 0 .../validation/fixture-1289-donotload.yaml | 0 .../validation/fixture-1289-good.yaml | 0 .../validation/fixture-1289.yaml | 0 .../validation/fixture-161-2.json | 0 .../validation/fixture-161-good.json | 0 .../validation/fixture-161.json | 0 .../validation/fixture-342-2.yaml | 0 .../validation/fixture-342.yaml | 0 .../validation/fixture-43-2.json | 0 .../validation/fixture-43.json | 0 .../validation/fixture-581-good-numbers.yaml | 0 .../validation/fixture-581-good.yaml | 0 .../fixture-581-inline-param-format.yaml | 0 .../validation/fixture-581-inline-param.yaml | 0 .../validation/fixture-581.yaml | 0 .../validation/fixture-859-2.yaml | 0 .../validation/fixture-859-good.yaml | 0 .../validation/fixture-859.yaml | 0 .../fixture-additional-items-2.yaml | 0 .../fixture-additional-items-3.yaml | 0 ...xture-additional-items-invalid-values.yaml | 0 .../validation/fixture-additional-items.orig | 0 .../validation/fixture-additional-items.yaml | 0 .../validation/fixture-all-formats.yaml | 0 .../validation/fixture-bad-response.yaml | 0 .../validation/fixture-collisions.yaml | 0 .../fixture-constraints-on-numbers.yaml | 0 .../validation/fixture-empty-paths.json | 0 .../fixture-invalid-example-property.yaml | 0 .../validation/fixture-items-items.yaml | 0 .../validation/fixture-no-json-example.yaml | 0 .../validation/fixture-no-response.yaml | 0 .../validation/fixture-patternProperties.json | 0 .../fixture-valid-example-property.yaml | 0 .../validation/gentest.yaml | 0 .../validation/gentest2.yaml | 0 .../validation/gentest3.yaml | 0 .../indirect-circular-ancestor.json | 0 .../invalid-formdata-body-params.json | 0 .../validation/invalid-ref.json | 0 .../validation/invalid-referenced.yml | 0 .../validation/nestedduplicateprops.json | 0 .../validation/petstore-expanded.json | 0 .../recursive-circular-ancestor.json | 0 .../validation/type-keyword-mismatch.yaml | 0 .../validation/valid-ref.json | 0 .../validation/valid-referenced-variants.yaml | 0 .../validation/valid-referenced.yml | 0 update-fixtures.sh => update-testdata.sh | 4 +- 372 files changed, 151 insertions(+), 151 deletions(-) rename {fixtures => testdata}/bugs/102/fixture-102.json (100%) rename {fixtures => testdata}/bugs/123-validate/fixture-123.json (100%) rename {fixtures => testdata}/bugs/123/swagger.yml (100%) rename {fixtures => testdata}/bugs/1341/fixture-1341-2.yaml (100%) rename {fixtures => testdata}/bugs/1341/fixture-1341-3.yaml (100%) rename {fixtures => testdata}/bugs/1341/fixture-1341-4.yaml (100%) rename {fixtures => testdata}/bugs/1341/fixture-1341-5.yaml (100%) rename {fixtures => testdata}/bugs/1341/fixture-1341-good.yaml (100%) rename {fixtures => testdata}/bugs/1341/fixture-1341.yaml (100%) rename {fixtures => testdata}/bugs/1429/expand-1429.yaml (100%) rename {fixtures => testdata}/bugs/1429/flatten-1429.yaml (100%) rename {fixtures => testdata}/bugs/1429/responses.yaml (100%) rename {fixtures => testdata}/bugs/1429/swagger.yaml (100%) rename {fixtures => testdata}/bugs/1614/gitea-expanded.json (100%) rename {fixtures => testdata}/bugs/1614/gitea.json (100%) rename {fixtures => testdata}/bugs/1621/1621-flat.yaml (100%) rename {fixtures => testdata}/bugs/1621/definitions.yaml (100%) rename {fixtures => testdata}/bugs/1621/fixture-1621.yaml (100%) rename {fixtures => testdata}/bugs/1621/parameters.yaml (100%) rename {fixtures => testdata}/bugs/1621/responses.yaml (100%) rename {fixtures => testdata}/bugs/18/headerItems.json (100%) rename {fixtures => testdata}/bugs/18/headers.json (100%) rename {fixtures => testdata}/bugs/18/paramItems.json (100%) rename {fixtures => testdata}/bugs/18/parameters.json (100%) rename {fixtures => testdata}/bugs/18/schema.json (100%) rename {fixtures => testdata}/bugs/2137/fixture-2137.yaml (100%) rename {fixtures => testdata}/bugs/2527/swagger-fixed.yml (100%) rename {fixtures => testdata}/bugs/2527/swagger-other.yml (100%) rename {fixtures => testdata}/bugs/2527/swagger-schema-error.yml (100%) rename {fixtures => testdata}/bugs/2527/swagger.yml (100%) rename {fixtures => testdata}/bugs/2649/swagger.yaml (100%) rename {fixtures => testdata}/bugs/2866/2866.yaml (100%) rename {fixtures => testdata}/bugs/39/swagger.yml (100%) rename {fixtures => testdata}/bugs/43/fixture-1456.yaml (100%) rename {fixtures => testdata}/bugs/43/fixture-43-fail.yaml (100%) rename {fixtures => testdata}/bugs/43/fixture-43-variants.yaml (100%) rename {fixtures => testdata}/bugs/43/fixture-43.yaml (100%) rename {fixtures => testdata}/bugs/52/swagger.json (100%) rename {fixtures => testdata}/bugs/53/noswagger.json (100%) rename {fixtures => testdata}/bugs/6/empty-responses.json (100%) rename {fixtures => testdata}/bugs/6/no-responses.json (100%) rename {fixtures => testdata}/bugs/61/multiple-refs.json (100%) rename {fixtures => testdata}/bugs/61/unresolved-ref-for-name.json (100%) rename {fixtures => testdata}/bugs/62/swagger.json (100%) rename {fixtures => testdata}/bugs/63/swagger.json (100%) rename {fixtures => testdata}/bugs/73/fixture-responses-2.yaml (100%) rename {fixtures => testdata}/bugs/73/fixture-responses-3.yaml (100%) rename {fixtures => testdata}/bugs/73/fixture-responses.yaml (100%) rename {fixtures => testdata}/bugs/73/fixture-swagger-2.yaml (100%) rename {fixtures => testdata}/bugs/73/fixture-swagger-3.yaml (100%) rename {fixtures => testdata}/bugs/73/fixture-swagger-good.yaml (100%) rename {fixtures => testdata}/bugs/73/fixture-swagger.yaml (100%) rename {fixtures => testdata}/defaulting/schema.json (100%) rename {fixtures => testdata}/formats/extended-format.json (100%) rename {fixtures => testdata}/go-swagger/bugs/1010/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/103/swagger.json (100%) rename {fixtures => testdata}/go-swagger/bugs/106/swagger.json (100%) rename {fixtures => testdata}/go-swagger/bugs/1111/arrayParam.json (100%) rename {fixtures => testdata}/go-swagger/bugs/1171/swagger.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/1199/nonEmptyBody.json (100%) rename {fixtures => testdata}/go-swagger/bugs/1216/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/1238/swagger.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/1289/fixture-1289-2.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/1289/fixture-1289-3.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/1289/fixture-1289-4.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/1289/fixture-1289.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/155/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/162/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/163/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/193/spec1.json (100%) rename {fixtures => testdata}/go-swagger/bugs/193/spec2.json (100%) rename {fixtures => testdata}/go-swagger/bugs/195/swagger.json (100%) rename {fixtures => testdata}/go-swagger/bugs/196/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/217/array.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/217/interface.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/217/map.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/217/string.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/248/swagger.json (100%) rename {fixtures => testdata}/go-swagger/bugs/249/swagger.json (100%) rename {fixtures => testdata}/go-swagger/bugs/251/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/252/swagger.json (100%) rename {fixtures => testdata}/go-swagger/bugs/287/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/319/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/342/fixture-342-2.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/342/fixture-342-3.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/342/fixture-342.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/423/swagger.json (100%) rename {fixtures => testdata}/go-swagger/bugs/436/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/453/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/454/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/455/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/465/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/500/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/511/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/524/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/540/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/541/swagger.json (100%) rename {fixtures => testdata}/go-swagger/bugs/628/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/727/swagger.json (100%) rename {fixtures => testdata}/go-swagger/bugs/733/swagger.json (100%) rename {fixtures => testdata}/go-swagger/bugs/740/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/743/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/763/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/774/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/776/error.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/776/item.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/776/param.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/776/spec.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/776/swagger-template.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/786/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/789/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/809/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/811/swagger.json (100%) rename {fixtures => testdata}/go-swagger/bugs/822/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/825/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/84/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/844/swagger.json (100%) rename {fixtures => testdata}/go-swagger/bugs/846/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/881/deep.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/881/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/890/path/health_check.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/890/swagger.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/899/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/bugs/981/swagger.json (91%) rename {fixtures => testdata}/go-swagger/bugs/982/swagger.yaml (100%) rename {fixtures => testdata}/go-swagger/bugs/987/swagger.yml (100%) rename {fixtures => testdata}/go-swagger/canary/bitbucket.org/swagger.json (100%) rename {fixtures => testdata}/go-swagger/canary/docker/swagger.json (100%) rename {fixtures => testdata}/go-swagger/canary/kubernetes/swagger.json (100%) rename {fixtures => testdata}/go-swagger/canary/ms-cog-sci/swagger.json (100%) rename {fixtures => testdata}/go-swagger/canary/petstore/swagger.json (100%) rename {fixtures => testdata}/go-swagger/canary/quay.io/swagger.json (100%) rename {fixtures => testdata}/go-swagger/expansion/all-the-things.json (100%) rename {fixtures => testdata}/go-swagger/expansion/circularRefs.json (100%) rename {fixtures => testdata}/go-swagger/expansion/circularSpec.json (100%) rename {fixtures => testdata}/go-swagger/expansion/circularSpec.yaml (100%) rename {fixtures => testdata}/go-swagger/expansion/clickmeter.json (100%) rename {fixtures => testdata}/go-swagger/expansion/clickmeter.yaml (100%) rename {fixtures => testdata}/go-swagger/expansion/invalid-refs.json (100%) rename {fixtures => testdata}/go-swagger/expansion/params.json (100%) rename {fixtures => testdata}/go-swagger/expansion/schemas1.json (100%) rename {fixtures => testdata}/go-swagger/expansion/schemas2.json (100%) rename {fixtures => testdata}/go-swagger/petstores/petstore-expanded.json (100%) rename {fixtures => testdata}/go-swagger/petstores/petstore-simple.json (100%) rename {fixtures => testdata}/go-swagger/petstores/petstore-with-external-docs.json (100%) rename {fixtures => testdata}/go-swagger/petstores/petstore.json (100%) rename {fixtures => testdata}/go-swagger/remotes/folder/folderInteger.json (100%) rename {fixtures => testdata}/go-swagger/remotes/integer.json (100%) rename {fixtures => testdata}/go-swagger/remotes/subSchemas.json (100%) rename {fixtures => testdata}/go-swagger/specs/deeper/arrayProp.json (100%) rename {fixtures => testdata}/go-swagger/specs/deeper/stringProp.json (100%) rename {fixtures => testdata}/go-swagger/specs/refed.json (100%) rename {fixtures => testdata}/go-swagger/specs/resolution.json (100%) rename {fixtures => testdata}/go-swagger/specs/resolution2.json (100%) rename {fixtures => testdata}/go-swagger/specs/response_name.json (100%) rename {fixtures => testdata}/go-swagger/templates/swagger_json_embed.gotmpl (100%) rename {fixtures => testdata}/jsonschema_suite/additionalItems.json (100%) rename {fixtures => testdata}/jsonschema_suite/additionalProperties.json (100%) rename {fixtures => testdata}/jsonschema_suite/allOf.json (100%) rename {fixtures => testdata}/jsonschema_suite/anyOf.json (100%) rename {fixtures => testdata}/jsonschema_suite/default.json (100%) rename {fixtures => testdata}/jsonschema_suite/definitions.json (100%) rename {fixtures => testdata}/jsonschema_suite/dependencies.json (100%) rename {fixtures => testdata}/jsonschema_suite/enum.json (100%) rename {fixtures => testdata}/jsonschema_suite/format.json (100%) rename {fixtures => testdata}/jsonschema_suite/items.json (100%) rename {fixtures => testdata}/jsonschema_suite/maxItems.json (100%) rename {fixtures => testdata}/jsonschema_suite/maxLength.json (100%) rename {fixtures => testdata}/jsonschema_suite/maxProperties.json (100%) rename {fixtures => testdata}/jsonschema_suite/maximum.json (100%) rename {fixtures => testdata}/jsonschema_suite/minItems.json (100%) rename {fixtures => testdata}/jsonschema_suite/minLength.json (100%) rename {fixtures => testdata}/jsonschema_suite/minProperties.json (100%) rename {fixtures => testdata}/jsonschema_suite/minimum.json (100%) rename {fixtures => testdata}/jsonschema_suite/multipleOf.json (100%) rename {fixtures => testdata}/jsonschema_suite/not.json (100%) rename {fixtures => testdata}/jsonschema_suite/oneOf.json (100%) rename {fixtures => testdata}/jsonschema_suite/optional/bignum.json (100%) rename {fixtures => testdata}/jsonschema_suite/optional/ecmascript-regex.json (100%) rename {fixtures => testdata}/jsonschema_suite/optional/format.json (100%) rename {fixtures => testdata}/jsonschema_suite/optional/zeroTerminatedFloats.json (100%) rename {fixtures => testdata}/jsonschema_suite/pattern.json (100%) rename {fixtures => testdata}/jsonschema_suite/patternProperties.json (100%) rename {fixtures => testdata}/jsonschema_suite/properties.json (100%) rename {fixtures => testdata}/jsonschema_suite/ref.json (100%) rename {fixtures => testdata}/jsonschema_suite/refRemote.json (100%) rename {fixtures => testdata}/jsonschema_suite/remotes/folder/folderInteger.json (100%) rename {fixtures => testdata}/jsonschema_suite/remotes/integer.json (100%) rename {fixtures => testdata}/jsonschema_suite/remotes/name.json (100%) rename {fixtures => testdata}/jsonschema_suite/remotes/subSchemas.json (100%) rename {fixtures => testdata}/jsonschema_suite/required.json (100%) rename {fixtures => testdata}/jsonschema_suite/type.json (100%) rename {fixtures => testdata}/jsonschema_suite/uniqueItems.json (100%) rename {fixtures => testdata}/local_expansion/item.yaml (100%) rename {fixtures => testdata}/local_expansion/spec.yaml (100%) rename {fixtures => testdata}/petstore/swagger-invalid.json (100%) rename {fixtures => testdata}/petstore/swagger.json (100%) rename {fixtures => testdata}/pruning/schema.json (100%) rename {fixtures => testdata}/recursive_expansion/item.yaml (100%) rename {fixtures => testdata}/recursive_expansion/spec.yaml (100%) rename {fixtures => testdata}/schemas/int-enum.json (100%) rename {fixtures => testdata}/validation/bitbucket.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-default-response-PatternProperties.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-default-response.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-header-badpattern.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-header-items-default-response.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-header-items-response.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-header-items.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-header-pattern.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-header-response.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-header.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-parameter-items.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-parameter-ref.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-parameter-required.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-parameter-schema.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-parameter.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-response-ref.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-schema-additionalProperties.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-schema-allOf.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-schema-items-allOf.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-schema-items.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-schema-patternProperties.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-schema-ref.json (100%) rename {fixtures => testdata}/validation/default/invalid-default-value-schema.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-default-response-PatternProperties.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-default-response.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-header-badpattern.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-header-items-default-response.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-header-items-response.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-header-items.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-header-pattern.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-header-response.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-header.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-parameter-items.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-parameter-ref.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-parameter-required.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-parameter-schema.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-parameter.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-response-ref.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-schema-additionalProperties.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-schema-allOf.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-schema-items-allOf.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-schema-items.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-schema-patternProperties.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-schema-ref.json (100%) rename {fixtures => testdata}/validation/default/valid-default-value-schema.json (100%) rename {fixtures => testdata}/validation/direct-circular-ancestor.json (100%) rename {fixtures => testdata}/validation/duplicateprops.json (100%) rename {fixtures => testdata}/validation/empty-path-param-name.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-default-response-PatternProperties.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-default-response.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-header-badpattern.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-header-items-default-response.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-header-items-response.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-header-items.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-header-pattern.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-header-response.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-header.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-parameter-items.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-parameter-ref.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-parameter-required.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-parameter-schema.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-parameter.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-response-ref.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-response.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-schema-additionalProperties.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-schema-allOf.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-schema-items-allOf.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-schema-items.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-schema-patternProperties.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-schema-ref.json (100%) rename {fixtures => testdata}/validation/example/invalid-example-schema.json (100%) rename {fixtures => testdata}/validation/example/valid-example-default-response-PatternProperties.json (100%) rename {fixtures => testdata}/validation/example/valid-example-default-response.json (100%) rename {fixtures => testdata}/validation/example/valid-example-header-badpattern.json (100%) rename {fixtures => testdata}/validation/example/valid-example-header-items-default-response.json (100%) rename {fixtures => testdata}/validation/example/valid-example-header-items-response.json (100%) rename {fixtures => testdata}/validation/example/valid-example-header-items.json (100%) rename {fixtures => testdata}/validation/example/valid-example-header-pattern.json (100%) rename {fixtures => testdata}/validation/example/valid-example-header-response.json (100%) rename {fixtures => testdata}/validation/example/valid-example-header.json (100%) rename {fixtures => testdata}/validation/example/valid-example-parameter-items.json (100%) rename {fixtures => testdata}/validation/example/valid-example-parameter-ref.json (100%) rename {fixtures => testdata}/validation/example/valid-example-parameter-required.json (100%) rename {fixtures => testdata}/validation/example/valid-example-parameter-schema.json (100%) rename {fixtures => testdata}/validation/example/valid-example-parameter.json (100%) rename {fixtures => testdata}/validation/example/valid-example-response-ref.json (100%) rename {fixtures => testdata}/validation/example/valid-example-response.json (100%) rename {fixtures => testdata}/validation/example/valid-example-schema-additionalProperties.json (100%) rename {fixtures => testdata}/validation/example/valid-example-schema-allOf.json (100%) rename {fixtures => testdata}/validation/example/valid-example-schema-items-allOf.json (100%) rename {fixtures => testdata}/validation/example/valid-example-schema-items.json (100%) rename {fixtures => testdata}/validation/example/valid-example-schema-patternProperties.json (100%) rename {fixtures => testdata}/validation/example/valid-example-schema-ref.json (100%) rename {fixtures => testdata}/validation/example/valid-example-schema.json (100%) rename {fixtures => testdata}/validation/expected_messages.yaml (100%) rename {fixtures => testdata}/validation/fixture-1050.yaml (100%) rename {fixtures => testdata}/validation/fixture-1171.yaml (100%) rename {fixtures => testdata}/validation/fixture-1231.yaml (100%) rename {fixtures => testdata}/validation/fixture-1238.yaml (100%) rename {fixtures => testdata}/validation/fixture-1243-2.yaml (100%) rename {fixtures => testdata}/validation/fixture-1243-3.yaml (100%) rename {fixtures => testdata}/validation/fixture-1243-4.yaml (100%) rename {fixtures => testdata}/validation/fixture-1243-5.json (100%) rename {fixtures => testdata}/validation/fixture-1243-5.yaml (100%) rename {fixtures => testdata}/validation/fixture-1243-good.yaml (100%) rename {fixtures => testdata}/validation/fixture-1243.yaml (100%) rename {fixtures => testdata}/validation/fixture-1289-donotload.json (100%) rename {fixtures => testdata}/validation/fixture-1289-donotload.yaml (100%) rename {fixtures => testdata}/validation/fixture-1289-good.yaml (100%) rename {fixtures => testdata}/validation/fixture-1289.yaml (100%) rename {fixtures => testdata}/validation/fixture-161-2.json (100%) rename {fixtures => testdata}/validation/fixture-161-good.json (100%) rename {fixtures => testdata}/validation/fixture-161.json (100%) rename {fixtures => testdata}/validation/fixture-342-2.yaml (100%) rename {fixtures => testdata}/validation/fixture-342.yaml (100%) rename {fixtures => testdata}/validation/fixture-43-2.json (100%) rename {fixtures => testdata}/validation/fixture-43.json (100%) rename {fixtures => testdata}/validation/fixture-581-good-numbers.yaml (100%) rename {fixtures => testdata}/validation/fixture-581-good.yaml (100%) rename {fixtures => testdata}/validation/fixture-581-inline-param-format.yaml (100%) rename {fixtures => testdata}/validation/fixture-581-inline-param.yaml (100%) rename {fixtures => testdata}/validation/fixture-581.yaml (100%) rename {fixtures => testdata}/validation/fixture-859-2.yaml (100%) rename {fixtures => testdata}/validation/fixture-859-good.yaml (100%) rename {fixtures => testdata}/validation/fixture-859.yaml (100%) rename {fixtures => testdata}/validation/fixture-additional-items-2.yaml (100%) rename {fixtures => testdata}/validation/fixture-additional-items-3.yaml (100%) rename {fixtures => testdata}/validation/fixture-additional-items-invalid-values.yaml (100%) rename {fixtures => testdata}/validation/fixture-additional-items.orig (100%) rename {fixtures => testdata}/validation/fixture-additional-items.yaml (100%) rename {fixtures => testdata}/validation/fixture-all-formats.yaml (100%) rename {fixtures => testdata}/validation/fixture-bad-response.yaml (100%) rename {fixtures => testdata}/validation/fixture-collisions.yaml (100%) rename {fixtures => testdata}/validation/fixture-constraints-on-numbers.yaml (100%) rename {fixtures => testdata}/validation/fixture-empty-paths.json (100%) rename {fixtures => testdata}/validation/fixture-invalid-example-property.yaml (100%) rename {fixtures => testdata}/validation/fixture-items-items.yaml (100%) rename {fixtures => testdata}/validation/fixture-no-json-example.yaml (100%) rename {fixtures => testdata}/validation/fixture-no-response.yaml (100%) rename {fixtures => testdata}/validation/fixture-patternProperties.json (100%) rename {fixtures => testdata}/validation/fixture-valid-example-property.yaml (100%) rename {fixtures => testdata}/validation/gentest.yaml (100%) rename {fixtures => testdata}/validation/gentest2.yaml (100%) rename {fixtures => testdata}/validation/gentest3.yaml (100%) rename {fixtures => testdata}/validation/indirect-circular-ancestor.json (100%) rename {fixtures => testdata}/validation/invalid-formdata-body-params.json (100%) rename {fixtures => testdata}/validation/invalid-ref.json (100%) rename {fixtures => testdata}/validation/invalid-referenced.yml (100%) rename {fixtures => testdata}/validation/nestedduplicateprops.json (100%) rename {fixtures => testdata}/validation/petstore-expanded.json (100%) rename {fixtures => testdata}/validation/recursive-circular-ancestor.json (100%) rename {fixtures => testdata}/validation/type-keyword-mismatch.yaml (100%) rename {fixtures => testdata}/validation/valid-ref.json (100%) rename {fixtures => testdata}/validation/valid-referenced-variants.yaml (100%) rename {fixtures => testdata}/validation/valid-referenced.yml (100%) rename update-fixtures.sh => update-testdata.sh (77%) diff --git a/benchmark_test.go b/benchmark_test.go index a488b31..4d28886 100644 --- a/benchmark_test.go +++ b/benchmark_test.go @@ -13,7 +13,7 @@ import ( ) func Benchmark_KubernetesSpec(b *testing.B) { - fp := filepath.Join("fixtures", "go-swagger", "canary", "kubernetes", "swagger.json") + fp := filepath.Join("testdata", "go-swagger", "canary", "kubernetes", "swagger.json") doc, err := loads.Spec(fp) require.NoError(b, err) require.NotNil(b, doc) diff --git a/default_validator_test.go b/default_validator_test.go index c35759c..739cbad 100644 --- a/default_validator_test.go +++ b/default_validator_test.go @@ -68,7 +68,7 @@ func TestDefault_ValidateDefaults(t *testing.T) { } for _, tt := range tests { - path := filepath.Join("fixtures", "validation", "default", "valid-default-value-"+tt+jsonExt) + path := filepath.Join("testdata", "validation", "default", "valid-default-value-"+tt+jsonExt) if DebugTest { t.Logf("Testing valid default values for: %s", path) } @@ -83,7 +83,7 @@ func TestDefault_ValidateDefaults(t *testing.T) { assert.SliceContainsT(t, warns, "limit in query has a default value and is required as parameter") } - path = filepath.Join("fixtures", "validation", "default", "invalid-default-value-"+tt+jsonExt) + path = filepath.Join("testdata", "validation", "default", "invalid-default-value-"+tt+jsonExt) if DebugTest { t.Logf("Testing invalid default values for: %s", path) } diff --git a/deterministic_test.go b/deterministic_test.go index 6d0a20d..dc1f7ca 100644 --- a/deterministic_test.go +++ b/deterministic_test.go @@ -125,9 +125,9 @@ func TestDeterministic_FullReport(t *testing.T) { const runs = 20 for _, fixture := range []string{ - filepath.Join("fixtures", "validation", "fixture-1231.yaml"), - filepath.Join("fixtures", "validation", "fixture-additional-items-invalid-values.yaml"), - filepath.Join("fixtures", "validation", "fixture-342.yaml"), + filepath.Join("testdata", "validation", "fixture-1231.yaml"), + filepath.Join("testdata", "validation", "fixture-additional-items-invalid-values.yaml"), + filepath.Join("testdata", "validation", "fixture-342.yaml"), } { t.Run(filepath.Base(fixture), func(t *testing.T) { t.Parallel() diff --git a/doc_test.go b/doc_test.go index 8d51eb9..42ec9ad 100644 --- a/doc_test.go +++ b/doc_test.go @@ -21,7 +21,7 @@ func ExampleSpec() { // Example with high level spec validation call, without showing warnings // Example with spec file in this repo: - path := "fixtures/validation/valid-ref.json" + path := "testdata/validation/valid-ref.json" doc, err := loads.Spec(path) if err == nil { validate.SetContinueOnErrors(true) // Set global options @@ -43,7 +43,7 @@ func ExampleSpec_second() { // Example with the bundled Petstore spec: // Also works with URL, e.g. http://petstore.swagger.io/v2/swagger.json - path := "fixtures/go-swagger/canary/petstore/swagger.json" + path := "testdata/go-swagger/canary/petstore/swagger.json" doc, err := loads.JSONSpec(path) if err == nil { validate.SetContinueOnErrors(true) // Set global options @@ -74,7 +74,7 @@ func ExampleSpecValidator_Validate() { // doc, err := loads.JSONSpec(url) // Example with spec file in this repo: - path := "fixtures/validation/valid-ref.json" + path := "testdata/validation/valid-ref.json" doc, err := loads.Spec(path) if err == nil { validator := validate.NewSpecValidator(doc.Schema(), strfmt.Default) @@ -99,7 +99,7 @@ func ExampleSpecValidator_Validate_url() { // Example with the bundled Petstore spec: // Also works with URL, e.g. http://petstore.swagger.io/v2/swagger.json - path := "fixtures/go-swagger/canary/petstore/swagger.json" + path := "testdata/go-swagger/canary/petstore/swagger.json" doc, err := loads.JSONSpec(path) if err == nil { validator := validate.NewSpecValidator(doc.Schema(), strfmt.Default) @@ -191,8 +191,8 @@ func getSimpleSchema() *spec.Schema { func Test_Issue102_Circular(t *testing.T) { // assert that the issue is fixed in go-openapi/spec for _, fixture := range []string{ - filepath.Join("fixtures", "bugs", "102", "fixture-102.json"), - filepath.Join("fixtures", "bugs", "123-validate", "fixture-123.json"), + filepath.Join("testdata", "bugs", "102", "fixture-102.json"), + filepath.Join("testdata", "bugs", "123-validate", "fixture-123.json"), } { t.Run(fixture, func(t *testing.T) { filebytes, err := os.ReadFile(fixture) diff --git a/example_validator_test.go b/example_validator_test.go index 25a9087..0ad6c19 100644 --- a/example_validator_test.go +++ b/example_validator_test.go @@ -50,7 +50,7 @@ func TestExample_ValidateExamples(t *testing.T) { } for _, tt := range tests { - path := filepath.Join("fixtures", "validation", "example", "valid-example-"+tt+".json") + path := filepath.Join("testdata", "validation", "example", "valid-example-"+tt+".json") if DebugTest { t.Logf("Testing valid example values for: %s", path) } @@ -67,7 +67,7 @@ func TestExample_ValidateExamples(t *testing.T) { */ debugTest(t, path, res) - path = filepath.Join("fixtures", "validation", "example", "invalid-example-"+tt+".json") + path = filepath.Join("testdata", "validation", "example", "invalid-example-"+tt+".json") if DebugTest { t.Logf("Testing invalid example values for: %s", path) diff --git a/items_validator_test.go b/items_validator_test.go index 56e95d1..265f687 100644 --- a/items_validator_test.go +++ b/items_validator_test.go @@ -27,7 +27,7 @@ var ( ) func init() { - petstoreFixture := filepath.Join("fixtures", "petstore", "swagger.json") + petstoreFixture := filepath.Join("testdata", "petstore", "swagger.json") petstore, err := os.ReadFile(petstoreFixture) if err != nil { log.Fatalf("could not initialize fixture: %s: %v", petstoreFixture, err) diff --git a/jsonschema_test.go b/jsonschema_test.go index 55ba1db..c6de88b 100644 --- a/jsonschema_test.go +++ b/jsonschema_test.go @@ -33,9 +33,9 @@ type schemaTestT struct { } var ( - jsonSchemaFixturesPath = filepath.Join("fixtures", "jsonschema_suite") - schemaFixturesPath = filepath.Join("fixtures", "schemas") - formatFixturesPath = filepath.Join("fixtures", "formats") + jsonSchemaFixturesPath = filepath.Join("testdata", "jsonschema_suite") + schemaFixturesPath = filepath.Join("testdata", "schemas") + formatFixturesPath = filepath.Join("testdata", "formats") ) func enabled() []string { diff --git a/messages_test.go b/messages_test.go index 4ec58e0..ceb6f91 100644 --- a/messages_test.go +++ b/messages_test.go @@ -101,13 +101,13 @@ func testMessageQuality(t *testing.T, haltOnErrors bool, continueOnErrors bool) // set SWAGGER_DEBUG_TEST=1 env to get a report of messages at the end of each test. // expectedMessage{"", false, false}, // - // expected messages and warnings are configured in ./fixtures/validation/expected_messages.yaml + // expected messages and warnings are configured in ./testdata/validation/expected_messages.yaml // var errs int // error count - tested := loadTestConfig(t, filepath.Join("fixtures", "validation", "expected_messages.yaml")) + tested := loadTestConfig(t, filepath.Join("testdata", "validation", "expected_messages.yaml")) - if err := filepath.Walk(filepath.Join("fixtures", "validation"), testWalkSpecs(t, tested, haltOnErrors, continueOnErrors)); err != nil { + if err := filepath.Walk(filepath.Join("testdata", "validation"), testWalkSpecs(t, tested, haltOnErrors, continueOnErrors)); err != nil { t.Logf("%v", err) errs++ } @@ -433,6 +433,6 @@ func testIssue(t *testing.T, path string, expectedNumErrors, expectedNumWarnings // Test unitary fixture for dev and bug fixing. func Test_SingleFixture(t *testing.T) { t.SkipNow() - path := filepath.Join("fixtures", "validation", "fixture-1231.yaml") + path := filepath.Join("testdata", "validation", "fixture-1231.yaml") testIssue(t, path, -1, -1) } diff --git a/pointer_resolution_test.go b/pointer_resolution_test.go index 098c7ad..bfc1574 100644 --- a/pointer_resolution_test.go +++ b/pointer_resolution_test.go @@ -143,13 +143,13 @@ func TestPointerResolution_EveryFixture(t *testing.T) { var files []string for _, pattern := range []string{ - filepath.Join("fixtures", "validation", "*.json"), - filepath.Join("fixtures", "validation", "*.yaml"), - filepath.Join("fixtures", "bugs", "*", "*.json"), - filepath.Join("fixtures", "bugs", "*", "*.yaml"), - filepath.Join("fixtures", "go-swagger", "*", "*", "*.json"), - filepath.Join("fixtures", "go-swagger", "*", "*", "*.yaml"), - filepath.Join("fixtures", "petstore", "*.json"), + filepath.Join("testdata", "validation", "*.json"), + filepath.Join("testdata", "validation", "*.yaml"), + filepath.Join("testdata", "bugs", "*", "*.json"), + filepath.Join("testdata", "bugs", "*", "*.yaml"), + filepath.Join("testdata", "go-swagger", "*", "*", "*.json"), + filepath.Join("testdata", "go-swagger", "*", "*", "*.yaml"), + filepath.Join("testdata", "petstore", "*.json"), } { matched, err := filepath.Glob(pattern) require.NoError(t, err) diff --git a/pools_leak_test.go b/pools_leak_test.go index b6cbd5a..4243d39 100644 --- a/pools_leak_test.go +++ b/pools_leak_test.go @@ -28,7 +28,7 @@ func TestPools_NoLeakOnSpecValidation(t *testing.T) { pools.ResetTracking() t.Cleanup(pools.ResetTracking) - fp := filepath.Join("fixtures", "bugs", "2866", "2866.yaml") + fp := filepath.Join("testdata", "bugs", "2866", "2866.yaml") doc, err := loads.Spec(fp) require.NoError(t, err) require.NotNil(t, doc) diff --git a/pools_test.go b/pools_test.go index 1e27631..348dec1 100644 --- a/pools_test.go +++ b/pools_test.go @@ -20,9 +20,9 @@ func Test_ParallelPool(t *testing.T) { // that target OS. Typically, a CI runner breaks with "ThreadSanitizer failed to allocate ..." // Also -race in this context times out on macos. We need our validation on our platform only. - fixture1 := filepath.Join("fixtures", "bugs", "1429", "swagger.yaml") - fixture2 := filepath.Join("fixtures", "bugs", "2866", "2866.yaml") - fixture3 := filepath.Join("fixtures", "bugs", "43", "fixture-43.yaml") + fixture1 := filepath.Join("testdata", "bugs", "1429", "swagger.yaml") + fixture2 := filepath.Join("testdata", "bugs", "2866", "2866.yaml") + fixture3 := filepath.Join("testdata", "bugs", "43", "fixture-43.yaml") t.Run("should validate in parallel", func(t *testing.T) { for range 20 { diff --git a/post/defaulter_test.go b/post/defaulter_test.go index 8947097..a7a5876 100644 --- a/post/defaulter_test.go +++ b/post/defaulter_test.go @@ -16,7 +16,7 @@ import ( "github.com/go-openapi/validate" ) -var defaulterFixturesPath = filepath.Join("..", "fixtures", "defaulting") +var defaulterFixturesPath = filepath.Join("..", "testdata", "defaulting") func TestDefaulter(t *testing.T) { schema, err := defaulterFixture() diff --git a/post/prune_test.go b/post/prune_test.go index aa516b1..de13b74 100644 --- a/post/prune_test.go +++ b/post/prune_test.go @@ -17,7 +17,7 @@ import ( validate "github.com/go-openapi/validate" ) -var pruneFixturesPath = filepath.Join("..", "fixtures", "pruning") +var pruneFixturesPath = filepath.Join("..", "testdata", "pruning") func TestPrune(t *testing.T) { schema, err := pruningFixture() diff --git a/spec_test.go b/spec_test.go index 0b8f6eb..b9108fb 100644 --- a/spec_test.go +++ b/spec_test.go @@ -83,20 +83,20 @@ func verifiedTestWarnings(res *Result) []string { } func TestSpec_ExpandResponseLocalFile(t *testing.T) { - res, _ := loadAndValidate(t, filepath.Join("fixtures", "local_expansion", "spec.yaml")) + res, _ := loadAndValidate(t, filepath.Join("testdata", "local_expansion", "spec.yaml")) assert.TrueT(t, res.IsValid()) assert.Empty(t, res.Errors) } func TestSpec_ExpandResponseRecursive(t *testing.T) { - res, _ := loadAndValidate(t, filepath.Join("fixtures", "recursive_expansion", "spec.yaml")) + res, _ := loadAndValidate(t, filepath.Join("testdata", "recursive_expansion", "spec.yaml")) assert.TrueT(t, res.IsValid()) assert.Empty(t, res.Errors) } // Spec with no path. func TestSpec_Issue52(t *testing.T) { - fp := filepath.Join("fixtures", "bugs", "52", "swagger.json") + fp := filepath.Join("testdata", "bugs", "52", "swagger.json") jstext, _ := os.ReadFile(fp) // as json schema @@ -121,7 +121,7 @@ func TestSpec_Issue52(t *testing.T) { } func TestSpec_Issue53(t *testing.T) { - fp := filepath.Join("fixtures", "bugs", "53", "noswagger.json") + fp := filepath.Join("testdata", "bugs", "53", "noswagger.json") jstext, _ := os.ReadFile(fp) // as json schema @@ -142,7 +142,7 @@ func TestSpec_Issue53(t *testing.T) { } func TestSpec_Issue62(t *testing.T) { - fp := filepath.Join("fixtures", "bugs", "62", "swagger.json") + fp := filepath.Join("testdata", "bugs", "62", "swagger.json") // as swagger spec doc, err := loads.Spec(fp) @@ -155,25 +155,25 @@ func TestSpec_Issue62(t *testing.T) { } func TestSpec_Issue63(t *testing.T) { - res, _ := loadAndValidate(t, filepath.Join("fixtures", "bugs", "63", "swagger.json")) + res, _ := loadAndValidate(t, filepath.Join("testdata", "bugs", "63", "swagger.json")) assert.TrueT(t, res.IsValid()) } func TestSpec_Issue61_MultipleRefs(t *testing.T) { - res, _ := loadAndValidate(t, filepath.Join("fixtures", "bugs", "61", "multiple-refs.json")) + res, _ := loadAndValidate(t, filepath.Join("testdata", "bugs", "61", "multiple-refs.json")) assert.Empty(t, res.Errors) assert.TrueT(t, res.IsValid()) } func TestSpec_Issue61_ResolvedRef(t *testing.T) { - res, _ := loadAndValidate(t, filepath.Join("fixtures", "bugs", "61", "unresolved-ref-for-name.json")) + res, _ := loadAndValidate(t, filepath.Join("testdata", "bugs", "61", "unresolved-ref-for-name.json")) assert.Empty(t, res.Errors) assert.TrueT(t, res.IsValid()) } // No error with this one. func TestSpec_Issue123(t *testing.T) { - fp := filepath.Join("fixtures", "bugs", "123", "swagger.yml") + fp := filepath.Join("testdata", "bugs", "123", "swagger.yml") res, _ := loadAndValidate(t, fp) assert.TrueT(t, res.IsValid()) assert.Empty(t, res.Errors) @@ -182,7 +182,7 @@ func TestSpec_Issue123(t *testing.T) { } func TestSpec_Issue6(t *testing.T) { - files, _ := filepath.Glob(filepath.Join("fixtures", "bugs", "6", "*.json")) + files, _ := filepath.Glob(filepath.Join("testdata", "bugs", "6", "*.json")) for _, path := range files { t.Logf("Tested spec=%s", path) res, _ := loadAndValidate(t, path) @@ -206,7 +206,7 @@ func TestSpec_Issue6(t *testing.T) { // check if invalid patterns are indeed invalidated. func TestSpec_Issue18(t *testing.T) { - files, _ := filepath.Glob(filepath.Join("fixtures", "bugs", "18", "*.json")) + files, _ := filepath.Glob(filepath.Join("testdata", "bugs", "18", "*.json")) for _, path := range files { t.Logf("Tested spec=%s", path) res, _ := loadAndValidate(t, path) @@ -246,7 +246,7 @@ func TestSpec_Issue18(t *testing.T) { // check if a fragment path parameter is recognized, without error. func TestSpec_Issue39(t *testing.T) { - fp := filepath.Join("fixtures", "bugs", "39", "swagger.yml") + fp := filepath.Join("testdata", "bugs", "39", "swagger.yml") res, _ := loadAndValidate(t, fp) assert.TrueT(t, res.IsValid()) assert.Empty(t, res.Errors) @@ -255,7 +255,7 @@ func TestSpec_Issue39(t *testing.T) { func TestSpec_ValidateDuplicatePropertyNames(t *testing.T) { // simple allOf - doc, err := loads.Spec(filepath.Join("fixtures", "validation", "duplicateprops.json")) + doc, err := loads.Spec(filepath.Join("testdata", "validation", "duplicateprops.json")) require.NoError(t, err) validator := NewSpecValidator(spec.MustLoadSwagger20Schema(), strfmt.Default) @@ -265,7 +265,7 @@ func TestSpec_ValidateDuplicatePropertyNames(t *testing.T) { assert.Len(t, res.Errors, 1) // nested allOf - doc, err = loads.Spec(filepath.Join("fixtures", "validation", "nestedduplicateprops.json")) + doc, err = loads.Spec(filepath.Join("testdata", "validation", "nestedduplicateprops.json")) require.NoError(t, err) validator = NewSpecValidator(spec.MustLoadSwagger20Schema(), strfmt.Default) @@ -276,7 +276,7 @@ func TestSpec_ValidateDuplicatePropertyNames(t *testing.T) { } func TestSpec_ValidateNonEmptyPathParameterNames(t *testing.T) { - doc, err := loads.Spec(filepath.Join("fixtures", "validation", "empty-path-param-name.json")) + doc, err := loads.Spec(filepath.Join("testdata", "validation", "empty-path-param-name.json")) require.NoError(t, err) validator := NewSpecValidator(spec.MustLoadSwagger20Schema(), strfmt.Default) @@ -287,7 +287,7 @@ func TestSpec_ValidateNonEmptyPathParameterNames(t *testing.T) { } func TestSpec_ValidateCircularAncestry(t *testing.T) { - doc, err := loads.Spec(filepath.Join("fixtures", "validation", "direct-circular-ancestor.json")) + doc, err := loads.Spec(filepath.Join("testdata", "validation", "direct-circular-ancestor.json")) require.NoError(t, err) validator := NewSpecValidator(spec.MustLoadSwagger20Schema(), strfmt.Default) @@ -296,7 +296,7 @@ func TestSpec_ValidateCircularAncestry(t *testing.T) { assert.NotEmpty(t, res.Errors) assert.Len(t, res.Errors, 1) - doc, err = loads.Spec(filepath.Join("fixtures", "validation", "indirect-circular-ancestor.json")) + doc, err = loads.Spec(filepath.Join("testdata", "validation", "indirect-circular-ancestor.json")) require.NoError(t, err) validator = NewSpecValidator(spec.MustLoadSwagger20Schema(), strfmt.Default) @@ -305,7 +305,7 @@ func TestSpec_ValidateCircularAncestry(t *testing.T) { assert.NotEmpty(t, res.Errors) assert.Len(t, res.Errors, 1) - doc, err = loads.Spec(filepath.Join("fixtures", "validation", "recursive-circular-ancestor.json")) + doc, err = loads.Spec(filepath.Join("testdata", "validation", "recursive-circular-ancestor.json")) require.NoError(t, err) validator = NewSpecValidator(spec.MustLoadSwagger20Schema(), strfmt.Default) @@ -316,7 +316,7 @@ func TestSpec_ValidateCircularAncestry(t *testing.T) { } func TestSpec_ValidateReferenced(t *testing.T) { - doc, err := loads.Spec(filepath.Join("fixtures", "validation", "valid-referenced.yml")) + doc, err := loads.Spec(filepath.Join("testdata", "validation", "valid-referenced.yml")) require.NoError(t, err) validator := NewSpecValidator(spec.MustLoadSwagger20Schema(), strfmt.Default) @@ -325,7 +325,7 @@ func TestSpec_ValidateReferenced(t *testing.T) { res := validator.validateReferenced() assert.Empty(t, res.Errors) - doc, err = loads.Spec(filepath.Join("fixtures", "validation", "invalid-referenced.yml")) + doc, err = loads.Spec(filepath.Join("testdata", "validation", "invalid-referenced.yml")) require.NoError(t, err) validator = NewSpecValidator(spec.MustLoadSwagger20Schema(), strfmt.Default) @@ -338,7 +338,7 @@ func TestSpec_ValidateReferenced(t *testing.T) { } func TestSpec_ValidateReferencesValid(t *testing.T) { - doc, err := loads.Spec(filepath.Join("fixtures", "validation", "valid-ref.json")) + doc, err := loads.Spec(filepath.Join("testdata", "validation", "valid-ref.json")) require.NoError(t, err) validator := NewSpecValidator(spec.MustLoadSwagger20Schema(), strfmt.Default) @@ -347,7 +347,7 @@ func TestSpec_ValidateReferencesValid(t *testing.T) { res := validator.validateReferencesValid() assert.Empty(t, res.Errors) - doc, err = loads.Spec(filepath.Join("fixtures", "validation", "invalid-ref.json")) + doc, err = loads.Spec(filepath.Join("testdata", "validation", "invalid-ref.json")) require.NoError(t, err) validator = NewSpecValidator(spec.MustLoadSwagger20Schema(), strfmt.Default) @@ -449,7 +449,7 @@ func TestSpec_ValidateParameters(t *testing.T) { }) t.Run("should detect invalid parameter schema in (modified) classic PetStore", func(t *testing.T) { - fixture := filepath.Join("fixtures", "petstore", "swagger-invalid.json") + fixture := filepath.Join("testdata", "petstore", "swagger-invalid.json") t.Run("with raw JSON", func(t *testing.T) { // loading with full root document @@ -554,7 +554,7 @@ func TestSpec_ValidateParameters(t *testing.T) { }) t.Run("with issue go-swagger/go-swagger#2527", func(t *testing.T) { - basePath := filepath.Join("fixtures", "bugs", "2527") + basePath := filepath.Join("testdata", "bugs", "2527") t.Run("should detect mismatch between parameter and schema", func(t *testing.T) { doc, err := loads.Spec(filepath.Join(basePath, "swagger.yml")) @@ -742,7 +742,7 @@ func TestSpec_ValidateItems(t *testing.T) { // Reuse known validated cases through the higher level Spec() call. func TestSpec_ValidDoc(t *testing.T) { - fp := filepath.Join("fixtures", "local_expansion", "spec.yaml") + fp := filepath.Join("testdata", "local_expansion", "spec.yaml") doc2, err := loads.Spec(fp) require.NoError(t, err) err = Spec(doc2, strfmt.Default) @@ -751,14 +751,14 @@ func TestSpec_ValidDoc(t *testing.T) { // Check higher level behavior on invalid spec doc. func TestSpec_InvalidDoc(t *testing.T) { - doc, err := loads.Spec(filepath.Join("fixtures", "validation", "default", "invalid-default-value-parameter.json")) + doc, err := loads.Spec(filepath.Join("testdata", "validation", "default", "invalid-default-value-parameter.json")) require.NoError(t, err) err = Spec(doc, strfmt.Default) require.Error(t, err) } func TestSpec_Validate_InvalidInterface(t *testing.T) { - fp := filepath.Join("fixtures", "local_expansion", "spec.yaml") + fp := filepath.Join("testdata", "local_expansion", "spec.yaml") doc2, err := loads.Spec(fp) require.NoError(t, err) require.NotNil(t, doc2) @@ -771,72 +771,72 @@ func TestSpec_Validate_InvalidInterface(t *testing.T) { } func TestSpec_ValidateBodyFormDataParams(t *testing.T) { - res, _ := loadAndValidate(t, filepath.Join("fixtures", "validation", "invalid-formdata-body-params.json")) + res, _ := loadAndValidate(t, filepath.Join("testdata", "validation", "invalid-formdata-body-params.json")) assert.NotEmpty(t, res.Errors) assert.Len(t, res.Errors, 1) } func TestSpec_Issue73(t *testing.T) { - res, _ := loadAndValidate(t, filepath.Join("fixtures", "bugs", "73", "fixture-swagger.yaml")) + res, _ := loadAndValidate(t, filepath.Join("testdata", "bugs", "73", "fixture-swagger.yaml")) assert.Empty(t, res.Errors, " in fixture-swagger.yaml") - res, _ = loadAndValidate(t, filepath.Join("fixtures", "bugs", "73", "fixture-swagger-2.yaml")) + res, _ = loadAndValidate(t, filepath.Join("testdata", "bugs", "73", "fixture-swagger-2.yaml")) assert.Empty(t, res.Errors, "in fixture-swagger-2.yaml") - res, _ = loadAndValidate(t, filepath.Join("fixtures", "bugs", "73", "fixture-swagger-3.yaml")) + res, _ = loadAndValidate(t, filepath.Join("testdata", "bugs", "73", "fixture-swagger-3.yaml")) assert.Empty(t, res.Errors, "in fixture-swagger-3.yaml") - res, _ = loadAndValidate(t, filepath.Join("fixtures", "bugs", "73", "fixture-swagger-good.yaml")) + res, _ = loadAndValidate(t, filepath.Join("testdata", "bugs", "73", "fixture-swagger-good.yaml")) assert.Empty(t, res.Errors, " in fixture-swagger-good.yaml") } func TestSpec_Issue1341(t *testing.T) { // testing recursive walk with defaults and examples - res, _ := loadAndValidate(t, filepath.Join("fixtures", "bugs", "1341", "fixture-1341-good.yaml")) + res, _ := loadAndValidate(t, filepath.Join("testdata", "bugs", "1341", "fixture-1341-good.yaml")) assert.Empty(t, res.Errors, " in fixture-1341-good.yaml") assert.Len(t, res.Warnings, 1, " in fixture-1341-good.yaml") - res, _ = loadAndValidate(t, filepath.Join("fixtures", "bugs", "1341", "fixture-1341.yaml")) + res, _ = loadAndValidate(t, filepath.Join("testdata", "bugs", "1341", "fixture-1341.yaml")) assert.Empty(t, res.Errors, "in fixture-1341.yaml") assert.Empty(t, res.Warnings, "in fixture-1341.yaml") - res, _ = loadAndValidate(t, filepath.Join("fixtures", "bugs", "1341", "fixture-1341-2.yaml")) + res, _ = loadAndValidate(t, filepath.Join("testdata", "bugs", "1341", "fixture-1341-2.yaml")) assert.Empty(t, res.Errors, "in fixture-1341-2.yaml") assert.Empty(t, res.Warnings, "in fixture-1341-2.yaml") - res, _ = loadAndValidate(t, filepath.Join("fixtures", "bugs", "1341", "fixture-1341-3.yaml")) + res, _ = loadAndValidate(t, filepath.Join("testdata", "bugs", "1341", "fixture-1341-3.yaml")) assert.Empty(t, res.Errors, "in fixture-1341-3.yaml") assert.Len(t, res.Warnings, 4, "in fixture-1341-3.yaml") - res, _ = loadAndValidate(t, filepath.Join("fixtures", "bugs", "1341", "fixture-1341-4.yaml")) + res, _ = loadAndValidate(t, filepath.Join("testdata", "bugs", "1341", "fixture-1341-4.yaml")) assert.Empty(t, res.Errors, "in fixture-1341-4.yaml") assert.Empty(t, res.Warnings, "in fixture-1341-4.yaml") - res, _ = loadAndValidate(t, filepath.Join("fixtures", "bugs", "1341", "fixture-1341-5.yaml")) + res, _ = loadAndValidate(t, filepath.Join("testdata", "bugs", "1341", "fixture-1341-5.yaml")) assert.Len(t, res.Errors, 4, "in fixture-1341-5.yaml") assert.Empty(t, res.Warnings, "in fixture-1341-5.yaml") } // test go-swagger/go-swagger#1614 (circular refs). func Test_Issue1614(t *testing.T) { - path := filepath.Join("fixtures", "bugs", "1614", "gitea.json") + path := filepath.Join("testdata", "bugs", "1614", "gitea.json") testIssue(t, path, 0, 3) } // Test go-swagger/go-swagger#1621 (remote $ref). func Test_Issue1621(t *testing.T) { - path := filepath.Join("fixtures", "bugs", "1621", "fixture-1621.yaml") + path := filepath.Join("testdata", "bugs", "1621", "fixture-1621.yaml") testIssue(t, path, 0, 0) } // Test go-swagger/go-swagger#1429 (remote $ref). func Test_Issue1429(t *testing.T) { - path := filepath.Join("fixtures", "bugs", "1429", "swagger.yaml") + path := filepath.Join("testdata", "bugs", "1429", "swagger.yaml") testIssue(t, path, 0, 0) } func TestSpec_ValidationTypeMismatch(t *testing.T) { - doc, err := loads.Spec(filepath.Join("fixtures", "validation", "type-keyword-mismatch.yaml")) + doc, err := loads.Spec(filepath.Join("testdata", "validation", "type-keyword-mismatch.yaml")) require.NoError(t, err) validator := NewSpecValidator(doc.Schema(), strfmt.Default) validator.spec = doc @@ -873,7 +873,7 @@ func TestItemsProperty_Issue43(t *testing.T) { "fixture-43-variants.yaml", "fixture-1456.yaml", } { - fp := filepath.Join("fixtures", "bugs", "43", fixture) + fp := filepath.Join("testdata", "bugs", "43", fixture) res, warnings := loadAndValidate(t, fp) assert.TrueTf(t, res.IsValid(), "expected spec from %s to be valid", fixture) assert.Emptyf(t, res.Errors, "expected no error in %s", fixture) @@ -881,12 +881,12 @@ func TestItemsProperty_Issue43(t *testing.T) { assert.Emptyf(t, warnings, "expected no warning in %s", fixture) } - fp := filepath.Join("fixtures", "bugs", "43", "fixture-43-fail.yaml") + fp := filepath.Join("testdata", "bugs", "43", "fixture-43-fail.yaml") res, _ := loadAndValidate(t, fp) assert.FalseTf(t, res.IsValid(), "expected spec to be invalid") assert.GreaterT(t, len(res.Errors), 3) - fp = filepath.Join("fixtures", "validation", "fixture-1171.yaml") + fp = filepath.Join("testdata", "validation", "fixture-1171.yaml") res, _ = loadAndValidate(t, fp) assert.FalseTf(t, res.IsValid(), "expected spec to be invalid") assert.GreaterT(t, len(res.Errors), 3) @@ -901,7 +901,7 @@ func TestItemsProperty_Issue43(t *testing.T) { } func Test_Issue2137(t *testing.T) { - fp := filepath.Join("fixtures", "bugs", "2137", "fixture-2137.yaml") + fp := filepath.Join("testdata", "bugs", "2137", "fixture-2137.yaml") res, _ := loadAndValidate(t, fp) assert.FalseTf(t, res.IsValid(), "expected spec to be invalid") found := false @@ -915,7 +915,7 @@ func Test_Issue2137(t *testing.T) { } func Test_Examples(t *testing.T) { - fp := filepath.Join("fixtures", "bugs", "2649", "swagger.yaml") + fp := filepath.Join("testdata", "bugs", "2649", "swagger.yaml") doc, err := loads.Spec(fp) require.NoError(t, err) @@ -934,7 +934,7 @@ func Test_2866(t *testing.T) { // exercises fixture from go-swagger/go-swagger#2866, a test in go-swagger // that used to be problematic when using memory pools. - fp := filepath.Join("fixtures", "bugs", "2866", "2866.yaml") + fp := filepath.Join("testdata", "bugs", "2866", "2866.yaml") doc, err := loads.Spec(fp) require.NoError(t, err) diff --git a/swagger_test.go b/swagger_test.go index e70dfca..086c2c3 100644 --- a/swagger_test.go +++ b/swagger_test.go @@ -27,7 +27,7 @@ func skipNotifyGoSwagger(t *testing.T) { // Exercise validate will all tests cases from package go-swagger // A copy of all fixtures available in go-swagger/go-swagger -// is maintained in fixtures/go-swagger +// is maintained in testdata/go-swagger // // Proposal for enhancement: move this list to a YAML fixture config file. func Test_GoSwaggerTestCases(t *testing.T) { @@ -37,75 +37,75 @@ func Test_GoSwaggerTestCases(t *testing.T) { } // A list of test cases which fail on "swagger validate" at spec load time expectedLoadFailures := map[string]bool{ - "fixtures/go-swagger/bugs/342/fixture-342.yaml": false, - "fixtures/go-swagger/bugs/342/fixture-342-2.yaml": true, + "testdata/go-swagger/bugs/342/fixture-342.yaml": false, + "testdata/go-swagger/bugs/342/fixture-342-2.yaml": true, } // A list of test cases which fail on "swagger validate" expectedFailures := map[string]bool{ - "fixtures/go-swagger/bugs/1010/swagger.yml": true, - "fixtures/go-swagger/bugs/103/swagger.json": true, - "fixtures/go-swagger/bugs/106/swagger.json": true, - "fixtures/go-swagger/bugs/1171/swagger.yaml": true, - "fixtures/go-swagger/bugs/1238/swagger.yaml": true, - "fixtures/go-swagger/bugs/1289/fixture-1289-2.yaml": true, - "fixtures/go-swagger/bugs/1289/fixture-1289.yaml": true, - "fixtures/go-swagger/bugs/193/spec2.json": true, - "fixtures/go-swagger/bugs/195/swagger.json": true, - "fixtures/go-swagger/bugs/248/swagger.json": true, - "fixtures/go-swagger/bugs/249/swagger.json": true, - "fixtures/go-swagger/bugs/342/fixture-342-2.yaml": true, - "fixtures/go-swagger/bugs/342/fixture-342.yaml": true, - "fixtures/go-swagger/bugs/423/swagger.json": true, - "fixtures/go-swagger/bugs/453/swagger.yml": true, - "fixtures/go-swagger/bugs/455/swagger.yml": true, - "fixtures/go-swagger/bugs/628/swagger.yml": true, - "fixtures/go-swagger/bugs/733/swagger.json": false, - "fixtures/go-swagger/bugs/763/swagger.yml": true, - "fixtures/go-swagger/bugs/774/swagger.yml": true, - "fixtures/go-swagger/bugs/776/error.yaml": true, - "fixtures/go-swagger/bugs/776/item.yaml": true, - "fixtures/go-swagger/bugs/809/swagger.yml": true, - "fixtures/go-swagger/bugs/825/swagger.yml": true, - "fixtures/go-swagger/bugs/890/path/health_check.yaml": true, - "fixtures/go-swagger/bugs/981/swagger.json": true, - "fixtures/go-swagger/canary/docker/swagger.json": true, - "fixtures/go-swagger/canary/ms-cog-sci/swagger.json": true, - "fixtures/go-swagger/codegen/azure-text-analyis.json": true, - "fixtures/go-swagger/codegen/issue72.json": true, - "fixtures/go-swagger/codegen/simplesearch.yml": true, - "fixtures/go-swagger/codegen/swagger-codegen-tests.json": true, - "fixtures/go-swagger/codegen/todolist.allparams.yml": true, - "fixtures/go-swagger/codegen/todolist.bodyparams.yml": true, - "fixtures/go-swagger/codegen/todolist.discriminators.yml": true, - "fixtures/go-swagger/codegen/todolist.enums.yml": true, - "fixtures/go-swagger/codegen/todolist.models.yml": true, - "fixtures/go-swagger/codegen/todolist.responses.yml": true, - "fixtures/go-swagger/codegen/todolist.schemavalidation.yml": true, - "fixtures/go-swagger/codegen/todolist.simplepath.yml": true, - "fixtures/go-swagger/codegen/todolist.simple.yml": true, - "fixtures/go-swagger/codegen/todolist.url.basepath.yml": true, - "fixtures/go-swagger/codegen/todolist.url.simple.yml": true, - "fixtures/go-swagger/expansion/all-the-things.json": true, - "fixtures/go-swagger/expansion/circularRefs.json": true, - "fixtures/go-swagger/expansion/invalid-refs.json": true, - "fixtures/go-swagger/expansion/params.json": true, - "fixtures/go-swagger/expansion/schemas1.json": true, - "fixtures/go-swagger/expansion/schemas2.json": true, - "fixtures/go-swagger/petstores/petstore-expanded.json": true, - "fixtures/go-swagger/petstores/petstore-simple.json": true, - "fixtures/go-swagger/petstores/petstore-with-external-docs.json": true, - "fixtures/go-swagger/remotes/folder/folderInteger.json": true, - "fixtures/go-swagger/remotes/integer.json": true, - "fixtures/go-swagger/remotes/subSchemas.json": true, - "fixtures/go-swagger/specs/deeper/arrayProp.json": true, - "fixtures/go-swagger/specs/deeper/stringProp.json": true, - "fixtures/go-swagger/specs/refed.json": true, - "fixtures/go-swagger/specs/resolution2.json": true, - "fixtures/go-swagger/specs/resolution.json": true, + "testdata/go-swagger/bugs/1010/swagger.yml": true, + "testdata/go-swagger/bugs/103/swagger.json": true, + "testdata/go-swagger/bugs/106/swagger.json": true, + "testdata/go-swagger/bugs/1171/swagger.yaml": true, + "testdata/go-swagger/bugs/1238/swagger.yaml": true, + "testdata/go-swagger/bugs/1289/fixture-1289-2.yaml": true, + "testdata/go-swagger/bugs/1289/fixture-1289.yaml": true, + "testdata/go-swagger/bugs/193/spec2.json": true, + "testdata/go-swagger/bugs/195/swagger.json": true, + "testdata/go-swagger/bugs/248/swagger.json": true, + "testdata/go-swagger/bugs/249/swagger.json": true, + "testdata/go-swagger/bugs/342/fixture-342-2.yaml": true, + "testdata/go-swagger/bugs/342/fixture-342.yaml": true, + "testdata/go-swagger/bugs/423/swagger.json": true, + "testdata/go-swagger/bugs/453/swagger.yml": true, + "testdata/go-swagger/bugs/455/swagger.yml": true, + "testdata/go-swagger/bugs/628/swagger.yml": true, + "testdata/go-swagger/bugs/733/swagger.json": false, + "testdata/go-swagger/bugs/763/swagger.yml": true, + "testdata/go-swagger/bugs/774/swagger.yml": true, + "testdata/go-swagger/bugs/776/error.yaml": true, + "testdata/go-swagger/bugs/776/item.yaml": true, + "testdata/go-swagger/bugs/809/swagger.yml": true, + "testdata/go-swagger/bugs/825/swagger.yml": true, + "testdata/go-swagger/bugs/890/path/health_check.yaml": true, + "testdata/go-swagger/bugs/981/swagger.json": true, + "testdata/go-swagger/canary/docker/swagger.json": true, + "testdata/go-swagger/canary/ms-cog-sci/swagger.json": true, + "testdata/go-swagger/codegen/azure-text-analyis.json": true, + "testdata/go-swagger/codegen/issue72.json": true, + "testdata/go-swagger/codegen/simplesearch.yml": true, + "testdata/go-swagger/codegen/swagger-codegen-tests.json": true, + "testdata/go-swagger/codegen/todolist.allparams.yml": true, + "testdata/go-swagger/codegen/todolist.bodyparams.yml": true, + "testdata/go-swagger/codegen/todolist.discriminators.yml": true, + "testdata/go-swagger/codegen/todolist.enums.yml": true, + "testdata/go-swagger/codegen/todolist.models.yml": true, + "testdata/go-swagger/codegen/todolist.responses.yml": true, + "testdata/go-swagger/codegen/todolist.schemavalidation.yml": true, + "testdata/go-swagger/codegen/todolist.simplepath.yml": true, + "testdata/go-swagger/codegen/todolist.simple.yml": true, + "testdata/go-swagger/codegen/todolist.url.basepath.yml": true, + "testdata/go-swagger/codegen/todolist.url.simple.yml": true, + "testdata/go-swagger/expansion/all-the-things.json": true, + "testdata/go-swagger/expansion/circularRefs.json": true, + "testdata/go-swagger/expansion/invalid-refs.json": true, + "testdata/go-swagger/expansion/params.json": true, + "testdata/go-swagger/expansion/schemas1.json": true, + "testdata/go-swagger/expansion/schemas2.json": true, + "testdata/go-swagger/petstores/petstore-expanded.json": true, + "testdata/go-swagger/petstores/petstore-simple.json": true, + "testdata/go-swagger/petstores/petstore-with-external-docs.json": true, + "testdata/go-swagger/remotes/folder/folderInteger.json": true, + "testdata/go-swagger/remotes/integer.json": true, + "testdata/go-swagger/remotes/subSchemas.json": true, + "testdata/go-swagger/specs/deeper/arrayProp.json": true, + "testdata/go-swagger/specs/deeper/stringProp.json": true, + "testdata/go-swagger/specs/refed.json": true, + "testdata/go-swagger/specs/resolution2.json": true, + "testdata/go-swagger/specs/resolution.json": true, } - testGoSwaggerSpecs(t, filepath.Join(".", "fixtures", "go-swagger"), expectedFailures, expectedLoadFailures, true) + testGoSwaggerSpecs(t, filepath.Join(".", "testdata", "go-swagger"), expectedFailures, expectedLoadFailures, true) } func wantSwaggerTest(info os.FileInfo) bool { @@ -114,7 +114,7 @@ func wantSwaggerTest(info os.FileInfo) bool { } // A non regression test re "swagger validate" expectations. -// Just validates all fixtures in ./fixtures/go-swagger (excluded codegen cases). +// Just validates all fixtures in ./testdata/go-swagger (excluded codegen cases). func testGoSwaggerSpecs(t *testing.T, path string, expectToFail, expectToFailOnLoad map[string]bool, haltOnErrors bool) { err := filepath.Walk(path, func(path string, info os.FileInfo, _ error) error { diff --git a/fixtures/bugs/102/fixture-102.json b/testdata/bugs/102/fixture-102.json similarity index 100% rename from fixtures/bugs/102/fixture-102.json rename to testdata/bugs/102/fixture-102.json diff --git a/fixtures/bugs/123-validate/fixture-123.json b/testdata/bugs/123-validate/fixture-123.json similarity index 100% rename from fixtures/bugs/123-validate/fixture-123.json rename to testdata/bugs/123-validate/fixture-123.json diff --git a/fixtures/bugs/123/swagger.yml b/testdata/bugs/123/swagger.yml similarity index 100% rename from fixtures/bugs/123/swagger.yml rename to testdata/bugs/123/swagger.yml diff --git a/fixtures/bugs/1341/fixture-1341-2.yaml b/testdata/bugs/1341/fixture-1341-2.yaml similarity index 100% rename from fixtures/bugs/1341/fixture-1341-2.yaml rename to testdata/bugs/1341/fixture-1341-2.yaml diff --git a/fixtures/bugs/1341/fixture-1341-3.yaml b/testdata/bugs/1341/fixture-1341-3.yaml similarity index 100% rename from fixtures/bugs/1341/fixture-1341-3.yaml rename to testdata/bugs/1341/fixture-1341-3.yaml diff --git a/fixtures/bugs/1341/fixture-1341-4.yaml b/testdata/bugs/1341/fixture-1341-4.yaml similarity index 100% rename from fixtures/bugs/1341/fixture-1341-4.yaml rename to testdata/bugs/1341/fixture-1341-4.yaml diff --git a/fixtures/bugs/1341/fixture-1341-5.yaml b/testdata/bugs/1341/fixture-1341-5.yaml similarity index 100% rename from fixtures/bugs/1341/fixture-1341-5.yaml rename to testdata/bugs/1341/fixture-1341-5.yaml diff --git a/fixtures/bugs/1341/fixture-1341-good.yaml b/testdata/bugs/1341/fixture-1341-good.yaml similarity index 100% rename from fixtures/bugs/1341/fixture-1341-good.yaml rename to testdata/bugs/1341/fixture-1341-good.yaml diff --git a/fixtures/bugs/1341/fixture-1341.yaml b/testdata/bugs/1341/fixture-1341.yaml similarity index 100% rename from fixtures/bugs/1341/fixture-1341.yaml rename to testdata/bugs/1341/fixture-1341.yaml diff --git a/fixtures/bugs/1429/expand-1429.yaml b/testdata/bugs/1429/expand-1429.yaml similarity index 100% rename from fixtures/bugs/1429/expand-1429.yaml rename to testdata/bugs/1429/expand-1429.yaml diff --git a/fixtures/bugs/1429/flatten-1429.yaml b/testdata/bugs/1429/flatten-1429.yaml similarity index 100% rename from fixtures/bugs/1429/flatten-1429.yaml rename to testdata/bugs/1429/flatten-1429.yaml diff --git a/fixtures/bugs/1429/responses.yaml b/testdata/bugs/1429/responses.yaml similarity index 100% rename from fixtures/bugs/1429/responses.yaml rename to testdata/bugs/1429/responses.yaml diff --git a/fixtures/bugs/1429/swagger.yaml b/testdata/bugs/1429/swagger.yaml similarity index 100% rename from fixtures/bugs/1429/swagger.yaml rename to testdata/bugs/1429/swagger.yaml diff --git a/fixtures/bugs/1614/gitea-expanded.json b/testdata/bugs/1614/gitea-expanded.json similarity index 100% rename from fixtures/bugs/1614/gitea-expanded.json rename to testdata/bugs/1614/gitea-expanded.json diff --git a/fixtures/bugs/1614/gitea.json b/testdata/bugs/1614/gitea.json similarity index 100% rename from fixtures/bugs/1614/gitea.json rename to testdata/bugs/1614/gitea.json diff --git a/fixtures/bugs/1621/1621-flat.yaml b/testdata/bugs/1621/1621-flat.yaml similarity index 100% rename from fixtures/bugs/1621/1621-flat.yaml rename to testdata/bugs/1621/1621-flat.yaml diff --git a/fixtures/bugs/1621/definitions.yaml b/testdata/bugs/1621/definitions.yaml similarity index 100% rename from fixtures/bugs/1621/definitions.yaml rename to testdata/bugs/1621/definitions.yaml diff --git a/fixtures/bugs/1621/fixture-1621.yaml b/testdata/bugs/1621/fixture-1621.yaml similarity index 100% rename from fixtures/bugs/1621/fixture-1621.yaml rename to testdata/bugs/1621/fixture-1621.yaml diff --git a/fixtures/bugs/1621/parameters.yaml b/testdata/bugs/1621/parameters.yaml similarity index 100% rename from fixtures/bugs/1621/parameters.yaml rename to testdata/bugs/1621/parameters.yaml diff --git a/fixtures/bugs/1621/responses.yaml b/testdata/bugs/1621/responses.yaml similarity index 100% rename from fixtures/bugs/1621/responses.yaml rename to testdata/bugs/1621/responses.yaml diff --git a/fixtures/bugs/18/headerItems.json b/testdata/bugs/18/headerItems.json similarity index 100% rename from fixtures/bugs/18/headerItems.json rename to testdata/bugs/18/headerItems.json diff --git a/fixtures/bugs/18/headers.json b/testdata/bugs/18/headers.json similarity index 100% rename from fixtures/bugs/18/headers.json rename to testdata/bugs/18/headers.json diff --git a/fixtures/bugs/18/paramItems.json b/testdata/bugs/18/paramItems.json similarity index 100% rename from fixtures/bugs/18/paramItems.json rename to testdata/bugs/18/paramItems.json diff --git a/fixtures/bugs/18/parameters.json b/testdata/bugs/18/parameters.json similarity index 100% rename from fixtures/bugs/18/parameters.json rename to testdata/bugs/18/parameters.json diff --git a/fixtures/bugs/18/schema.json b/testdata/bugs/18/schema.json similarity index 100% rename from fixtures/bugs/18/schema.json rename to testdata/bugs/18/schema.json diff --git a/fixtures/bugs/2137/fixture-2137.yaml b/testdata/bugs/2137/fixture-2137.yaml similarity index 100% rename from fixtures/bugs/2137/fixture-2137.yaml rename to testdata/bugs/2137/fixture-2137.yaml diff --git a/fixtures/bugs/2527/swagger-fixed.yml b/testdata/bugs/2527/swagger-fixed.yml similarity index 100% rename from fixtures/bugs/2527/swagger-fixed.yml rename to testdata/bugs/2527/swagger-fixed.yml diff --git a/fixtures/bugs/2527/swagger-other.yml b/testdata/bugs/2527/swagger-other.yml similarity index 100% rename from fixtures/bugs/2527/swagger-other.yml rename to testdata/bugs/2527/swagger-other.yml diff --git a/fixtures/bugs/2527/swagger-schema-error.yml b/testdata/bugs/2527/swagger-schema-error.yml similarity index 100% rename from fixtures/bugs/2527/swagger-schema-error.yml rename to testdata/bugs/2527/swagger-schema-error.yml diff --git a/fixtures/bugs/2527/swagger.yml b/testdata/bugs/2527/swagger.yml similarity index 100% rename from fixtures/bugs/2527/swagger.yml rename to testdata/bugs/2527/swagger.yml diff --git a/fixtures/bugs/2649/swagger.yaml b/testdata/bugs/2649/swagger.yaml similarity index 100% rename from fixtures/bugs/2649/swagger.yaml rename to testdata/bugs/2649/swagger.yaml diff --git a/fixtures/bugs/2866/2866.yaml b/testdata/bugs/2866/2866.yaml similarity index 100% rename from fixtures/bugs/2866/2866.yaml rename to testdata/bugs/2866/2866.yaml diff --git a/fixtures/bugs/39/swagger.yml b/testdata/bugs/39/swagger.yml similarity index 100% rename from fixtures/bugs/39/swagger.yml rename to testdata/bugs/39/swagger.yml diff --git a/fixtures/bugs/43/fixture-1456.yaml b/testdata/bugs/43/fixture-1456.yaml similarity index 100% rename from fixtures/bugs/43/fixture-1456.yaml rename to testdata/bugs/43/fixture-1456.yaml diff --git a/fixtures/bugs/43/fixture-43-fail.yaml b/testdata/bugs/43/fixture-43-fail.yaml similarity index 100% rename from fixtures/bugs/43/fixture-43-fail.yaml rename to testdata/bugs/43/fixture-43-fail.yaml diff --git a/fixtures/bugs/43/fixture-43-variants.yaml b/testdata/bugs/43/fixture-43-variants.yaml similarity index 100% rename from fixtures/bugs/43/fixture-43-variants.yaml rename to testdata/bugs/43/fixture-43-variants.yaml diff --git a/fixtures/bugs/43/fixture-43.yaml b/testdata/bugs/43/fixture-43.yaml similarity index 100% rename from fixtures/bugs/43/fixture-43.yaml rename to testdata/bugs/43/fixture-43.yaml diff --git a/fixtures/bugs/52/swagger.json b/testdata/bugs/52/swagger.json similarity index 100% rename from fixtures/bugs/52/swagger.json rename to testdata/bugs/52/swagger.json diff --git a/fixtures/bugs/53/noswagger.json b/testdata/bugs/53/noswagger.json similarity index 100% rename from fixtures/bugs/53/noswagger.json rename to testdata/bugs/53/noswagger.json diff --git a/fixtures/bugs/6/empty-responses.json b/testdata/bugs/6/empty-responses.json similarity index 100% rename from fixtures/bugs/6/empty-responses.json rename to testdata/bugs/6/empty-responses.json diff --git a/fixtures/bugs/6/no-responses.json b/testdata/bugs/6/no-responses.json similarity index 100% rename from fixtures/bugs/6/no-responses.json rename to testdata/bugs/6/no-responses.json diff --git a/fixtures/bugs/61/multiple-refs.json b/testdata/bugs/61/multiple-refs.json similarity index 100% rename from fixtures/bugs/61/multiple-refs.json rename to testdata/bugs/61/multiple-refs.json diff --git a/fixtures/bugs/61/unresolved-ref-for-name.json b/testdata/bugs/61/unresolved-ref-for-name.json similarity index 100% rename from fixtures/bugs/61/unresolved-ref-for-name.json rename to testdata/bugs/61/unresolved-ref-for-name.json diff --git a/fixtures/bugs/62/swagger.json b/testdata/bugs/62/swagger.json similarity index 100% rename from fixtures/bugs/62/swagger.json rename to testdata/bugs/62/swagger.json diff --git a/fixtures/bugs/63/swagger.json b/testdata/bugs/63/swagger.json similarity index 100% rename from fixtures/bugs/63/swagger.json rename to testdata/bugs/63/swagger.json diff --git a/fixtures/bugs/73/fixture-responses-2.yaml b/testdata/bugs/73/fixture-responses-2.yaml similarity index 100% rename from fixtures/bugs/73/fixture-responses-2.yaml rename to testdata/bugs/73/fixture-responses-2.yaml diff --git a/fixtures/bugs/73/fixture-responses-3.yaml b/testdata/bugs/73/fixture-responses-3.yaml similarity index 100% rename from fixtures/bugs/73/fixture-responses-3.yaml rename to testdata/bugs/73/fixture-responses-3.yaml diff --git a/fixtures/bugs/73/fixture-responses.yaml b/testdata/bugs/73/fixture-responses.yaml similarity index 100% rename from fixtures/bugs/73/fixture-responses.yaml rename to testdata/bugs/73/fixture-responses.yaml diff --git a/fixtures/bugs/73/fixture-swagger-2.yaml b/testdata/bugs/73/fixture-swagger-2.yaml similarity index 100% rename from fixtures/bugs/73/fixture-swagger-2.yaml rename to testdata/bugs/73/fixture-swagger-2.yaml diff --git a/fixtures/bugs/73/fixture-swagger-3.yaml b/testdata/bugs/73/fixture-swagger-3.yaml similarity index 100% rename from fixtures/bugs/73/fixture-swagger-3.yaml rename to testdata/bugs/73/fixture-swagger-3.yaml diff --git a/fixtures/bugs/73/fixture-swagger-good.yaml b/testdata/bugs/73/fixture-swagger-good.yaml similarity index 100% rename from fixtures/bugs/73/fixture-swagger-good.yaml rename to testdata/bugs/73/fixture-swagger-good.yaml diff --git a/fixtures/bugs/73/fixture-swagger.yaml b/testdata/bugs/73/fixture-swagger.yaml similarity index 100% rename from fixtures/bugs/73/fixture-swagger.yaml rename to testdata/bugs/73/fixture-swagger.yaml diff --git a/fixtures/defaulting/schema.json b/testdata/defaulting/schema.json similarity index 100% rename from fixtures/defaulting/schema.json rename to testdata/defaulting/schema.json diff --git a/fixtures/formats/extended-format.json b/testdata/formats/extended-format.json similarity index 100% rename from fixtures/formats/extended-format.json rename to testdata/formats/extended-format.json diff --git a/fixtures/go-swagger/bugs/1010/swagger.yml b/testdata/go-swagger/bugs/1010/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/1010/swagger.yml rename to testdata/go-swagger/bugs/1010/swagger.yml diff --git a/fixtures/go-swagger/bugs/103/swagger.json b/testdata/go-swagger/bugs/103/swagger.json similarity index 100% rename from fixtures/go-swagger/bugs/103/swagger.json rename to testdata/go-swagger/bugs/103/swagger.json diff --git a/fixtures/go-swagger/bugs/106/swagger.json b/testdata/go-swagger/bugs/106/swagger.json similarity index 100% rename from fixtures/go-swagger/bugs/106/swagger.json rename to testdata/go-swagger/bugs/106/swagger.json diff --git a/fixtures/go-swagger/bugs/1111/arrayParam.json b/testdata/go-swagger/bugs/1111/arrayParam.json similarity index 100% rename from fixtures/go-swagger/bugs/1111/arrayParam.json rename to testdata/go-swagger/bugs/1111/arrayParam.json diff --git a/fixtures/go-swagger/bugs/1171/swagger.yaml b/testdata/go-swagger/bugs/1171/swagger.yaml similarity index 100% rename from fixtures/go-swagger/bugs/1171/swagger.yaml rename to testdata/go-swagger/bugs/1171/swagger.yaml diff --git a/fixtures/go-swagger/bugs/1199/nonEmptyBody.json b/testdata/go-swagger/bugs/1199/nonEmptyBody.json similarity index 100% rename from fixtures/go-swagger/bugs/1199/nonEmptyBody.json rename to testdata/go-swagger/bugs/1199/nonEmptyBody.json diff --git a/fixtures/go-swagger/bugs/1216/swagger.yml b/testdata/go-swagger/bugs/1216/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/1216/swagger.yml rename to testdata/go-swagger/bugs/1216/swagger.yml diff --git a/fixtures/go-swagger/bugs/1238/swagger.yaml b/testdata/go-swagger/bugs/1238/swagger.yaml similarity index 100% rename from fixtures/go-swagger/bugs/1238/swagger.yaml rename to testdata/go-swagger/bugs/1238/swagger.yaml diff --git a/fixtures/go-swagger/bugs/1289/fixture-1289-2.yaml b/testdata/go-swagger/bugs/1289/fixture-1289-2.yaml similarity index 100% rename from fixtures/go-swagger/bugs/1289/fixture-1289-2.yaml rename to testdata/go-swagger/bugs/1289/fixture-1289-2.yaml diff --git a/fixtures/go-swagger/bugs/1289/fixture-1289-3.yaml b/testdata/go-swagger/bugs/1289/fixture-1289-3.yaml similarity index 100% rename from fixtures/go-swagger/bugs/1289/fixture-1289-3.yaml rename to testdata/go-swagger/bugs/1289/fixture-1289-3.yaml diff --git a/fixtures/go-swagger/bugs/1289/fixture-1289-4.yaml b/testdata/go-swagger/bugs/1289/fixture-1289-4.yaml similarity index 100% rename from fixtures/go-swagger/bugs/1289/fixture-1289-4.yaml rename to testdata/go-swagger/bugs/1289/fixture-1289-4.yaml diff --git a/fixtures/go-swagger/bugs/1289/fixture-1289.yaml b/testdata/go-swagger/bugs/1289/fixture-1289.yaml similarity index 100% rename from fixtures/go-swagger/bugs/1289/fixture-1289.yaml rename to testdata/go-swagger/bugs/1289/fixture-1289.yaml diff --git a/fixtures/go-swagger/bugs/155/swagger.yml b/testdata/go-swagger/bugs/155/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/155/swagger.yml rename to testdata/go-swagger/bugs/155/swagger.yml diff --git a/fixtures/go-swagger/bugs/162/swagger.yml b/testdata/go-swagger/bugs/162/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/162/swagger.yml rename to testdata/go-swagger/bugs/162/swagger.yml diff --git a/fixtures/go-swagger/bugs/163/swagger.yml b/testdata/go-swagger/bugs/163/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/163/swagger.yml rename to testdata/go-swagger/bugs/163/swagger.yml diff --git a/fixtures/go-swagger/bugs/193/spec1.json b/testdata/go-swagger/bugs/193/spec1.json similarity index 100% rename from fixtures/go-swagger/bugs/193/spec1.json rename to testdata/go-swagger/bugs/193/spec1.json diff --git a/fixtures/go-swagger/bugs/193/spec2.json b/testdata/go-swagger/bugs/193/spec2.json similarity index 100% rename from fixtures/go-swagger/bugs/193/spec2.json rename to testdata/go-swagger/bugs/193/spec2.json diff --git a/fixtures/go-swagger/bugs/195/swagger.json b/testdata/go-swagger/bugs/195/swagger.json similarity index 100% rename from fixtures/go-swagger/bugs/195/swagger.json rename to testdata/go-swagger/bugs/195/swagger.json diff --git a/fixtures/go-swagger/bugs/196/swagger.yml b/testdata/go-swagger/bugs/196/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/196/swagger.yml rename to testdata/go-swagger/bugs/196/swagger.yml diff --git a/fixtures/go-swagger/bugs/217/array.yml b/testdata/go-swagger/bugs/217/array.yml similarity index 100% rename from fixtures/go-swagger/bugs/217/array.yml rename to testdata/go-swagger/bugs/217/array.yml diff --git a/fixtures/go-swagger/bugs/217/interface.yml b/testdata/go-swagger/bugs/217/interface.yml similarity index 100% rename from fixtures/go-swagger/bugs/217/interface.yml rename to testdata/go-swagger/bugs/217/interface.yml diff --git a/fixtures/go-swagger/bugs/217/map.yml b/testdata/go-swagger/bugs/217/map.yml similarity index 100% rename from fixtures/go-swagger/bugs/217/map.yml rename to testdata/go-swagger/bugs/217/map.yml diff --git a/fixtures/go-swagger/bugs/217/string.yml b/testdata/go-swagger/bugs/217/string.yml similarity index 100% rename from fixtures/go-swagger/bugs/217/string.yml rename to testdata/go-swagger/bugs/217/string.yml diff --git a/fixtures/go-swagger/bugs/248/swagger.json b/testdata/go-swagger/bugs/248/swagger.json similarity index 100% rename from fixtures/go-swagger/bugs/248/swagger.json rename to testdata/go-swagger/bugs/248/swagger.json diff --git a/fixtures/go-swagger/bugs/249/swagger.json b/testdata/go-swagger/bugs/249/swagger.json similarity index 100% rename from fixtures/go-swagger/bugs/249/swagger.json rename to testdata/go-swagger/bugs/249/swagger.json diff --git a/fixtures/go-swagger/bugs/251/swagger.yml b/testdata/go-swagger/bugs/251/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/251/swagger.yml rename to testdata/go-swagger/bugs/251/swagger.yml diff --git a/fixtures/go-swagger/bugs/252/swagger.json b/testdata/go-swagger/bugs/252/swagger.json similarity index 100% rename from fixtures/go-swagger/bugs/252/swagger.json rename to testdata/go-swagger/bugs/252/swagger.json diff --git a/fixtures/go-swagger/bugs/287/swagger.yml b/testdata/go-swagger/bugs/287/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/287/swagger.yml rename to testdata/go-swagger/bugs/287/swagger.yml diff --git a/fixtures/go-swagger/bugs/319/swagger.yml b/testdata/go-swagger/bugs/319/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/319/swagger.yml rename to testdata/go-swagger/bugs/319/swagger.yml diff --git a/fixtures/go-swagger/bugs/342/fixture-342-2.yaml b/testdata/go-swagger/bugs/342/fixture-342-2.yaml similarity index 100% rename from fixtures/go-swagger/bugs/342/fixture-342-2.yaml rename to testdata/go-swagger/bugs/342/fixture-342-2.yaml diff --git a/fixtures/go-swagger/bugs/342/fixture-342-3.yaml b/testdata/go-swagger/bugs/342/fixture-342-3.yaml similarity index 100% rename from fixtures/go-swagger/bugs/342/fixture-342-3.yaml rename to testdata/go-swagger/bugs/342/fixture-342-3.yaml diff --git a/fixtures/go-swagger/bugs/342/fixture-342.yaml b/testdata/go-swagger/bugs/342/fixture-342.yaml similarity index 100% rename from fixtures/go-swagger/bugs/342/fixture-342.yaml rename to testdata/go-swagger/bugs/342/fixture-342.yaml diff --git a/fixtures/go-swagger/bugs/423/swagger.json b/testdata/go-swagger/bugs/423/swagger.json similarity index 100% rename from fixtures/go-swagger/bugs/423/swagger.json rename to testdata/go-swagger/bugs/423/swagger.json diff --git a/fixtures/go-swagger/bugs/436/swagger.yml b/testdata/go-swagger/bugs/436/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/436/swagger.yml rename to testdata/go-swagger/bugs/436/swagger.yml diff --git a/fixtures/go-swagger/bugs/453/swagger.yml b/testdata/go-swagger/bugs/453/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/453/swagger.yml rename to testdata/go-swagger/bugs/453/swagger.yml diff --git a/fixtures/go-swagger/bugs/454/swagger.yml b/testdata/go-swagger/bugs/454/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/454/swagger.yml rename to testdata/go-swagger/bugs/454/swagger.yml diff --git a/fixtures/go-swagger/bugs/455/swagger.yml b/testdata/go-swagger/bugs/455/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/455/swagger.yml rename to testdata/go-swagger/bugs/455/swagger.yml diff --git a/fixtures/go-swagger/bugs/465/swagger.yml b/testdata/go-swagger/bugs/465/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/465/swagger.yml rename to testdata/go-swagger/bugs/465/swagger.yml diff --git a/fixtures/go-swagger/bugs/500/swagger.yml b/testdata/go-swagger/bugs/500/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/500/swagger.yml rename to testdata/go-swagger/bugs/500/swagger.yml diff --git a/fixtures/go-swagger/bugs/511/swagger.yml b/testdata/go-swagger/bugs/511/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/511/swagger.yml rename to testdata/go-swagger/bugs/511/swagger.yml diff --git a/fixtures/go-swagger/bugs/524/swagger.yml b/testdata/go-swagger/bugs/524/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/524/swagger.yml rename to testdata/go-swagger/bugs/524/swagger.yml diff --git a/fixtures/go-swagger/bugs/540/swagger.yml b/testdata/go-swagger/bugs/540/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/540/swagger.yml rename to testdata/go-swagger/bugs/540/swagger.yml diff --git a/fixtures/go-swagger/bugs/541/swagger.json b/testdata/go-swagger/bugs/541/swagger.json similarity index 100% rename from fixtures/go-swagger/bugs/541/swagger.json rename to testdata/go-swagger/bugs/541/swagger.json diff --git a/fixtures/go-swagger/bugs/628/swagger.yml b/testdata/go-swagger/bugs/628/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/628/swagger.yml rename to testdata/go-swagger/bugs/628/swagger.yml diff --git a/fixtures/go-swagger/bugs/727/swagger.json b/testdata/go-swagger/bugs/727/swagger.json similarity index 100% rename from fixtures/go-swagger/bugs/727/swagger.json rename to testdata/go-swagger/bugs/727/swagger.json diff --git a/fixtures/go-swagger/bugs/733/swagger.json b/testdata/go-swagger/bugs/733/swagger.json similarity index 100% rename from fixtures/go-swagger/bugs/733/swagger.json rename to testdata/go-swagger/bugs/733/swagger.json diff --git a/fixtures/go-swagger/bugs/740/swagger.yml b/testdata/go-swagger/bugs/740/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/740/swagger.yml rename to testdata/go-swagger/bugs/740/swagger.yml diff --git a/fixtures/go-swagger/bugs/743/swagger.yml b/testdata/go-swagger/bugs/743/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/743/swagger.yml rename to testdata/go-swagger/bugs/743/swagger.yml diff --git a/fixtures/go-swagger/bugs/763/swagger.yml b/testdata/go-swagger/bugs/763/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/763/swagger.yml rename to testdata/go-swagger/bugs/763/swagger.yml diff --git a/fixtures/go-swagger/bugs/774/swagger.yml b/testdata/go-swagger/bugs/774/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/774/swagger.yml rename to testdata/go-swagger/bugs/774/swagger.yml diff --git a/fixtures/go-swagger/bugs/776/error.yaml b/testdata/go-swagger/bugs/776/error.yaml similarity index 100% rename from fixtures/go-swagger/bugs/776/error.yaml rename to testdata/go-swagger/bugs/776/error.yaml diff --git a/fixtures/go-swagger/bugs/776/item.yaml b/testdata/go-swagger/bugs/776/item.yaml similarity index 100% rename from fixtures/go-swagger/bugs/776/item.yaml rename to testdata/go-swagger/bugs/776/item.yaml diff --git a/fixtures/go-swagger/bugs/776/param.yaml b/testdata/go-swagger/bugs/776/param.yaml similarity index 100% rename from fixtures/go-swagger/bugs/776/param.yaml rename to testdata/go-swagger/bugs/776/param.yaml diff --git a/fixtures/go-swagger/bugs/776/spec.yaml b/testdata/go-swagger/bugs/776/spec.yaml similarity index 100% rename from fixtures/go-swagger/bugs/776/spec.yaml rename to testdata/go-swagger/bugs/776/spec.yaml diff --git a/fixtures/go-swagger/bugs/776/swagger-template.yml b/testdata/go-swagger/bugs/776/swagger-template.yml similarity index 100% rename from fixtures/go-swagger/bugs/776/swagger-template.yml rename to testdata/go-swagger/bugs/776/swagger-template.yml diff --git a/fixtures/go-swagger/bugs/786/swagger.yml b/testdata/go-swagger/bugs/786/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/786/swagger.yml rename to testdata/go-swagger/bugs/786/swagger.yml diff --git a/fixtures/go-swagger/bugs/789/swagger.yml b/testdata/go-swagger/bugs/789/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/789/swagger.yml rename to testdata/go-swagger/bugs/789/swagger.yml diff --git a/fixtures/go-swagger/bugs/809/swagger.yml b/testdata/go-swagger/bugs/809/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/809/swagger.yml rename to testdata/go-swagger/bugs/809/swagger.yml diff --git a/fixtures/go-swagger/bugs/811/swagger.json b/testdata/go-swagger/bugs/811/swagger.json similarity index 100% rename from fixtures/go-swagger/bugs/811/swagger.json rename to testdata/go-swagger/bugs/811/swagger.json diff --git a/fixtures/go-swagger/bugs/822/swagger.yml b/testdata/go-swagger/bugs/822/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/822/swagger.yml rename to testdata/go-swagger/bugs/822/swagger.yml diff --git a/fixtures/go-swagger/bugs/825/swagger.yml b/testdata/go-swagger/bugs/825/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/825/swagger.yml rename to testdata/go-swagger/bugs/825/swagger.yml diff --git a/fixtures/go-swagger/bugs/84/swagger.yml b/testdata/go-swagger/bugs/84/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/84/swagger.yml rename to testdata/go-swagger/bugs/84/swagger.yml diff --git a/fixtures/go-swagger/bugs/844/swagger.json b/testdata/go-swagger/bugs/844/swagger.json similarity index 100% rename from fixtures/go-swagger/bugs/844/swagger.json rename to testdata/go-swagger/bugs/844/swagger.json diff --git a/fixtures/go-swagger/bugs/846/swagger.yml b/testdata/go-swagger/bugs/846/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/846/swagger.yml rename to testdata/go-swagger/bugs/846/swagger.yml diff --git a/fixtures/go-swagger/bugs/881/deep.yml b/testdata/go-swagger/bugs/881/deep.yml similarity index 100% rename from fixtures/go-swagger/bugs/881/deep.yml rename to testdata/go-swagger/bugs/881/deep.yml diff --git a/fixtures/go-swagger/bugs/881/swagger.yml b/testdata/go-swagger/bugs/881/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/881/swagger.yml rename to testdata/go-swagger/bugs/881/swagger.yml diff --git a/fixtures/go-swagger/bugs/890/path/health_check.yaml b/testdata/go-swagger/bugs/890/path/health_check.yaml similarity index 100% rename from fixtures/go-swagger/bugs/890/path/health_check.yaml rename to testdata/go-swagger/bugs/890/path/health_check.yaml diff --git a/fixtures/go-swagger/bugs/890/swagger.yaml b/testdata/go-swagger/bugs/890/swagger.yaml similarity index 100% rename from fixtures/go-swagger/bugs/890/swagger.yaml rename to testdata/go-swagger/bugs/890/swagger.yaml diff --git a/fixtures/go-swagger/bugs/899/swagger.yml b/testdata/go-swagger/bugs/899/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/899/swagger.yml rename to testdata/go-swagger/bugs/899/swagger.yml diff --git a/fixtures/go-swagger/bugs/981/swagger.json b/testdata/go-swagger/bugs/981/swagger.json similarity index 91% rename from fixtures/go-swagger/bugs/981/swagger.json rename to testdata/go-swagger/bugs/981/swagger.json index 7e0d4f0..2bff599 100644 --- a/fixtures/go-swagger/bugs/981/swagger.json +++ b/testdata/go-swagger/bugs/981/swagger.json @@ -27,7 +27,7 @@ "x-go-name": "Type" } }, - "x-go-package": "github.com/go-swagger/go-swagger/fixtures/bugs/981" + "x-go-package": "github.com/go-swagger/go-swagger/testdata/bugs/981" } } } diff --git a/fixtures/go-swagger/bugs/982/swagger.yaml b/testdata/go-swagger/bugs/982/swagger.yaml similarity index 100% rename from fixtures/go-swagger/bugs/982/swagger.yaml rename to testdata/go-swagger/bugs/982/swagger.yaml diff --git a/fixtures/go-swagger/bugs/987/swagger.yml b/testdata/go-swagger/bugs/987/swagger.yml similarity index 100% rename from fixtures/go-swagger/bugs/987/swagger.yml rename to testdata/go-swagger/bugs/987/swagger.yml diff --git a/fixtures/go-swagger/canary/bitbucket.org/swagger.json b/testdata/go-swagger/canary/bitbucket.org/swagger.json similarity index 100% rename from fixtures/go-swagger/canary/bitbucket.org/swagger.json rename to testdata/go-swagger/canary/bitbucket.org/swagger.json diff --git a/fixtures/go-swagger/canary/docker/swagger.json b/testdata/go-swagger/canary/docker/swagger.json similarity index 100% rename from fixtures/go-swagger/canary/docker/swagger.json rename to testdata/go-swagger/canary/docker/swagger.json diff --git a/fixtures/go-swagger/canary/kubernetes/swagger.json b/testdata/go-swagger/canary/kubernetes/swagger.json similarity index 100% rename from fixtures/go-swagger/canary/kubernetes/swagger.json rename to testdata/go-swagger/canary/kubernetes/swagger.json diff --git a/fixtures/go-swagger/canary/ms-cog-sci/swagger.json b/testdata/go-swagger/canary/ms-cog-sci/swagger.json similarity index 100% rename from fixtures/go-swagger/canary/ms-cog-sci/swagger.json rename to testdata/go-swagger/canary/ms-cog-sci/swagger.json diff --git a/fixtures/go-swagger/canary/petstore/swagger.json b/testdata/go-swagger/canary/petstore/swagger.json similarity index 100% rename from fixtures/go-swagger/canary/petstore/swagger.json rename to testdata/go-swagger/canary/petstore/swagger.json diff --git a/fixtures/go-swagger/canary/quay.io/swagger.json b/testdata/go-swagger/canary/quay.io/swagger.json similarity index 100% rename from fixtures/go-swagger/canary/quay.io/swagger.json rename to testdata/go-swagger/canary/quay.io/swagger.json diff --git a/fixtures/go-swagger/expansion/all-the-things.json b/testdata/go-swagger/expansion/all-the-things.json similarity index 100% rename from fixtures/go-swagger/expansion/all-the-things.json rename to testdata/go-swagger/expansion/all-the-things.json diff --git a/fixtures/go-swagger/expansion/circularRefs.json b/testdata/go-swagger/expansion/circularRefs.json similarity index 100% rename from fixtures/go-swagger/expansion/circularRefs.json rename to testdata/go-swagger/expansion/circularRefs.json diff --git a/fixtures/go-swagger/expansion/circularSpec.json b/testdata/go-swagger/expansion/circularSpec.json similarity index 100% rename from fixtures/go-swagger/expansion/circularSpec.json rename to testdata/go-swagger/expansion/circularSpec.json diff --git a/fixtures/go-swagger/expansion/circularSpec.yaml b/testdata/go-swagger/expansion/circularSpec.yaml similarity index 100% rename from fixtures/go-swagger/expansion/circularSpec.yaml rename to testdata/go-swagger/expansion/circularSpec.yaml diff --git a/fixtures/go-swagger/expansion/clickmeter.json b/testdata/go-swagger/expansion/clickmeter.json similarity index 100% rename from fixtures/go-swagger/expansion/clickmeter.json rename to testdata/go-swagger/expansion/clickmeter.json diff --git a/fixtures/go-swagger/expansion/clickmeter.yaml b/testdata/go-swagger/expansion/clickmeter.yaml similarity index 100% rename from fixtures/go-swagger/expansion/clickmeter.yaml rename to testdata/go-swagger/expansion/clickmeter.yaml diff --git a/fixtures/go-swagger/expansion/invalid-refs.json b/testdata/go-swagger/expansion/invalid-refs.json similarity index 100% rename from fixtures/go-swagger/expansion/invalid-refs.json rename to testdata/go-swagger/expansion/invalid-refs.json diff --git a/fixtures/go-swagger/expansion/params.json b/testdata/go-swagger/expansion/params.json similarity index 100% rename from fixtures/go-swagger/expansion/params.json rename to testdata/go-swagger/expansion/params.json diff --git a/fixtures/go-swagger/expansion/schemas1.json b/testdata/go-swagger/expansion/schemas1.json similarity index 100% rename from fixtures/go-swagger/expansion/schemas1.json rename to testdata/go-swagger/expansion/schemas1.json diff --git a/fixtures/go-swagger/expansion/schemas2.json b/testdata/go-swagger/expansion/schemas2.json similarity index 100% rename from fixtures/go-swagger/expansion/schemas2.json rename to testdata/go-swagger/expansion/schemas2.json diff --git a/fixtures/go-swagger/petstores/petstore-expanded.json b/testdata/go-swagger/petstores/petstore-expanded.json similarity index 100% rename from fixtures/go-swagger/petstores/petstore-expanded.json rename to testdata/go-swagger/petstores/petstore-expanded.json diff --git a/fixtures/go-swagger/petstores/petstore-simple.json b/testdata/go-swagger/petstores/petstore-simple.json similarity index 100% rename from fixtures/go-swagger/petstores/petstore-simple.json rename to testdata/go-swagger/petstores/petstore-simple.json diff --git a/fixtures/go-swagger/petstores/petstore-with-external-docs.json b/testdata/go-swagger/petstores/petstore-with-external-docs.json similarity index 100% rename from fixtures/go-swagger/petstores/petstore-with-external-docs.json rename to testdata/go-swagger/petstores/petstore-with-external-docs.json diff --git a/fixtures/go-swagger/petstores/petstore.json b/testdata/go-swagger/petstores/petstore.json similarity index 100% rename from fixtures/go-swagger/petstores/petstore.json rename to testdata/go-swagger/petstores/petstore.json diff --git a/fixtures/go-swagger/remotes/folder/folderInteger.json b/testdata/go-swagger/remotes/folder/folderInteger.json similarity index 100% rename from fixtures/go-swagger/remotes/folder/folderInteger.json rename to testdata/go-swagger/remotes/folder/folderInteger.json diff --git a/fixtures/go-swagger/remotes/integer.json b/testdata/go-swagger/remotes/integer.json similarity index 100% rename from fixtures/go-swagger/remotes/integer.json rename to testdata/go-swagger/remotes/integer.json diff --git a/fixtures/go-swagger/remotes/subSchemas.json b/testdata/go-swagger/remotes/subSchemas.json similarity index 100% rename from fixtures/go-swagger/remotes/subSchemas.json rename to testdata/go-swagger/remotes/subSchemas.json diff --git a/fixtures/go-swagger/specs/deeper/arrayProp.json b/testdata/go-swagger/specs/deeper/arrayProp.json similarity index 100% rename from fixtures/go-swagger/specs/deeper/arrayProp.json rename to testdata/go-swagger/specs/deeper/arrayProp.json diff --git a/fixtures/go-swagger/specs/deeper/stringProp.json b/testdata/go-swagger/specs/deeper/stringProp.json similarity index 100% rename from fixtures/go-swagger/specs/deeper/stringProp.json rename to testdata/go-swagger/specs/deeper/stringProp.json diff --git a/fixtures/go-swagger/specs/refed.json b/testdata/go-swagger/specs/refed.json similarity index 100% rename from fixtures/go-swagger/specs/refed.json rename to testdata/go-swagger/specs/refed.json diff --git a/fixtures/go-swagger/specs/resolution.json b/testdata/go-swagger/specs/resolution.json similarity index 100% rename from fixtures/go-swagger/specs/resolution.json rename to testdata/go-swagger/specs/resolution.json diff --git a/fixtures/go-swagger/specs/resolution2.json b/testdata/go-swagger/specs/resolution2.json similarity index 100% rename from fixtures/go-swagger/specs/resolution2.json rename to testdata/go-swagger/specs/resolution2.json diff --git a/fixtures/go-swagger/specs/response_name.json b/testdata/go-swagger/specs/response_name.json similarity index 100% rename from fixtures/go-swagger/specs/response_name.json rename to testdata/go-swagger/specs/response_name.json diff --git a/fixtures/go-swagger/templates/swagger_json_embed.gotmpl b/testdata/go-swagger/templates/swagger_json_embed.gotmpl similarity index 100% rename from fixtures/go-swagger/templates/swagger_json_embed.gotmpl rename to testdata/go-swagger/templates/swagger_json_embed.gotmpl diff --git a/fixtures/jsonschema_suite/additionalItems.json b/testdata/jsonschema_suite/additionalItems.json similarity index 100% rename from fixtures/jsonschema_suite/additionalItems.json rename to testdata/jsonschema_suite/additionalItems.json diff --git a/fixtures/jsonschema_suite/additionalProperties.json b/testdata/jsonschema_suite/additionalProperties.json similarity index 100% rename from fixtures/jsonschema_suite/additionalProperties.json rename to testdata/jsonschema_suite/additionalProperties.json diff --git a/fixtures/jsonschema_suite/allOf.json b/testdata/jsonschema_suite/allOf.json similarity index 100% rename from fixtures/jsonschema_suite/allOf.json rename to testdata/jsonschema_suite/allOf.json diff --git a/fixtures/jsonschema_suite/anyOf.json b/testdata/jsonschema_suite/anyOf.json similarity index 100% rename from fixtures/jsonschema_suite/anyOf.json rename to testdata/jsonschema_suite/anyOf.json diff --git a/fixtures/jsonschema_suite/default.json b/testdata/jsonschema_suite/default.json similarity index 100% rename from fixtures/jsonschema_suite/default.json rename to testdata/jsonschema_suite/default.json diff --git a/fixtures/jsonschema_suite/definitions.json b/testdata/jsonschema_suite/definitions.json similarity index 100% rename from fixtures/jsonschema_suite/definitions.json rename to testdata/jsonschema_suite/definitions.json diff --git a/fixtures/jsonschema_suite/dependencies.json b/testdata/jsonschema_suite/dependencies.json similarity index 100% rename from fixtures/jsonschema_suite/dependencies.json rename to testdata/jsonschema_suite/dependencies.json diff --git a/fixtures/jsonschema_suite/enum.json b/testdata/jsonschema_suite/enum.json similarity index 100% rename from fixtures/jsonschema_suite/enum.json rename to testdata/jsonschema_suite/enum.json diff --git a/fixtures/jsonschema_suite/format.json b/testdata/jsonschema_suite/format.json similarity index 100% rename from fixtures/jsonschema_suite/format.json rename to testdata/jsonschema_suite/format.json diff --git a/fixtures/jsonschema_suite/items.json b/testdata/jsonschema_suite/items.json similarity index 100% rename from fixtures/jsonschema_suite/items.json rename to testdata/jsonschema_suite/items.json diff --git a/fixtures/jsonschema_suite/maxItems.json b/testdata/jsonschema_suite/maxItems.json similarity index 100% rename from fixtures/jsonschema_suite/maxItems.json rename to testdata/jsonschema_suite/maxItems.json diff --git a/fixtures/jsonschema_suite/maxLength.json b/testdata/jsonschema_suite/maxLength.json similarity index 100% rename from fixtures/jsonschema_suite/maxLength.json rename to testdata/jsonschema_suite/maxLength.json diff --git a/fixtures/jsonschema_suite/maxProperties.json b/testdata/jsonschema_suite/maxProperties.json similarity index 100% rename from fixtures/jsonschema_suite/maxProperties.json rename to testdata/jsonschema_suite/maxProperties.json diff --git a/fixtures/jsonschema_suite/maximum.json b/testdata/jsonschema_suite/maximum.json similarity index 100% rename from fixtures/jsonschema_suite/maximum.json rename to testdata/jsonschema_suite/maximum.json diff --git a/fixtures/jsonschema_suite/minItems.json b/testdata/jsonschema_suite/minItems.json similarity index 100% rename from fixtures/jsonschema_suite/minItems.json rename to testdata/jsonschema_suite/minItems.json diff --git a/fixtures/jsonschema_suite/minLength.json b/testdata/jsonschema_suite/minLength.json similarity index 100% rename from fixtures/jsonschema_suite/minLength.json rename to testdata/jsonschema_suite/minLength.json diff --git a/fixtures/jsonschema_suite/minProperties.json b/testdata/jsonschema_suite/minProperties.json similarity index 100% rename from fixtures/jsonschema_suite/minProperties.json rename to testdata/jsonschema_suite/minProperties.json diff --git a/fixtures/jsonschema_suite/minimum.json b/testdata/jsonschema_suite/minimum.json similarity index 100% rename from fixtures/jsonschema_suite/minimum.json rename to testdata/jsonschema_suite/minimum.json diff --git a/fixtures/jsonschema_suite/multipleOf.json b/testdata/jsonschema_suite/multipleOf.json similarity index 100% rename from fixtures/jsonschema_suite/multipleOf.json rename to testdata/jsonschema_suite/multipleOf.json diff --git a/fixtures/jsonschema_suite/not.json b/testdata/jsonschema_suite/not.json similarity index 100% rename from fixtures/jsonschema_suite/not.json rename to testdata/jsonschema_suite/not.json diff --git a/fixtures/jsonschema_suite/oneOf.json b/testdata/jsonschema_suite/oneOf.json similarity index 100% rename from fixtures/jsonschema_suite/oneOf.json rename to testdata/jsonschema_suite/oneOf.json diff --git a/fixtures/jsonschema_suite/optional/bignum.json b/testdata/jsonschema_suite/optional/bignum.json similarity index 100% rename from fixtures/jsonschema_suite/optional/bignum.json rename to testdata/jsonschema_suite/optional/bignum.json diff --git a/fixtures/jsonschema_suite/optional/ecmascript-regex.json b/testdata/jsonschema_suite/optional/ecmascript-regex.json similarity index 100% rename from fixtures/jsonschema_suite/optional/ecmascript-regex.json rename to testdata/jsonschema_suite/optional/ecmascript-regex.json diff --git a/fixtures/jsonschema_suite/optional/format.json b/testdata/jsonschema_suite/optional/format.json similarity index 100% rename from fixtures/jsonschema_suite/optional/format.json rename to testdata/jsonschema_suite/optional/format.json diff --git a/fixtures/jsonschema_suite/optional/zeroTerminatedFloats.json b/testdata/jsonschema_suite/optional/zeroTerminatedFloats.json similarity index 100% rename from fixtures/jsonschema_suite/optional/zeroTerminatedFloats.json rename to testdata/jsonschema_suite/optional/zeroTerminatedFloats.json diff --git a/fixtures/jsonschema_suite/pattern.json b/testdata/jsonschema_suite/pattern.json similarity index 100% rename from fixtures/jsonschema_suite/pattern.json rename to testdata/jsonschema_suite/pattern.json diff --git a/fixtures/jsonschema_suite/patternProperties.json b/testdata/jsonschema_suite/patternProperties.json similarity index 100% rename from fixtures/jsonschema_suite/patternProperties.json rename to testdata/jsonschema_suite/patternProperties.json diff --git a/fixtures/jsonschema_suite/properties.json b/testdata/jsonschema_suite/properties.json similarity index 100% rename from fixtures/jsonschema_suite/properties.json rename to testdata/jsonschema_suite/properties.json diff --git a/fixtures/jsonschema_suite/ref.json b/testdata/jsonschema_suite/ref.json similarity index 100% rename from fixtures/jsonschema_suite/ref.json rename to testdata/jsonschema_suite/ref.json diff --git a/fixtures/jsonschema_suite/refRemote.json b/testdata/jsonschema_suite/refRemote.json similarity index 100% rename from fixtures/jsonschema_suite/refRemote.json rename to testdata/jsonschema_suite/refRemote.json diff --git a/fixtures/jsonschema_suite/remotes/folder/folderInteger.json b/testdata/jsonschema_suite/remotes/folder/folderInteger.json similarity index 100% rename from fixtures/jsonschema_suite/remotes/folder/folderInteger.json rename to testdata/jsonschema_suite/remotes/folder/folderInteger.json diff --git a/fixtures/jsonschema_suite/remotes/integer.json b/testdata/jsonschema_suite/remotes/integer.json similarity index 100% rename from fixtures/jsonschema_suite/remotes/integer.json rename to testdata/jsonschema_suite/remotes/integer.json diff --git a/fixtures/jsonschema_suite/remotes/name.json b/testdata/jsonschema_suite/remotes/name.json similarity index 100% rename from fixtures/jsonschema_suite/remotes/name.json rename to testdata/jsonschema_suite/remotes/name.json diff --git a/fixtures/jsonschema_suite/remotes/subSchemas.json b/testdata/jsonschema_suite/remotes/subSchemas.json similarity index 100% rename from fixtures/jsonschema_suite/remotes/subSchemas.json rename to testdata/jsonschema_suite/remotes/subSchemas.json diff --git a/fixtures/jsonschema_suite/required.json b/testdata/jsonschema_suite/required.json similarity index 100% rename from fixtures/jsonschema_suite/required.json rename to testdata/jsonschema_suite/required.json diff --git a/fixtures/jsonschema_suite/type.json b/testdata/jsonschema_suite/type.json similarity index 100% rename from fixtures/jsonschema_suite/type.json rename to testdata/jsonschema_suite/type.json diff --git a/fixtures/jsonschema_suite/uniqueItems.json b/testdata/jsonschema_suite/uniqueItems.json similarity index 100% rename from fixtures/jsonschema_suite/uniqueItems.json rename to testdata/jsonschema_suite/uniqueItems.json diff --git a/fixtures/local_expansion/item.yaml b/testdata/local_expansion/item.yaml similarity index 100% rename from fixtures/local_expansion/item.yaml rename to testdata/local_expansion/item.yaml diff --git a/fixtures/local_expansion/spec.yaml b/testdata/local_expansion/spec.yaml similarity index 100% rename from fixtures/local_expansion/spec.yaml rename to testdata/local_expansion/spec.yaml diff --git a/fixtures/petstore/swagger-invalid.json b/testdata/petstore/swagger-invalid.json similarity index 100% rename from fixtures/petstore/swagger-invalid.json rename to testdata/petstore/swagger-invalid.json diff --git a/fixtures/petstore/swagger.json b/testdata/petstore/swagger.json similarity index 100% rename from fixtures/petstore/swagger.json rename to testdata/petstore/swagger.json diff --git a/fixtures/pruning/schema.json b/testdata/pruning/schema.json similarity index 100% rename from fixtures/pruning/schema.json rename to testdata/pruning/schema.json diff --git a/fixtures/recursive_expansion/item.yaml b/testdata/recursive_expansion/item.yaml similarity index 100% rename from fixtures/recursive_expansion/item.yaml rename to testdata/recursive_expansion/item.yaml diff --git a/fixtures/recursive_expansion/spec.yaml b/testdata/recursive_expansion/spec.yaml similarity index 100% rename from fixtures/recursive_expansion/spec.yaml rename to testdata/recursive_expansion/spec.yaml diff --git a/fixtures/schemas/int-enum.json b/testdata/schemas/int-enum.json similarity index 100% rename from fixtures/schemas/int-enum.json rename to testdata/schemas/int-enum.json diff --git a/fixtures/validation/bitbucket.json b/testdata/validation/bitbucket.json similarity index 100% rename from fixtures/validation/bitbucket.json rename to testdata/validation/bitbucket.json diff --git a/fixtures/validation/default/invalid-default-value-default-response-PatternProperties.json b/testdata/validation/default/invalid-default-value-default-response-PatternProperties.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-default-response-PatternProperties.json rename to testdata/validation/default/invalid-default-value-default-response-PatternProperties.json diff --git a/fixtures/validation/default/invalid-default-value-default-response.json b/testdata/validation/default/invalid-default-value-default-response.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-default-response.json rename to testdata/validation/default/invalid-default-value-default-response.json diff --git a/fixtures/validation/default/invalid-default-value-header-badpattern.json b/testdata/validation/default/invalid-default-value-header-badpattern.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-header-badpattern.json rename to testdata/validation/default/invalid-default-value-header-badpattern.json diff --git a/fixtures/validation/default/invalid-default-value-header-items-default-response.json b/testdata/validation/default/invalid-default-value-header-items-default-response.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-header-items-default-response.json rename to testdata/validation/default/invalid-default-value-header-items-default-response.json diff --git a/fixtures/validation/default/invalid-default-value-header-items-response.json b/testdata/validation/default/invalid-default-value-header-items-response.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-header-items-response.json rename to testdata/validation/default/invalid-default-value-header-items-response.json diff --git a/fixtures/validation/default/invalid-default-value-header-items.json b/testdata/validation/default/invalid-default-value-header-items.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-header-items.json rename to testdata/validation/default/invalid-default-value-header-items.json diff --git a/fixtures/validation/default/invalid-default-value-header-pattern.json b/testdata/validation/default/invalid-default-value-header-pattern.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-header-pattern.json rename to testdata/validation/default/invalid-default-value-header-pattern.json diff --git a/fixtures/validation/default/invalid-default-value-header-response.json b/testdata/validation/default/invalid-default-value-header-response.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-header-response.json rename to testdata/validation/default/invalid-default-value-header-response.json diff --git a/fixtures/validation/default/invalid-default-value-header.json b/testdata/validation/default/invalid-default-value-header.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-header.json rename to testdata/validation/default/invalid-default-value-header.json diff --git a/fixtures/validation/default/invalid-default-value-parameter-items.json b/testdata/validation/default/invalid-default-value-parameter-items.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-parameter-items.json rename to testdata/validation/default/invalid-default-value-parameter-items.json diff --git a/fixtures/validation/default/invalid-default-value-parameter-ref.json b/testdata/validation/default/invalid-default-value-parameter-ref.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-parameter-ref.json rename to testdata/validation/default/invalid-default-value-parameter-ref.json diff --git a/fixtures/validation/default/invalid-default-value-parameter-required.json b/testdata/validation/default/invalid-default-value-parameter-required.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-parameter-required.json rename to testdata/validation/default/invalid-default-value-parameter-required.json diff --git a/fixtures/validation/default/invalid-default-value-parameter-schema.json b/testdata/validation/default/invalid-default-value-parameter-schema.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-parameter-schema.json rename to testdata/validation/default/invalid-default-value-parameter-schema.json diff --git a/fixtures/validation/default/invalid-default-value-parameter.json b/testdata/validation/default/invalid-default-value-parameter.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-parameter.json rename to testdata/validation/default/invalid-default-value-parameter.json diff --git a/fixtures/validation/default/invalid-default-value-response-ref.json b/testdata/validation/default/invalid-default-value-response-ref.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-response-ref.json rename to testdata/validation/default/invalid-default-value-response-ref.json diff --git a/fixtures/validation/default/invalid-default-value-schema-additionalProperties.json b/testdata/validation/default/invalid-default-value-schema-additionalProperties.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-schema-additionalProperties.json rename to testdata/validation/default/invalid-default-value-schema-additionalProperties.json diff --git a/fixtures/validation/default/invalid-default-value-schema-allOf.json b/testdata/validation/default/invalid-default-value-schema-allOf.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-schema-allOf.json rename to testdata/validation/default/invalid-default-value-schema-allOf.json diff --git a/fixtures/validation/default/invalid-default-value-schema-items-allOf.json b/testdata/validation/default/invalid-default-value-schema-items-allOf.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-schema-items-allOf.json rename to testdata/validation/default/invalid-default-value-schema-items-allOf.json diff --git a/fixtures/validation/default/invalid-default-value-schema-items.json b/testdata/validation/default/invalid-default-value-schema-items.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-schema-items.json rename to testdata/validation/default/invalid-default-value-schema-items.json diff --git a/fixtures/validation/default/invalid-default-value-schema-patternProperties.json b/testdata/validation/default/invalid-default-value-schema-patternProperties.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-schema-patternProperties.json rename to testdata/validation/default/invalid-default-value-schema-patternProperties.json diff --git a/fixtures/validation/default/invalid-default-value-schema-ref.json b/testdata/validation/default/invalid-default-value-schema-ref.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-schema-ref.json rename to testdata/validation/default/invalid-default-value-schema-ref.json diff --git a/fixtures/validation/default/invalid-default-value-schema.json b/testdata/validation/default/invalid-default-value-schema.json similarity index 100% rename from fixtures/validation/default/invalid-default-value-schema.json rename to testdata/validation/default/invalid-default-value-schema.json diff --git a/fixtures/validation/default/valid-default-value-default-response-PatternProperties.json b/testdata/validation/default/valid-default-value-default-response-PatternProperties.json similarity index 100% rename from fixtures/validation/default/valid-default-value-default-response-PatternProperties.json rename to testdata/validation/default/valid-default-value-default-response-PatternProperties.json diff --git a/fixtures/validation/default/valid-default-value-default-response.json b/testdata/validation/default/valid-default-value-default-response.json similarity index 100% rename from fixtures/validation/default/valid-default-value-default-response.json rename to testdata/validation/default/valid-default-value-default-response.json diff --git a/fixtures/validation/default/valid-default-value-header-badpattern.json b/testdata/validation/default/valid-default-value-header-badpattern.json similarity index 100% rename from fixtures/validation/default/valid-default-value-header-badpattern.json rename to testdata/validation/default/valid-default-value-header-badpattern.json diff --git a/fixtures/validation/default/valid-default-value-header-items-default-response.json b/testdata/validation/default/valid-default-value-header-items-default-response.json similarity index 100% rename from fixtures/validation/default/valid-default-value-header-items-default-response.json rename to testdata/validation/default/valid-default-value-header-items-default-response.json diff --git a/fixtures/validation/default/valid-default-value-header-items-response.json b/testdata/validation/default/valid-default-value-header-items-response.json similarity index 100% rename from fixtures/validation/default/valid-default-value-header-items-response.json rename to testdata/validation/default/valid-default-value-header-items-response.json diff --git a/fixtures/validation/default/valid-default-value-header-items.json b/testdata/validation/default/valid-default-value-header-items.json similarity index 100% rename from fixtures/validation/default/valid-default-value-header-items.json rename to testdata/validation/default/valid-default-value-header-items.json diff --git a/fixtures/validation/default/valid-default-value-header-pattern.json b/testdata/validation/default/valid-default-value-header-pattern.json similarity index 100% rename from fixtures/validation/default/valid-default-value-header-pattern.json rename to testdata/validation/default/valid-default-value-header-pattern.json diff --git a/fixtures/validation/default/valid-default-value-header-response.json b/testdata/validation/default/valid-default-value-header-response.json similarity index 100% rename from fixtures/validation/default/valid-default-value-header-response.json rename to testdata/validation/default/valid-default-value-header-response.json diff --git a/fixtures/validation/default/valid-default-value-header.json b/testdata/validation/default/valid-default-value-header.json similarity index 100% rename from fixtures/validation/default/valid-default-value-header.json rename to testdata/validation/default/valid-default-value-header.json diff --git a/fixtures/validation/default/valid-default-value-parameter-items.json b/testdata/validation/default/valid-default-value-parameter-items.json similarity index 100% rename from fixtures/validation/default/valid-default-value-parameter-items.json rename to testdata/validation/default/valid-default-value-parameter-items.json diff --git a/fixtures/validation/default/valid-default-value-parameter-ref.json b/testdata/validation/default/valid-default-value-parameter-ref.json similarity index 100% rename from fixtures/validation/default/valid-default-value-parameter-ref.json rename to testdata/validation/default/valid-default-value-parameter-ref.json diff --git a/fixtures/validation/default/valid-default-value-parameter-required.json b/testdata/validation/default/valid-default-value-parameter-required.json similarity index 100% rename from fixtures/validation/default/valid-default-value-parameter-required.json rename to testdata/validation/default/valid-default-value-parameter-required.json diff --git a/fixtures/validation/default/valid-default-value-parameter-schema.json b/testdata/validation/default/valid-default-value-parameter-schema.json similarity index 100% rename from fixtures/validation/default/valid-default-value-parameter-schema.json rename to testdata/validation/default/valid-default-value-parameter-schema.json diff --git a/fixtures/validation/default/valid-default-value-parameter.json b/testdata/validation/default/valid-default-value-parameter.json similarity index 100% rename from fixtures/validation/default/valid-default-value-parameter.json rename to testdata/validation/default/valid-default-value-parameter.json diff --git a/fixtures/validation/default/valid-default-value-response-ref.json b/testdata/validation/default/valid-default-value-response-ref.json similarity index 100% rename from fixtures/validation/default/valid-default-value-response-ref.json rename to testdata/validation/default/valid-default-value-response-ref.json diff --git a/fixtures/validation/default/valid-default-value-schema-additionalProperties.json b/testdata/validation/default/valid-default-value-schema-additionalProperties.json similarity index 100% rename from fixtures/validation/default/valid-default-value-schema-additionalProperties.json rename to testdata/validation/default/valid-default-value-schema-additionalProperties.json diff --git a/fixtures/validation/default/valid-default-value-schema-allOf.json b/testdata/validation/default/valid-default-value-schema-allOf.json similarity index 100% rename from fixtures/validation/default/valid-default-value-schema-allOf.json rename to testdata/validation/default/valid-default-value-schema-allOf.json diff --git a/fixtures/validation/default/valid-default-value-schema-items-allOf.json b/testdata/validation/default/valid-default-value-schema-items-allOf.json similarity index 100% rename from fixtures/validation/default/valid-default-value-schema-items-allOf.json rename to testdata/validation/default/valid-default-value-schema-items-allOf.json diff --git a/fixtures/validation/default/valid-default-value-schema-items.json b/testdata/validation/default/valid-default-value-schema-items.json similarity index 100% rename from fixtures/validation/default/valid-default-value-schema-items.json rename to testdata/validation/default/valid-default-value-schema-items.json diff --git a/fixtures/validation/default/valid-default-value-schema-patternProperties.json b/testdata/validation/default/valid-default-value-schema-patternProperties.json similarity index 100% rename from fixtures/validation/default/valid-default-value-schema-patternProperties.json rename to testdata/validation/default/valid-default-value-schema-patternProperties.json diff --git a/fixtures/validation/default/valid-default-value-schema-ref.json b/testdata/validation/default/valid-default-value-schema-ref.json similarity index 100% rename from fixtures/validation/default/valid-default-value-schema-ref.json rename to testdata/validation/default/valid-default-value-schema-ref.json diff --git a/fixtures/validation/default/valid-default-value-schema.json b/testdata/validation/default/valid-default-value-schema.json similarity index 100% rename from fixtures/validation/default/valid-default-value-schema.json rename to testdata/validation/default/valid-default-value-schema.json diff --git a/fixtures/validation/direct-circular-ancestor.json b/testdata/validation/direct-circular-ancestor.json similarity index 100% rename from fixtures/validation/direct-circular-ancestor.json rename to testdata/validation/direct-circular-ancestor.json diff --git a/fixtures/validation/duplicateprops.json b/testdata/validation/duplicateprops.json similarity index 100% rename from fixtures/validation/duplicateprops.json rename to testdata/validation/duplicateprops.json diff --git a/fixtures/validation/empty-path-param-name.json b/testdata/validation/empty-path-param-name.json similarity index 100% rename from fixtures/validation/empty-path-param-name.json rename to testdata/validation/empty-path-param-name.json diff --git a/fixtures/validation/example/invalid-example-default-response-PatternProperties.json b/testdata/validation/example/invalid-example-default-response-PatternProperties.json similarity index 100% rename from fixtures/validation/example/invalid-example-default-response-PatternProperties.json rename to testdata/validation/example/invalid-example-default-response-PatternProperties.json diff --git a/fixtures/validation/example/invalid-example-default-response.json b/testdata/validation/example/invalid-example-default-response.json similarity index 100% rename from fixtures/validation/example/invalid-example-default-response.json rename to testdata/validation/example/invalid-example-default-response.json diff --git a/fixtures/validation/example/invalid-example-header-badpattern.json b/testdata/validation/example/invalid-example-header-badpattern.json similarity index 100% rename from fixtures/validation/example/invalid-example-header-badpattern.json rename to testdata/validation/example/invalid-example-header-badpattern.json diff --git a/fixtures/validation/example/invalid-example-header-items-default-response.json b/testdata/validation/example/invalid-example-header-items-default-response.json similarity index 100% rename from fixtures/validation/example/invalid-example-header-items-default-response.json rename to testdata/validation/example/invalid-example-header-items-default-response.json diff --git a/fixtures/validation/example/invalid-example-header-items-response.json b/testdata/validation/example/invalid-example-header-items-response.json similarity index 100% rename from fixtures/validation/example/invalid-example-header-items-response.json rename to testdata/validation/example/invalid-example-header-items-response.json diff --git a/fixtures/validation/example/invalid-example-header-items.json b/testdata/validation/example/invalid-example-header-items.json similarity index 100% rename from fixtures/validation/example/invalid-example-header-items.json rename to testdata/validation/example/invalid-example-header-items.json diff --git a/fixtures/validation/example/invalid-example-header-pattern.json b/testdata/validation/example/invalid-example-header-pattern.json similarity index 100% rename from fixtures/validation/example/invalid-example-header-pattern.json rename to testdata/validation/example/invalid-example-header-pattern.json diff --git a/fixtures/validation/example/invalid-example-header-response.json b/testdata/validation/example/invalid-example-header-response.json similarity index 100% rename from fixtures/validation/example/invalid-example-header-response.json rename to testdata/validation/example/invalid-example-header-response.json diff --git a/fixtures/validation/example/invalid-example-header.json b/testdata/validation/example/invalid-example-header.json similarity index 100% rename from fixtures/validation/example/invalid-example-header.json rename to testdata/validation/example/invalid-example-header.json diff --git a/fixtures/validation/example/invalid-example-parameter-items.json b/testdata/validation/example/invalid-example-parameter-items.json similarity index 100% rename from fixtures/validation/example/invalid-example-parameter-items.json rename to testdata/validation/example/invalid-example-parameter-items.json diff --git a/fixtures/validation/example/invalid-example-parameter-ref.json b/testdata/validation/example/invalid-example-parameter-ref.json similarity index 100% rename from fixtures/validation/example/invalid-example-parameter-ref.json rename to testdata/validation/example/invalid-example-parameter-ref.json diff --git a/fixtures/validation/example/invalid-example-parameter-required.json b/testdata/validation/example/invalid-example-parameter-required.json similarity index 100% rename from fixtures/validation/example/invalid-example-parameter-required.json rename to testdata/validation/example/invalid-example-parameter-required.json diff --git a/fixtures/validation/example/invalid-example-parameter-schema.json b/testdata/validation/example/invalid-example-parameter-schema.json similarity index 100% rename from fixtures/validation/example/invalid-example-parameter-schema.json rename to testdata/validation/example/invalid-example-parameter-schema.json diff --git a/fixtures/validation/example/invalid-example-parameter.json b/testdata/validation/example/invalid-example-parameter.json similarity index 100% rename from fixtures/validation/example/invalid-example-parameter.json rename to testdata/validation/example/invalid-example-parameter.json diff --git a/fixtures/validation/example/invalid-example-response-ref.json b/testdata/validation/example/invalid-example-response-ref.json similarity index 100% rename from fixtures/validation/example/invalid-example-response-ref.json rename to testdata/validation/example/invalid-example-response-ref.json diff --git a/fixtures/validation/example/invalid-example-response.json b/testdata/validation/example/invalid-example-response.json similarity index 100% rename from fixtures/validation/example/invalid-example-response.json rename to testdata/validation/example/invalid-example-response.json diff --git a/fixtures/validation/example/invalid-example-schema-additionalProperties.json b/testdata/validation/example/invalid-example-schema-additionalProperties.json similarity index 100% rename from fixtures/validation/example/invalid-example-schema-additionalProperties.json rename to testdata/validation/example/invalid-example-schema-additionalProperties.json diff --git a/fixtures/validation/example/invalid-example-schema-allOf.json b/testdata/validation/example/invalid-example-schema-allOf.json similarity index 100% rename from fixtures/validation/example/invalid-example-schema-allOf.json rename to testdata/validation/example/invalid-example-schema-allOf.json diff --git a/fixtures/validation/example/invalid-example-schema-items-allOf.json b/testdata/validation/example/invalid-example-schema-items-allOf.json similarity index 100% rename from fixtures/validation/example/invalid-example-schema-items-allOf.json rename to testdata/validation/example/invalid-example-schema-items-allOf.json diff --git a/fixtures/validation/example/invalid-example-schema-items.json b/testdata/validation/example/invalid-example-schema-items.json similarity index 100% rename from fixtures/validation/example/invalid-example-schema-items.json rename to testdata/validation/example/invalid-example-schema-items.json diff --git a/fixtures/validation/example/invalid-example-schema-patternProperties.json b/testdata/validation/example/invalid-example-schema-patternProperties.json similarity index 100% rename from fixtures/validation/example/invalid-example-schema-patternProperties.json rename to testdata/validation/example/invalid-example-schema-patternProperties.json diff --git a/fixtures/validation/example/invalid-example-schema-ref.json b/testdata/validation/example/invalid-example-schema-ref.json similarity index 100% rename from fixtures/validation/example/invalid-example-schema-ref.json rename to testdata/validation/example/invalid-example-schema-ref.json diff --git a/fixtures/validation/example/invalid-example-schema.json b/testdata/validation/example/invalid-example-schema.json similarity index 100% rename from fixtures/validation/example/invalid-example-schema.json rename to testdata/validation/example/invalid-example-schema.json diff --git a/fixtures/validation/example/valid-example-default-response-PatternProperties.json b/testdata/validation/example/valid-example-default-response-PatternProperties.json similarity index 100% rename from fixtures/validation/example/valid-example-default-response-PatternProperties.json rename to testdata/validation/example/valid-example-default-response-PatternProperties.json diff --git a/fixtures/validation/example/valid-example-default-response.json b/testdata/validation/example/valid-example-default-response.json similarity index 100% rename from fixtures/validation/example/valid-example-default-response.json rename to testdata/validation/example/valid-example-default-response.json diff --git a/fixtures/validation/example/valid-example-header-badpattern.json b/testdata/validation/example/valid-example-header-badpattern.json similarity index 100% rename from fixtures/validation/example/valid-example-header-badpattern.json rename to testdata/validation/example/valid-example-header-badpattern.json diff --git a/fixtures/validation/example/valid-example-header-items-default-response.json b/testdata/validation/example/valid-example-header-items-default-response.json similarity index 100% rename from fixtures/validation/example/valid-example-header-items-default-response.json rename to testdata/validation/example/valid-example-header-items-default-response.json diff --git a/fixtures/validation/example/valid-example-header-items-response.json b/testdata/validation/example/valid-example-header-items-response.json similarity index 100% rename from fixtures/validation/example/valid-example-header-items-response.json rename to testdata/validation/example/valid-example-header-items-response.json diff --git a/fixtures/validation/example/valid-example-header-items.json b/testdata/validation/example/valid-example-header-items.json similarity index 100% rename from fixtures/validation/example/valid-example-header-items.json rename to testdata/validation/example/valid-example-header-items.json diff --git a/fixtures/validation/example/valid-example-header-pattern.json b/testdata/validation/example/valid-example-header-pattern.json similarity index 100% rename from fixtures/validation/example/valid-example-header-pattern.json rename to testdata/validation/example/valid-example-header-pattern.json diff --git a/fixtures/validation/example/valid-example-header-response.json b/testdata/validation/example/valid-example-header-response.json similarity index 100% rename from fixtures/validation/example/valid-example-header-response.json rename to testdata/validation/example/valid-example-header-response.json diff --git a/fixtures/validation/example/valid-example-header.json b/testdata/validation/example/valid-example-header.json similarity index 100% rename from fixtures/validation/example/valid-example-header.json rename to testdata/validation/example/valid-example-header.json diff --git a/fixtures/validation/example/valid-example-parameter-items.json b/testdata/validation/example/valid-example-parameter-items.json similarity index 100% rename from fixtures/validation/example/valid-example-parameter-items.json rename to testdata/validation/example/valid-example-parameter-items.json diff --git a/fixtures/validation/example/valid-example-parameter-ref.json b/testdata/validation/example/valid-example-parameter-ref.json similarity index 100% rename from fixtures/validation/example/valid-example-parameter-ref.json rename to testdata/validation/example/valid-example-parameter-ref.json diff --git a/fixtures/validation/example/valid-example-parameter-required.json b/testdata/validation/example/valid-example-parameter-required.json similarity index 100% rename from fixtures/validation/example/valid-example-parameter-required.json rename to testdata/validation/example/valid-example-parameter-required.json diff --git a/fixtures/validation/example/valid-example-parameter-schema.json b/testdata/validation/example/valid-example-parameter-schema.json similarity index 100% rename from fixtures/validation/example/valid-example-parameter-schema.json rename to testdata/validation/example/valid-example-parameter-schema.json diff --git a/fixtures/validation/example/valid-example-parameter.json b/testdata/validation/example/valid-example-parameter.json similarity index 100% rename from fixtures/validation/example/valid-example-parameter.json rename to testdata/validation/example/valid-example-parameter.json diff --git a/fixtures/validation/example/valid-example-response-ref.json b/testdata/validation/example/valid-example-response-ref.json similarity index 100% rename from fixtures/validation/example/valid-example-response-ref.json rename to testdata/validation/example/valid-example-response-ref.json diff --git a/fixtures/validation/example/valid-example-response.json b/testdata/validation/example/valid-example-response.json similarity index 100% rename from fixtures/validation/example/valid-example-response.json rename to testdata/validation/example/valid-example-response.json diff --git a/fixtures/validation/example/valid-example-schema-additionalProperties.json b/testdata/validation/example/valid-example-schema-additionalProperties.json similarity index 100% rename from fixtures/validation/example/valid-example-schema-additionalProperties.json rename to testdata/validation/example/valid-example-schema-additionalProperties.json diff --git a/fixtures/validation/example/valid-example-schema-allOf.json b/testdata/validation/example/valid-example-schema-allOf.json similarity index 100% rename from fixtures/validation/example/valid-example-schema-allOf.json rename to testdata/validation/example/valid-example-schema-allOf.json diff --git a/fixtures/validation/example/valid-example-schema-items-allOf.json b/testdata/validation/example/valid-example-schema-items-allOf.json similarity index 100% rename from fixtures/validation/example/valid-example-schema-items-allOf.json rename to testdata/validation/example/valid-example-schema-items-allOf.json diff --git a/fixtures/validation/example/valid-example-schema-items.json b/testdata/validation/example/valid-example-schema-items.json similarity index 100% rename from fixtures/validation/example/valid-example-schema-items.json rename to testdata/validation/example/valid-example-schema-items.json diff --git a/fixtures/validation/example/valid-example-schema-patternProperties.json b/testdata/validation/example/valid-example-schema-patternProperties.json similarity index 100% rename from fixtures/validation/example/valid-example-schema-patternProperties.json rename to testdata/validation/example/valid-example-schema-patternProperties.json diff --git a/fixtures/validation/example/valid-example-schema-ref.json b/testdata/validation/example/valid-example-schema-ref.json similarity index 100% rename from fixtures/validation/example/valid-example-schema-ref.json rename to testdata/validation/example/valid-example-schema-ref.json diff --git a/fixtures/validation/example/valid-example-schema.json b/testdata/validation/example/valid-example-schema.json similarity index 100% rename from fixtures/validation/example/valid-example-schema.json rename to testdata/validation/example/valid-example-schema.json diff --git a/fixtures/validation/expected_messages.yaml b/testdata/validation/expected_messages.yaml similarity index 100% rename from fixtures/validation/expected_messages.yaml rename to testdata/validation/expected_messages.yaml diff --git a/fixtures/validation/fixture-1050.yaml b/testdata/validation/fixture-1050.yaml similarity index 100% rename from fixtures/validation/fixture-1050.yaml rename to testdata/validation/fixture-1050.yaml diff --git a/fixtures/validation/fixture-1171.yaml b/testdata/validation/fixture-1171.yaml similarity index 100% rename from fixtures/validation/fixture-1171.yaml rename to testdata/validation/fixture-1171.yaml diff --git a/fixtures/validation/fixture-1231.yaml b/testdata/validation/fixture-1231.yaml similarity index 100% rename from fixtures/validation/fixture-1231.yaml rename to testdata/validation/fixture-1231.yaml diff --git a/fixtures/validation/fixture-1238.yaml b/testdata/validation/fixture-1238.yaml similarity index 100% rename from fixtures/validation/fixture-1238.yaml rename to testdata/validation/fixture-1238.yaml diff --git a/fixtures/validation/fixture-1243-2.yaml b/testdata/validation/fixture-1243-2.yaml similarity index 100% rename from fixtures/validation/fixture-1243-2.yaml rename to testdata/validation/fixture-1243-2.yaml diff --git a/fixtures/validation/fixture-1243-3.yaml b/testdata/validation/fixture-1243-3.yaml similarity index 100% rename from fixtures/validation/fixture-1243-3.yaml rename to testdata/validation/fixture-1243-3.yaml diff --git a/fixtures/validation/fixture-1243-4.yaml b/testdata/validation/fixture-1243-4.yaml similarity index 100% rename from fixtures/validation/fixture-1243-4.yaml rename to testdata/validation/fixture-1243-4.yaml diff --git a/fixtures/validation/fixture-1243-5.json b/testdata/validation/fixture-1243-5.json similarity index 100% rename from fixtures/validation/fixture-1243-5.json rename to testdata/validation/fixture-1243-5.json diff --git a/fixtures/validation/fixture-1243-5.yaml b/testdata/validation/fixture-1243-5.yaml similarity index 100% rename from fixtures/validation/fixture-1243-5.yaml rename to testdata/validation/fixture-1243-5.yaml diff --git a/fixtures/validation/fixture-1243-good.yaml b/testdata/validation/fixture-1243-good.yaml similarity index 100% rename from fixtures/validation/fixture-1243-good.yaml rename to testdata/validation/fixture-1243-good.yaml diff --git a/fixtures/validation/fixture-1243.yaml b/testdata/validation/fixture-1243.yaml similarity index 100% rename from fixtures/validation/fixture-1243.yaml rename to testdata/validation/fixture-1243.yaml diff --git a/fixtures/validation/fixture-1289-donotload.json b/testdata/validation/fixture-1289-donotload.json similarity index 100% rename from fixtures/validation/fixture-1289-donotload.json rename to testdata/validation/fixture-1289-donotload.json diff --git a/fixtures/validation/fixture-1289-donotload.yaml b/testdata/validation/fixture-1289-donotload.yaml similarity index 100% rename from fixtures/validation/fixture-1289-donotload.yaml rename to testdata/validation/fixture-1289-donotload.yaml diff --git a/fixtures/validation/fixture-1289-good.yaml b/testdata/validation/fixture-1289-good.yaml similarity index 100% rename from fixtures/validation/fixture-1289-good.yaml rename to testdata/validation/fixture-1289-good.yaml diff --git a/fixtures/validation/fixture-1289.yaml b/testdata/validation/fixture-1289.yaml similarity index 100% rename from fixtures/validation/fixture-1289.yaml rename to testdata/validation/fixture-1289.yaml diff --git a/fixtures/validation/fixture-161-2.json b/testdata/validation/fixture-161-2.json similarity index 100% rename from fixtures/validation/fixture-161-2.json rename to testdata/validation/fixture-161-2.json diff --git a/fixtures/validation/fixture-161-good.json b/testdata/validation/fixture-161-good.json similarity index 100% rename from fixtures/validation/fixture-161-good.json rename to testdata/validation/fixture-161-good.json diff --git a/fixtures/validation/fixture-161.json b/testdata/validation/fixture-161.json similarity index 100% rename from fixtures/validation/fixture-161.json rename to testdata/validation/fixture-161.json diff --git a/fixtures/validation/fixture-342-2.yaml b/testdata/validation/fixture-342-2.yaml similarity index 100% rename from fixtures/validation/fixture-342-2.yaml rename to testdata/validation/fixture-342-2.yaml diff --git a/fixtures/validation/fixture-342.yaml b/testdata/validation/fixture-342.yaml similarity index 100% rename from fixtures/validation/fixture-342.yaml rename to testdata/validation/fixture-342.yaml diff --git a/fixtures/validation/fixture-43-2.json b/testdata/validation/fixture-43-2.json similarity index 100% rename from fixtures/validation/fixture-43-2.json rename to testdata/validation/fixture-43-2.json diff --git a/fixtures/validation/fixture-43.json b/testdata/validation/fixture-43.json similarity index 100% rename from fixtures/validation/fixture-43.json rename to testdata/validation/fixture-43.json diff --git a/fixtures/validation/fixture-581-good-numbers.yaml b/testdata/validation/fixture-581-good-numbers.yaml similarity index 100% rename from fixtures/validation/fixture-581-good-numbers.yaml rename to testdata/validation/fixture-581-good-numbers.yaml diff --git a/fixtures/validation/fixture-581-good.yaml b/testdata/validation/fixture-581-good.yaml similarity index 100% rename from fixtures/validation/fixture-581-good.yaml rename to testdata/validation/fixture-581-good.yaml diff --git a/fixtures/validation/fixture-581-inline-param-format.yaml b/testdata/validation/fixture-581-inline-param-format.yaml similarity index 100% rename from fixtures/validation/fixture-581-inline-param-format.yaml rename to testdata/validation/fixture-581-inline-param-format.yaml diff --git a/fixtures/validation/fixture-581-inline-param.yaml b/testdata/validation/fixture-581-inline-param.yaml similarity index 100% rename from fixtures/validation/fixture-581-inline-param.yaml rename to testdata/validation/fixture-581-inline-param.yaml diff --git a/fixtures/validation/fixture-581.yaml b/testdata/validation/fixture-581.yaml similarity index 100% rename from fixtures/validation/fixture-581.yaml rename to testdata/validation/fixture-581.yaml diff --git a/fixtures/validation/fixture-859-2.yaml b/testdata/validation/fixture-859-2.yaml similarity index 100% rename from fixtures/validation/fixture-859-2.yaml rename to testdata/validation/fixture-859-2.yaml diff --git a/fixtures/validation/fixture-859-good.yaml b/testdata/validation/fixture-859-good.yaml similarity index 100% rename from fixtures/validation/fixture-859-good.yaml rename to testdata/validation/fixture-859-good.yaml diff --git a/fixtures/validation/fixture-859.yaml b/testdata/validation/fixture-859.yaml similarity index 100% rename from fixtures/validation/fixture-859.yaml rename to testdata/validation/fixture-859.yaml diff --git a/fixtures/validation/fixture-additional-items-2.yaml b/testdata/validation/fixture-additional-items-2.yaml similarity index 100% rename from fixtures/validation/fixture-additional-items-2.yaml rename to testdata/validation/fixture-additional-items-2.yaml diff --git a/fixtures/validation/fixture-additional-items-3.yaml b/testdata/validation/fixture-additional-items-3.yaml similarity index 100% rename from fixtures/validation/fixture-additional-items-3.yaml rename to testdata/validation/fixture-additional-items-3.yaml diff --git a/fixtures/validation/fixture-additional-items-invalid-values.yaml b/testdata/validation/fixture-additional-items-invalid-values.yaml similarity index 100% rename from fixtures/validation/fixture-additional-items-invalid-values.yaml rename to testdata/validation/fixture-additional-items-invalid-values.yaml diff --git a/fixtures/validation/fixture-additional-items.orig b/testdata/validation/fixture-additional-items.orig similarity index 100% rename from fixtures/validation/fixture-additional-items.orig rename to testdata/validation/fixture-additional-items.orig diff --git a/fixtures/validation/fixture-additional-items.yaml b/testdata/validation/fixture-additional-items.yaml similarity index 100% rename from fixtures/validation/fixture-additional-items.yaml rename to testdata/validation/fixture-additional-items.yaml diff --git a/fixtures/validation/fixture-all-formats.yaml b/testdata/validation/fixture-all-formats.yaml similarity index 100% rename from fixtures/validation/fixture-all-formats.yaml rename to testdata/validation/fixture-all-formats.yaml diff --git a/fixtures/validation/fixture-bad-response.yaml b/testdata/validation/fixture-bad-response.yaml similarity index 100% rename from fixtures/validation/fixture-bad-response.yaml rename to testdata/validation/fixture-bad-response.yaml diff --git a/fixtures/validation/fixture-collisions.yaml b/testdata/validation/fixture-collisions.yaml similarity index 100% rename from fixtures/validation/fixture-collisions.yaml rename to testdata/validation/fixture-collisions.yaml diff --git a/fixtures/validation/fixture-constraints-on-numbers.yaml b/testdata/validation/fixture-constraints-on-numbers.yaml similarity index 100% rename from fixtures/validation/fixture-constraints-on-numbers.yaml rename to testdata/validation/fixture-constraints-on-numbers.yaml diff --git a/fixtures/validation/fixture-empty-paths.json b/testdata/validation/fixture-empty-paths.json similarity index 100% rename from fixtures/validation/fixture-empty-paths.json rename to testdata/validation/fixture-empty-paths.json diff --git a/fixtures/validation/fixture-invalid-example-property.yaml b/testdata/validation/fixture-invalid-example-property.yaml similarity index 100% rename from fixtures/validation/fixture-invalid-example-property.yaml rename to testdata/validation/fixture-invalid-example-property.yaml diff --git a/fixtures/validation/fixture-items-items.yaml b/testdata/validation/fixture-items-items.yaml similarity index 100% rename from fixtures/validation/fixture-items-items.yaml rename to testdata/validation/fixture-items-items.yaml diff --git a/fixtures/validation/fixture-no-json-example.yaml b/testdata/validation/fixture-no-json-example.yaml similarity index 100% rename from fixtures/validation/fixture-no-json-example.yaml rename to testdata/validation/fixture-no-json-example.yaml diff --git a/fixtures/validation/fixture-no-response.yaml b/testdata/validation/fixture-no-response.yaml similarity index 100% rename from fixtures/validation/fixture-no-response.yaml rename to testdata/validation/fixture-no-response.yaml diff --git a/fixtures/validation/fixture-patternProperties.json b/testdata/validation/fixture-patternProperties.json similarity index 100% rename from fixtures/validation/fixture-patternProperties.json rename to testdata/validation/fixture-patternProperties.json diff --git a/fixtures/validation/fixture-valid-example-property.yaml b/testdata/validation/fixture-valid-example-property.yaml similarity index 100% rename from fixtures/validation/fixture-valid-example-property.yaml rename to testdata/validation/fixture-valid-example-property.yaml diff --git a/fixtures/validation/gentest.yaml b/testdata/validation/gentest.yaml similarity index 100% rename from fixtures/validation/gentest.yaml rename to testdata/validation/gentest.yaml diff --git a/fixtures/validation/gentest2.yaml b/testdata/validation/gentest2.yaml similarity index 100% rename from fixtures/validation/gentest2.yaml rename to testdata/validation/gentest2.yaml diff --git a/fixtures/validation/gentest3.yaml b/testdata/validation/gentest3.yaml similarity index 100% rename from fixtures/validation/gentest3.yaml rename to testdata/validation/gentest3.yaml diff --git a/fixtures/validation/indirect-circular-ancestor.json b/testdata/validation/indirect-circular-ancestor.json similarity index 100% rename from fixtures/validation/indirect-circular-ancestor.json rename to testdata/validation/indirect-circular-ancestor.json diff --git a/fixtures/validation/invalid-formdata-body-params.json b/testdata/validation/invalid-formdata-body-params.json similarity index 100% rename from fixtures/validation/invalid-formdata-body-params.json rename to testdata/validation/invalid-formdata-body-params.json diff --git a/fixtures/validation/invalid-ref.json b/testdata/validation/invalid-ref.json similarity index 100% rename from fixtures/validation/invalid-ref.json rename to testdata/validation/invalid-ref.json diff --git a/fixtures/validation/invalid-referenced.yml b/testdata/validation/invalid-referenced.yml similarity index 100% rename from fixtures/validation/invalid-referenced.yml rename to testdata/validation/invalid-referenced.yml diff --git a/fixtures/validation/nestedduplicateprops.json b/testdata/validation/nestedduplicateprops.json similarity index 100% rename from fixtures/validation/nestedduplicateprops.json rename to testdata/validation/nestedduplicateprops.json diff --git a/fixtures/validation/petstore-expanded.json b/testdata/validation/petstore-expanded.json similarity index 100% rename from fixtures/validation/petstore-expanded.json rename to testdata/validation/petstore-expanded.json diff --git a/fixtures/validation/recursive-circular-ancestor.json b/testdata/validation/recursive-circular-ancestor.json similarity index 100% rename from fixtures/validation/recursive-circular-ancestor.json rename to testdata/validation/recursive-circular-ancestor.json diff --git a/fixtures/validation/type-keyword-mismatch.yaml b/testdata/validation/type-keyword-mismatch.yaml similarity index 100% rename from fixtures/validation/type-keyword-mismatch.yaml rename to testdata/validation/type-keyword-mismatch.yaml diff --git a/fixtures/validation/valid-ref.json b/testdata/validation/valid-ref.json similarity index 100% rename from fixtures/validation/valid-ref.json rename to testdata/validation/valid-ref.json diff --git a/fixtures/validation/valid-referenced-variants.yaml b/testdata/validation/valid-referenced-variants.yaml similarity index 100% rename from fixtures/validation/valid-referenced-variants.yaml rename to testdata/validation/valid-referenced-variants.yaml diff --git a/fixtures/validation/valid-referenced.yml b/testdata/validation/valid-referenced.yml similarity index 100% rename from fixtures/validation/valid-referenced.yml rename to testdata/validation/valid-referenced.yml diff --git a/update-fixtures.sh b/update-testdata.sh similarity index 77% rename from update-fixtures.sh rename to update-testdata.sh index 8ee55ca..69ca541 100755 --- a/update-fixtures.sh +++ b/update-testdata.sh @@ -13,5 +13,5 @@ trap finish EXIT SIGHUP SIGINT SIGTERM cd "$scratch" git clone https://github.com/json-schema-org/JSON-Schema-Test-Suite Suite -cp -r Suite/tests/draft4/* "$dir/fixtures/jsonschema_suite" -cp -a Suite/remotes "$dir/fixtures/jsonschema_suite" +cp -r Suite/tests/draft4/* "$dir/testdata/jsonschema_suite" +cp -a Suite/remotes "$dir/testdata/jsonschema_suite"