From 858137c2695f9a6ef5a42fdd67bfe2efb1fa08e0 Mon Sep 17 00:00:00 2001 From: Jerry Olsson Date: Thu, 21 May 2026 19:46:39 +0200 Subject: [PATCH 1/2] Remove github.com/andreyvit/diff dependency When the tests were added 8 years ago, the assert.Equal() diff were not so easy to compare. Since github.com/stretchr/testify v1.2.2, the Equal() function produce a nice diff similar to what github.com/andreyvit/diff does. --- ast/dumper_test.go | 3 --- go.mod | 4 ++-- go.sum | 9 --------- parser/testrunner/runner.go | 7 ++----- 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/ast/dumper_test.go b/ast/dumper_test.go index 45397a4d..9909604d 100644 --- a/ast/dumper_test.go +++ b/ast/dumper_test.go @@ -1,10 +1,8 @@ package ast import ( - "fmt" "testing" - "github.com/andreyvit/diff" "github.com/stretchr/testify/require" ) @@ -28,6 +26,5 @@ func TestDump(t *testing.T) { Name: "bar" - ` - fmt.Println(diff.LineDiff(expected, res)) require.Equal(t, expected, res) } diff --git a/go.mod b/go.mod index df00fb24..bc0018e6 100644 --- a/go.mod +++ b/go.mod @@ -4,15 +4,15 @@ go 1.22 require ( github.com/agnivade/levenshtein v1.2.1 - github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 github.com/stretchr/testify v1.11.1 gopkg.in/yaml.v3 v3.0.1 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect + github.com/kr/pretty v0.1.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/sergi/go-diff v1.3.1 // indirect + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect ) retract ( diff --git a/go.sum b/go.sum index e072c320..a63d77c1 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,7 @@ github.com/agnivade/levenshtein v1.2.1 h1:EHBY3UOn1gwdy/VbFwgo4cxecRznFk7fKWN1KOX7eoM= github.com/agnivade/levenshtein v1.2.1/go.mod h1:QVVI16kDrtSuwcpd0p1+xMC6Z/VfhtCyDIjcwga4/DU= -github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= -github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q= github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/dgryski/trifles v0.0.0-20230903005119-f50d829f2e54 h1:SG7nF6SRlWhcT7cNTs5R6Hk4V2lcmLz2NsG2VnInyNo= @@ -16,16 +13,10 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= 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/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= -github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/parser/testrunner/runner.go b/parser/testrunner/runner.go index ba385ab3..588bfd8a 100644 --- a/parser/testrunner/runner.go +++ b/parser/testrunner/runner.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/andreyvit/diff" "gopkg.in/yaml.v3" + "github.com/stretchr/testify/assert" "github.com/vektah/gqlparser/v2/gqlerror" ) @@ -156,10 +156,7 @@ func Test(t *testing.T, filename string, f func(t *testing.T, input string) Spec result.AST = strings.TrimSpace(result.AST) if spec.AST != "" && spec.AST != result.AST { - diffStr := diff.LineDiff(spec.AST, result.AST) - if diffStr != "" { - t.Errorf("AST mismatch:\n%s", diffStr) - } + assert.Equal(t, spec.AST, result.AST, "AST mismatch") } if t.Failed() { From 215500c42587bfb1708c5eaf50ee4ad5a1b76f9d Mon Sep 17 00:00:00 2001 From: Jerry Olsson Date: Mon, 25 May 2026 21:20:02 +0200 Subject: [PATCH 2/2] fix linting --- parser/testrunner/runner.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser/testrunner/runner.go b/parser/testrunner/runner.go index 588bfd8a..c1042192 100644 --- a/parser/testrunner/runner.go +++ b/parser/testrunner/runner.go @@ -6,9 +6,9 @@ import ( "strings" "testing" + "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - "github.com/stretchr/testify/assert" "github.com/vektah/gqlparser/v2/gqlerror" )