diff --git a/benchmark_test.go b/benchmark_test.go index 6277c2d..a488b31 100644 --- a/benchmark_test.go +++ b/benchmark_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-openapi/loads" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" ) func Benchmark_KubernetesSpec(b *testing.B) { diff --git a/context_test.go b/context_test.go index a692ad1..4ac93a2 100644 --- a/context_test.go +++ b/context_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/stretchr/testify/assert" + "github.com/go-openapi/testify/v2/assert" ) func TestContext_ExtractOperationType(t *testing.T) { diff --git a/debug_test.go b/debug_test.go index ae766f4..a1d2287 100644 --- a/debug_test.go +++ b/debug_test.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "github.com/stretchr/testify/assert" + "github.com/go-openapi/testify/v2/assert" ) var ( diff --git a/default_validator_test.go b/default_validator_test.go index fc16137..039d7b8 100644 --- a/default_validator_test.go +++ b/default_validator_test.go @@ -11,8 +11,8 @@ import ( "github.com/go-openapi/loads" "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) const ( diff --git a/doc_test.go b/doc_test.go index 7f89783..7b2515a 100644 --- a/doc_test.go +++ b/doc_test.go @@ -12,9 +12,9 @@ import ( "github.com/go-openapi/loads" // Spec loading "github.com/go-openapi/spec" - "github.com/go-openapi/strfmt" // OpenAPI format extensions + "github.com/go-openapi/strfmt" // OpenAPI format extensions + "github.com/go-openapi/testify/v2/require" "github.com/go-openapi/validate" // This package - "github.com/stretchr/testify/require" ) func ExampleSpec() { diff --git a/example_validator_test.go b/example_validator_test.go index 7ed5f0e..25137ec 100644 --- a/example_validator_test.go +++ b/example_validator_test.go @@ -11,7 +11,7 @@ import ( "github.com/go-openapi/loads" "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" + "github.com/go-openapi/testify/v2/assert" ) func TestExample_ValidateExamples(t *testing.T) { diff --git a/formats_test.go b/formats_test.go index f86cbb8..9713ef2 100644 --- a/formats_test.go +++ b/formats_test.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" + "github.com/go-openapi/testify/v2/assert" ) // Validator for string formats diff --git a/go.mod b/go.mod index a6d3b83..8088352 100644 --- a/go.mod +++ b/go.mod @@ -1,24 +1,22 @@ module github.com/go-openapi/validate require ( - github.com/go-openapi/analysis v0.24.0 - github.com/go-openapi/errors v0.22.3 + github.com/go-openapi/analysis v0.24.1 + github.com/go-openapi/errors v0.22.4 github.com/go-openapi/jsonpointer v0.22.1 - github.com/go-openapi/loads v0.23.1 - github.com/go-openapi/spec v0.22.0 - github.com/go-openapi/strfmt v0.24.0 + github.com/go-openapi/loads v0.23.2 + github.com/go-openapi/spec v0.22.1 + github.com/go-openapi/strfmt v0.25.0 github.com/go-openapi/swag/conv v0.25.1 github.com/go-openapi/swag/fileutils v0.25.1 github.com/go-openapi/swag/jsonutils v0.25.1 github.com/go-openapi/swag/stringutils v0.25.1 - github.com/stretchr/testify v1.11.1 + github.com/go-openapi/testify/v2 v2.0.2 go.yaml.in/yaml/v3 v3.0.4 ) require ( - github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-openapi/jsonreference v0.21.2 // indirect + github.com/go-openapi/jsonreference v0.21.3 // indirect github.com/go-openapi/swag/jsonname v0.25.1 // indirect github.com/go-openapi/swag/loading v0.25.1 // indirect github.com/go-openapi/swag/mangling v0.25.1 // indirect @@ -27,11 +25,9 @@ require ( github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/oklog/ulid v1.3.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - go.mongodb.org/mongo-driver v1.17.4 // indirect - golang.org/x/net v0.44.0 // indirect - golang.org/x/text v0.29.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect + go.mongodb.org/mongo-driver v1.17.6 // indirect + golang.org/x/net v0.46.0 // indirect + golang.org/x/text v0.30.0 // indirect ) go 1.24.0 diff --git a/go.sum b/go.sum index 3f44496..bfb33b0 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,19 @@ -github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= -github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-openapi/analysis v0.24.0 h1:vE/VFFkICKyYuTWYnplQ+aVr45vlG6NcZKC7BdIXhsA= -github.com/go-openapi/analysis v0.24.0/go.mod h1:GLyoJA+bvmGGaHgpfeDh8ldpGo69fAJg7eeMDMRCIrw= -github.com/go-openapi/errors v0.22.3 h1:k6Hxa5Jg1TUyZnOwV2Lh81j8ayNw5VVYLvKrp4zFKFs= -github.com/go-openapi/errors v0.22.3/go.mod h1:+WvbaBBULWCOna//9B9TbLNGSFOfF8lY9dw4hGiEiKQ= +github.com/go-openapi/analysis v0.24.1 h1:Xp+7Yn/KOnVWYG8d+hPksOYnCYImE3TieBa7rBOesYM= +github.com/go-openapi/analysis v0.24.1/go.mod h1:dU+qxX7QGU1rl7IYhBC8bIfmWQdX4Buoea4TGtxXY84= +github.com/go-openapi/errors v0.22.4 h1:oi2K9mHTOb5DPW2Zjdzs/NIvwi2N3fARKaTJLdNabaM= +github.com/go-openapi/errors v0.22.4/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk= github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo92JUxBNk= github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM= -github.com/go-openapi/jsonreference v0.21.2 h1:Wxjda4M/BBQllegefXrY/9aq1fxBA8sI5M/lFU6tSWU= -github.com/go-openapi/jsonreference v0.21.2/go.mod h1:pp3PEjIsJ9CZDGCNOyXIQxsNuroxm8FAJ/+quA0yKzQ= -github.com/go-openapi/loads v0.23.1 h1:H8A0dX2KDHxDzc797h0+uiCZ5kwE2+VojaQVaTlXvS0= -github.com/go-openapi/loads v0.23.1/go.mod h1:hZSXkyACCWzWPQqizAv/Ye0yhi2zzHwMmoXQ6YQml44= -github.com/go-openapi/spec v0.22.0 h1:xT/EsX4frL3U09QviRIZXvkh80yibxQmtoEvyqug0Tw= -github.com/go-openapi/spec v0.22.0/go.mod h1:K0FhKxkez8YNS94XzF8YKEMULbFrRw4m15i2YUht4L0= -github.com/go-openapi/strfmt v0.24.0 h1:dDsopqbI3wrrlIzeXRbqMihRNnjzGC+ez4NQaAAJLuc= -github.com/go-openapi/strfmt v0.24.0/go.mod h1:Lnn1Bk9rZjXxU9VMADbEEOo7D7CDyKGLsSKekhFr7s4= +github.com/go-openapi/jsonreference v0.21.3 h1:96Dn+MRPa0nYAR8DR1E03SblB5FJvh7W6krPI0Z7qMc= +github.com/go-openapi/jsonreference v0.21.3/go.mod h1:RqkUP0MrLf37HqxZxrIAtTWW4ZJIK1VzduhXYBEeGc4= +github.com/go-openapi/loads v0.23.2 h1:rJXAcP7g1+lWyBHC7iTY+WAF0rprtM+pm8Jxv1uQJp4= +github.com/go-openapi/loads v0.23.2/go.mod h1:IEVw1GfRt/P2Pplkelxzj9BYFajiWOtY2nHZNj4UnWY= +github.com/go-openapi/spec v0.22.1 h1:beZMa5AVQzRspNjvhe5aG1/XyBSMeX1eEOs7dMoXh/k= +github.com/go-openapi/spec v0.22.1/go.mod h1:c7aeIQT175dVowfp7FeCvXXnjN/MrpaONStibD2WtDA= +github.com/go-openapi/strfmt v0.25.0 h1:7R0RX7mbKLa9EYCTHRcCuIPcaqlyQiWNPTXwClK0saQ= +github.com/go-openapi/strfmt v0.25.0/go.mod h1:nNXct7OzbwrMY9+5tLX4I21pzcmE6ccMGXl3jFdPfn8= github.com/go-openapi/swag/conv v0.25.1 h1:+9o8YUg6QuqqBM5X6rYL/p1dpWeZRhoIt9x7CCP+he0= github.com/go-openapi/swag/conv v0.25.1/go.mod h1:Z1mFEGPfyIKPu0806khI3zF+/EUXde+fdeksUl2NiDs= github.com/go-openapi/swag/fileutils v0.25.1 h1:rSRXapjQequt7kqalKXdcpIegIShhTPXx7yw0kek2uU= @@ -36,6 +34,10 @@ github.com/go-openapi/swag/typeutils v0.25.1 h1:rD/9HsEQieewNt6/k+JBwkxuAHktFtH3 github.com/go-openapi/swag/typeutils v0.25.1/go.mod h1:9McMC/oCdS4BKwk2shEB7x17P6HmMmA6dQRtAkSnNb8= github.com/go-openapi/swag/yamlutils v0.25.1 h1:mry5ez8joJwzvMbaTGLhw8pXUnhDK91oSJLDPF1bmGk= github.com/go-openapi/swag/yamlutils v0.25.1/go.mod h1:cm9ywbzncy3y6uPm/97ysW8+wZ09qsks+9RS8fLWKqg= +github.com/go-openapi/testify/enable/yaml/v2 v2.0.2 h1:0+Y41Pz1NkbTHz8NngxTuAXxEodtNSI1WG1c/m5Akw4= +github.com/go-openapi/testify/enable/yaml/v2 v2.0.2/go.mod h1:kme83333GCtJQHXQ8UKX3IBZu6z8T5Dvy5+CW3NLUUg= +github.com/go-openapi/testify/v2 v2.0.2 h1:X999g3jeLcoY8qctY/c/Z8iBHTbwLz7R2WXd6Ub6wls= +github.com/go-openapi/testify/v2 v2.0.2/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54= github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -50,18 +52,18 @@ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= +github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw= -go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= +go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss= +go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= -golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= -golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= -golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= +golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= +golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/helpers_test.go b/helpers_test.go index 05f5d9f..bdf9beb 100644 --- a/helpers_test.go +++ b/helpers_test.go @@ -7,8 +7,8 @@ import ( "errors" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) var errMyError = errors.New("my error") diff --git a/items_validator_test.go b/items_validator_test.go index 8f5e382..cd21e97 100644 --- a/items_validator_test.go +++ b/items_validator_test.go @@ -14,8 +14,8 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) var ( diff --git a/jsonschema_test.go b/jsonschema_test.go index 0ad6288..80f5924 100644 --- a/jsonschema_test.go +++ b/jsonschema_test.go @@ -15,8 +15,8 @@ import ( "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" "github.com/go-openapi/swag/stringutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) // Data structure for jsonschema-suite fixtures diff --git a/messages_test.go b/messages_test.go index 7467498..a736159 100644 --- a/messages_test.go +++ b/messages_test.go @@ -14,8 +14,8 @@ import ( "github.com/go-openapi/loads" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" yaml "go.yaml.in/yaml/v3" ) diff --git a/object_validator_test.go b/object_validator_test.go index cbe5603..d9cd328 100644 --- a/object_validator_test.go +++ b/object_validator_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/go-openapi/spec" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func itemsFixture() map[string]any { diff --git a/parameter_validator_test.go b/parameter_validator_test.go index 18b5628..e3ae8fa 100644 --- a/parameter_validator_test.go +++ b/parameter_validator_test.go @@ -10,8 +10,8 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) // common validations: enum, allOf, anyOf, oneOf, not, definitions diff --git a/pools_debug_test.go b/pools_debug_test.go index b8d2fb3..9ca8a59 100644 --- a/pools_debug_test.go +++ b/pools_debug_test.go @@ -11,7 +11,7 @@ import ( "github.com/go-openapi/loads" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" ) func Test_Debug_2866(t *testing.T) { diff --git a/pools_test.go b/pools_test.go index efcf7a5..a6bc48f 100644 --- a/pools_test.go +++ b/pools_test.go @@ -9,8 +9,8 @@ import ( "github.com/go-openapi/loads" "github.com/go-openapi/strfmt" + "github.com/go-openapi/testify/v2/require" "github.com/go-openapi/validate" - "github.com/stretchr/testify/require" ) func Test_ParallelPool(t *testing.T) { diff --git a/post/defaulter_test.go b/post/defaulter_test.go index 33e52de..9ea9918 100644 --- a/post/defaulter_test.go +++ b/post/defaulter_test.go @@ -11,9 +11,9 @@ import ( "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" "github.com/go-openapi/validate" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) var defaulterFixturesPath = filepath.Join("..", "fixtures", "defaulting") diff --git a/post/prune_test.go b/post/prune_test.go index 78685ba..cad2e9a 100644 --- a/post/prune_test.go +++ b/post/prune_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" diff --git a/result_test.go b/result_test.go index d8bcdd1..fbfaa9c 100644 --- a/result_test.go +++ b/result_test.go @@ -7,8 +7,8 @@ import ( "errors" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) var ( diff --git a/rexp_test.go b/rexp_test.go index c80ed1b..c1fe6ec 100644 --- a/rexp_test.go +++ b/rexp_test.go @@ -21,8 +21,8 @@ import ( re "regexp" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) // Save repeated regexp compilation diff --git a/schema_option_test.go b/schema_option_test.go index 944eec8..e8a533c 100644 --- a/schema_option_test.go +++ b/schema_option_test.go @@ -6,7 +6,7 @@ package validate import ( "testing" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" ) func TestSchemaOptions(t *testing.T) { diff --git a/schema_props_test.go b/schema_props_test.go index 028b4ba..4fe7bb7 100644 --- a/schema_props_test.go +++ b/schema_props_test.go @@ -8,8 +8,8 @@ import ( "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) // Test edge cases in schema_props_validator which are difficult diff --git a/schema_test.go b/schema_test.go index 7c6fa48..9e114f9 100644 --- a/schema_test.go +++ b/schema_test.go @@ -9,8 +9,8 @@ import ( "reflect" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" diff --git a/slice_validator_test.go b/slice_validator_test.go index 9df5ad4..b7513e4 100644 --- a/slice_validator_test.go +++ b/slice_validator_test.go @@ -6,7 +6,7 @@ package validate import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/go-openapi/testify/v2/assert" ) // Test edge cases in slice_validator which are difficult diff --git a/spec_test.go b/spec_test.go index e51e575..16cb512 100644 --- a/spec_test.go +++ b/spec_test.go @@ -16,8 +16,8 @@ import ( "github.com/go-openapi/loads/fmts" "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) const testID = "id" diff --git a/swagger_test.go b/swagger_test.go index 797fec4..a281cad 100644 --- a/swagger_test.go +++ b/swagger_test.go @@ -13,8 +13,8 @@ import ( "github.com/go-openapi/loads" "github.com/go-openapi/loads/fmts" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func init() { diff --git a/type_test.go b/type_test.go index 6a7b777..a777494 100644 --- a/type_test.go +++ b/type_test.go @@ -12,8 +12,8 @@ import ( "github.com/go-openapi/strfmt" "github.com/go-openapi/swag/fileutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) type expectedJSONType struct { @@ -22,7 +22,6 @@ type expectedJSONType struct { expectedSwaggerFormat string } -//nolint:testifylint func TestType_schemaInfoForType(t *testing.T) { testTypes := []expectedJSONType{ { diff --git a/validator_test.go b/validator_test.go index 29438e3..bc5038f 100644 --- a/validator_test.go +++ b/validator_test.go @@ -10,8 +10,8 @@ import ( "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestHeaderValidator(t *testing.T) { diff --git a/values_test.go b/values_test.go index 2b13e9f..38bdf8f 100644 --- a/values_test.go +++ b/values_test.go @@ -10,8 +10,8 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestValues_ValidateIntEnum(t *testing.T) {