Actually move pkg/merge into pkg/apis/pipeline/v1alpha1/ to avoid cir…

…cular dependency

pkg/merge/merge_test.go → pkg/apis/pipeline/v1alpha1/merge_test.go

@@ -11,9 +11,16 @@
  limitations under the License.
 */
 
-package merge
+package v1alpha1
+
+import (
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+)
 
-/*
 func TestCombineStepsWithStepTemplate(t *testing.T) {
 	resourceQuantityCmp := cmp.Comparer(func(x, y resource.Quantity) bool {
 		return x.Cmp(y) == 0
@@ -22,42 +29,42 @@ func TestCombineStepsWithStepTemplate(t *testing.T) {
 	for _, tc := range []struct {
 		name     string
 		template *corev1.Container
-		steps    []corev1.Container
-		expected []corev1.Container
+		steps    []Step
+		expected []Step
 	}{{
 		name:     "nil-template",
 		template: nil,
-		steps: []corev1.Container{{
+		steps: []Step{{Container: corev1.Container{
 			Image: "some-image",
-		}},
-		expected: []corev1.Container{{
+		}}},
+		expected: []Step{{Container: corev1.Container{
 			Image: "some-image",
-		}},
+		}}},
 	}, {
 		name: "not-overlapping",
 		template: &corev1.Container{
 			Command: []string{"/somecmd"},
 		},
-		steps: []corev1.Container{{
+		steps: []Step{{Container: corev1.Container{
 			Image: "some-image",
-		}},
-		expected: []corev1.Container{{
+		}}},
+		expected: []Step{{Container: corev1.Container{
 			Command: []string{"/somecmd"},
 			Image:   "some-image",
-		}},
+		}}},
 	}, {
 		name: "overwriting-one-field",
 		template: &corev1.Container{
 			Image:   "some-image",
 			Command: []string{"/somecmd"},
 		},
-		steps: []corev1.Container{{
+		steps: []Step{{Container: corev1.Container{
 			Image: "some-other-image",
-		}},
-		expected: []corev1.Container{{
+		}}},
+		expected: []Step{{Container: corev1.Container{
 			Command: []string{"/somecmd"},
 			Image:   "some-other-image",
-		}},
+		}}},
 	}, {
 		name: "merge-and-overwrite-slice",
 		template: &corev1.Container{
@@ -71,7 +78,7 @@ func TestCombineStepsWithStepTemplate(t *testing.T) {
 				},
 			},
 		},
-		steps: []corev1.Container{{
+		steps: []Step{{Container: corev1.Container{
 			Env: []corev1.EnvVar{
 				{
 					Name:  "NEW_KEY",
@@ -81,8 +88,8 @@ func TestCombineStepsWithStepTemplate(t *testing.T) {
 					Value: "NEW_VALUE",
 				},
 			},
-		}},
-		expected: []corev1.Container{{
+		}}},
+		expected: []Step{{Container: corev1.Container{
 			Env: []corev1.EnvVar{
 				{
 					Name:  "NEW_KEY",
@@ -95,7 +102,7 @@ func TestCombineStepsWithStepTemplate(t *testing.T) {
 					Value: "NEW_VALUE",
 				},
 			},
-		}},
+		}}},
 	}} {
 		t.Run(tc.name, func(t *testing.T) {
 			result, err := CombineStepsWithStepTemplate(tc.template, tc.steps)
@@ -109,4 +116,3 @@ func TestCombineStepsWithStepTemplate(t *testing.T) {
 		})
 	}
 }
-*/