Merge pull request #4 from wallester/chore/implement-a-switch-to-randomizer

Djenchik · web-flow · commit 0d4462b984b6 · 2024-07-05T18:24:34.000+03:00
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ package yours
 
 import (
   "testing"
-  "github.com/wallester/testify/assert"
+  "github.com/stretchr/testify/assert"
 )
 
 func TestSomething(t *testing.T) {
@@ -73,7 +73,7 @@ package yours
 
 import (
   "testing"
-  "github.com/wallester/testify/assert"
+  "github.com/stretchr/testify/assert"
 )
 
 func TestSomething(t *testing.T) {
@@ -119,7 +119,7 @@ package yours
 
 import (
   "testing"
-  "github.com/wallester/testify/mock"
+  "github.com/stretchr/testify/mock"
 )
 
 /*
@@ -232,8 +232,8 @@ An example suite is shown below:
 // Basic imports
 import (
     "testing"
-    "github.com/wallester/testify/assert"
-    "github.com/wallester/testify/suite"
+    "github.com/stretchr/testify/assert"
+    "github.com/stretchr/testify/suite"
 )
 
 // Define the suite, and absorb the built-in basic suite
@@ -273,7 +273,7 @@ For more information on writing suites, check out the [API documentation for the
 // Basic imports
 import (
     "testing"
-    "github.com/wallester/testify/suite"
+    "github.com/stretchr/testify/suite"
 )
 
 // Define the suite, and absorb the built-in basic suite
@@ -309,15 +309,15 @@ Installation
 
 To install Testify, use `go get`:
 
-    go get github.com/wallester/testify
+    go get github.com/stretchr/testify
 
 This will then make the following packages available to you:
 
-    github.com/wallester/testify/assert
-    github.com/wallester/testify/require
-    github.com/wallester/testify/mock
-    github.com/wallester/testify/suite
-    github.com/wallester/testify/http (deprecated)
+    github.com/stretchr/testify/assert
+    github.com/stretchr/testify/require
+    github.com/stretchr/testify/mock
+    github.com/stretchr/testify/suite
+    github.com/stretchr/testify/http (deprecated)
 
 Import the `testify/assert` package into your code using this template:
 
@@ -326,7 +326,7 @@ package yours
 
 import (
   "testing"
-  "github.com/wallester/testify/assert"
+  "github.com/stretchr/testify/assert"
 )
 
 func TestSomething(t *testing.T) {
diff --git a/_codegen/main.go b/_codegen/main.go
@@ -28,7 +28,7 @@ import (
 )
 
 var (
-	pkg       = flag.String("assert-path", "github.com/wallester/testify/assert", "Path to the assert package")
+	pkg       = flag.String("assert-path", "github.com/stretchr/testify/assert", "Path to the assert package")
 	includeF  = flag.Bool("include-format-funcs", false, "include format functions such as Errorf and Equalf")
 	outputPkg = flag.String("output-package", "", "package for the resulting code")
 	tmplFile  = flag.String("template", "", "What file to load the function template from")
diff --git a/assert/assertion_compare_test.go b/assert/assertion_compare_test.go
@@ -166,7 +166,7 @@ func TestGreater(t *testing.T) {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, Greater(out, currCase.less, currCase.greater))
 		Contains(t, out.buf.String(), currCase.msg)
-		Contains(t, out.helpers, "github.com/wallester/testify/assert.Greater")
+		Contains(t, out.helpers, "github.com/stretchr/testify/assert.Greater")
 	}
 }
 
@@ -210,7 +210,7 @@ func TestGreaterOrEqual(t *testing.T) {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, GreaterOrEqual(out, currCase.less, currCase.greater))
 		Contains(t, out.buf.String(), currCase.msg)
-		Contains(t, out.helpers, "github.com/wallester/testify/assert.GreaterOrEqual")
+		Contains(t, out.helpers, "github.com/stretchr/testify/assert.GreaterOrEqual")
 	}
 }
 
@@ -254,7 +254,7 @@ func TestLess(t *testing.T) {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, Less(out, currCase.greater, currCase.less))
 		Contains(t, out.buf.String(), currCase.msg)
-		Contains(t, out.helpers, "github.com/wallester/testify/assert.Less")
+		Contains(t, out.helpers, "github.com/stretchr/testify/assert.Less")
 	}
 }
 
@@ -298,7 +298,7 @@ func TestLessOrEqual(t *testing.T) {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, LessOrEqual(out, currCase.greater, currCase.less))
 		Contains(t, out.buf.String(), currCase.msg)
-		Contains(t, out.helpers, "github.com/wallester/testify/assert.LessOrEqual")
+		Contains(t, out.helpers, "github.com/stretchr/testify/assert.LessOrEqual")
 	}
 }
 
@@ -337,7 +337,7 @@ func TestPositive(t *testing.T) {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, Positive(out, currCase.e))
 		Contains(t, out.buf.String(), currCase.msg)
-		Contains(t, out.helpers, "github.com/wallester/testify/assert.Positive")
+		Contains(t, out.helpers, "github.com/stretchr/testify/assert.Positive")
 	}
 }
 
@@ -376,7 +376,7 @@ func TestNegative(t *testing.T) {
 		out := &outputT{buf: bytes.NewBuffer(nil)}
 		False(t, Negative(out, currCase.e))
 		Contains(t, out.buf.String(), currCase.msg)
-		Contains(t, out.helpers, "github.com/wallester/testify/assert.Negative")
+		Contains(t, out.helpers, "github.com/stretchr/testify/assert.Negative")
 	}
 }
 
diff --git a/assert/assertions.go b/assert/assertions.go
@@ -21,7 +21,7 @@ import (
 	"github.com/pmezard/go-difflib/difflib"
 
 	// Wrapper around gopkg.in/yaml.v3
-	"github.com/wallester/testify/assert/yaml"
+	"github.com/stretchr/testify/assert/yaml"
 )
 
 //go:generate sh -c "cd ../_codegen && go build && cd - && ../_codegen/_codegen -output-package=assert -template=assertion_format.go.tmpl"
diff --git a/assert/internal/unsafetests/unsafetests_test.go b/assert/internal/unsafetests/unsafetests_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"unsafe"
 
-	"github.com/wallester/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 type ignoreTestingT struct{}
diff --git a/assert/yaml/yaml_fail.go b/assert/yaml/yaml_fail.go
@@ -11,7 +11,7 @@ package yaml
 
 import "errors"
 
-var errNotImplemented = errors.New("YAML functions are not available (see https://pkg.go.dev/github.com/wallester/testify/assert/yaml)")
+var errNotImplemented = errors.New("YAML functions are not available (see https://pkg.go.dev/github.com/stretchr/testify/assert/yaml)")
 
 func Unmarshal([]byte, interface{}) error {
 	return errNotImplemented
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/wallester/testify
+module github.com/stretchr/testify
 
 // This should match the minimum supported version that is tested in
 // .github/workflows/main.yml
diff --git a/go.sum b/go.sum
@@ -10,7 +10,6 @@ github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 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=
diff --git a/http/test_round_tripper.go b/http/test_round_tripper.go
@@ -3,7 +3,7 @@ package http
 import (
 	"net/http"
 
-	"github.com/wallester/testify/mock"
+	"github.com/stretchr/testify/mock"
 )
 
 // Deprecated: Use [net/http/httptest] instead.
diff --git a/mock/mock.go b/mock/mock.go
@@ -15,7 +15,7 @@ import (
 	"github.com/pmezard/go-difflib/difflib"
 	"github.com/stretchr/objx"
 
-	"github.com/wallester/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 // regex for GCCGO functions
diff --git a/mock/mock_test.go b/mock/mock_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/wallester/testify/assert"
-	"github.com/wallester/testify/require"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 /*
diff --git a/package_test.go b/package_test.go
@@ -3,7 +3,7 @@ package testify
 import (
 	"testing"
 
-	"github.com/wallester/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestImports(t *testing.T) {
diff --git a/require/require.go b/require/require.go
diff --git a/require/require_forward.go b/require/require_forward.go
diff --git a/require/requirements_test.go b/require/requirements_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/wallester/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 // AssertionTesterInterface defines an interface to be used for testing assertion methods
diff --git a/suite/stats_test.go b/suite/stats_test.go
@@ -3,7 +3,7 @@ package suite
 import (
 	"testing"
 
-	"github.com/wallester/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestPassedReturnsTrueWhenAllTestsPass(t *testing.T) {
diff --git a/suite/suite.go b/suite/suite.go
@@ -12,8 +12,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/wallester/testify/assert"
-	"github.com/wallester/testify/require"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 var allTestsFilter = func(_, _ string) (bool, error) { return true, nil }
@@ -119,9 +119,14 @@ func (suite *Suite) Run(name string, subtest func()) bool {
 
 // Run takes a testing suite and runs all of the tests attached
 // to it.
-func Run(t *testing.T, suite TestingSuite) {
+func Run(t *testing.T, suite TestingSuite, shuffleTests ...bool) {
 	defer recoverAndFailOnPanic(t)
 
+	var shuffle bool
+	if len(shuffleTests) > 0 {
+		shuffle = shuffleTests[0]
+	}
+
 	suite.SetT(t)
 	suite.SetS(suite)
 
@@ -218,9 +223,11 @@ func Run(t *testing.T, suite TestingSuite) {
 		}()
 	}
 
-	rand.Shuffle(len(tests), func(i, j int) {
-		tests[i], tests[j] = tests[j], tests[i]
-	})
+	if shuffle {
+		rand.Shuffle(len(tests), func(i, j int) {
+			tests[i], tests[j] = tests[j], tests[i]
+		})
+	}
 
 	runTests(t, tests)
 }
diff --git a/suite/suite_test.go b/suite/suite_test.go
@@ -12,8 +12,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/wallester/testify/assert"
-	"github.com/wallester/testify/require"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 // SuiteRequireTwice is intended to test the usage of suite.Require in two

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`var (`
`31`		`- pkg = flag.String("assert-path", "github.com/wallester/testify/assert", "Path to the assert package")`
	`31`	`+ pkg = flag.String("assert-path", "github.com/stretchr/testify/assert", "Path to the assert package")`
`32`	`32`	`includeF = flag.Bool("include-format-funcs", false, "include format functions such as Errorf and Equalf")`
`33`	`33`	`outputPkg = flag.String("output-package", "", "package for the resulting code")`
`34`	`34`	`tmplFile = flag.String("template", "", "What file to load the function template from")`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func TestGreater(t *testing.T) {`
`166`	`166`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`167`	`167`	`False(t, Greater(out, currCase.less, currCase.greater))`
`168`	`168`	`Contains(t, out.buf.String(), currCase.msg)`
`169`		`- Contains(t, out.helpers, "github.com/wallester/testify/assert.Greater")`
	`169`	`+ Contains(t, out.helpers, "github.com/stretchr/testify/assert.Greater")`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`
`@@ -210,7 +210,7 @@ func TestGreaterOrEqual(t *testing.T) {`
`210`	`210`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`211`	`211`	`False(t, GreaterOrEqual(out, currCase.less, currCase.greater))`
`212`	`212`	`Contains(t, out.buf.String(), currCase.msg)`
`213`		`- Contains(t, out.helpers, "github.com/wallester/testify/assert.GreaterOrEqual")`
	`213`	`+ Contains(t, out.helpers, "github.com/stretchr/testify/assert.GreaterOrEqual")`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`
`@@ -254,7 +254,7 @@ func TestLess(t *testing.T) {`
`254`	`254`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`255`	`255`	`False(t, Less(out, currCase.greater, currCase.less))`
`256`	`256`	`Contains(t, out.buf.String(), currCase.msg)`
`257`		`- Contains(t, out.helpers, "github.com/wallester/testify/assert.Less")`
	`257`	`+ Contains(t, out.helpers, "github.com/stretchr/testify/assert.Less")`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`
`@@ -298,7 +298,7 @@ func TestLessOrEqual(t *testing.T) {`
`298`	`298`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`299`	`299`	`False(t, LessOrEqual(out, currCase.greater, currCase.less))`
`300`	`300`	`Contains(t, out.buf.String(), currCase.msg)`
`301`		`- Contains(t, out.helpers, "github.com/wallester/testify/assert.LessOrEqual")`
	`301`	`+ Contains(t, out.helpers, "github.com/stretchr/testify/assert.LessOrEqual")`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`
`@@ -337,7 +337,7 @@ func TestPositive(t *testing.T) {`
`337`	`337`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`338`	`338`	`False(t, Positive(out, currCase.e))`
`339`	`339`	`Contains(t, out.buf.String(), currCase.msg)`
`340`		`- Contains(t, out.helpers, "github.com/wallester/testify/assert.Positive")`
	`340`	`+ Contains(t, out.helpers, "github.com/stretchr/testify/assert.Positive")`
`341`	`341`	`}`
`342`	`342`	`}`
`343`	`343`
`@@ -376,7 +376,7 @@ func TestNegative(t *testing.T) {`
`376`	`376`	`out := &outputT{buf: bytes.NewBuffer(nil)}`
`377`	`377`	`False(t, Negative(out, currCase.e))`
`378`	`378`	`Contains(t, out.buf.String(), currCase.msg)`
`379`		`- Contains(t, out.helpers, "github.com/wallester/testify/assert.Negative")`
	`379`	`+ Contains(t, out.helpers, "github.com/stretchr/testify/assert.Negative")`
`380`	`380`	`}`
`381`	`381`	`}`
`382`	`382`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"github.com/pmezard/go-difflib/difflib"`
`22`	`22`
`23`	`23`	`// Wrapper around gopkg.in/yaml.v3`
`24`		`- "github.com/wallester/testify/assert/yaml"`
	`24`	`+ "github.com/stretchr/testify/assert/yaml"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`//go:generate sh -c "cd ../_codegen && go build && cd - && ../_codegen/_codegen -output-package=assert -template=assertion_format.go.tmpl"`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`	`"unsafe"`
`7`	`7`
`8`		`- "github.com/wallester/testify/assert"`
	`8`	`+ "github.com/stretchr/testify/assert"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type ignoreTestingT struct{}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/wallester/testify`
	`1`	`+module github.com/stretchr/testify`
`2`	`2`
`3`	`3`	`// This should match the minimum supported version that is tested in`
`4`	`4`	`// .github/workflows/main.yml`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package http`
`3`	`3`	`import (`
`4`	`4`	`"net/http"`
`5`	`5`
`6`		`- "github.com/wallester/testify/mock"`
	`6`	`+ "github.com/stretchr/testify/mock"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// Deprecated: Use [net/http/httptest] instead.`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"github.com/pmezard/go-difflib/difflib"`
`16`	`16`	`"github.com/stretchr/objx"`
`17`	`17`
`18`		`- "github.com/wallester/testify/assert"`
	`18`	`+ "github.com/stretchr/testify/assert"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`// regex for GCCGO functions`