tests: replaced stretchr/testify by go-openapi/testify

fredbi · fredbi · commit f06cfffb0300 · 2025-11-09T14:27:19.000+01:00
Signed-off-by: Frederic BIDON &lt;fredbi@yahoo.com&gt;
diff --git a/cache_test.go b/cache_test.go
@@ -6,7 +6,7 @@ package spec
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/go-openapi/testify/v2/assert"
 )
 
 func TestDefaultResolutionCache(t *testing.T) {
diff --git a/circular_test.go b/circular_test.go
@@ -12,8 +12,8 @@ import (
 	"testing"
 	"time"
 
-	"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 TestExpandCircular_Issue3(t *testing.T) {
diff --git a/contact_info_test.go b/contact_info_test.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"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"
 )
 
 const contactInfoJSON = `{
diff --git 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/expander_test.go b/expander_test.go
@@ -13,8 +13,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"
 )
 
 const (
diff --git a/go.mod b/go.mod
@@ -2,22 +2,20 @@ module github.com/go-openapi/spec
 
 require (
 	github.com/go-openapi/jsonpointer v0.22.1
-	github.com/go-openapi/jsonreference v0.21.2
+	github.com/go-openapi/jsonreference v0.21.3
 	github.com/go-openapi/swag/conv v0.25.1
 	github.com/go-openapi/swag/jsonname v0.25.1
 	github.com/go-openapi/swag/jsonutils v0.25.1
 	github.com/go-openapi/swag/loading 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/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-openapi/swag/typeutils v0.25.1 // indirect
 	github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
 )
 
 go 1.24.0
diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ 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/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/jsonreference v0.21.3 h1:96Dn+MRPa0nYAR8DR1E03SblB5FJvh7W6krPI0Z7qMc=
+github.com/go-openapi/jsonreference v0.21.3/go.mod h1:RqkUP0MrLf37HqxZxrIAtTWW4ZJIK1VzduhXYBEeGc4=
 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/jsonname v0.25.1 h1:Sgx+qbwa4ej6AomWC6pEfXrA6uP2RkaNjA9BR8a1RJU=
@@ -20,14 +20,16 @@ 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/v2 v2.0.2 h1:X999g3jeLcoY8qctY/c/Z8iBHTbwLz7R2WXd6Ub6wls=
+github.com/go-openapi/testify/v2 v2.0.2/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 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.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
diff --git a/header_test.go b/header_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/go-openapi/swag/conv"
-	"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 epsilon = 1e-9
diff --git a/helpers_spec_test.go b/helpers_spec_test.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/go-openapi/spec"
 	"github.com/go-openapi/swag/loading"
-	"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/helpers_test.go b/helpers_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 
 	"github.com/go-openapi/swag/loading"
-	"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 rex = regexp.MustCompile(`"\$ref":\s*"(.*?)"`)
diff --git a/info_test.go b/info_test.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"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"
 )
 
 const infoJSON = `{
diff --git a/items_test.go b/items_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/go-openapi/swag/conv"
-	"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 testItems = Items{
diff --git a/license_test.go b/license_test.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"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"
 )
 
 func TestIntegrationLicense(t *testing.T) {
diff --git a/normalizer_test.go b/normalizer_test.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"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"
 )
 
 const windowsOS = "windows"
diff --git a/operation_test.go b/operation_test.go
@@ -9,8 +9,8 @@ import (
 	"encoding/json"
 	"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 operation = Operation{
diff --git a/parameters_test.go b/parameters_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/go-openapi/swag/conv"
-	"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 parameter = Parameter{
diff --git a/path_item_test.go b/path_item_test.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"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 pathItem = PathItem{
diff --git a/paths_test.go b/paths_test.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"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 paths = Paths{
diff --git a/ref_test.go b/ref_test.go
@@ -9,8 +9,8 @@ import (
 	"encoding/json"
 	"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"
 )
 
 // pin pointing go-swagger/go-swagger#1816 issue with cloning ref's
diff --git a/resolver_test.go b/resolver_test.go
@@ -12,8 +12,8 @@ import (
 	"testing"
 
 	"github.com/go-openapi/jsonpointer"
-	"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 TestResolveRef(t *testing.T) {
diff --git a/response_test.go b/response_test.go
@@ -21,8 +21,8 @@ import (
 	"encoding/json"
 	"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 response = Response{
diff --git a/responses_test.go b/responses_test.go
@@ -21,8 +21,8 @@ import (
 	"encoding/json"
 	"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 responses = Responses{
diff --git a/schema_loader_test.go b/schema_loader_test.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/stretchr/testify/require"
+	"github.com/go-openapi/testify/v2/require"
 )
 
 func TestLoader_Issue145(t *testing.T) {
diff --git a/schema_test.go b/schema_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/go-openapi/swag/conv"
-	"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 schema = Schema{
diff --git a/spec_test.go b/spec_test.go
@@ -9,8 +9,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"
 )
 
 // Test unitary fixture for dev and bug fixing
diff --git a/structs_test.go b/structs_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/go-openapi/testify/v2/assert"
 	yaml "go.yaml.in/yaml/v3"
 )
 
diff --git a/swagger_test.go b/swagger_test.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"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 spec = Swagger{
diff --git a/validations_test.go b/validations_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/go-openapi/swag/conv"
-	"github.com/stretchr/testify/require"
+	"github.com/go-openapi/testify/v2/require"
 )
 
 func mkVal() SchemaValidations {
diff --git a/xml_object_test.go b/xml_object_test.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"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"
 )
 
 func TestXmlObject_Serialize(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ package spec`
`6`	`6`	`import (`
`7`	`7`	`"testing"`
`8`	`8`
`9`		`- "github.com/stretchr/testify/assert"`
	`9`	`+ "github.com/go-openapi/testify/v2/assert"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func TestDefaultResolutionCache(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ import (`
`12`	`12`	`"testing"`
`13`	`13`	`"time"`
`14`	`14`
`15`		`- "github.com/stretchr/testify/assert"`
`16`		`- "github.com/stretchr/testify/require"`
	`15`	`+ "github.com/go-openapi/testify/v2/assert"`
	`16`	`+ "github.com/go-openapi/testify/v2/require"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`func TestExpandCircular_Issue3(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"encoding/json"`
`8`	`8`	`"testing"`
`9`	`9`
`10`		`- "github.com/stretchr/testify/assert"`
`11`		`- "github.com/stretchr/testify/require"`
	`10`	`+ "github.com/go-openapi/testify/v2/assert"`
	`11`	`+ "github.com/go-openapi/testify/v2/require"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	const contactInfoJSON = `{
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"sync"`
`9`	`9`	`"testing"`
`10`	`10`
`11`		`- "github.com/stretchr/testify/assert"`
	`11`	`+ "github.com/go-openapi/testify/v2/assert"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ import (`
`13`	`13`	`"path/filepath"`
`14`	`14`	`"testing"`
`15`	`15`
`16`		`- "github.com/stretchr/testify/assert"`
`17`		`- "github.com/stretchr/testify/require"`
	`16`	`+ "github.com/go-openapi/testify/v2/assert"`
	`17`	`+ "github.com/go-openapi/testify/v2/require"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`	`"testing"`
`9`	`9`
`10`	`10`	`"github.com/go-openapi/swag/conv"`
`11`		`- "github.com/stretchr/testify/assert"`
`12`		`- "github.com/stretchr/testify/require"`
	`11`	`+ "github.com/go-openapi/testify/v2/assert"`
	`12`	`+ "github.com/go-openapi/testify/v2/require"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`const epsilon = 1e-9`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`	`"testing"`
`12`	`12`
`13`	`13`	`"github.com/go-openapi/swag/loading"`
`14`		`- "github.com/stretchr/testify/assert"`
`15`		`- "github.com/stretchr/testify/require"`
	`14`	`+ "github.com/go-openapi/testify/v2/assert"`
	`15`	`+ "github.com/go-openapi/testify/v2/require"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	var rex = regexp.MustCompile(`"\$ref":\s"(.?)"`)