Skip to content

Commit 9a4b529

Browse files
antonmedvantonmedv
authored
Vendor testify (#642)
1 parent 5b538a7 commit 9a4b529

File tree

87 files changed

+21989
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+21989
-76
lines changed

‎ast/print_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package ast_test
33
import (
44
"testing"
55

6-
"github.com/stretchr/testify/assert"
7-
"github.com/stretchr/testify/require"
6+
"github.com/expr-lang/expr/internal/testify/assert"
7+
"github.com/expr-lang/expr/internal/testify/require"
88

99
"github.com/expr-lang/expr/ast"
1010
"github.com/expr-lang/expr/parser"

‎ast/visitor_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ package ast_test
33
import (
44
"testing"
55

6+
"github.com/expr-lang/expr/internal/testify/assert"
7+
68
"github.com/expr-lang/expr/ast"
7-
"github.com/stretchr/testify/assert"
89
)
910

1011
type visitor struct {

‎bench_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package expr_test
33
import (
44
"testing"
55

6-
"github.com/stretchr/testify/require"
6+
"github.com/expr-lang/expr/internal/testify/require"
77

88
"github.com/expr-lang/expr"
99
"github.com/expr-lang/expr/vm"

‎builtin/builtin_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/stretchr/testify/assert"
11-
"github.com/stretchr/testify/require"
10+
"github.com/expr-lang/expr/internal/testify/assert"
11+
"github.com/expr-lang/expr/internal/testify/require"
1212

1313
"github.com/expr-lang/expr"
1414
"github.com/expr-lang/expr/builtin"

‎checker/checker_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strings"
88
"testing"
99

10-
"github.com/stretchr/testify/assert"
11-
"github.com/stretchr/testify/require"
10+
"github.com/expr-lang/expr/internal/testify/assert"
11+
"github.com/expr-lang/expr/internal/testify/require"
1212

1313
"github.com/expr-lang/expr"
1414
"github.com/expr-lang/expr/ast"

‎checker/info_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/stretchr/testify/require"
8+
"github.com/expr-lang/expr/internal/testify/require"
99

1010
"github.com/expr-lang/expr/checker"
1111
"github.com/expr-lang/expr/test/mock"

‎compiler/compiler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"math"
55
"testing"
66

7-
"github.com/stretchr/testify/assert"
8-
"github.com/stretchr/testify/require"
7+
"github.com/expr-lang/expr/internal/testify/assert"
8+
"github.com/expr-lang/expr/internal/testify/require"
99

1010
"github.com/expr-lang/expr"
1111
"github.com/expr-lang/expr/test/mock"

‎debug/go.sum

-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
21
github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
32
github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
43
github.com/gdamore/tcell/v2 v2.6.0 h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg=
@@ -8,14 +7,12 @@ github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i
87
github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
98
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
109
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
11-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1210
github.com/rivo/tview v0.0.0-20230814110005-ccc2c8119703 h1:ZyM/+FYnpbZsFWuCohniM56kRoHRB4r5EuIzXEYkpxo=
1311
github.com/rivo/tview v0.0.0-20230814110005-ccc2c8119703/go.mod h1:nVwGv4MP47T0jvlk7KuTTjjuSmrGO4JF0iaiNt4bufE=
1412
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
1513
github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
1614
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
1715
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
18-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
1916
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
2017
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
2118
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -48,4 +45,3 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
4845
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
4946
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
5047
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
51-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎docgen/docgen_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import (
55
"testing"
66
"time"
77

8+
"github.com/expr-lang/expr/internal/testify/assert"
9+
"github.com/expr-lang/expr/internal/testify/require"
10+
811
. "github.com/expr-lang/expr/docgen"
9-
"github.com/stretchr/testify/assert"
10-
"github.com/stretchr/testify/require"
1112
)
1213

1314
type Tweet struct {

‎expr_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/stretchr/testify/assert"
14-
"github.com/stretchr/testify/require"
13+
"github.com/expr-lang/expr/internal/testify/assert"
14+
"github.com/expr-lang/expr/internal/testify/require"
1515

1616
"github.com/expr-lang/expr"
1717
"github.com/expr-lang/expr/ast"

‎file/source_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"testing"
66

7-
"github.com/stretchr/testify/assert"
7+
"github.com/expr-lang/expr/internal/testify/assert"
88
)
99

1010
const (

‎go.mod

-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
module github.com/expr-lang/expr
22

33
go 1.18
4-
5-
require github.com/stretchr/testify v1.8.4
6-
7-
require (
8-
github.com/davecgh/go-spew v1.1.1 // indirect
9-
github.com/pmezard/go-difflib v1.0.0 // indirect
10-
gopkg.in/yaml.v3 v3.0.1 // indirect
11-
)

‎go.sum

-10
This file was deleted.

‎internal/deref/deref_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"reflect"
55
"testing"
66

7-
"github.com/stretchr/testify/assert"
7+
"github.com/expr-lang/expr/internal/testify/assert"
88

99
"github.com/expr-lang/expr/internal/deref"
1010
)

0 commit comments

Comments
 (0)