zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: make methods consistent in signatures (#1971)

Browse Source 
* chore: make methods consistent in signatures

* test: fix fails
This commit is contained in:
Kevin Wan
2022-06-05 12:56:13 +08:00
committed by GitHub
parent 3fa8c5940d
commit 1d95e95cf8
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/logx/tracelogger_test.go
View File

@@ -210,7 +210,6 @@ func validate(t *testing.T, body string, expectedTrace, expectedSpan bool) {
val = doc val = doc
} }
assert.Nil(t, json.Unmarshal([]byte(body), &val), body)
assert.Equal(t, expectedTrace, len(val.Trace) > 0, body) assert.Equal(t, expectedTrace, len(val.Trace) > 0, body)
assert.Equal(t, expectedSpan, len(val.Span) > 0, body) assert.Equal(t, expectedSpan, len(val.Span) > 0, body)
} }

4
core/mapping/unmarshaler.go
View File

@@ -231,7 +231,7 @@ func (u *Unmarshaler) processFieldPrimitive(field reflect.StructField, value ref
return u.processFieldPrimitiveWithJSONNumber(field, value, v, opts, fullName) return u.processFieldPrimitiveWithJSONNumber(field, value, v, opts, fullName)
default: default:
if typeKind == valueKind { if typeKind == valueKind {
if err := validateValueInOptions(opts.options(), mapValue); err != nil { if err := validateValueInOptions(mapValue, opts.options()); err != nil {
return err return err
} }
@@ -253,7 +253,7 @@ func (u *Unmarshaler) processFieldPrimitiveWithJSONNumber(field reflect.StructFi
return err return err
} }
if err := validateValueInOptions(opts.options(), v); err != nil { if err := validateValueInOptions(v, opts.options()); err != nil {
return err return err
} }

8
core/mapping/unmarshaler_test.go
View File

@@ -1184,6 +1184,14 @@ func TestUnmarshalWithJsonNumberOptionsIncorrect(t *testing.T) {
assert.NotNil(t, UnmarshalKey(m, &in)) assert.NotNil(t, UnmarshalKey(m, &in))
} }
func TestUnmarshaler_UnmarshalIntOptions(t *testing.T) {
var val struct {
Sex int `json:"sex,options=0|1"`
}
input := []byte(`{"sex": 2}`)
assert.NotNil(t, UnmarshalJsonBytes(input, &val))
}
func TestUnmarshalWithUintOptionsCorrect(t *testing.T) { func TestUnmarshalWithUintOptionsCorrect(t *testing.T) {
type inner struct { type inner struct {
Value string `key:"value,options=first|second"` Value string `key:"value,options=first|second"`

6
core/mapping/utils.go
View File

@@ -592,16 +592,16 @@ func validateNumberRange(fv float64, nr *numberRange) error {
return nil return nil
} }
func validateValueInOptions(options []string, value interface{}) error { func validateValueInOptions(val interface{}, options []string) error {
if len(options) > 0 { if len(options) > 0 {
switch v := value.(type) { switch v := val.(type) {
case string: case string:
if !stringx.Contains(options, v) { if !stringx.Contains(options, v) {
return fmt.Errorf(`error: value "%s" is not defined in options "%v"`, v, options) return fmt.Errorf(`error: value "%s" is not defined in options "%v"`, v, options)
} }
default: default:
if !stringx.Contains(options, Repr(v)) { if !stringx.Contains(options, Repr(v)) {
return fmt.Errorf(`error: value "%v" is not defined in options "%v"`, value, options) return fmt.Errorf(`error: value "%v" is not defined in options "%v"`, val, options)
} }
} }
} }