Merge pull request #83 from yangcao77/448-update-apis-return-error-if…

…-absent return error in update apis if the particular element does not exist
devfile · May 4, 2021 · f3024dd · f3024dd
2 parents c8a6bbf + 06d6b01
commit f3024dd
Show file tree

Hide file tree

Showing 17 changed files with 323 additions and 366 deletions.
diff --git a/pkg/devfile/generator/generators_test.go b/pkg/devfile/generator/generators_test.go
@@ -52,7 +52,7 @@ func TestGetContainers(t *testing.T) {
 		wantErr               bool
 	}{
 		{
-			name: "Case 1: Container with default project root",
+			name: "Container with default project root",
 			containerComponents: []v1.Component{
 				{
 					Name: containerNames[0],
@@ -87,7 +87,7 @@ func TestGetContainers(t *testing.T) {
 			},
 		},
 		{
-			name: "Case 2: Container with source mapping",
+			name: "Container with source mapping",
 			containerComponents: []v1.Component{
 				{
 					Name: containerNames[0],
@@ -123,7 +123,7 @@ func TestGetContainers(t *testing.T) {
 			},
 		},
 		{
-			name: "Case 3: Container with no mount source",
+			name: "Container with no mount source",
 			containerComponents: []v1.Component{
 				{
 					Name: containerNames[0],
@@ -141,7 +141,7 @@ func TestGetContainers(t *testing.T) {
 			wantContainerImage: containerImages[0],
 		},
 		{
-			name: "Case 4: Filter containers",
+			name: "Filter containers",
 			containerComponents: []v1.Component{
 				{
 					Name: containerNames[0],
@@ -201,26 +201,20 @@ func TestGetContainers(t *testing.T) {
 			// Unexpected error
 			if (err != nil) != tt.wantErr {
 				t.Errorf("TestGetContainers() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-
-			// Expected error and got an err
-			if tt.wantErr && err != nil {
-				return
-			}
-
-			for _, container := range containers {
-				if container.Name != tt.wantContainerName {
-					t.Errorf("TestGetContainers error: Name mismatch - got: %s, wanted: %s", container.Name, tt.wantContainerName)
-				}
-				if container.Image != tt.wantContainerImage {
-					t.Errorf("TestGetContainers error: Image mismatch - got: %s, wanted: %s", container.Image, tt.wantContainerImage)
-				}
-				if len(container.Env) > 0 && !reflect.DeepEqual(container.Env, tt.wantContainerEnv) {
-					t.Errorf("TestGetContainers error: Env mismatch - got: %+v, wanted: %+v", container.Env, tt.wantContainerEnv)
-				}
-				if len(container.VolumeMounts) > 0 && !reflect.DeepEqual(container.VolumeMounts, tt.wantContainerVolMount) {
-					t.Errorf("TestGetContainers error: Vol Mount mismatch - got: %+v, wanted: %+v", container.VolumeMounts, tt.wantContainerVolMount)
+			} else if err == nil {
+				for _, container := range containers {
+					if container.Name != tt.wantContainerName {
+						t.Errorf("TestGetContainers error: Name mismatch - got: %s, wanted: %s", container.Name, tt.wantContainerName)
+					}
+					if container.Image != tt.wantContainerImage {
+						t.Errorf("TestGetContainers error: Image mismatch - got: %s, wanted: %s", container.Image, tt.wantContainerImage)
+					}
+					if len(container.Env) > 0 && !reflect.DeepEqual(container.Env, tt.wantContainerEnv) {
+						t.Errorf("TestGetContainers error: Env mismatch - got: %+v, wanted: %+v", container.Env, tt.wantContainerEnv)
+					}
+					if len(container.VolumeMounts) > 0 && !reflect.DeepEqual(container.VolumeMounts, tt.wantContainerVolMount) {
+						t.Errorf("TestGetContainers error: Vol Mount mismatch - got: %+v, wanted: %+v", container.VolumeMounts, tt.wantContainerVolMount)
+					}
 				}
 			}
 		})