Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

return error in update apis if the particular element does not exist #83

Merged
merged 2 commits into from
May 4, 2021
Merged

return error in update apis if the particular element does not exist #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1adb1d5
return error in update apis if the particular element does not exist
yangcao77 Apr 30, 2021
06d6b01
address review comments
yangcao77 May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 18 additions & 24 deletions pkg/devfile/generator/generators_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down Expand Up @@ -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],
Expand Down Expand Up @@ -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],
Expand All @@ -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],
Expand Down Expand Up @@ -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)
}
}
}
})
Expand Down
Loading