Unit test improvements

Author: ironcladlou

pkg/deploy/controller/imagechange/controller_test.go

@@ -108,10 +108,10 @@ func TestHandle_changeForUnregisteredTag(t *testing.T) {
 	}
 }
 
-// TestHande_matchScenarios comprehensively tests trigger definitions against
+// TestHandle_matchScenarios comprehensively tests trigger definitions against
 // image repo updates to ensure that the image change triggers match (or don't
 // match) properly.
-func TestHande_matchScenarios(t *testing.T) {
+func TestHandle_matchScenarios(t *testing.T) {
 	params := map[string]*deployapi.DeploymentTriggerImageChangeParams{
 		"params.1": {
 			Automatic:      true,
@@ -133,13 +133,13 @@ func TestHande_matchScenarios(t *testing.T) {
 		},
 	}
 
-	tagHistoryFor := func(repo, tag, value string) map[string]imageapi.TagEventList {
+	tagHistoryFor := func(repo, tag, dir, image string) map[string]imageapi.TagEventList {
 		return map[string]imageapi.TagEventList{
 			tag: {
 				Items: []imageapi.TagEvent{
 					{
-						DockerImageReference: fmt.Sprintf("%s:%s", repo, value),
-						Image:                value,
+						DockerImageReference: fmt.Sprintf("%s:%s", repo, dir),
+						Image:                image,
 					},
 				},
 			},
@@ -151,30 +151,37 @@ func TestHande_matchScenarios(t *testing.T) {
 			ObjectMeta: kapi.ObjectMeta{Name: "repoA", Namespace: kapi.NamespaceDefault},
 			Status: imageapi.ImageRepositoryStatus{
 				DockerImageRepository: "registry:8080/openshift/test-image",
-				Tags: tagHistoryFor("registry:8080/openshift/test-image", "test-tag", "ref-2"),
+				Tags: tagHistoryFor("registry:8080/openshift/test-image", "test-tag", "ref-2", "ref-2"),
 			},
 			Tags: map[string]string{"test-tag": "ref-2"},
 		},
 		"repo.2": {
 			ObjectMeta: kapi.ObjectMeta{Name: "repoB", Namespace: kapi.NamespaceDefault},
 			Status: imageapi.ImageRepositoryStatus{
 				DockerImageRepository: "registry:8080/openshift/test-image",
-				Tags: tagHistoryFor("registry:8080/openshift/test-image", "test-tag", "ref-3"),
+				Tags: tagHistoryFor("registry:8080/openshift/test-image", "test-tag", "ref-3", "ref-3"),
 			},
 			Tags: map[string]string{"test-tag": "ref-3"},
 		},
 		"repo.3": {
 			ObjectMeta: kapi.ObjectMeta{Name: "repoC", Namespace: kapi.NamespaceDefault},
 			Status: imageapi.ImageRepositoryStatus{
 				DockerImageRepository: "registry:8080/openshift/test-image-B",
-				Tags: tagHistoryFor("registry:8080/openshift/test-image-B", "test-tag", "ref-2"),
+				Tags: tagHistoryFor("registry:8080/openshift/test-image-B", "test-tag", "ref-2", "ref-2"),
 			},
 			Tags: map[string]string{"test-tag": "ref-2"},
 		},
 		"repo.4": {
 			ObjectMeta: kapi.ObjectMeta{Name: "repoA", Namespace: kapi.NamespaceDefault},
 			Status: imageapi.ImageRepositoryStatus{
-				Tags: tagHistoryFor("default/repoA", "test-tag", "ref-2"),
+				Tags: tagHistoryFor("default/repoA", "test-tag", "ref-2", "ref-2"),
+			},
+			Tags: map[string]string{"test-tag": "ref-2"},
+		},
+		"repo.5": {
+			ObjectMeta: kapi.ObjectMeta{Name: "repoA", Namespace: kapi.NamespaceDefault},
+			Status: imageapi.ImageRepositoryStatus{
+				Tags: tagHistoryFor("default/repoA", "test-tag", "ref-2", ""),
 			},
 			Tags: map[string]string{"test-tag": "ref-2"},
 		},