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.

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

test(client): wrap cmd.SetArgs to fix bugs for cmd.SetArgs #18960

Merged
merged 24 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
fa6ff57
refactor: wrap cmd.SetArgs to fix bugs for cmd.SetArgs
levisyin Jan 6, 2024
4ddd859
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 6, 2024
4914c8c
make ci lint happy
levisyin Jan 6, 2024
9e33798
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 7, 2024
1c93feb
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 8, 2024
7d462b8
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 8, 2024
7875553
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 10, 2024
21cb771
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 11, 2024
5668e4c
Merge branch 'main' into feat/wrap-cmd-setargs
facundomedica Jan 12, 2024
62c6f60
refactor: rename to ResetArgs
levisyin Jan 12, 2024
a392ecb
refactor: ResetArgs should only do the resetting/clearing
levisyin Jan 12, 2024
b1d8255
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 13, 2024
68b709e
update cmd.go
levisyin Jan 16, 2024
01404ae
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 20, 2024
34c11f3
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 23, 2024
bea81d1
Update internal/testutil/cmd.go
levisyin Jan 23, 2024
c02a2b9
Update internal/testutil/cmd.go
levisyin Jan 23, 2024
ec7fc1d
Update internal/testutil/cmd.go
levisyin Jan 23, 2024
79e8515
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 23, 2024
ae114e5
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 23, 2024
d8b3f19
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 24, 2024
41ecd66
fix: ci lint
levisyin Jan 24, 2024
151c6bd
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 24, 2024
703b423
Merge branch 'main' into feat/wrap-cmd-setargs
levisyin Jan 25, 2024
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
50 changes: 50 additions & 0 deletions internal/testutil/cmd.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package testutil

import (
"fmt"
"strings"

"github.com/spf13/cobra"
"github.com/spf13/pflag"
)

// SetArgs sets arguments for the command. It is desired to replace the cmd.SetArgs in all test cases, as cmd.SetArgs doesn't reset the flag value as expected.
//
// **Warning**: this is only compatible with following flag types:
// 1. the implementations of pflag.Value
// 2. the built-in implementations of pflag.SliceValue
// 3. the custom implementations of pflag.SliceValue that are split by comma ","
//
// see https://github.com/spf13/cobra/issues/2079#issuecomment-1867991505 for more detail info
func SetArgs(cmd *cobra.Command, args []string) {
// if flags haven't been parsed yet, it's ok to use cmd.SetArgs
if !cmd.Flags().Parsed() {
cmd.SetArgs(args)
return
}
// if flags have been parsed yet, we should reset flags's value that don't been set
levisyin marked this conversation as resolved.
Show resolved Hide resolved
cmd.Flags().Visit(func(pf *pflag.Flag) {
// if the flag hasn't been changed, ignore it
if !pf.Changed {
return
}
// handle pflag.SliceValue
if v, ok := pf.Value.(pflag.SliceValue); ok {
defVal := strings.Trim(pf.DefValue, "[]")
defSliceVal := make([]string, 0)
if defVal != "" {
defSliceVal = strings.Split(defVal, ",")
}
if err := v.Replace(defSliceVal); err != nil {
panic(fmt.Errorf("reset argument<%s> with default value<%+v> error %v", pf.Name, defSliceVal, err))
levisyin marked this conversation as resolved.
Show resolved Hide resolved
}
return
levisyin marked this conversation as resolved.
Show resolved Hide resolved
}
// handle pflag.Value
if err := pf.Value.Set(pf.DefValue); err != nil {
panic(fmt.Errorf("reset argument<%s> with default value<%s> error %v", pf.Name, pf.DefValue, err))
levisyin marked this conversation as resolved.
Show resolved Hide resolved
levisyin marked this conversation as resolved.
Show resolved Hide resolved
}
})
levisyin marked this conversation as resolved.
Show resolved Hide resolved
// call cmd.SetArgs at last
cmd.SetArgs(args)
}
levisyin marked this conversation as resolved.
Show resolved Hide resolved
161 changes: 161 additions & 0 deletions internal/testutil/cmd_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
package testutil_test

