diff options
Diffstat (limited to 'validator_derive')
| -rw-r--r-- | validator_derive/src/lib.rs | 4 | ||||
| -rw-r--r-- | validator_derive/src/quoting.rs | 2 | ||||
| -rw-r--r-- | validator_derive/tests/required.rs | 44 |
3 files changed, 42 insertions, 8 deletions
diff --git a/validator_derive/src/lib.rs b/validator_derive/src/lib.rs index 6f91ae8..3244679 100644 --- a/validator_derive/src/lib.rs +++ b/validator_derive/src/lib.rs @@ -290,6 +290,10 @@ fn find_validators_for_field( "required" => { validators.push(FieldValidation::new(Validator::Required)); } + "required_nested" => { + validators.push(FieldValidation::new(Validator::Required)); + validators.push(FieldValidation::new(Validator::Nested)); + } _ => panic!("Unexpected validator: {:?}", name.get_ident()), } } diff --git a/validator_derive/src/quoting.rs b/validator_derive/src/quoting.rs index 4c81037..a5af288 100644 --- a/validator_derive/src/quoting.rs +++ b/validator_derive/src/quoting.rs @@ -465,7 +465,7 @@ pub fn quote_field_validation( Validator::NonControlCharacter => { validations.push(quote_non_control_character_validation(&field_quoter, validation)) } - Validator::Required => { + Validator::Required | Validator::RequiredNested => { validations.push(quote_required_validation(&field_quoter, validation)) } } diff --git a/validator_derive/tests/required.rs b/validator_derive/tests/required.rs index 2f02b1b..a073f28 100644 --- a/validator_derive/tests/required.rs +++ b/validator_derive/tests/required.rs @@ -4,28 +4,58 @@ extern crate validator_derive; use serde::Serialize; use validator::Validate; -#[derive(Debug, Serialize)] +#[derive(Serialize)] struct ObjectRef { id: i32, name: String, } -#[derive(Debug, Validate)] -struct TestStruct { +#[derive(Serialize, Validate)] +struct CheckedObjectRef { + #[validate(range(min = 1))] + id: i32, + #[validate(length(min = 1))] + name: String, +} + +#[derive(Validate)] +struct Required { #[validate(required)] val: Option<ObjectRef>, } +#[derive(Validate)] +struct RequiredNested { + #[validate(required_nested)] + val: Option<CheckedObjectRef>, +} + +#[test] +fn can_validate_required() { + let s = Required { val: Some(ObjectRef { id: 0, name: String::new() }) }; + + assert!(s.validate().is_ok()); +} + #[test] -fn can_validate_some() { - let s = TestStruct { val: Some(ObjectRef { id: 0, name: String::new() }) }; +fn can_validate_required_nested() { + let s = RequiredNested { + val: Some(CheckedObjectRef { id: 1, name: String::from("Reference representation") }), + }; assert!(s.validate().is_ok()); } #[test] -fn none_fails_validate() { - let s = TestStruct { val: None }; +fn none_fails_required() { + let s = Required { val: None }; + + assert!(s.validate().is_err()); +} + +#[test] +fn none_fails_required_nested() { + let s = RequiredNested { val: None }; assert!(s.validate().is_err()); } |
