Skip to content

Commit da3a674

Browse files
author
Dominik Przybyl
committed
test refactor
1 parent 30842ef commit da3a674

File tree

1 file changed

+24
-28
lines changed

1 file changed

+24
-28
lines changed

‎cmd/aem/instance_list_int_test.go

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,69 +9,65 @@ import (
99
"testing"
1010
)
1111

12-
func testInstanceList(t *testing.T, args []string, expectedResult bool, expectedIDs []string) {
12+
func testInstanceList(t *testing.T, args []string, expectedIDs []string) {
1313
cli := NewCLI()
1414
cmd := cli.cmd
1515
cmd.SetArgs(args)
1616

1717
defer func() {
18-
err := recover()
19-
actualResult := err != nil
20-
if actualResult != expectedResult {
21-
t.Errorf("InstanceList(%v) = %v; want %v", args, actualResult, expectedResult)
22-
} else if actualResult && expectedResult {
23-
actualIDs := []string{}
18+
actualIDs := []string{}
19+
if recover() != nil {
2420
instances := cli.outputResponse.Data["instances"].([]pkg.Instance)
2521
for _, i := range instances {
2622
actualIDs = append(actualIDs, i.ID())
2723
}
28-
sort.SliceStable(actualIDs, func(i, j int) bool {
29-
return strings.Compare(actualIDs[i], actualIDs[j]) < 0
30-
})
31-
sort.SliceStable(expectedIDs, func(i, j int) bool {
32-
return strings.Compare(expectedIDs[i], expectedIDs[j]) < 0
33-
})
34-
result := len(actualIDs) == len(expectedIDs)
35-
for i := range actualIDs {
36-
result = result && actualIDs[i] == expectedIDs[i]
37-
}
38-
if !result {
39-
t.Errorf("InstanceList(%v) = %v; want %v", args, actualIDs, expectedIDs)
40-
}
24+
}
25+
sort.SliceStable(actualIDs, func(i, j int) bool {
26+
return strings.Compare(actualIDs[i], actualIDs[j]) < 0
27+
})
28+
sort.SliceStable(expectedIDs, func(i, j int) bool {
29+
return strings.Compare(expectedIDs[i], expectedIDs[j]) < 0
30+
})
31+
result := len(actualIDs) == len(expectedIDs)
32+
for i := range actualIDs {
33+
result = result && actualIDs[i] == expectedIDs[i]
34+
}
35+
if !result {
36+
t.Errorf("InstanceList(%v) = %v; want %v", args, actualIDs, expectedIDs)
4137
}
4238
}()
4339

4440
_ = cmd.Execute()
4541
}
4642

4743
func TestAllInstances(t *testing.T) {
48-
testInstanceList(t, []string{"instance", "list", "--output-value", "NONE"}, true, []string{"local_author", "local_publish"})
44+
testInstanceList(t, []string{"instance", "list", "--output-value", "NONE"}, []string{"local_author", "local_publish"})
4945
}
5046

5147
func TestAuthorInstances(t *testing.T) {
52-
testInstanceList(t, []string{"instance", "list", "-A", "--output-value", "NONE"}, true, []string{"local_author"})
48+
testInstanceList(t, []string{"instance", "list", "-A", "--output-value", "NONE"}, []string{"local_author"})
5349
}
5450

5551
func TestPublishInstances(t *testing.T) {
56-
testInstanceList(t, []string{"instance", "list", "-P", "--output-value", "NONE"}, true, []string{"local_publish"})
52+
testInstanceList(t, []string{"instance", "list", "-P", "--output-value", "NONE"}, []string{"local_publish"})
5753
}
5854

5955
func TestInstanceByID(t *testing.T) {
60-
testInstanceList(t, []string{"instance", "list", "-I", "local_author", "--output-value", "NONE"}, true, []string{"local_author"})
56+
testInstanceList(t, []string{"instance", "list", "-I", "local_author", "--output-value", "NONE"}, []string{"local_author"})
6157
}
6258

6359
func TestInstanceByURL(t *testing.T) {
64-
testInstanceList(t, []string{"instance", "list", "-U", "http://admin:admin@127.0.0.1:4502", "-U", "http://admin:admin@127.0.0.1:4503", "-U", "test_author=http://admin:admin@127.0.0.1:4502", "--output-value", "NONE"}, true, []string{"remote_adhoc_1", "remote_adhoc_2", "test_author"})
60+
testInstanceList(t, []string{"instance", "list", "-U", "http://admin:admin@127.0.0.1:4502", "-U", "http://admin:admin@127.0.0.1:4503", "-U", "test_author=http://admin:admin@127.0.0.1:4502", "--output-value", "NONE"}, []string{"remote_adhoc_1", "remote_adhoc_2", "test_author"})
6561
}
6662

6763
func TestInstanceByIDOrURL(t *testing.T) {
68-
testInstanceList(t, []string{"instance", "list", "-I", "local_publish", "-U", "http://admin:admin@127.0.0.1:4502", "--output-value", "NONE"}, true, []string{"local_publish", "remote_adhoc"})
64+
testInstanceList(t, []string{"instance", "list", "-I", "local_publish", "-U", "http://admin:admin@127.0.0.1:4502", "--output-value", "NONE"}, []string{"local_publish", "remote_adhoc"})
6965
}
7066

7167
func TestAuthorInstanceByURL(t *testing.T) {
72-
testInstanceList(t, []string{"instance", "list", "-U", "dev-auth_author=http://admin:admin@127.0.0.1:4502", "-U", "dev-pub1_publish=http://admin:admin@127.0.0.1:4503", "-U", "dev-pub2_publish=http://admin:admin@127.0.0.1:4504", "-A", "--output-value", "NONE"}, true, []string{"dev-auth_author"})
68+
testInstanceList(t, []string{"instance", "list", "-U", "dev-auth_author=http://admin:admin@127.0.0.1:4502", "-U", "dev-pub1_publish=http://admin:admin@127.0.0.1:4503", "-U", "dev-pub2_publish=http://admin:admin@127.0.0.1:4504", "-A", "--output-value", "NONE"}, []string{"dev-auth_author"})
7369
}
7470

7571
func TestPublishInstanceByURL(t *testing.T) {
76-
testInstanceList(t, []string{"instance", "list", "-U", "dev-auth_author=http://admin:admin@127.0.0.1:4502", "-U", "dev-pub1_publish=http://admin:admin@127.0.0.1:4503", "-U", "dev-pub2_publish=http://admin:admin@127.0.0.1:4504", "-P", "--output-value", "NONE"}, true, []string{"dev-pub1_publish", "dev-pub2_publish"})
72+
testInstanceList(t, []string{"instance", "list", "-U", "dev-auth_author=http://admin:admin@127.0.0.1:4502", "-U", "dev-pub1_publish=http://admin:admin@127.0.0.1:4503", "-U", "dev-pub2_publish=http://admin:admin@127.0.0.1:4504", "-P", "--output-value", "NONE"}, []string{"dev-pub1_publish", "dev-pub2_publish"})
7773
}

0 commit comments

Comments
 (0)