import (
"fmt"
"testing"

"github.com/spf13/cobra"
"github.com/stretchr/testify/require"

"github.com/cosmos/cosmos-sdk/internal/testutil"
)

// TestSetArgsWithOriginalMethod is used to illustrate cobra.Command.SetArgs won't reset args as expected
func TestSetArgsWithOriginalMethod(t *testing.T) {
getCMD := func() *cobra.Command {
cmd := &cobra.Command{
Use: "testcmd",
RunE: func(cmd *cobra.Command, args []string) error {
a, _ := cmd.Flags().GetBool("a")
b, _ := cmd.Flags().GetBool("b")
c, _ := cmd.Flags().GetBool("c")
switch {
case a && b, a && c, b && c:
return fmt.Errorf("a,b,c only one could be true")
}
return nil
},
}
f := cmd.Flags()
f.BoolP("a", "a", false, "a,b,c only one could be true")
f.BoolP("b", "b", false, "a,b,c only one could be true")
f.Bool("c", false, "a,b,c only one could be true")
return cmd
}

cmd := getCMD()

cmd.SetArgs([]string{
"testcmd",
"--a=true",
})
require.NoError(t, cmd.Execute())

// This call to cmd.SetArgs is expected to set only the 'b' flag. However, due to the bug, the 'a' flag remains set from the previous call to cmd.SetArgs, leading to an error.
cmd.SetArgs([]string{
"testcmd",
"--b=true",
})
require.True(t, cmd.Flags().Changed("a"))
require.Error(t, cmd.Execute())

// This call to cmd.SetArgs is expected to set only the 'c' flag. However, the 'a' and 'b' flags remain set from the previous calls, causing an unexpected error.
cmd.SetArgs([]string{
"testcmd",
"--c=true",
})
require.Error(t, cmd.Execute())

// To work around the bug, we must explicitly reset the 'a' and 'b' flags to false, even though we only want to set the 'c' flag to true.
cmd.SetArgs([]string{
"testcmd",
"--a=false",
"--b=false",
"--c=true",
})
require.NoError(t, cmd.Execute())
}

