✅ test: cflag,cli,fs - add more unit tests and fix some test error

cflag/ext.go

@@ -53,9 +53,9 @@ func NewIntVar(checkFn comdef.IntCheckFunc) IntVar {
 	return IntVar{CheckFn: checkFn}
 }
 
-// Get value string
+// Get value
 func (o *IntVar) Get() any {
-	return o.str
+	return o.val
 }
 
 // Set new value
@@ -102,7 +102,7 @@ type String string
 
 // Get value
 func (s *String) Get() any {
-	return s
+	return string(*s)
 }
 
 // Set value
@@ -224,7 +224,7 @@ type Ints []int
 
 // String to string
 func (s *Ints) String() string {
-	return fmt.Sprintf("%v", *s)
+	return arrutil.ToString(*s)
 }
 
 // Get value
@@ -251,9 +251,8 @@ func (s *Ints) IsRepeatable() bool {
 	return true
 }
 
-// Strings The string flag list, repeatable
-//
-// implemented flag.Value interface
+// Strings The string flag list, repeatable.
+// eg: --names tom --names john
 type Strings []string
 
 // String input value to string
@@ -263,7 +262,7 @@ func (s *Strings) String() string {
 
 // Get value
 func (s *Strings) Get() any {
-	return s
+	return []string(*s)
 }
 
 // Set new value
@@ -272,18 +271,28 @@ func (s *Strings) Set(value string) error {
 	return nil
 }
 
+// Strings value
+func (s *Strings) Strings() []string {
+	return *s
+}
+
 // IsRepeatable on input
 func (s *Strings) IsRepeatable() bool {
 	return true
 }
 
-// Booleans The bool flag list, repeatable
-// implemented flag.Value interface
+// Booleans The bool flag list, repeatable.
+// eg: -v -v => []bool{true, true}
 type Booleans []bool
 
 // String input value to string
 func (s *Booleans) String() string {
-	return fmt.Sprintf("%v", *s)
+	return arrutil.ToString(*s)
+}
+
+// Bools value
+func (s *Booleans) Bools() []bool {
+	return *s
 }
 
 // Set new value
@@ -424,8 +433,6 @@ func (s *KVString) IsRepeatable() bool {
 
 // ConfString The config-string flag, INI format, like nginx-config.
 //
-// Implemented the flag.Value interface.
-//
 // Example:
 //
 //	--config 'k0=val0;k1=val1' => string map {k0:val0, k1:val1}

cflag/ext_test.go

@@ -27,6 +27,12 @@ func TestString_methods(t *testing.T) {
 	assert.NoErr(t, s.Set("val"))
 	assert.Eq(t, "val", s.Get())
 	assert.Eq(t, "val", s.String())
+
+	assert.NoErr(t, s.Set("val1,val2"))
+	assert.Eq(t, []string{"val1", "val2"}, s.Strings())
+
+	assert.NoErr(t, s.Set("23,34"))
+	assert.Eq(t, []int{23, 34}, s.Ints(","))
 }
 
 func TestStrVar_methods(t *testing.T) {
@@ -101,6 +107,10 @@ func TestInts_methods(t *testing.T) {
 	assert.NotEmpty(t, its.Get())
 	assert.Eq(t, []int{23}, its.Ints())
 	assert.Eq(t, "[23]", its.String())
+
+	assert.True(t, its.IsRepeatable())
+	assert.NoErr(t, its.Set("34"))
+	assert.Eq(t, "[23,34]", its.String())
 }
 
 func TestIntsString_methods(t *testing.T) {
@@ -129,3 +139,26 @@ func TestIntsString_methods(t *testing.T) {
 	}
 	assert.Err(t, its.Set("45"))
 }
+
+func TestStrings_methods(t *testing.T) {
+	ss := cflag.Strings{}
+
+	assert.NoErr(t, ss.Set("val"))
+	assert.Eq(t, []string{"val"}, ss.Get())
+	assert.Eq(t, []string{"val"}, ss.Strings())
+
+	assert.NoErr(t, ss.Set("val2"))
+	assert.Eq(t, "val,val2", ss.String())
+	assert.True(t, ss.IsRepeatable())
+}
+
+func TestBooleans_methods(t *testing.T) {
+	bs := cflag.Booleans{}
+
+	assert.NoErr(t, bs.Set("true"))
+	assert.Eq(t, []bool{true}, bs.Bools())
+
+	assert.NoErr(t, bs.Set("false"))
+	assert.Eq(t, "[true,false]", bs.String())
+	assert.True(t, bs.IsRepeatable())
+}

cliutil/cliutil_test.go

@@ -145,3 +145,8 @@ func TestShellQuote(t *testing.T) {
 	assert.Eq(t, `'ab"s'`, cliutil.ShellQuote(`ab"s`))
 	assert.Eq(t, "abs", cliutil.ShellQuote("abs"))
 }
+
+func TestOutputLines(t *testing.T) {
+	assert.Empty(t, cliutil.OutputLines("\n"))
+	assert.Eq(t, []string{"a", "b"}, cliutil.OutputLines("a\nb"))
+}

comdef/types.go

@@ -44,12 +44,12 @@ type SortedType interface {
 	Int | Uint | Float | ~string
 }
 
-// Compared type. alias of constraints.ScalarType
+// Compared type. alias of constraints.SortedType
 //
 // TODO: use type alias, will error on go1.18 Error: types.go:50: interface contains type constraints
-// type Compared = ScalarType
+// type Compared = SortedType
 type Compared interface {
-	Int | Uint | Float | ~string | ~bool
+	Int | Uint | Float | ~string
 }
 
 // ScalarType interface type.

fsutil/operate_test.go

@@ -95,6 +95,61 @@ func TestQuickOpenFile(t *testing.T) {
 	assert.NoErr(t, fsutil.Remove(file.Name()))
 }
 
+func TestMustOpenFile(t *testing.T) {
+	assert.Panics(t, func() {
+		fsutil.MustOpenFile("/path-not-exists", os.O_RDONLY, 0666)
+	})
+}
+
+func TestOpenAppendFile(t *testing.T) {
+	fpath := "./testdata/open-append-file.txt"
+	assert.NoErr(t, fsutil.RmFileIfExist(fpath))
+
+	file, err := fsutil.OpenAppendFile(fpath)
+	assert.NoErr(t, err)
+	assert.Eq(t, fpath, file.Name())
+
+	_, err = file.WriteString("hello")
+	assert.NoErr(t, err)
+	assert.NoErr(t, file.Close())
+
+	// reopen for write
+	file, err = fsutil.OpenAppendFile(fpath)
+	assert.NoErr(t, err)
+
+	_, err = file.WriteString(" world")
+	assert.NoErr(t, err)
+	assert.NoErr(t, file.Close())
+
+	// read all
+	s := fsutil.ReadString(fpath)
+	assert.Eq(t, "hello world", s)
+}
+
+func TestOpenTruncFile(t *testing.T) {
+	fpath := "./testdata/open-trunc-file.txt"
+	assert.NoErr(t, fsutil.RmFileIfExist(fpath))
+
+	file, err := fsutil.OpenTruncFile(fpath)
+	assert.NoErr(t, err)
+	assert.Eq(t, fpath, file.Name())
+
+	_, err = file.WriteString("hello")
+	assert.NoErr(t, err)
+	assert.NoErr(t, file.Close())
+
+	// reopen for write
+	file, err = fsutil.OpenTruncFile(fpath)
+	assert.NoErr(t, err)
+
+	_, err = file.WriteString(" world")
+	assert.NoErr(t, err)
+
+	// read all
+	s := fsutil.ReadString(fpath)
+	assert.Eq(t, " world", s)
+}
+
 func TestMustRemove(t *testing.T) {
 	assert.Panics(t, func() {
 		fsutil.MustRm("/path-not-exist")