Add test case

Author: limpo1989

conf/internal/storage.go

@@ -73,9 +73,13 @@ func NewStorage() *Storage {
 
 // Copy returns a new copy of the *Storage object.
 func (s *Storage) Copy() *Storage {
+	data := s.Data()
+	if nil == data {
+		data = make(map[string]string)
+	}
 	return &Storage{
 		tree: s.tree.Copy(),
-		data: s.Data(),
+		data: data,
 	}
 }
 

dync/dync.go

@@ -75,6 +75,7 @@ func (p *Properties) Bind(i interface{}, args ...conf.BindArg) error {
 	return p.load().Bind(i, args...)
 }
 
+// Set refresh properties value by key.
 func (p *Properties) Set(key, value string) error {
 	prop := p.load().Copy()
 	if err := prop.Set(key, value); nil != err {
@@ -84,6 +85,7 @@ func (p *Properties) Set(key, value string) error {
 	return p.refreshKeys(prop, []string{key})
 }
 
+// Remove delete key from properties.
 func (p *Properties) Remove(key string) error {
 	prop := p.load()
 	coped := conf.New()

dync/dync_test.go

@@ -132,4 +132,27 @@ func TestDynamic(t *testing.T) {
 		assert.Nil(t, err)
 	})
 
+	t.Run("set value error", func(t *testing.T) {
+		p, cfg, err := newTest()
+		assert.Nil(t, err)
+		b, _ := json.Marshal(cfg)
+		assert.Equal(t, string(b), `{"Int":3,"Float":1.2,"Map":{},"Slice":[]}`)
+
+		err = p.Set("map.name", "jok")
+		assert.Nil(t, err)
+
+		name, exists := cfg.Map.Value()["name"]
+		assert.True(t, exists)
+		assert.Equal(t, name, "jok")
+
+		err = p.Set("map.name[", "jok")
+		assert.Error(t, err, `invalid key \'map\.name\[\'`)
+
+		err = p.Remove("map.name")
+		assert.Nil(t, err)
+
+		_, exists = cfg.Map.Value()["name"]
+		assert.False(t, exists)
+	})
+
 }

gs/app_args.go

@@ -24,7 +24,7 @@ import (
 	"github.com/go-spring-projects/go-spring/conf"
 )
 
-// EnvPrefix 属性覆盖的环境变量需要携带该前缀。
+// EnvPrefix environment variable prefix。
 const EnvPrefix = "GS_"
 
 // loadCmdArgs 加载以 -D key=value 或者 -D key[=true] 形式传入的命令行参数。

gs/arg/arg_test.go

@@ -20,6 +20,7 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/go-spring-projects/go-spring/gs/cond"
 	"github.com/go-spring-projects/go-spring/internal/utils/assert"
 	"github.com/golang/mock/gomock"
 )
@@ -146,4 +147,105 @@ func TestBind(t *testing.T) {
 		assert.Equal(t, len(values), 0)
 	})
 
+	t.Run("one ctx matches", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+		ctx := NewMockContext(ctrl)
+		ctx.EXPECT().Matches(gomock.Any()).Return(true, nil)
+
+		ok, err := ctx.Matches(cond.OK())
+		assert.Nil(t, err)
+		assert.True(t, ok)
+	})
+
+	t.Run("bind args", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+		ctx := NewMockContext(ctrl)
+
+		var expectValues = []interface{}{
+			0, 1, 2, 3, 4, 5, 6, nil,
+		}
+
+		var gotValues []interface{}
+		fn := func(r0 int, r1 int, r2 int, r3 int, r4 int, r5 int, r6 int, nilPtr *int) {
+			gotValues = append(gotValues, r0)
+			gotValues = append(gotValues, r1)
+			gotValues = append(gotValues, r2)
+			gotValues = append(gotValues, r3)
+			gotValues = append(gotValues, r4)
+			gotValues = append(gotValues, r5)
+			gotValues = append(gotValues, r6)
+			gotValues = append(gotValues, nil)
+		}
+
+		c, err := Bind(fn, []Arg{
+			R0(Value(expectValues[0])),
+			R1(Value(expectValues[1])),
+			R2(Value(expectValues[2])),
+			R3(Value(expectValues[3])),
+			R4(Value(expectValues[4])),
+			R5(Value(expectValues[5])),
+			R6(Value(expectValues[6])),
+			Index(7, Nil()),
+		}, 1)
+		assert.Nil(t, err)
+
+		values, err := c.Call(ctx)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		assert.Equal(t, len(values), 0)
+		assert.Equal(t, gotValues, expectValues)
+
+		// mark coverage
+		NewMockArg(ctrl).EXPECT()
+	})
+
+	t.Run("bind options", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+		ctx := NewMockContext(ctrl)
+
+		type options struct {
+			name string
+			age  int
+		}
+
+		type fnOption func(opts *options)
+
+		var gotOpts = &options{}
+
+		var optFn = func(option ...fnOption) {
+			for _, op := range option {
+				op(gotOpts)
+			}
+		}
+
+		var withName = func(name string) fnOption {
+			return func(opts *options) {
+				opts.name = name
+			}
+		}
+
+		var withAge = func(age int) fnOption {
+			return func(opts *options) {
+				opts.age = age
+			}
+		}
+
+		c, err := Bind(optFn, []Arg{Option(withName, Value("spring")), Option(withAge, Value(18))}, 1)
+		assert.Nil(t, err)
+
+		values, err := c.Call(ctx)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		assert.Equal(t, len(values), 0)
+		assert.Equal(t, gotOpts.name, "spring")
+		assert.Equal(t, gotOpts.age, 18)
+
+	})
 }