Skip to content

Commit

Permalink
Update dw merging tests for main branch dw rename
Browse files Browse the repository at this point in the history 
Signed-off-by: Maysun J Faisal <maysunaneek@gmail.com>
  • Loading branch information
@maysunfaisal
maysunfaisal committed Apr 7, 2021
1 parent 4e12491 commit e1621ce
Showing 1 changed file with 65 additions and 65 deletions.
130 changes: 65 additions & 65 deletions pkg/utils/overriding/merging_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"
"testing"

workspaces "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
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"
Expand All @@ -18,135 +18,135 @@ func TestBasicMerging(t *testing.T) {

tests := []struct {
name string
mainContent *workspaces.DevWorkspaceTemplateSpecContent
parentFlattenedContent *workspaces.DevWorkspaceTemplateSpecContent
pluginFlattenedContents []*workspaces.DevWorkspaceTemplateSpecContent
expected *workspaces.DevWorkspaceTemplateSpecContent
mainContent *dw.DevWorkspaceTemplateSpecContent
parentFlattenedContent *dw.DevWorkspaceTemplateSpecContent
pluginFlattenedContents []*dw.DevWorkspaceTemplateSpecContent
expected *dw.DevWorkspaceTemplateSpecContent
wantErr *string
}{
{
name: "Basic Merging",
mainContent: &workspaces.DevWorkspaceTemplateSpecContent{
mainContent: &dw.DevWorkspaceTemplateSpecContent{
Variables: map[string]string{
"version1": "main",
},
Attributes: attributesPkg.Attributes{}.FromMap(map[string]interface{}{
"main": true,
}, nil),
Commands: []workspaces.Command{
Commands: []dw.Command{
{
Id: "mainCommand",
CommandUnion: workspaces.CommandUnion{
Exec: &workspaces.ExecCommand{
CommandUnion: dw.CommandUnion{
Exec: &dw.ExecCommand{
WorkingDir: "dir",
},
},
},
},
Components: []workspaces.Component{
Components: []dw.Component{
{
Name: "mainComponent",
ComponentUnion: workspaces.ComponentUnion{
Container: &workspaces.ContainerComponent{
Container: workspaces.Container{
ComponentUnion: dw.ComponentUnion{
Container: &dw.ContainerComponent{
Container: dw.Container{
Image: "image",
},
},
},
},
{
Name: "mainPluginComponent",
ComponentUnion: workspaces.ComponentUnion{
Plugin: &workspaces.PluginComponent{
ImportReference: workspaces.ImportReference{
ImportReferenceUnion: workspaces.ImportReferenceUnion{
ComponentUnion: dw.ComponentUnion{
Plugin: &dw.PluginComponent{
ImportReference: dw.ImportReference{
ImportReferenceUnion: dw.ImportReferenceUnion{
Uri: "uri",
},
},
},
},
},
},
Events: &workspaces.Events{
WorkspaceEvents: workspaces.WorkspaceEvents{
Events: &dw.Events{
DevWorkspaceEvents: dw.DevWorkspaceEvents{
PostStop: []string{"post-stop-main"},
},
},
},
pluginFlattenedContents: []*workspaces.DevWorkspaceTemplateSpecContent{
pluginFlattenedContents: []*dw.DevWorkspaceTemplateSpecContent{
{
Variables: map[string]string{
"version2": "plugin",
},
Attributes: attributesPkg.Attributes{}.FromMap(map[string]interface{}{
"plugin": true,
}, nil),
Commands: []workspaces.Command{
Commands: []dw.Command{
{
Id: "pluginCommand",
CommandUnion: workspaces.CommandUnion{
Exec: &workspaces.ExecCommand{
CommandUnion: dw.CommandUnion{
Exec: &dw.ExecCommand{
WorkingDir: "dir",
},
},
},
},
Components: []workspaces.Component{
Components: []dw.Component{
{
Name: "pluginComponent",
ComponentUnion: workspaces.ComponentUnion{
Container: &workspaces.ContainerComponent{
Container: workspaces.Container{
ComponentUnion: dw.ComponentUnion{
Container: &dw.ContainerComponent{
Container: dw.Container{
Image: "image",
},
},
},
},
},
Events: &workspaces.Events{
WorkspaceEvents: workspaces.WorkspaceEvents{
Events: &dw.Events{
DevWorkspaceEvents: dw.DevWorkspaceEvents{
PostStop: []string{"post-stop-plugin"},
},
},
},
},
parentFlattenedContent: &workspaces.DevWorkspaceTemplateSpecContent{
parentFlattenedContent: &dw.DevWorkspaceTemplateSpecContent{
Variables: map[string]string{
"version3": "parent",
},
Attributes: attributesPkg.Attributes{}.FromMap(map[string]interface{}{
"parent": true,
}, nil),
Commands: []workspaces.Command{
Commands: []dw.Command{
{
Id: "parentCommand",
CommandUnion: workspaces.CommandUnion{
Exec: &workspaces.ExecCommand{
CommandUnion: dw.CommandUnion{
Exec: &dw.ExecCommand{
WorkingDir: "dir",
},
},
},
},
Components: []workspaces.Component{
Components: []dw.Component{
{
Name: "parentComponent",
ComponentUnion: workspaces.ComponentUnion{
Container: &workspaces.ContainerComponent{
Container: workspaces.Container{
ComponentUnion: dw.ComponentUnion{
Container: &dw.ContainerComponent{
Container: dw.Container{
Image: "image",
},
},
},
},
},
Events: &workspaces.Events{
WorkspaceEvents: workspaces.WorkspaceEvents{
Events: &dw.Events{
DevWorkspaceEvents: dw.DevWorkspaceEvents{
PostStop: []string{"post-stop-parent"},
PostStart: []string{"post-start-parent"},
},
},
},
expected: &workspaces.DevWorkspaceTemplateSpecContent{
expected: &dw.DevWorkspaceTemplateSpecContent{
Variables: map[string]string{
"version3": "parent",
"version2": "plugin",
Expand All @@ -157,66 +157,66 @@ func TestBasicMerging(t *testing.T) {
"plugin": true,
"main": true,
}, nil),
Commands: []workspaces.Command{
Commands: []dw.Command{
{
Id: "parentCommand",
CommandUnion: workspaces.CommandUnion{
Exec: &workspaces.ExecCommand{
CommandUnion: dw.CommandUnion{
Exec: &dw.ExecCommand{
WorkingDir: "dir",
},
},
},
{
Id: "pluginCommand",
CommandUnion: workspaces.CommandUnion{
Exec: &workspaces.ExecCommand{
CommandUnion: dw.CommandUnion{
Exec: &dw.ExecCommand{
WorkingDir: "dir",
},
},
},
{
Id: "mainCommand",
CommandUnion: workspaces.CommandUnion{
Exec: &workspaces.ExecCommand{
CommandUnion: dw.CommandUnion{
Exec: &dw.ExecCommand{
WorkingDir: "dir",
},
},
},
},
Components: []workspaces.Component{
Components: []dw.Component{
{
Name: "parentComponent",
ComponentUnion: workspaces.ComponentUnion{
Container: &workspaces.ContainerComponent{
Container: workspaces.Container{
ComponentUnion: dw.ComponentUnion{
Container: &dw.ContainerComponent{
Container: dw.Container{
Image: "image",
},
},
},
},
{
Name: "pluginComponent",
ComponentUnion: workspaces.ComponentUnion{
Container: &workspaces.ContainerComponent{
Container: workspaces.Container{
ComponentUnion: dw.ComponentUnion{
Container: &dw.ContainerComponent{
Container: dw.Container{
Image: "image",
},
},
},
},
{
Name: "mainComponent",
ComponentUnion: workspaces.ComponentUnion{
Container: &workspaces.ContainerComponent{
Container: workspaces.Container{
ComponentUnion: dw.ComponentUnion{
Container: &dw.ContainerComponent{
Container: dw.Container{
Image: "image",
},
},
},
},
},
Events: &workspaces.Events{
WorkspaceEvents: workspaces.WorkspaceEvents{
Events: &dw.Events{
DevWorkspaceEvents: dw.DevWorkspaceEvents{
PreStart: []string{},
PostStart: []string{"post-start-parent"},
PreStop: []string{},
Expand Down Expand Up @@ -337,9 +337,9 @@ func TestMergingOnlyPlugins(t *testing.T) {
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{}
baseDWT := dw.DevWorkspaceTemplateSpecContent{}
pluginDWT := dw.DevWorkspaceTemplateSpecContent{}
expectedDWT := dw.DevWorkspaceTemplateSpecContent{}

readFileToStruct(t, baseFile, &baseDWT)
readFileToStruct(t, pluginFile, &pluginDWT)
Expand All @@ -357,9 +357,9 @@ func TestMergingOnlyParent(t *testing.T) {
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{}
baseDWT := dw.DevWorkspaceTemplateSpecContent{}
parentDWT := dw.DevWorkspaceTemplateSpecContent{}
expectedDWT := dw.DevWorkspaceTemplateSpecContent{}

readFileToStruct(t, baseFile, &baseDWT)
readFileToStruct(t, parentFile, &parentDWT)
Expand Down

0 comments on commit e1621ce

Please sign in to comment.