Skip to content

Commit e6d285d

Browse files
buchdagbuchdag
committed
tests: use github.com/stretchr/testify/assert
1 parent 3a8a565 commit e6d285d

File tree

2 files changed

+54
-127
lines changed

2 files changed

+54
-127
lines changed

‎docker_client_test.go

Lines changed: 43 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -2,195 +2,130 @@ package dockergen
22

33
import (
44
"testing"
5+
6+
"github.com/stretchr/testify/assert"
57
)
68

79
func TestSplitDockerImageRepository(t *testing.T) {
810
registry, repository, tag := splitDockerImage("ubuntu")
911

10-
if registry != "" {
11-
t.Fail()
12-
}
13-
if repository != "ubuntu" {
14-
t.Fail()
15-
}
16-
if tag != "" {
17-
t.Fail()
18-
}
12+
assert.Equal(t, "", registry)
13+
assert.Equal(t, "ubuntu", repository)
14+
assert.Equal(t, "", tag)
1915

2016
dockerImage := DockerImage{
2117
Registry: registry,
2218
Repository: repository,
2319
Tag: tag,
2420
}
25-
if "ubuntu" != dockerImage.String() {
26-
t.Fail()
27-
}
21+
assert.Equal(t, "ubuntu", dockerImage.String())
2822
}
2923

3024
func TestSplitDockerImageWithRegistry(t *testing.T) {
3125
registry, repository, tag := splitDockerImage("custom.registry/ubuntu")
3226

33-
if registry != "custom.registry" {
34-
t.Fail()
35-
}
36-
if repository != "ubuntu" {
37-
t.Fail()
38-
}
39-
if tag != "" {
40-
t.Fail()
41-
}
27+
assert.Equal(t, "custom.registry", registry)
28+
assert.Equal(t, "ubuntu", repository)
29+
assert.Equal(t, "", tag)
30+
4231
dockerImage := DockerImage{
4332
Registry: registry,
4433
Repository: repository,
4534
Tag: tag,
4635
}
47-
if "custom.registry/ubuntu" != dockerImage.String() {
48-
t.Fail()
49-
}
50-
36+
assert.Equal(t, "custom.registry/ubuntu", dockerImage.String())
5137
}
5238

5339
func TestSplitDockerImageWithRegistryAndTag(t *testing.T) {
5440
registry, repository, tag := splitDockerImage("custom.registry/ubuntu:12.04")
5541

56-
if registry != "custom.registry" {
57-
t.Fail()
58-
}
59-
if repository != "ubuntu" {
60-
t.Fail()
61-
}
62-
if tag != "12.04" {
63-
t.Fail()
64-
}
42+
assert.Equal(t, "custom.registry", registry)
43+
assert.Equal(t, "ubuntu", repository)
44+
assert.Equal(t, "12.04", tag)
45+
6546
dockerImage := DockerImage{
6647
Registry: registry,
6748
Repository: repository,
6849
Tag: tag,
6950
}
70-
if "custom.registry/ubuntu:12.04" != dockerImage.String() {
71-
t.Fail()
72-
}
73-
51+
assert.Equal(t, "custom.registry/ubuntu:12.04", dockerImage.String())
7452
}
7553

7654
func TestSplitDockerImageWithRepositoryAndTag(t *testing.T) {
7755
registry, repository, tag := splitDockerImage("ubuntu:12.04")
7856

79-
if registry != "" {
80-
t.Fail()
81-
}
82-
83-
if repository != "ubuntu" {
84-
t.Fail()
85-
}
57+
assert.Equal(t, "", registry)
58+
assert.Equal(t, "ubuntu", repository)
59+
assert.Equal(t, "12.04", tag)
8660

87-
if tag != "12.04" {
88-
t.Fail()
89-
}
9061
dockerImage := DockerImage{
9162
Registry: registry,
9263
Repository: repository,
9364
Tag: tag,
9465
}
95-
if "ubuntu:12.04" != dockerImage.String() {
96-
t.Fail()
97-
}
66+
assert.Equal(t, "ubuntu:12.04", dockerImage.String())
9867
}
9968

10069
func TestSplitDockerImageWithPrivateRegistryPath(t *testing.T) {
10170
registry, repository, tag := splitDockerImage("localhost:8888/ubuntu/foo:12.04")
10271

103-
if registry != "localhost:8888" {
104-
t.Fail()
105-
}
106-
107-
if repository != "ubuntu/foo" {
108-
t.Fail()
109-
}
72+
assert.Equal(t, "localhost:8888", registry)
73+
assert.Equal(t, "ubuntu/foo", repository)
74+
assert.Equal(t, "12.04", tag)
11075

111-
if tag != "12.04" {
112-
t.Fail()
113-
}
11476
dockerImage := DockerImage{
11577
Registry: registry,
11678
Repository: repository,
11779
Tag: tag,
11880
}
119-
if "localhost:8888/ubuntu/foo:12.04" != dockerImage.String() {
120-
t.Fail()
121-
}
81+
assert.Equal(t, "localhost:8888/ubuntu/foo:12.04", dockerImage.String())
12282
}
12383
func TestSplitDockerImageWithLocalRepositoryAndTag(t *testing.T) {
12484
registry, repository, tag := splitDockerImage("localhost:8888/ubuntu:12.04")
12585

126-
if registry != "localhost:8888" {
127-
t.Fatalf("registry does not match: expected %s got %s", "localhost:8888", registry)
128-
}
86+
assert.Equal(t, "localhost:8888", registry)
87+
assert.Equal(t, "ubuntu", repository)
88+
assert.Equal(t, "12.04", tag)
12989

130-
if repository != "ubuntu" {
131-
t.Fatalf("repository does not match: expected %s got %s", "ubuntu", repository)
132-
}
133-
134-
if tag != "12.04" {
135-
t.Fatalf("tag does not match: expected %s got %s", "12.04", tag)
136-
}
13790
dockerImage := DockerImage{
13891
Registry: registry,
13992
Repository: repository,
14093
Tag: tag,
14194
}
142-
if "localhost:8888/ubuntu:12.04" != dockerImage.String() {
143-
t.Fail()
144-
}
145-
95+
assert.Equal(t, "localhost:8888/ubuntu:12.04", dockerImage.String())
14696
}
14797

