Update merging and overriding tests

Signed-off-by: Maysun J Faisal <maysunaneek@gmail.com>
devfile · Apr 19, 2021 · 2e7a57f · 2e7a57f
1 parent 4c6cc6e
commit 2e7a57f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 54 deletions.
diff --git a/pkg/utils/overriding/merging_test.go b/pkg/utils/overriding/merging_test.go
@@ -8,11 +8,9 @@ import (
 
 	dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/stretchr/testify/assert"
-	yamlMachinery "k8s.io/apimachinery/pkg/util/yaml"
-	"sigs.k8s.io/yaml"
 )
 
-func mergingPatchTest(main, parent, expected []byte, expectedError string, plugins ...[]byte) func(t *testing.T) {
+func mergingPatchTest(main, parent []byte, expectedTemplate dw.DevWorkspaceTemplateSpecContent, expectedError string, plugins ...[]byte) func(t *testing.T) {
 	return func(t *testing.T) {
 		result, err := MergeDevWorkspaceTemplateSpecBytes(main, parent, plugins...)
 		if err != nil {
@@ -24,21 +22,7 @@ func mergingPatchTest(main, parent, expected []byte, expectedError string, plugi
 			return
 		}
 
-		resultYaml, err := yaml.Marshal(result)
-		if err != nil {
-			t.Error(err)
-		}
-
-		expectedJson, err := yamlMachinery.ToJSON(expected)
-		if err != nil {
-			t.Error(err)
-		}
-		expectedYaml, err := yaml.JSONToYAML(expectedJson)
-		if err != nil {
-			t.Error(err)
-		}
-
-		assert.Equal(t, string(expectedYaml), string(resultYaml), "The two values should be the same.")
+		assert.Equal(t, &expectedTemplate, result, "The two values should be the same")
 	}
 }
 
@@ -75,7 +59,7 @@ func TestMerging(t *testing.T) {
 				}
 				plugins = append(plugins, plugin)
 			}
-			result := []byte{}
+			var resultTemplate dw.DevWorkspaceTemplateSpecContent
 			resultError := ""
 			errorFile := filepath.Join(dirPath, "result-error.txt")
 			if _, err = os.Stat(errorFile); err == nil {
@@ -86,15 +70,11 @@ func TestMerging(t *testing.T) {
 				}
 				resultError = string(resultErrorBytes)
 			} else {
-				result, err = ioutil.ReadFile(filepath.Join(dirPath, "result.yaml"))
-				if err != nil {
-					t.Error(err)
-					return nil
-				}
+				readFileToStruct(t, filepath.Join(dirPath, "result.yaml"), &resultTemplate)
 			}
 			testName := filepath.Base(dirPath)
 
-			t.Run(testName, mergingPatchTest(main, parent, result, resultError, plugins...))
+			t.Run(testName, mergingPatchTest(main, parent, resultTemplate, resultError, plugins...))
 		}
 		return nil
 	})

diff --git a/pkg/utils/overriding/overriding_test.go b/pkg/utils/overriding/overriding_test.go
@@ -10,8 +10,6 @@ import (
 	dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	attributesPkg "github.com/devfile/api/v2/pkg/attributes"
 	"github.com/stretchr/testify/assert"
-	"k8s.io/apimachinery/pkg/util/json"
-	yamlMachinery "k8s.io/apimachinery/pkg/util/yaml"
 	"sigs.k8s.io/yaml"
 )
 
@@ -163,7 +161,7 @@ func TestBasicToplevelOverriding(t *testing.T) {
 	assert.Equal(t, expected, result, "The two values should be the same.")
 }
 
-func overridingPatchTest(original, patch, expected []byte, expectedError string) func(t *testing.T) {
+func overridingPatchTest(original, patch []byte, expectedTemplate dw.DevWorkspaceTemplateSpecContent, expectedError string) func(t *testing.T) {
 	return func(t *testing.T) {
 		result, err := OverrideDevWorkspaceTemplateSpecBytes(original, patch)
 		if err != nil {
@@ -175,25 +173,7 @@ func overridingPatchTest(original, patch, expected []byte, expectedError string)
 			return
 		}
 
-		resultJson, err := json.Marshal(result)
-		if err != nil {
-			t.Error(err)
-		}
-		resultYaml, err := yaml.JSONToYAML(resultJson)
-		if err != nil {
-			t.Error(err)
-		}
-
-		expectedJson, err := yamlMachinery.ToJSON(expected)
-		if err != nil {
-			t.Error(err)
-		}
-		expectedYaml, err := yaml.JSONToYAML(expectedJson)
-		if err != nil {
-			t.Error(err)
-		}
-
-		assert.Equal(t, string(expectedYaml), string(resultYaml), "The two values should be the same.")
+		assert.Equal(t, &expectedTemplate, result, "The two values should be the same")
 	}
 }
 
@@ -215,7 +195,7 @@ func TestOverridingPatches(t *testing.T) {
 				t.Error(err)
 				return nil
 			}
-			result := []byte{}
+			var resultTemplate dw.DevWorkspaceTemplateSpecContent
 			resultError := ""
 			errorFile := filepath.Join(dirPath, "result-error.txt")
 			if _, err = os.Stat(errorFile); err == nil {
@@ -226,15 +206,11 @@ func TestOverridingPatches(t *testing.T) {
 				}
 				resultError = string(resultErrorBytes)
 			} else {
-				result, err = ioutil.ReadFile(filepath.Join(dirPath, "result.yaml"))
-				if err != nil {
-					t.Error(err)
-					return nil
-				}
+				readFileToStruct(t, filepath.Join(dirPath, "result.yaml"), &resultTemplate)
 			}
 			testName := filepath.Base(dirPath)
 
-			t.Run(testName, overridingPatchTest(original, patch, result, resultError))
+			t.Run(testName, overridingPatchTest(original, patch, resultTemplate, resultError))
 		}
 		return nil
 	})