Skip to content

Commit e30202f

Browse files
thaJeztahthaJeztah
committed
remove test-dependencies in favor of native go
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 6b9343f commit e30202f

File tree

6 files changed

+88
-53
lines changed

6 files changed

+88
-53
lines changed

‎clidocstool_man_test.go‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ import (
2525
"time"
2626

2727
"github.com/spf13/cobra/doc"
28-
"github.com/stretchr/testify/assert"
29-
"github.com/stretchr/testify/require"
3028
)
3129

3230
//nolint:errcheck
@@ -35,10 +33,15 @@ func TestGenManTree(t *testing.T) {
3533
tmpdir := t.TempDir()
3634

3735
epoch, err := time.Parse("2006-Jan-02", "2020-Jan-10")
38-
require.NoError(t, err)
36+
if err != nil {
37+
t.Fatal(err)
38+
}
3939
t.Setenv("SOURCE_DATE_EPOCH", strconv.FormatInt(epoch.Unix(), 10))
4040

41-
require.NoError(t, copyFile(path.Join("fixtures", "buildx_stop.pre.md"), path.Join(tmpdir, "buildx_stop.md")))
41+
err = copyFile(path.Join("fixtures", "buildx_stop.pre.md"), path.Join(tmpdir, "buildx_stop.md"))
42+
if err != nil {
43+
t.Fatal(err)
44+
}
4245

4346
c, err := New(Options{
4447
Root: dockerCmd,
@@ -51,8 +54,14 @@ func TestGenManTree(t *testing.T) {
5154
Manual: "Docker User Manuals",
5255
},
5356
})
54-
require.NoError(t, err)
55-
require.NoError(t, c.GenManTree(dockerCmd))
57+
if err != nil {
58+
t.Fatal(err)
59+
}
60+
61+
err = c.GenManTree(dockerCmd)
62+
if err != nil {
63+
t.Fatal(err)
64+
}
5665

5766
seen := make(map[string]struct{})
5867
remanpage := regexp.MustCompile(`\.\d+$`)
@@ -65,14 +74,19 @@ func TestGenManTree(t *testing.T) {
6574
}
6675
t.Run(fname, func(t *testing.T) {
6776
seen[fname] = struct{}{}
68-
require.NoError(t, err)
6977

7078
bres, err := os.ReadFile(filepath.Join(tmpdir, fname))
71-
require.NoError(t, err)
79+
if err != nil {
80+
t.Fatal(err)
81+
}
7282

7383
bexc, err := os.ReadFile(path)
74-
require.NoError(t, err)
75-
assert.Equal(t, string(bexc), string(bres))
84+
if err != nil {
85+
t.Fatal(err)
86+
}
87+
if string(bexc) != string(bres) {
88+
t.Fatalf("expected:\n%s\ngot:\n%s", string(bexc), string(bres))
89+
}
7690
})
7791
return nil
7892
})

‎clidocstool_md_test.go‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,30 @@ import (
2121
"path/filepath"
2222
"strings"
2323
"testing"
24-
25-
"github.com/stretchr/testify/require"
2624
)
2725

2826
//nolint:errcheck
2927
func TestGenMarkdownTree(t *testing.T) {
3028
setup()
3129
tmpdir := t.TempDir()
3230

33-
require.NoError(t, copyFile(path.Join("fixtures", "buildx_stop.pre.md"), path.Join(tmpdir, "buildx_stop.md")))
31+
err := copyFile(path.Join("fixtures", "buildx_stop.pre.md"), path.Join(tmpdir, "buildx_stop.md"))
32+
if err != nil {
33+
t.Fatal(err)
34+
}
3435

3536
c, err := New(Options{
3637
Root: dockerCmd,
3738
SourceDir: tmpdir,
3839
Plugin: false,
3940
})
40-
require.NoError(t, err)
41-
require.NoError(t, c.GenMarkdownTree(dockerCmd))
41+
if err != nil {
42+
t.Fatal(err)
43+
}
44+
err = c.GenMarkdownTree(dockerCmd)
45+
if err != nil {
46+
t.Fatal(err)
47+
}
4248

4349
seen := make(map[string]struct{})
4450

@@ -50,14 +56,19 @@ func TestGenMarkdownTree(t *testing.T) {
5056
}
5157
t.Run(fname, func(t *testing.T) {
5258
seen[fname] = struct{}{}
53-
require.NoError(t, err)
5459

5560
bres, err := os.ReadFile(filepath.Join(tmpdir, fname))
56-
require.NoError(t, err)
61+
if err != nil {
62+
t.Fatal(err)
63+
}
5764

5865
bexc, err := os.ReadFile(path)
59-
require.NoError(t, err)
60-
require.Equal(t, string(bexc), string(bres))
66+
if err != nil {
67+
t.Fatal(err)
68+
}
69+
if string(bexc) != string(bres) {
70+
t.Fatalf("expected:\n%s\ngot:\n%s", string(bexc), string(bres))
71+
}
6172
})
6273
return nil
6374
})

‎clidocstool_test.go‎

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import (
2727
"github.com/docker/cli-docs-tool/annotation"
2828
"github.com/spf13/cobra"
2929
"github.com/spf13/cobra/doc"
30-
"github.com/stretchr/testify/assert"
31-
"github.com/stretchr/testify/require"
3230
)
3331