14898
func TestParseHostUnix(t *testing.T) {
14999
proto, addr, err := parseHost("unix:///var/run/docker.sock")
150-
if err != nil {
151-
t.Fatalf("%s", err)
152-
}
153-
if proto != "unix" || addr != "/var/run/docker.sock" {
154-
t.Fatal("failed to parse unix:///var/run/docker.sock")
155-
}
100+
assert.NoError(t, err)
101+
assert.Equal(t, "unix", proto, "failed to parse unix:///var/run/docker.sock")
102+
assert.Equal(t, "/var/run/docker.sock", addr, "failed to parse unix:///var/run/docker.sock")
156103
}
157104

158105
func TestParseHostUnixDefault(t *testing.T) {
159106
proto, addr, err := parseHost("")
160-
if err != nil {
161-
t.Fatalf("%s", err)
162-
}
163-
if proto != "unix" || addr != "/var/run/docker.sock" {
164-
t.Fatal("failed to parse ''")
165-
}
107+
assert.NoError(t, err)
108+
assert.Equal(t, "unix", proto, "failed to parse ''")
109+
assert.Equal(t, "/var/run/docker.sock", addr, "failed to parse ''")
166110
}
167111

168112
func TestParseHostUnixDefaultNoPath(t *testing.T) {
169113
proto, addr, err := parseHost("unix://")
170-
if err != nil {
171-
t.Fatalf("%s", err)
172-
}
173-
if proto != "unix" || addr != "/var/run/docker.sock" {
174-
t.Fatal("failed to parse unix://")
175-
}
114+
assert.NoError(t, err)
115+
assert.Equal(t, "unix", proto, "failed to parse unix://")
116+
assert.Equal(t, "/var/run/docker.sock", addr, "failed to parse unix://")
176117
}
177118

178119
func TestParseHostTCP(t *testing.T) {
179120
proto, addr, err := parseHost("tcp://127.0.0.1:4243")
180-
if err != nil {
181-
t.Fatalf("%s", err)
182-
}
183-
if proto != "tcp" || addr != "127.0.0.1:4243" {
184-
t.Fatal("failed to parse tcp://127.0.0.1:4243")
185-
}
121+
assert.NoError(t, err)
122+
assert.Equal(t, "tcp", proto, "failed to parse tcp://127.0.0.1:4243")
123+
assert.Equal(t, "127.0.0.1:4243", addr, "failed to parse tcp://127.0.0.1:4243")
186124
}
187125

188126
func TestParseHostTCPDefault(t *testing.T) {
189127
proto, addr, err := parseHost("tcp://:4243")
190-
if err != nil {
191-
t.Fatalf("%s", err)
192-
}
193-
if proto != "tcp" || addr != "127.0.0.1:4243" {
194-
t.Fatal("failed to parse unix:///var/run/docker.sock")
195-
}
128+
assert.NoError(t, err)
129+
assert.Equal(t, "tcp", proto, "failed to parse tcp://:4243")
130+
assert.Equal(t, "127.0.0.1:4243", addr, "failed to parse tcp://:4243")
196131
}

‎reflect_test.go

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package dockergen
22

3-
import "testing"
3+
import (
4+
"testing"
5+
6+
"github.com/stretchr/testify/assert"
7+
)
48

59
func TestDeepGetNoPath(t *testing.T) {
610
item := RuntimeContainer{}
@@ -21,27 +25,19 @@ func TestDeepGetSimple(t *testing.T) {
2125
ID: "expected",
2226
}
2327
value := deepGet(item, "ID")
24-
if _, ok := value.(string); !ok {
25-
t.Errorf("expected: %#v. got: %#v", "expected", value)
26-
}
28+
assert.IsType(t, "", value)
2729

28-
if value != "expected" {
29-
t.Errorf("expected: %s. got: %s", "expected", value)
30-
}
30+
assert.Equal(t, "expected", value)
3131
}
3232

3333
func TestDeepGetSimpleDotPrefix(t *testing.T) {
3434
item := RuntimeContainer{
3535
ID: "expected",
3636
}
3737
value := deepGet(item, "...ID")
38-
if _, ok := value.(string); !ok {
39-
t.Errorf("expected: %#v. got: %#v", "expected", value)
40-
}
38+
assert.IsType(t, "", value)
4139

42-
if value != "expected" {
43-
t.Errorf("expected: %s. got: %s", "expected", value)
44-
}
40+
assert.Equal(t, "expected", value)
4541
}
4642

4743
func TestDeepGetMap(t *testing.T) {
@@ -51,11 +47,7 @@ func TestDeepGetMap(t *testing.T) {
5147
},
5248
}
5349
value := deepGet(item, "Env.key")
54-
if _, ok := value.(string); !ok {
55-
t.Errorf("expected: %#v. got: %#v", "value", value)
56-
}
50+
assert.IsType(t, "", value)
5751

58-
if value != "value" {
59-
t.Errorf("expected: %s. got: %s", "value", value)
60-
}
52+
assert.Equal(t, "value", value)
6153
}

0 commit comments

Comments
 (0)