Feature:(issue_1550):Add support Int64Slice by read toml config file
Feature:(issue_1550):add test flag test function
This commit is contained in:
parent
63cb372cce
commit
47d325e64f
@ -148,6 +148,37 @@ func (f *IntSliceFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceC
|
||||
return nil
|
||||
}
|
||||
|
||||
// ApplyInputSourceValue applies a Int64Slice value if required
|
||||
func (f *Int64SliceFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error {
|
||||
if f.set == nil || cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars) {
|
||||
return nil
|
||||
}
|
||||
for _, name := range f.Int64SliceFlag.Names() {
|
||||
if !isc.isSet(name) {
|
||||
continue
|
||||
}
|
||||
value, err := isc.Int64Slice(name)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if value == nil {
|
||||
continue
|
||||
}
|
||||
var sliceValue = *(cli.NewInt64Slice(value...))
|
||||
for _, n := range f.Names() {
|
||||
underlyingFlag := f.set.Lookup(n)
|
||||
if underlyingFlag == nil {
|
||||
continue
|
||||
}
|
||||
underlyingFlag.Value = &sliceValue
|
||||
}
|
||||
if f.Destination != nil {
|
||||
f.Destination.Set(sliceValue.Serialize())
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ApplyInputSourceValue applies a Bool value to the flagSet if required
|
||||
func (f *BoolFlag) ApplyInputSourceValue(cCtx *cli.Context, isc InputSourceContext) error {
|
||||
if f.set == nil || cCtx.IsSet(f.Name) || isEnvVarSet(f.EnvVars) {
|
||||
|
@ -257,6 +257,29 @@ func TestIntSliceApplyInputSourceMethodEnvVarSet(t *testing.T) {
|
||||
refute(t, c.IntSlice("test"), []int{3, 4})
|
||||
}
|
||||
|
||||
func TestInt64SliceFlagApplyInputSourceValue(t *testing.T) {
|
||||
dest := cli.NewInt64Slice()
|
||||
tis := testApplyInputSource{
|
||||
Flag: NewInt64SliceFlag(&cli.Int64SliceFlag{Name: "test", Destination: dest}),
|
||||
FlagName: "test",
|
||||
MapValue: []interface{}{int64(1), int64(2)},
|
||||
}
|
||||
c := runTest(t, tis)
|
||||
expect(t, c.Int64Slice("test"), []int64{1, 2})
|
||||
expect(t, dest.Value(), []int64{1, 2})
|
||||
|
||||
// reset dest
|
||||
dest = cli.NewInt64Slice()
|
||||
tis = testApplyInputSource{
|
||||
Flag: NewInt64SliceFlag(&cli.Int64SliceFlag{Name: "test", Destination: dest}),
|
||||
FlagName: "test",
|
||||
MapValue: []interface{}{int64(1), int64(2)},
|
||||
}
|
||||
c = runRacyTest(t, tis)
|
||||
refute(t, c.IntSlice("test"), []int64{1, 2})
|
||||
refute(t, dest.Value(), []int64{1, 2})
|
||||
}
|
||||
|
||||
func TestBoolApplyInputSourceMethodSet(t *testing.T) {
|
||||
tis := testApplyInputSource{
|
||||
Flag: NewBoolFlag(&cli.BoolFlag{Name: "test"}),
|
||||
|
@ -20,6 +20,7 @@ type InputSourceContext interface {
|
||||
String(name string) (string, error)
|
||||
StringSlice(name string) ([]string, error)
|
||||
IntSlice(name string) ([]int, error)
|
||||
Int64Slice(name string) ([]int64, error)
|
||||
Generic(name string) (cli.Generic, error)
|
||||
Bool(name string) (bool, error)
|
||||
|
||||
|
@ -160,6 +160,29 @@ func (x *jsonSource) IntSlice(name string) ([]int, error) {
|
||||
}
|
||||
}
|
||||
|
||||
func (x *jsonSource) Int64Slice(name string) ([]int64, error) {
|
||||
i, err := x.getValue(name)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
switch v := i.(type) {
|
||||
default:
|
||||
return nil, fmt.Errorf("unexpected type %T for %q", i, name)
|
||||
case []int64:
|
||||
return v, nil
|
||||
case []interface{}:
|
||||
c := []int64{}
|
||||
for _, s := range v {
|
||||
if i2, ok := s.(int64); ok {
|
||||
c = append(c, i2)
|
||||
} else {
|
||||
return c, fmt.Errorf("unexpected item type %T in %T for %q", s, c, name)
|
||||
}
|
||||
}
|
||||
return c, nil
|
||||
}
|
||||
}
|
||||
|
||||
func (x *jsonSource) Generic(name string) (cli.Generic, error) {
|
||||
i, err := x.getValue(name)
|
||||
if err != nil {
|
||||
|
@ -207,6 +207,35 @@ func (fsm *MapInputSource) IntSlice(name string) ([]int, error) {
|
||||
return intSlice, nil
|
||||
}
|
||||
|
||||
// Int64Slice returns an []int64 from the map if it exists otherwise returns nil
|
||||
func (fsm *MapInputSource) Int64Slice(name string) ([]int64, error) {
|
||||
otherGenericValue, exists := fsm.valueMap[name]
|
||||
if !exists {
|
||||
otherGenericValue, exists = nestedVal(name, fsm.valueMap)
|
||||
if !exists {
|
||||
return nil, nil
|
||||
}
|
||||
}
|
||||
|
||||
otherValue, isType := otherGenericValue.([]interface{})
|
||||
if !isType {
|
||||
return nil, incorrectTypeForFlagError(name, "[]interface{}", otherGenericValue)
|
||||
}
|
||||
|
||||
var int64Slice = make([]int64, 0, len(otherValue))
|
||||
for i, v := range otherValue {
|
||||
int64Value, isType := v.(int64)
|
||||
|
||||
if !isType {
|
||||
return nil, incorrectTypeForFlagError(fmt.Sprintf("%s[%d]", name, i), "int", v)
|
||||
}
|
||||
|
||||
int64Slice = append(int64Slice, int64Value)
|
||||
}
|
||||
|
||||
return int64Slice, nil
|
||||
}
|
||||
|
||||
// Generic returns an cli.Generic from the map if it exists otherwise returns nil
|
||||
func (fsm *MapInputSource) Generic(name string) (cli.Generic, error) {
|
||||
otherGenericValue, exists := fsm.valueMap[name]
|
||||
|
@ -22,3 +22,14 @@ func TestMapDuration(t *testing.T) {
|
||||
_, err = inputSource.Duration("duration_of_int_type")
|
||||
refute(t, nil, err)
|
||||
}
|
||||
|
||||
func TestMapInputSource_Int64Slice(t *testing.T) {
|
||||
inputSource := NewMapInputSource(
|
||||
"test",
|
||||
map[interface{}]interface{}{
|
||||
"test_num": []interface{}{int64(1), int64(2), int64(3)},
|
||||
})
|
||||
d, err := inputSource.Int64Slice("test_num")
|
||||
expect(t, []int64{1, 2, 3}, d)
|
||||
expect(t, nil, err)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user