From 0d24a800754788d7308a745c453a381788c2dd98 Mon Sep 17 00:00:00 2001 From: Roberto Hidalgo Date: Sat, 31 Dec 2022 18:07:54 -0600 Subject: [PATCH] fix tests --- pkg/command/arguments.go | 21 +++++++++++++++------ pkg/runtime/runtime_test.go | 4 ++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkg/command/arguments.go b/pkg/command/arguments.go index 1537d72..4ba54ac 100644 --- a/pkg/command/arguments.go +++ b/pkg/command/arguments.go @@ -38,6 +38,19 @@ func (args *Arguments) AllKnownStr() map[string]string { return col } +func anySliceToStringSlice(src any) []string { + res := []string{} + switch d := src.(type) { + case []string: + res = d + case []any: + for _, valI := range d { + res = append(res, valI.(string)) + } + } + return res +} + func (args *Arguments) Parse(supplied []string) { for idx, arg := range *args { argumentProvided := idx < len(supplied) @@ -45,11 +58,7 @@ func (args *Arguments) Parse(supplied []string) { if !argumentProvided { if arg.Default != nil { if arg.Variadic { - defaultSlice := arg.Default.([]string) - // defaultSlice := []string{} - // for _, valI := range arg.Default.([]string) { - // defaultSlice = append(defaultSlice, valI.(string)) - // } + defaultSlice := anySliceToStringSlice(arg.Default) arg.provided = &defaultSlice } else { defaultString := arg.Default.(string) @@ -185,7 +194,7 @@ func (arg *Argument) ToValue() any { } else { if arg.Default != nil { if arg.Variadic { - defaultSlice := arg.Default + defaultSlice := anySliceToStringSlice(arg.Default) // for _, valI := range arg.Default.([]any) { // valStr := valI.(string) // defaultSlice = append(defaultSlice, valStr) diff --git a/pkg/runtime/runtime_test.go b/pkg/runtime/runtime_test.go index d6f9121..2a19268 100644 --- a/pkg/runtime/runtime_test.go +++ b/pkg/runtime/runtime_test.go @@ -28,9 +28,9 @@ func TestEnabled(t *testing.T) { Expects: true, }, { - Name: env.Verbose, + Name: env.Silent, Func: SilenceEnabled, - Expects: false, + Expects: true, }, { Name: env.ValidationDisabled,