Skip to content

Commit

Permalink
Upgrade testdata to v1.10.0 of testify (#218)
Browse files Browse the repository at this point in the history 
* Upgrade testdata to v1.10.0 of testify

* self-review fixes
  • Loading branch information
@Antonboom
Antonboom authored Feb 10, 2025
1 parent 819c790 commit d76db50
Show file tree
Hide file tree
Showing 430 changed files with 16,534 additions and 9,415 deletions.
9 changes: 3 additions & 6 deletions analyzer/testdata/src/encoded-compare-issue196/false_positive_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ func loginUser(t *testing.T, uid string) *session {
return new(session)
}

type session struct {
}
type session struct{}

func (s *session) MakeRequest(t *testing.T, req *http.Request, expStatusCode int) *Response {
return new(Response)
Expand All @@ -57,8 +56,7 @@ type Response struct {
}

// HTMLDoc struct
type HTMLDoc struct {
}
type HTMLDoc struct{}

// NewHTMLParser parse html file
func NewHTMLParser(t testing.TB, body *bytes.Buffer) *HTMLDoc {
Expand All @@ -73,8 +71,7 @@ func (doc *HTMLDoc) Find(selector string) *Selection {
return new(Selection)
}

type Selection struct {
}
type Selection struct{}

// Attr gets the specified attribute's value for the first element in the
// Selection. To get the value for each element individually, use a looping
Expand Down
1 change: 0 additions & 1 deletion analyzer/testdata/src/ginkgo/ginkgo_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
)

var _ = ginkgo.Describe("[Load Balancer] EWMA", func() {

ginkgo.BeforeEach(func() {
// Some stuff...
})
Expand Down
1 change: 0 additions & 1 deletion analyzer/testdata/src/ginkgo/ginkgo_test.go.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
)

var _ = ginkgo.Describe("[Load Balancer] EWMA", func() {

ginkgo.BeforeEach(func() {
// Some stuff...
})
Expand Down
15 changes: 8 additions & 7 deletions analyzer/testdata/src/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ go 1.22.1

require (
github.com/ghetzel/testify v1.4.1
github.com/onsi/ginkgo/v2 v2.12.0
github.com/onsi/ginkgo/v2 v2.22.2
github.com/pmezard/go-difflib v1.0.0
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 // indirect
github.com/stretchr/objx v0.5.2 // indirect
golang.org/x/net v0.14.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/tools v0.12.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/tools v0.29.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
18 changes: 18 additions & 0 deletions analyzer/testdata/src/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,25 @@ github.com/ghetzel/testify v1.4.1 h1:wpJirdM+znAnxWruGDBdIys5aU+wGJHNUTkgEo4PYwk
github.com/ghetzel/testify v1.4.1/go.mod h1:FwvFn1OiGEUgzhS3ySCjTBG7/sez0WRvOAxz5uQU8so=
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 h1:43XjGa6toxLpeksjcxs1jIoIyr+vUfOqY2c6HB4bpoc=
github.com/google/pprof v0.0.0-20250208200701-d0013a598941/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/onsi/ginkgo/v2 v2.12.0 h1:UIVDowFPwpg6yMUpPjGkYvf06K3RAiJXUhCxEwQVHRI=
github.com/onsi/ginkgo/v2 v2.12.0/go.mod h1:ZNEzXISYlqpb8S36iN71ifqLi3vVD1rVJGvWRCJOUpQ=
github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand All @@ -27,16 +36,25 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
Expand Down
2 changes: 1 addition & 1 deletion analyzer/testdata/src/not-std-funcs/not_std_funcs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

func TestCustomStuff(t *testing.T) {
var err error
var errSentinel = errors.New("unexpected")
errSentinel := errors.New("unexpected")
var scores []float64

assert.Equal(t, nil, scores) // want "nil-compare: use assert\\.Nil"
Expand Down
2 changes: 1 addition & 1 deletion analyzer/testdata/src/not-std-funcs/not_std_funcs_test.go.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

func TestCustomStuff(t *testing.T) {
var err error
var errSentinel = errors.New("unexpected")
errSentinel := errors.New("unexpected")
var scores []float64

assert.Nil(t, scores) // want "nil-compare: use assert\\.Nil"
Expand Down
6 changes: 3 additions & 3 deletions analyzer/testdata/src/require-error-skip-logic/real_examples_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,14 +388,14 @@ func TestCSRDuration(t *testing.T) {
assert.NoError(t, err) // want "require-error: for error assertions use require"

caPublicKeyFile := path.Join(t.TempDir(), "test-ca-public-key")
err = os.WriteFile(caPublicKeyFile, pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: caCert.([]byte)}), os.FileMode(0600))
err = os.WriteFile(caPublicKeyFile, pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: caCert.([]byte)}), os.FileMode(0o600))
require.NoError(t, err)

caPrivateKeyBytes, err := operationWithResult()
assert.NoError(t, err) // want "require-error: for error assertions use require"

caPrivateKeyFile := path.Join(t.TempDir(), "test-ca-private-key")
err = os.WriteFile(caPrivateKeyFile, caPrivateKeyBytes.([]byte), os.FileMode(0600))
err = os.WriteFile(caPrivateKeyFile, caPrivateKeyBytes.([]byte), os.FileMode(0o600))
assert.NoError(t, err) // want "require-error: for error assertions use require"

tests := []struct {
Expand Down Expand Up @@ -547,7 +547,7 @@ func createTempPackageJson(t *testing.T, version string) error {
data := struct{}{}
file, _ := json.MarshalIndent(data, "", " ")

err := os.WriteFile("package.json", file, 0644)
err := os.WriteFile("package.json", file, 0o644)
assert.NoError(t, err) // want "require-error: for error assertions use require"

t.Cleanup(func() {
Expand Down
127 changes: 126 additions & 1 deletion analyzer/testdata/src/vendor/github.com/go-logr/logr/README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions analyzer/testdata/src/vendor/github.com/go-logr/logr/SECURITY.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions analyzer/testdata/src/vendor/github.com/go-logr/logr/context.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d76db50

Please sign in to comment.