pharnexbase
/
validator
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix support for aliased time.Duration types

Browse Source
pull/937/head
tom twinkle 3 years ago
parent 9e2ea40380
commit 8e94f1ae3a
2 changed files with 300 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      util.go
  2. 276
      validator_test.go

5
util.go
Unescape View File

@ -243,10 +243,9 @@ func asIntFromTimeDuration(param string) int64 {
// asIntFromType calls the proper function to parse param as int64,
// given a field's Type t.
func asIntFromType(t reflect.Type, param string) int64 {
switch t {
case timeDurationType:
if t.ConvertibleTo(timeDurationType) {
return asIntFromTimeDuration(param)
default:
} else {
return asInt(param)
}
}

276
validator_test.go
Unescape View File

@ -1126,6 +1126,47 @@ func TestCrossStructLteFieldValidation(t *testing.T) {
timeDurationOmitemptyTest = &TimeDurationOmitemptyTest{timeDurationInner, time.Duration(0)}
errs = validate.Struct(timeDurationOmitemptyTest)
Equal(t, errs, nil)
// -- Validations for a struct and an inner struct with time.Duration alias type fields.
type DurationAlias time.Duration
type TimeDurationAliasInner struct {
Duration DurationAlias
}
var timeDurationAliasInner *TimeDurationAliasInner
type TimeDurationAliasTest struct {
Inner *TimeDurationAliasInner
Duration DurationAlias `validate:"ltecsfield=Inner.Duration"`
}
var timeDurationAliasTest *TimeDurationAliasTest
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour + time.Minute)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
Equal(t, errs, nil)
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
Equal(t, errs, nil)
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour - time.Minute)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
NotEqual(t, errs, nil)
AssertError(t, errs, "TimeDurationAliasTest.Duration", "TimeDurationAliasTest.Duration", "Duration", "Duration", "ltecsfield")
type TimeDurationAliasOmitemptyTest struct {
Inner *TimeDurationAliasInner
Duration DurationAlias `validate:"omitempty,ltecsfield=Inner.Duration"`
}
var timeDurationAliasOmitemptyTest *TimeDurationAliasOmitemptyTest
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(-time.Minute)}
timeDurationAliasOmitemptyTest = &TimeDurationAliasOmitemptyTest{timeDurationAliasInner, DurationAlias(0)}
errs = validate.Struct(timeDurationAliasOmitemptyTest)
Equal(t, errs, nil)
}
func TestCrossStructLtFieldValidation(t *testing.T) {
@ -1282,6 +1323,48 @@ func TestCrossStructLtFieldValidation(t *testing.T) {
timeDurationOmitemptyTest = &TimeDurationOmitemptyTest{timeDurationInner, time.Duration(0)}
errs = validate.Struct(timeDurationOmitemptyTest)
Equal(t, errs, nil)
// -- Validations for a struct and an inner struct with time.Duration alias type fields.
type DurationAlias time.Duration
type TimeDurationAliasInner struct {
Duration DurationAlias
}
var timeDurationAliasInner *TimeDurationAliasInner
type TimeDurationAliasTest struct {
Inner *TimeDurationAliasInner
Duration DurationAlias `validate:"ltcsfield=Inner.Duration"`
}
var timeDurationAliasTest *TimeDurationAliasTest
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour + time.Minute)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
Equal(t, errs, nil)
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
NotEqual(t, errs, nil)
AssertError(t, errs, "TimeDurationAliasTest.Duration", "TimeDurationAliasTest.Duration", "Duration", "Duration", "ltcsfield")
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour - time.Minute)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
NotEqual(t, errs, nil)
AssertError(t, errs, "TimeDurationAliasTest.Duration", "TimeDurationAliasTest.Duration", "Duration", "Duration", "ltcsfield")
type TimeDurationAliasOmitemptyTest struct {
Inner *TimeDurationAliasInner
Duration DurationAlias `validate:"omitempty,ltcsfield=Inner.Duration"`
}
var timeDurationAliasOmitemptyTest *TimeDurationAliasOmitemptyTest
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(-time.Minute)}
timeDurationAliasOmitemptyTest = &TimeDurationAliasOmitemptyTest{timeDurationAliasInner, DurationAlias(0)}
errs = validate.Struct(timeDurationAliasOmitemptyTest)
Equal(t, errs, nil)
}
func TestCrossStructGteFieldValidation(t *testing.T) {
@ -1448,6 +1531,47 @@ func TestCrossStructGteFieldValidation(t *testing.T) {
timeDurationOmitemptyTest = &TimeDurationOmitemptyTest{timeDurationInner, time.Duration(0)}
errs = validate.Struct(timeDurationOmitemptyTest)
Equal(t, errs, nil)
// -- Validations for a struct and an inner struct with time.Duration alias type fields.
type DurationAlias time.Duration
type TimeDurationAliasInner struct {
Duration DurationAlias
}
var timeDurationAliasInner *TimeDurationAliasInner
type TimeDurationAliasTest struct {
Inner *TimeDurationAliasInner
Duration DurationAlias `validate:"gtecsfield=Inner.Duration"`
}
var timeDurationAliasTest *TimeDurationAliasTest
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour - time.Minute)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
Equal(t, errs, nil)
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
Equal(t, errs, nil)
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour + time.Minute)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
NotEqual(t, errs, nil)
AssertError(t, errs, "TimeDurationAliasTest.Duration", "TimeDurationAliasTest.Duration", "Duration", "Duration", "gtecsfield")
type TimeDurationAliasOmitemptyTest struct {
Inner *TimeDurationAliasInner
Duration DurationAlias `validate:"omitempty,gtecsfield=Inner.Duration"`
}
var timeDurationAliasOmitemptyTest *TimeDurationAliasOmitemptyTest
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour)}
timeDurationAliasOmitemptyTest = &TimeDurationAliasOmitemptyTest{timeDurationAliasInner, DurationAlias(0)}
errs = validate.Struct(timeDurationAliasOmitemptyTest)
Equal(t, errs, nil)
}
func TestCrossStructGtFieldValidation(t *testing.T) {
@ -1604,6 +1728,48 @@ func TestCrossStructGtFieldValidation(t *testing.T) {
timeDurationOmitemptyTest = &TimeDurationOmitemptyTest{timeDurationInner, time.Duration(0)}
errs = validate.Struct(timeDurationOmitemptyTest)
Equal(t, errs, nil)
// -- Validations for a struct and an inner struct with time.Duration alias type fields.
type DurationAlias time.Duration
type TimeDurationAliasInner struct {
Duration DurationAlias
}
var timeDurationAliasInner *TimeDurationAliasInner
type TimeDurationAliasTest struct {
Inner *TimeDurationAliasInner
Duration DurationAlias `validate:"gtcsfield=Inner.Duration"`
}
var timeDurationAliasTest *TimeDurationAliasTest
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour - time.Minute)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
Equal(t, errs, nil)
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
NotEqual(t, errs, nil)
AssertError(t, errs, "TimeDurationAliasTest.Duration", "TimeDurationAliasTest.Duration", "Duration", "Duration", "gtcsfield")
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour + time.Minute)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
NotEqual(t, errs, nil)
AssertError(t, errs, "TimeDurationAliasTest.Duration", "TimeDurationAliasTest.Duration", "Duration", "Duration", "gtcsfield")
type TimeDurationAliasOmitemptyTest struct {
Inner *TimeDurationAliasInner
Duration DurationAlias `validate:"omitempty,gtcsfield=Inner.Duration"`
}
var timeDurationAliasOmitemptyTest *TimeDurationAliasOmitemptyTest
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour)}
timeDurationAliasOmitemptyTest = &TimeDurationAliasOmitemptyTest{timeDurationAliasInner, DurationAlias(0)}
errs = validate.Struct(timeDurationAliasOmitemptyTest)
Equal(t, errs, nil)
}
func TestCrossStructNeFieldValidation(t *testing.T) {
@ -1776,6 +1942,47 @@ func TestCrossStructNeFieldValidation(t *testing.T) {
timeDurationOmitemptyTest = &TimeDurationOmitemptyTest{timeDurationInner, time.Duration(0)}
errs = validate.Struct(timeDurationOmitemptyTest)
Equal(t, errs, nil)
// -- Validations for a struct and an inner struct with time.Duration alias type fields.
type DurationAlias time.Duration
type TimeDurationAliasInner struct {
Duration DurationAlias
}
var timeDurationAliasInner *TimeDurationAliasInner
type TimeDurationAliasTest struct {
Inner *TimeDurationAliasInner
Duration DurationAlias `validate:"necsfield=Inner.Duration"`
}
var timeDurationAliasTest *TimeDurationAliasTest
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour - time.Minute)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
Equal(t, errs, nil)
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour + time.Minute)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
Equal(t, errs, nil)
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
NotEqual(t, errs, nil)
AssertError(t, errs, "TimeDurationAliasTest.Duration", "TimeDurationAliasTest.Duration", "Duration", "Duration", "necsfield")
type TimeDurationAliasOmitemptyTest struct {
Inner *TimeDurationAliasInner
Duration DurationAlias `validate:"omitempty,necsfield=Inner.Duration"`
}
var timeDurationAliasOmitemptyTest *TimeDurationAliasOmitemptyTest
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(0)}
timeDurationAliasOmitemptyTest = &TimeDurationAliasOmitemptyTest{timeDurationAliasInner, DurationAlias(0)}
errs = validate.Struct(timeDurationAliasOmitemptyTest)
Equal(t, errs, nil)
}
func TestCrossStructEqFieldValidation(t *testing.T) {
@ -1946,6 +2153,48 @@ func TestCrossStructEqFieldValidation(t *testing.T) {
timeDurationOmitemptyTest = &TimeDurationOmitemptyTest{timeDurationInner, time.Duration(0)}
errs = validate.Struct(timeDurationOmitemptyTest)
Equal(t, errs, nil)
// -- Validations for a struct and an inner struct with time.Duration alias type fields.
type DurationAlias time.Duration
type TimeDurationAliasInner struct {
Duration DurationAlias
}
var timeDurationAliasInner *TimeDurationAliasInner
type TimeDurationAliasTest struct {
Inner *TimeDurationAliasInner
Duration DurationAlias `validate:"eqcsfield=Inner.Duration"`
}
var timeDurationAliasTest *TimeDurationAliasTest
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
Equal(t, errs, nil)
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour - time.Minute)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
NotEqual(t, errs, nil)
AssertError(t, errs, "TimeDurationAliasTest.Duration", "TimeDurationAliasTest.Duration", "Duration", "Duration", "eqcsfield")
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour + time.Minute)}
timeDurationAliasTest = &TimeDurationAliasTest{timeDurationAliasInner, DurationAlias(time.Hour)}
errs = validate.Struct(timeDurationAliasTest)
NotEqual(t, errs, nil)
AssertError(t, errs, "TimeDurationAliasTest.Duration", "TimeDurationAliasTest.Duration", "Duration", "Duration", "eqcsfield")
type TimeDurationAliasOmitemptyTest struct {
Inner *TimeDurationAliasInner
Duration DurationAlias `validate:"omitempty,eqcsfield=Inner.Duration"`
}
var timeDurationAliasOmitemptyTest *TimeDurationAliasOmitemptyTest
timeDurationAliasInner = &TimeDurationAliasInner{DurationAlias(time.Hour)}
timeDurationAliasOmitemptyTest = &TimeDurationAliasOmitemptyTest{timeDurationAliasInner, DurationAlias(0)}
errs = validate.Struct(timeDurationAliasOmitemptyTest)
Equal(t, errs, nil)
}
func TestCrossNamespaceFieldValidation(t *testing.T) {
@ -5402,6 +5651,33 @@ func TestIsEqFieldValidationWithAliasTime(t *testing.T) {
Equal(t, errs, nil)
}
func TestMaxValidationWithAliasTimeDuration(t *testing.T) {
var errs error
validate := New()
type CustomDuration time.Duration
type Test struct {
ParamInt CustomDuration `validate:"max=1000000000"`
ParamDurationString CustomDuration `validate:"max=1s"`
ParamIntP *CustomDuration `validate:"max=1000000000"`
ParamDurationStringP *CustomDuration `validate:"max=1s"`
}
duration := time.Second
customDuration := CustomDuration(duration)
sv := &Test{
ParamInt: customDuration,
ParamDurationString: customDuration,
ParamIntP: &customDuration,
ParamDurationStringP: &customDuration,
}
errs = validate.Struct(sv)
Equal(t, errs, nil)
}
func TestIsEqValidation(t *testing.T) {
var errs error
validate := New()

Write Preview
Loading…
Cancel
Save