diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3d137a5..e0a4ee1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,10 +6,10 @@ jobs: name: Build and Test strategy: matrix: - go: ['1.13', '1.14', '1.15', '1.16', '1.17', '1.18', '1.19', '1.20'] + go: ['1.13', '1.14', '1.15', '1.16', '1.17', '1.18', '1.19', '1.20', '1.21'] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: go-version: ${{ matrix.go }} diff --git a/checker.go b/checker.go index b5e695e..e378680 100644 --- a/checker.go +++ b/checker.go @@ -95,7 +95,7 @@ func (c *equalsChecker) Check(got interface{}, args []interface{}, note func(key } if isMultiLine(got) || isMultiLine(want) { diff := cmp.Diff(strings.SplitAfter(want, "\n"), strings.SplitAfter(got, "\n")) - note("line diff (+got -want)", Unquoted(diff)) + note("line diff (-want +got)", Unquoted(diff)) } } } @@ -138,7 +138,7 @@ func (c *cmpEqualsChecker) Check(got interface{}, args []interface{}, note func( if diff := cmp.Diff(want, got, c.opts...); diff != "" { // Only output values when the verbose flag is set. note("error", Unquoted("values are not deep equal")) - note("diff (+got -want)", Unquoted(diff)) + note("diff (-want +got)", Unquoted(diff)) note("got", SuppressedIfLong{got}) note("want", SuppressedIfLong{want}) return ErrSilent diff --git a/checker_test.go b/checker_test.go index e2c53b1..c869a62 100644 --- a/checker_test.go +++ b/checker_test.go @@ -131,7 +131,7 @@ want: expectedCheckFailure: fmt.Sprintf(` error: values are not equal -line diff (+got -want): +line diff (-want +got): %s got: "a\nlong\nmultiline\nstring" @@ -159,7 +159,7 @@ want: expectedCheckFailure: fmt.Sprintf(` error: values are not equal -line diff (+got -want): +line diff (-want +got): %s got: "\nfoo" @@ -415,7 +415,7 @@ want: expectedCheckFailure: fmt.Sprintf(` error: values are not deep equal -diff (+got -want): +diff (-want +got): %s got: struct { Strings []interface {}; Ints []int }{ @@ -442,7 +442,7 @@ want: expectedCheckFailure: fmt.Sprintf(` error: values are not deep equal -diff (+got -want): +diff (-want +got): %s got: @@ -467,7 +467,7 @@ want: expectedCheckFailure: fmt.Sprintf(` error: values are not deep equal -diff (+got -want): +diff (-want +got): %s got: []interface {}{ @@ -501,7 +501,7 @@ want: expectedCheckFailure: fmt.Sprintf(` error: values are not deep equal -diff (+got -want): +diff (-want +got): %s got: @@ -533,7 +533,7 @@ want: expectedCheckFailure: fmt.Sprintf(` error: values are not deep equal -diff (+got -want): +diff (-want +got): %s got: []int{1, 2, 4} @@ -608,7 +608,7 @@ want: expectedCheckFailure: fmt.Sprintf(` error: values are not deep equal -diff (+got -want): +diff (-want +got): %s got: s"2012-03-29 00:00:00 +0000 UTC" @@ -665,7 +665,7 @@ want args: expectedCheckFailure: fmt.Sprintf(` error: values are not deep equal -diff (+got -want): +diff (-want +got): %s got: struct { Strings []interface {}; Ints []int }{ @@ -692,7 +692,7 @@ want: expectedCheckFailure: fmt.Sprintf(` error: values are not deep equal -diff (+got -want): +diff (-want +got): %s got: @@ -708,7 +708,7 @@ want: expectedCheckFailure: fmt.Sprintf(` error: values are not deep equal -diff (+got -want): +diff (-want +got): %s got: []interface {}{ @@ -878,7 +878,7 @@ want: expectedCheckFailure: fmt.Sprintf(` error: values are not deep equal -diff (+got -want): +diff (-want +got): %s got: []string{"bad", "wolf"} @@ -2721,7 +2721,7 @@ error: mismatch at index 1 error: values are not deep equal -diff (+got -want): +diff (-want +got): %s got: []string{"a", "c"} @@ -2947,7 +2947,7 @@ want: expectedCheckFailure: fmt.Sprintf(` error: values are not deep equal -diff (+got -want): +diff (-want +got): %s got: map[string]interface {}{ diff --git a/go.mod b/go.mod index d5ba542..b3e9124 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,9 @@ module github.com/frankban/quicktest require ( - github.com/google/go-cmp v0.5.9 + github.com/google/go-cmp v0.6.0 github.com/kr/pretty v0.3.1 + github.com/rogpeppe/go-internal v1.12.0 // indirect ) go 1.13 diff --git a/go.sum b/go.sum index a3c4790..5b52866 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,35 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/report_test.go b/report_test.go index d4ebc6d..741af54 100644 --- a/report_test.go +++ b/report_test.go @@ -113,7 +113,7 @@ func TestCmpReportOutput(t *testing.T) { want := ` error: values are not deep equal -diff (+got -want): +diff (-want +got): []*quicktest_test.reportExample{ &{AnInt: 42}, &{AnInt: 47},