diff --git a/clidocstool_md_test.go b/clidocstool_md_test.go index ec2c970..44df886 100644 --- a/clidocstool_md_test.go +++ b/clidocstool_md_test.go @@ -19,9 +19,6 @@ import ( "path" "path/filepath" "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) //nolint:errcheck @@ -29,25 +26,38 @@ func TestGenMarkdownTree(t *testing.T) { tmpdir := t.TempDir() err := copyFile(path.Join("fixtures", "buildx_stop.pre.md"), path.Join(tmpdir, "buildx_stop.md")) - require.NoError(t, err) + if err != nil { + t.Fatal(err) + } c, err := New(Options{ Root: buildxCmd, SourceDir: tmpdir, Plugin: true, }) - require.NoError(t, err) - require.NoError(t, c.GenMarkdownTree(buildxCmd)) + if err != nil { + t.Fatal(err) + } + err = c.GenMarkdownTree(buildxCmd) + if err != nil { + t.Fatal(err) + } for _, tt := range []string{"buildx.md", "buildx_build.md", "buildx_stop.md"} { tt := tt t.Run(tt, func(t *testing.T) { bres, err := os.ReadFile(filepath.Join(tmpdir, tt)) - require.NoError(t, err) + if err != nil { + t.Fatal(err) + } bexc, err := os.ReadFile(path.Join("fixtures", tt)) - require.NoError(t, err) - assert.Equal(t, string(bexc), string(bres)) + if err != nil { + t.Fatal(err) + } + if string(bexc) != string(bres) { + t.Fatalf("expected:\n%s\ngot:\n%s", string(bexc), string(bres)) + } }) } } diff --git a/clidocstool_test.go b/clidocstool_test.go index 2c50733..569cd89 100644 --- a/clidocstool_test.go +++ b/clidocstool_test.go @@ -22,8 +22,6 @@ import ( "github.com/docker/cli-docs-tool/annotation" "github.com/spf13/cobra" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) var ( @@ -178,25 +176,38 @@ func TestGenAllTree(t *testing.T) { tmpdir := t.TempDir() err := copyFile(path.Join("fixtures", "buildx_stop.pre.md"), path.Join(tmpdir, "buildx_stop.md")) - require.NoError(t, err) + if err != nil { + t.Fatal(err) + } c, err := New(Options{ Root: buildxCmd, SourceDir: tmpdir, Plugin: true, }) - require.NoError(t, err) - require.NoError(t, c.GenAllTree()) + if err != nil { + t.Fatal(err) + } + err = c.GenAllTree() + if err != nil { + t.Fatal(err) + } for _, tt := range []string{"buildx.md", "buildx_build.md", "buildx_stop.md", "docker_buildx.yaml", "docker_buildx_build.yaml", "docker_buildx_stop.yaml"} { tt := tt t.Run(tt, func(t *testing.T) { bres, err := os.ReadFile(filepath.Join(tmpdir, tt)) - require.NoError(t, err) + if err != nil { + t.Fatal(err) + } bexc, err := os.ReadFile(path.Join("fixtures", tt)) - require.NoError(t, err) - assert.Equal(t, string(bexc), string(bres)) + if err != nil { + t.Fatal(err) + } + if string(bexc) != string(bres) { + t.Fatalf("expected:\n%s\ngot:\n%s", string(bexc), string(bres)) + } }) } } diff --git a/clidocstool_yaml_test.go b/clidocstool_yaml_test.go index a5892c0..a99f1e1 100644 --- a/clidocstool_yaml_test.go +++ b/clidocstool_yaml_test.go @@ -19,9 +19,6 @@ import ( "path" "path/filepath" "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) //nolint:errcheck @@ -33,18 +30,29 @@ func TestGenYamlTree(t *testing.T) { SourceDir: tmpdir, Plugin: true, }) - require.NoError(t, err) - require.NoError(t, c.GenYamlTree(buildxCmd)) + if err != nil { + t.Fatal(err) + } + err = c.GenYamlTree(buildxCmd) + if err != nil { + t.Fatal(err) + } for _, tt := range []string{"docker_buildx.yaml", "docker_buildx_build.yaml", "docker_buildx_stop.yaml"} { tt := tt t.Run(tt, func(t *testing.T) { bres, err := os.ReadFile(filepath.Join(tmpdir, tt)) - require.NoError(t, err) + if err != nil { + t.Fatal(err) + } bexc, err := os.ReadFile(path.Join("fixtures", tt)) - require.NoError(t, err) - assert.Equal(t, string(bexc), string(bres)) + if err != nil { + t.Fatal(err) + } + if string(bexc) != string(bres) { + t.Fatalf("expected:\n%s\ngot:\n%s", string(bexc), string(bres)) + } }) } } diff --git a/go.mod b/go.mod index 9252b68..1c0cb4f 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,5 @@ go 1.16 require ( github.com/spf13/cobra v1.2.1 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.7.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index f94ce98..9294bed 100644 --- a/go.sum +++ b/go.sum @@ -57,7 +57,6 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= 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/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -192,7 +191,6 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -218,7 +216,6 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -560,7 +557,6 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=