Add tests for merging TemplateSpecs with nil parent or plugin

These tests are expected to fail due to devfile#295

Signed-off-by: Angel Misevski <[email protected]>

Author: amisevsk

pkg/utils/overriding/overriding_test.go

@@ -323,6 +323,45 @@ func TestPluginOverrides(t *testing.T) {
 	}
 }
 
+func TestMergingOnlyPlugins(t *testing.T) {
+	baseFile := "test-fixtures/merges/no-parent/main.yaml"
+	pluginFile := "test-fixtures/merges/no-parent/plugin.yaml"
+	resultFile := "test-fixtures/merges/no-parent/result.yaml"
+
+	baseDWT := workspaces.DevWorkspaceTemplateSpecContent{}
+	pluginDWT := workspaces.DevWorkspaceTemplateSpecContent{}
+	expectedDWT := workspaces.DevWorkspaceTemplateSpecContent{}
+
+	readFileToStruct(t, baseFile, &baseDWT)
+	readFileToStruct(t, pluginFile, &pluginDWT)
+	readFileToStruct(t, resultFile, &expectedDWT)
+
+	gotDWT, err := MergeDevWorkspaceTemplateSpec(&baseDWT, nil, &pluginDWT)
+	if assert.NoError(t, err) {
+		assert.Equal(t, &expectedDWT, gotDWT)
+	}
+}
+
+func TestMergingOnlyParent(t *testing.T) {
+	// Reuse only plugin case since it's compatible
+	baseFile := "test-fixtures/merges/no-parent/main.yaml"
+	parentFile := "test-fixtures/merges/no-parent/plugin.yaml"
+	resultFile := "test-fixtures/merges/no-parent/result.yaml"
+
+	baseDWT := workspaces.DevWorkspaceTemplateSpecContent{}
+	parentDWT := workspaces.DevWorkspaceTemplateSpecContent{}
+	expectedDWT := workspaces.DevWorkspaceTemplateSpecContent{}
+
+	readFileToStruct(t, baseFile, &baseDWT)
+	readFileToStruct(t, parentFile, &parentDWT)
+	readFileToStruct(t, resultFile, &expectedDWT)
+
+	gotDWT, err := MergeDevWorkspaceTemplateSpec(&baseDWT, &parentDWT)
+	if assert.NoError(t, err) {
+		assert.Equal(t, &expectedDWT, gotDWT)
+	}
+}
+
 func readFileToStruct(t *testing.T, path string, into interface{}) {
 	bytes, err := ioutil.ReadFile(path)
 	if err != nil {

pkg/utils/overriding/test-fixtures/merges/no-parent/main.yaml

@@ -0,0 +1,4 @@
+components:
+  - name: test-component
+    container:
+      image: test-image

pkg/utils/overriding/test-fixtures/merges/no-parent/plugin.yaml

@@ -0,0 +1,4 @@
+components:
+  - name: test-plugin-component
+    container:
+      image: test-plugin-image

pkg/utils/overriding/test-fixtures/merges/no-parent/result.yaml

@@ -0,0 +1,7 @@
+components:
+  - name: test-plugin-component
+    container:
+      image: test-plugin-image
+  - name: test-component
+    container:
+      image: test-image