Merge pull request #2236 from dearchap/improve_test_cov_112025

Improve test coverage

Author: dearchap

args_test.go

@@ -8,6 +8,15 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestArgNotSet(t *testing.T) {
+	arg := &StringArg{
+		Name:  "sa",
+		Value: "foo",
+	}
+
+	require.Equal(t, "foo", arg.Get())
+}
+
 func TestArgsFloatTypes(t *testing.T) {
 	cmd := buildMinimalTestCommand()
 	var fval float64

command.go

@@ -334,14 +334,10 @@ func (cmd *Command) handleExitCoder(ctx context.Context, err error) error {
 }
 
 func (cmd *Command) argsWithDefaultCommand(oldArgs Args) Args {
-	if cmd.DefaultCommand != "" {
-		rawArgs := append([]string{cmd.DefaultCommand}, oldArgs.Slice()...)
-		newArgs := &stringSliceArgs{v: rawArgs}
+	rawArgs := append([]string{cmd.DefaultCommand}, oldArgs.Slice()...)
+	newArgs := &stringSliceArgs{v: rawArgs}
 
-		return newArgs
-	}
-
-	return oldArgs
+	return newArgs
 }
 
 // Root returns the Command at the root of the graph

flag.go

@@ -77,11 +77,6 @@ func (f FlagsByName) Len() int {
 }
 
 func (f FlagsByName) Less(i, j int) bool {
-	if len(f[j].Names()) == 0 {
-		return false
-	} else if len(f[i].Names()) == 0 {
-		return true
-	}
 	return lexicographicLess(f[i].Names()[0], f[j].Names()[0])
 }
 

flag_bool.go

@@ -50,7 +50,8 @@ func (b boolValue) Create(val bool, p *bool, c BoolConfig) Value {
 
 // ToString formats the bool value
 func (b boolValue) ToString(value bool) string {
-	return strconv.FormatBool(value)
+	b.destination = &value
+	return b.String()
 }
 
 // Below functions are to satisfy the flag.Value interface

flag_duration.go

@@ -18,7 +18,8 @@ func (d durationValue) Create(val time.Duration, p *time.Duration, c NoConfig) V
 }
 
 func (d durationValue) ToString(val time.Duration) string {
-	return fmt.Sprintf("%v", val)
+	d = durationValue(val)
+	return d.String()
 }
 
 // Below functions are to satisfy the flag.Value interface
@@ -34,7 +35,9 @@ func (d *durationValue) Set(s string) error {
 
 func (d *durationValue) Get() any { return time.Duration(*d) }
 
-func (d *durationValue) String() string { return (*time.Duration)(d).String() }
+func (d *durationValue) String() string {
+	return fmt.Sprintf("%v", time.Duration(*d))
+}
 
 func (cmd *Command) Duration(name string) time.Duration {
 	if v, ok := cmd.Value(name).(time.Duration); ok {

flag_float.go

@@ -25,7 +25,8 @@ func (f floatValue[T]) Create(val T, p *T, c NoConfig) Value {
 }
 
 func (f floatValue[T]) ToString(b T) string {
-	return strconv.FormatFloat(float64(b), 'g', -1, int(unsafe.Sizeof(T(0))*8))
+	f.val = &b
+	return f.String()
 }
 
 // Below functions are to satisfy the flag.Value interface

flag_generic.go

@@ -17,10 +17,8 @@ func (f genericValue) Create(val Value, p *Value, c NoConfig) Value {
 }
 
 func (f genericValue) ToString(b Value) string {
-	if b != nil {
-		return b.String()
-	}
-	return ""
+	f.val = b
+	return f.String()
 }
 
 // Below functions are to satisfy the flag.Value interface

flag_int.go

@@ -36,11 +36,8 @@ func (i intValue[T]) Create(val T, p *T, c IntegerConfig) Value {
 }
 
 func (i intValue[T]) ToString(b T) string {
-	if i.base == 0 {
-		i.base = 10
-	}
-
-	return strconv.FormatInt(int64(b), i.base)
+	i.val = &b
+	return i.String()
 }
 
 // Below functions are to satisfy the flag.Value interface

flag_slice_base.go

@@ -82,12 +82,12 @@ func (i *SliceBase[T, C, VC]) Set(value string) error {
 
 // String returns a readable representation of this value (for usage defaults)
 func (i *SliceBase[T, C, VC]) String() string {
-	v := i.Value()
-	var t T
-	if reflect.TypeOf(t).Kind() == reflect.String {
-		return fmt.Sprintf("%v", v)
+	var defaultVals []string
+	var v VC
+	for _, s := range *i.slice {
+		defaultVals = append(defaultVals, v.ToString(s))
 	}
-	return fmt.Sprintf("%T{%s}", v, i.ToString(v))
+	return strings.Join(defaultVals, ", ")
 }
 
 // Serialize allows SliceBase to fulfill Serializer
@@ -110,10 +110,6 @@ func (i *SliceBase[T, C, VC]) Get() interface{} {
 }
 
 func (i SliceBase[T, C, VC]) ToString(t []T) string {
-	var defaultVals []string
-	var v VC
-	for _, s := range t {
-		defaultVals = append(defaultVals, v.ToString(s))
-	}
-	return strings.Join(defaultVals, ", ")
+	i.slice = &t
+	return i.String()
 }

flag_string.go

@@ -30,10 +30,8 @@ func (s stringValue) Create(val string, p *string, c StringConfig) Value {
 }
 
 func (s stringValue) ToString(val string) string {
-	if val == "" {
-		return val
-	}
-	return fmt.Sprintf("%q", val)
+	s.destination = &val
+	return s.String()
 }
 
 // Below functions are to satisfy the flag.Value interface
@@ -49,8 +47,8 @@ func (s *stringValue) Set(val string) error {
 func (s *stringValue) Get() any { return *s.destination }
 
 func (s *stringValue) String() string {
-	if s.destination != nil {
-		return *s.destination
+	if s.destination != nil && *s.destination != "" {
+		return fmt.Sprintf("%q", *s.destination)
 	}
 	return ""
 }