func TestSetArgsWithWrappedMethod(t *testing.T) {
var (
mockFlagWithCommaF = testutil.MockFlagsWithComma{Ary: []string{"g;m", "g;n"}}
mockFlagWithCommaG testutil.MockFlagsWithComma
)
var (
mockFlagWithSemicolonH = testutil.MockFlagsWithSemicolon{Ary: []string{"g,m", "g,n"}}
mockFlagWithSemicolonI testutil.MockFlagsWithSemicolon
)
getCMD := func() *cobra.Command {
cmd := &cobra.Command{
Use: "testcmd",
RunE: func(cmd *cobra.Command, args []string) error {
return nil
},
}
f := cmd.Flags()
f.BoolP("a", "a", false, "check build-in pflag.Value")
f.IntSlice("b", []int{1, 2}, "check build-in pflag.SliceValue with default value")
f.IntSliceP("c", "c", nil, "check build-in pflag.SliceValue with nil default value")
f.Var(&mockFlagWithCommaF, "d", "check custom implementation of pflag.SliceValue with splitting by comma and default value")
f.VarP(&mockFlagWithCommaG, "e", "e", "check custom implementation of pflag.SliceValue with splitting by comma and nil default value")
f.Var(&mockFlagWithSemicolonH, "f", "check custom implementation of pflag.SliceValue with splitting by semicolon and default value")
f.VarP(&mockFlagWithSemicolonI, "g", "g", "check custom implementation of pflag.SliceValue with splitting by semicolon and nil default value")
return cmd
}

cmd := getCMD()

var checkFlagsValue = func(cmd *cobra.Command, notDefaultFlags map[string]string) bool {
require.NoError(t, cmd.Execute())
for _, k := range []string{"a", "b", "c", "d", "e", "f", "g"} {
curVal := cmd.Flag(k).Value
curDefVal := cmd.Flag(k).DefValue
if v, ok := notDefaultFlags[k]; ok {
require.NotEqual(t, curVal.String(), curDefVal, fmt.Sprintf("flag: %s, cmp_to: %v", k, curVal))
require.Equal(t, curVal.String(), v, fmt.Sprintf("flag: %s, cmp_to: %v", k, curVal))
} else {
require.Equal(t, curVal.String(), curDefVal, fmt.Sprintf("flag: %s, cmp_to: %v", k, curVal))
}
}
return true
}

testutil.SetArgs(cmd, []string{
"testcmd",
})
checkFlagsValue(cmd, nil)

testutil.SetArgs(cmd, []string{
"testcmd",
"--a=true",
})
checkFlagsValue(cmd, map[string]string{"a": "true"})

testutil.SetArgs(cmd, []string{
"testcmd",
"--b=3,4",
})
checkFlagsValue(cmd, map[string]string{"b": "[3,4]"})

testutil.SetArgs(cmd, []string{
"testcmd",
"--c=3,4",
})
checkFlagsValue(cmd, map[string]string{"c": "[3,4]"})

testutil.SetArgs(cmd, []string{
"testcmd",
"--d=g;n,g;m",
})
checkFlagsValue(cmd, map[string]string{"d": "g;n,g;m"})

testutil.SetArgs(cmd, []string{
"testcmd",
"--e=g;n,g;m",
})
checkFlagsValue(cmd, map[string]string{"e": "g;n,g;m"})

testutil.SetArgs(cmd, []string{
"testcmd",
"--f=g,n;g,m",
})
checkFlagsValue(cmd, map[string]string{"f": "g,n;g,m"})

testutil.SetArgs(cmd, []string{
"testcmd",
"--g=g,n;g,m",
})
// custom implementation of pflag.SliceValue with splitting by semicolon is not compatible with testutil.SetArgs.
// So `f` is changed to "g;m;g;n"(split to ["g", "m;g", "n"], and then join with ";"), not default value "g,m;g,n"
checkFlagsValue(cmd, map[string]string{"f": "g;m;g;n", "g": "g,n;g,m"})
levisyin marked this conversation as resolved.
Show resolved Hide resolved
}
77 changes: 77 additions & 0 deletions internal/testutil/mock_flags.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
package testutil

import "strings"

type MockFlagsWithComma struct {
Ary []string
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Ary []string
Arg []string

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or Args?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually it means 'Array', not 'arg' or 'args', just for illustrate slice type field

changed bool
}

func (m *MockFlagsWithComma) String() string {
return strings.Join(m.Ary, ",")
}

func (m *MockFlagsWithComma) Set(value string) error {
if m.changed {
m.Ary = append(m.Ary, strings.Split(value, ",")...)
} else {
m.Ary = strings.Split(value, ",")
m.changed = true
}
return nil
}

func (m *MockFlagsWithComma) Type() string {
return "mock_flags"
}

func (m *MockFlagsWithComma) Replace(value []string) error {
m.Ary = value
return nil
}

func (m *MockFlagsWithComma) Append(value string) error {
m.Ary = append(m.Ary, value)
return nil
}

func (m *MockFlagsWithComma) GetSlice() []string {
return m.Ary
}

type MockFlagsWithSemicolon struct {
Ary []string
changed bool
}

func (m *MockFlagsWithSemicolon) String() string {
return strings.Join(m.Ary, ";")
}

func (m *MockFlagsWithSemicolon) Set(value string) error {
if m.changed {
m.Ary = append(m.Ary, strings.Split(value, ";")...)
} else {
m.Ary = strings.Split(value, ";")
m.changed = true
}
return nil
}

func (m *MockFlagsWithSemicolon) Type() string {
return "mock_flags"
}

func (m *MockFlagsWithSemicolon) Replace(value []string) error {
m.Ary = value
return nil
}

func (m *MockFlagsWithSemicolon) Append(value string) error {
m.Ary = append(m.Ary, value)
return nil
}

func (m *MockFlagsWithSemicolon) GetSlice() []string {
return m.Ary
}
Loading