3432
var (
@@ -249,15 +247,22 @@ func TestGenAllTree(t *testing.T) {
249247
tmpdir := t.TempDir()
250248

251249
// keep for testing
252-
//tmpdir, err := os.MkdirTemp("", "cli-docs-tools")
253-
//require.NoError(t, err)
254-
//t.Log(tmpdir)
250+
// tmpdir, err := os.MkdirTemp("", "cli-docs-tools")
251+
// if err != nil {
252+
// t.Fatal(err)
253+
// }
254+
// t.Log(tmpdir)
255255

256256
epoch, err := time.Parse("2006-Jan-02", "2020-Jan-10")
257-
require.NoError(t, err)
257+
if err != nil {
258+
t.Fatal(err)
259+
}
258260
t.Setenv("SOURCE_DATE_EPOCH", strconv.FormatInt(epoch.Unix(), 10))
259261

260-
require.NoError(t, copyFile(path.Join("fixtures", "buildx_stop.pre.md"), path.Join(tmpdir, "buildx_stop.md")))
262+
err = copyFile(path.Join("fixtures", "buildx_stop.pre.md"), path.Join(tmpdir, "buildx_stop.md"))
263+
if err != nil {
264+
t.Fatal(err)
265+
}
261266

262267
c, err := New(Options{
263268
Root: dockerCmd,
@@ -270,8 +275,13 @@ func TestGenAllTree(t *testing.T) {
270275
Manual: "Docker User Manuals",
271276
},
272277
})
273-
require.NoError(t, err)
274-
require.NoError(t, c.GenAllTree())
278+
if err != nil {
279+
t.Fatal(err)
280+
}
281+
err = c.GenAllTree()
282+
if err != nil {
283+
t.Fatal(err)
284+
}
275285

276286
seen := make(map[string]struct{})
277287

@@ -283,14 +293,19 @@ func TestGenAllTree(t *testing.T) {
283293
}
284294
t.Run(fname, func(t *testing.T) {
285295
seen[fname] = struct{}{}
286-
require.NoError(t, err)
287296

288297
bres, err := os.ReadFile(filepath.Join(tmpdir, fname))
289-
require.NoError(t, err)
298+
if err != nil {
299+
t.Fatal(err)
300+
}
290301

291302
bexc, err := os.ReadFile(path)
292-
require.NoError(t, err)
293-
assert.Equal(t, string(bexc), string(bres))
303+
if err != nil {
304+
t.Fatal(err)
305+
}
306+
if string(bexc) != string(bres) {
307+
t.Fatalf("expected:\n%s\ngot:\n%s", string(bexc), string(bres))
308+
}
294309
})
295310
return nil
296311
})

‎clidocstool_yaml_test.go‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ import (
2020
"path/filepath"
2121
"strings"
2222
"testing"
23-
24-
"github.com/stretchr/testify/assert"
25-
"github.com/stretchr/testify/require"
2623
)
2724

2825
//nolint:errcheck
@@ -35,8 +32,13 @@ func TestGenYamlTree(t *testing.T) {
3532
SourceDir: tmpdir,
3633
Plugin: false,
3734
})
38-
require.NoError(t, err)
39-
require.NoError(t, c.GenYamlTree(dockerCmd))
35+
if err != nil {
36+
t.Fatal(err)
37+
}
38+
err = c.GenYamlTree(dockerCmd)
39+
if err != nil {
40+
t.Fatal(err)
41+
}
4042

4143
seen := make(map[string]struct{})
4244

@@ -48,14 +50,19 @@ func TestGenYamlTree(t *testing.T) {
4850
}
4951
t.Run(fname, func(t *testing.T) {
5052
seen[fname] = struct{}{}
51-
require.NoError(t, err)
5253

5354
bres, err := os.ReadFile(filepath.Join(tmpdir, fname))
54-
require.NoError(t, err)
55+
if err != nil {
56+
t.Fatal(err)
57+
}
5558

5659
bexc, err := os.ReadFile(path)
57-
require.NoError(t, err)
58-
assert.Equal(t, string(bexc), string(bres))
60+
if err != nil {
61+
t.Fatal(err)
62+
}
63+
if string(bexc) != string(bres) {
64+
t.Fatalf("expected:\n%s\ngot:\n%s", string(bexc), string(bres))
65+
}
5966
})
6067
return nil
6168
})

‎go.mod‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@ go 1.23.0
55
require (
66
github.com/spf13/cobra v1.10.2
77
github.com/spf13/pflag v1.0.10
8-
github.com/stretchr/testify v1.9.0
98
go.yaml.in/yaml/v3 v3.0.4
109
)
1110

1211
require (
1312
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
14-
github.com/davecgh/go-spew v1.1.1 // indirect
1513
github.com/inconshreveable/mousetrap v1.1.0 // indirect
16-
github.com/pmezard/go-difflib v1.0.0 // indirect
1714
github.com/russross/blackfriday/v2 v2.1.0 // indirect
18-
gopkg.in/yaml.v3 v3.0.1 // indirect
1915
)

‎go.sum‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
11
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
22
github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
33
github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
4-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
5-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
64
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
75
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
8-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
9-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
106
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
117
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
128
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
139
github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
1410
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
1511
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
1612
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
17-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
18-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
1913
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
2014
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
2115
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2216
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
23-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
24-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)