@@ -21,21 +21,46 @@ import (
2121)
2222
2323var diffArgNumTests = []testpair {
24- {[]string {}, false },
25- {[]string {"one" }, false },
26- {[]string {"one" , "two" }, true },
27- {[]string {"one" , "two" , "three" }, false },
24+ {[]string {}, true },
25+ {[]string {"one" }, true },
26+ {[]string {"one" , "two" }, false },
27+ {[]string {"one" , "two" , "three" }, true },
2828}
2929
3030func TestDiffArgNum (t * testing.T ) {
3131 for _ , test := range diffArgNumTests {
3232 err := checkDiffArgNum (test .input )
33- if (err == nil ) != test .expected_output {
34- if test .expected_output {
35- t .Errorf ("Got unexpected error: %s" , err )
36- } else {
37- t .Errorf ("Expected error but got none" )
38- }
33+ checkError (t , err , test .shouldError )
34+ }
35+ }
36+
37+ type imageDiff struct {
38+ image1 string
39+ image2 string
40+ shouldError bool
41+ }
42+
43+ var imageDiffs = []imageDiff {
44+ {"" , "" , true },
45+ {"gcr.io/google-appengine/python" , "gcr.io/google-appengine/debian9" , false },
46+ {"gcr.io/google-appengine/python" , "cats" , true },
47+ }
48+
49+ func TestDiffImages (t * testing.T ) {
50+ for _ , test := range imageDiffs {
51+ err := diffImages (test .image1 , test .image2 , []string {"apt" })
52+ checkError (t , err , test .shouldError )
53+ err = diffImages (test .image1 , test .image2 , []string {"metadata" })
54+ checkError (t , err , test .shouldError )
55+ }
56+ }
57+
58+ func checkError (t * testing.T , err error , shouldError bool ) {
59+ if (err == nil ) == shouldError {
60+ if shouldError {
61+ t .Errorf ("expected error but got none" )
62+ } else {
63+ t .Errorf ("got unexpected error: %s" , err )
3964 }
4065 }
4166}
0 commit comments