Skip to content
This repository has been archived by the owner on Sep 22, 2020. It is now read-only.

pass slice of key/value pairs instead of strings in bootstrap_test #13

Merged
merged 1 commit into from
Feb 24, 2020
Merged

pass slice of key/value pairs instead of strings in bootstrap_test #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 22 additions & 10 deletions pkg/odo/cli/pipelines/bootstrap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ import (
"github.com/spf13/cobra"
)

type keyValuePair struct {
key string
value string
}

func TestCompleteBootstrapOptions(t *testing.T) {
completeTests := []struct {
name string
Expand Down Expand Up @@ -61,28 +66,28 @@ func TestValidateBootstrapOptions(t *testing.T) {
}
func TestBootstrapCommandWithMissingParams(t *testing.T) {
cmdTests := []struct {
args []string
flags []keyValuePair
wantErr string
}{
{[]string{"quay-username", "example", "github-token", "abc123", "dockerconfigjson", "~/"}, `Required flag(s) "git-repository" have/has not been set`},
{[]string{"quay-username", "example", "github-token", "abc123", "git-repository", "example/repo"}, `Required flag(s) "dockerconfigjson" have/has not been set`},
{[]string{"quay-username", "example", "dockerconfigjson", "~/", "git-repository", "example/repo"}, `Required flag(s) "github-token" have/has not been set`},
{[]string{"github-token", "abc123", "dockerconfigjson", "~/", "git-repository", "example/repo"}, `Required flag(s) "quay-username" have/has not been set`},
{[]keyValuePair{flag("quay-username", "example"), flag("github-token", "abc123"), flag("dockerconfigjson", "~/")}, `Required flag(s) "git-repository" have/has not been set`},
{[]keyValuePair{flag("quay-username", "example"), flag("github-token", "abc123"), flag("git-repository", "example/repo")}, `Required flag(s) "dockerconfigjson" have/has not been set`},
{[]keyValuePair{flag("quay-username", "example"), flag("dockerconfigjson", "~/"), flag("git-repository", "example/repo")}, `Required flag(s) "github-token" have/has not been set`},
{[]keyValuePair{flag("github-token", "abc123"), flag("dockerconfigjson", "~/"), flag("git-repository", "example/repo")}, `Required flag(s) "quay-username" have/has not been set`},
}
for _, tt := range cmdTests {
_, _, err := executeCommand(NewCmdBootstrap("bootstrap", "odo pipelines bootstrap"), tt.args...)
_, _, err := executeCommand(NewCmdBootstrap("bootstrap", "odo pipelines bootstrap"), tt.flags...)
if err.Error() != tt.wantErr {
t.Errorf("got %s, want %s", err, tt.wantErr)
}
}
}

func executeCommand(cmd *cobra.Command, args ...string) (c *cobra.Command, output string, err error) {
func executeCommand(cmd *cobra.Command, flags ...keyValuePair) (c *cobra.Command, output string, err error) {
buf := new(bytes.Buffer)
cmd.SetOutput(buf)
cmd.Flags().Set(args[0], args[1])
cmd.Flags().Set(args[2], args[3])
cmd.Flags().Set(args[4], args[5])
for _, flag := range flags {
cmd.Flags().Set(flag.key, flag.value)
}
c, err = cmd.ExecuteC()
return c, buf.String(), err
}
Expand All @@ -101,3 +106,10 @@ func matchError(t *testing.T, s string, e error) bool {
}
return match
}

func flag(k, v string) keyValuePair {
return keyValuePair{
key: k,
value: v,
}
}