up: add func for get coped global messages, fix some tests

issues_test.go

@@ -1002,6 +1002,11 @@ func TestIssues_148(t *testing.T) {
 
 // https://github.com/gookit/validate/issues/152
 func TestIssue_152(t *testing.T) {
+	old := validate.CopyGlobalMessages()
+	defer func() {
+		validate.SetBuiltinMessages(old)
+	}()
+
 	zhcn.RegisterGlobal()
 
 	// test required if
@@ -1031,7 +1036,6 @@ func TestIssue_152(t *testing.T) {
 	})
 
 	v.Validate()
-
 	assert.Equal(t, `当 类型 不为 [1] 时 数据 不能为空。`, v.Errors.One())
 }
 
@@ -1077,7 +1081,7 @@ func TestIssues_159(t *testing.T) {
 
 	v := validate.Struct(ts)
 	ok := v.Validate()
-	dump.Println(v.Errors)
+	// dump.Println(v.Errors)
 	assert.False(t, ok)
 	assert.Equal(t, "end value should be greater or equal to field start", v.Errors.One())
 }

locales/ruru/ruru_test.go

@@ -1,9 +1,10 @@
 package ruru
 
 import (
+	"testing"
+
 	"github.com/gookit/validate"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestRegister(t *testing.T) {
@@ -21,6 +22,11 @@ func TestRegister(t *testing.T) {
 }
 
 func TestRegisterGlobal(t *testing.T) {
+	old := validate.CopyGlobalMessages()
+	defer func() {
+		validate.SetBuiltinMessages(old)
+	}()
+
 	RegisterGlobal()
 
 	is := assert.New(t)

locales/zhcn/zhcn.go

@@ -10,7 +10,7 @@ func Register(v *validate.Validation) {
 	v.AddMessages(Data)
 }
 
-// RegisterGlobal register to the validate global messages
+// RegisterGlobal register to validate global messages
 func RegisterGlobal() {
 	validate.AddGlobalMessages(Data)
 }

locales/zhcn/zhcn_test.go

@@ -22,6 +22,11 @@ func TestRegister(t *testing.T) {
 }
 
 func TestRegisterGlobal(t *testing.T) {
+	old := validate.CopyGlobalMessages()
+	defer func() {
+		validate.SetBuiltinMessages(old)
+	}()
+
 	RegisterGlobal()
 
 	is := assert.New(t)

locales/zhtw/zhtw_test.go

@@ -23,6 +23,11 @@ func TestRegister(t *testing.T) {
 }
 
 func TestRegisterGlobal(t *testing.T) {
+	old := validate.CopyGlobalMessages()
+	defer func() {
+		validate.SetBuiltinMessages(old)
+	}()
+
 	RegisterGlobal()
 
 	is := assert.New(t)

messages.go

@@ -257,17 +257,23 @@ func AddGlobalMessages(mp map[string]string) {
 }
 
 // AddBuiltinMessages alias of the AddGlobalMessages()
-func AddBuiltinMessages(mp map[string]string) {
-	for name, msg := range mp {
-		builtinMessages[name] = msg
-	}
-}
+func AddBuiltinMessages(mp map[string]string) { AddGlobalMessages(mp) }
 
 // BuiltinMessages get builtin messages
-func BuiltinMessages() map[string]string {
-	return builtinMessages
+func BuiltinMessages() map[string]string { return builtinMessages }
+
+// CopyGlobalMessages copy get builtin messages
+func CopyGlobalMessages() map[string]string {
+	cp := make(map[string]string, len(builtinMessages))
+	for name, msg := range builtinMessages {
+		cp[name] = msg
+	}
+	return cp
 }
 
+// SetBuiltinMessages override set builtin messages
+func SetBuiltinMessages(mp map[string]string) { builtinMessages = mp }
+
 /*************************************************************
  * Error messages translator
  *************************************************************/

rule_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestRule(t *testing.T) {
+func TestRule_basic(t *testing.T) {
 	is := assert.New(t)
 	data := url.Values{
 		"name": []string{"inhere"},
@@ -33,7 +33,7 @@ func TestRule(t *testing.T) {
 	v.AddRule("key0", "inRule").SetCheckFunc(func(s string) bool {
 		return s == "val0"
 	})
-	v.AddRule("name", "gtField", "key0")
+	v.AddRule("name", "ltField", "key0")
 
 	// validate. will skip validate field "name"
 	v.Validate()
@@ -63,8 +63,7 @@ func TestRule_SetBeforeFunc(t *testing.T) {
 
 	// use SetBeforeFunc
 	v = Map(mp)
-	v.
-		AddRule("avatar", "isFile").
+	v.AddRule("avatar", "isFile").
 		SetBeforeFunc(func(v *Validation) bool {
 			// return false for skip validate
 			return false
@@ -81,8 +80,7 @@ func TestRule_SetFilterFunc(t *testing.T) {
 		"age":  "abc",
 	})
 
-	v.
-		AddRule("age", "int", 1, 100).
+	v.AddRule("age", "int", 1, 100).
 		SetFilterFunc(func(val interface{}) (i interface{}, e error) {
 			return filter.Int(val)
 		})
@@ -102,6 +100,7 @@ func TestRule_SetSkipEmpty(t *testing.T) {
 	v.AddRule("age", "int", 1)
 	v.AddRule("name", "string", 1, 10)
 	is.True(v.Validate())
+
 	sd := v.SafeData()
 	is.Contains(sd, "name")
 	is.NotContains(sd, "age")

util.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/gookit/filter"
 	"github.com/gookit/goutil/mathutil"
+	"github.com/gookit/goutil/reflects"
 	"github.com/gookit/goutil/strutil"
 )
 
@@ -21,7 +22,7 @@ var nilObj = NilObject{}
 // init a reflect nil value
 var nilRVal = reflect.ValueOf(nilObj)
 
-// TODO a reflect nil value
+// NilValue TODO a reflect nil value, use for instead of nilRVal
 var NilValue = reflect.Zero(reflect.TypeOf((*interface{})(nil)).Elem())
 
 // IsNilObj check value is internal NilObject
@@ -126,32 +127,14 @@ func ValueIsEmpty(v reflect.Value) bool {
 	return reflect.DeepEqual(v.Interface(), reflect.Zero(v.Type()).Interface())
 }
 
-// ValueLen get value length. TODO use reflects.Len()
+// ValueLen get value length.
+// Deprecated: please use reflects.Len()
 func ValueLen(v reflect.Value) int {
-	v = reflect.Indirect(v)
-	k := v.Kind()
-
-	// (u)int use width.
-	switch k {
-	case reflect.String:
-		return len([]rune(v.String()))
-	case reflect.Map, reflect.Array, reflect.Chan, reflect.Slice:
-		return v.Len()
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return len(strconv.FormatInt(int64(v.Uint()), 10))
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return len(strconv.FormatInt(v.Int(), 10))
-	case reflect.Float32, reflect.Float64:
-		return len(fmt.Sprint(v.Interface()))
-	}
-
-	// cannot get length
-	return -1
+	return reflects.Len(v)
 }
 
-var (
-	ErrConvertFail = errors.New("convert value is failure")
-)
+// ErrConvertFail error
+var ErrConvertFail = errors.New("convert value is failure")
 
 func valueToInt64(v interface{}, strict bool) (i64 int64, err error) {
 	switch tVal := v.(type) {
@@ -202,11 +185,8 @@ func CalcLength(val interface{}) int {
 		return -1
 	}
 
-	// fix: issues#39 dont use `return len(str)` for string.
-	if str, ok := val.(string); ok {
-		return len([]rune(str))
-	}
-	return ValueLen(reflect.ValueOf(val))
+	// return ValueLen(reflect.ValueOf(val))
+	return reflects.Len(reflect.ValueOf(val))
 }
 
 // value compare.
@@ -215,8 +195,8 @@ func CalcLength(val interface{}) int {
 func valueCompare(srcVal, dstVal interface{}, op string) (ok bool) {
 	// string compare
 	if str1, ok := srcVal.(string); ok {
-		str2, ok := dstVal.(string)
-		if !ok {
+		str2, err := strutil.ToString(dstVal)
+		if err != nil {
 			return false
 		}
 

validators_test.go

@@ -246,7 +246,7 @@ func TestLtGt(t *testing.T) {
 	is.True(Gt(0.3, 0.2))
 	is.True(Gt(2.1, 2))
 	is.False(Gt(2, 3))
-	is.False(Gt("invalid", 3))
+	is.False(Gt([]int{23}, 3))
 }
 
 func TestMin(t *testing.T) {
@@ -261,7 +261,7 @@ func TestMin(t *testing.T) {
 		{val: float32(3.2), min: 3.1},
 		{val: 3.2, min: 3.2},
 		{val: 3.2, min: "3.2"},
-		{val: "3", min: 3.2},
+		{val: 3, min: 3.2},
 		{val: 0.02, min: 0.01},
 		{val: 0.02, min: 0.02},
 	}
@@ -271,9 +271,9 @@ func TestMin(t *testing.T) {
 
 	// fail
 	tests = []struct{ val, min interface{} }{
-		{val: "3.2", min: 3.2},
+		{val: 3.1, min: 3.2},
 		{nil, 3},
-		{"str", 3},
+		{"abc", "def"},
 		{3, nil},
 		{3, 4},
 		{3, "abc"},