|
From: Aleksandar S. <as...@us...> - 2008-02-05 20:40:50
|
Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Validation/Validators In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9288/test/Spring/Spring.Core.Tests/Validation/Validators Modified Files: ConditionValidatorTests.cs CreditCardValidatorTests.cs EmailValidatorTests.cs ISBNValidatorTests.cs RequiredValidatorTests.cs UrlValidatorTests.cs Log Message: Extracted IValidationErrors interface and made ValidationErrors non-sealed. Added ValidationException class. Modified email, credit card, isbn and url validators to return true (valid) if object to validate is null or empty. Index: ConditionValidatorTests.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Validation/Validators/ConditionValidatorTests.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ConditionValidatorTests.cs 9 Apr 2006 07:24:53 -0000 1.8 --- ConditionValidatorTests.cs 5 Feb 2008 20:40:27 -0000 1.9 *************** *** 74,78 **** ConditionValidator validator = new ConditionValidator(Expression.Parse("Name == 'Nikola Tesla'"), null); validator.Actions = new ErrorMessageAction[] {new ErrorMessageAction("Wrong name", "InventorValidator") }; ! ValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(tesla, errors)); Assert.IsFalse(errors.IsEmpty); --- 74,78 ---- ConditionValidator validator = new ConditionValidator(Expression.Parse("Name == 'Nikola Tesla'"), null); validator.Actions = new ErrorMessageAction[] {new ErrorMessageAction("Wrong name", "InventorValidator") }; ! IValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(tesla, errors)); Assert.IsFalse(errors.IsEmpty); *************** *** 89,93 **** validator.Test = Expression.Parse("false"); validator.When = Expression.Parse("false"); ! ValidationErrors errors = new ValidationErrors(); bool valid = validator.Validate(new object(), null, errors); --- 89,93 ---- validator.Test = Expression.Parse("false"); validator.When = Expression.Parse("false"); ! IValidationErrors errors = new ValidationErrors(); bool valid = validator.Validate(new object(), null, errors); Index: RequiredValidatorTests.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Validation/Validators/RequiredValidatorTests.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RequiredValidatorTests.cs 9 Apr 2006 07:24:53 -0000 1.6 --- RequiredValidatorTests.cs 5 Feb 2008 20:40:27 -0000 1.7 *************** *** 42,46 **** RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("null"); ! ValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } --- 42,46 ---- RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("null"); ! IValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } *************** *** 50,54 **** { RequiredValidator validator = new RequiredValidator("0", null); ! ValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } --- 50,54 ---- { RequiredValidator validator = new RequiredValidator("0", null); ! IValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } *************** *** 58,62 **** { RequiredValidator validator = new RequiredValidator(Expression.Parse("100"), null); ! ValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } --- 58,62 ---- { RequiredValidator validator = new RequiredValidator(Expression.Parse("100"), null); ! IValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } *************** *** 67,71 **** RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("-100"); ! ValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } --- 67,71 ---- RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("-100"); ! IValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } *************** *** 75,79 **** { RequiredValidator validator = new RequiredValidator("''", null); ! ValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } --- 75,79 ---- { RequiredValidator validator = new RequiredValidator("''", null); ! IValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } *************** *** 83,87 **** { RequiredValidator validator = new RequiredValidator(Expression.Parse("' '"), null); ! ValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } --- 83,87 ---- { RequiredValidator validator = new RequiredValidator(Expression.Parse("' '"), null); ! IValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } *************** *** 92,96 **** RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("'some non-empty string'"); ! ValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } --- 92,96 ---- RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("'some non-empty string'"); ! IValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } *************** *** 100,104 **** { RequiredValidator validator = new RequiredValidator("DateTime.Today", null); ! ValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } --- 100,104 ---- { RequiredValidator validator = new RequiredValidator("DateTime.Today", null); ! IValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } *************** *** 108,112 **** { RequiredValidator validator = new RequiredValidator(Expression.Parse("DateTime.MinValue"), null); ! ValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } --- 108,112 ---- { RequiredValidator validator = new RequiredValidator(Expression.Parse("DateTime.MinValue"), null); ! IValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } *************** *** 117,121 **** RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("DateTime.MaxValue"); ! ValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } --- 117,121 ---- RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("DateTime.MaxValue"); ! IValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } *************** *** 125,129 **** { RequiredValidator validator = new RequiredValidator("0.00F", null); ! ValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } --- 125,129 ---- { RequiredValidator validator = new RequiredValidator("0.00F", null); ! IValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } *************** *** 133,137 **** { RequiredValidator validator = new RequiredValidator(Expression.Parse("5.25F"), null); ! ValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } --- 133,137 ---- { RequiredValidator validator = new RequiredValidator(Expression.Parse("5.25F"), null); ! IValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } *************** *** 141,145 **** { RequiredValidator validator = new RequiredValidator("0.00D", null); ! ValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } --- 141,145 ---- { RequiredValidator validator = new RequiredValidator("0.00D", null); ! IValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } *************** *** 149,153 **** { RequiredValidator validator = new RequiredValidator("5.25D", null); ! ValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } --- 149,153 ---- { RequiredValidator validator = new RequiredValidator("5.25D", null); ! IValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } *************** *** 158,162 **** RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("char.MinValue"); ! ValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } --- 158,162 ---- RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("char.MinValue"); ! IValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } *************** *** 167,171 **** RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("' '.ToCharArray()[0]"); ! ValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } --- 167,171 ---- RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("' '.ToCharArray()[0]"); ! IValidationErrors errors = new ValidationErrors(); Assert.IsFalse(validator.Validate(null, errors)); } *************** *** 176,180 **** RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("'xyz'.ToCharArray()[1]"); ! ValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } --- 176,180 ---- RequiredValidator validator = new RequiredValidator(); validator.Test = Expression.Parse("'xyz'.ToCharArray()[1]"); ! IValidationErrors errors = new ValidationErrors(); Assert.IsTrue(validator.Validate(null, errors)); } *************** *** 184,188 **** { RequiredValidator validator = new RequiredValidator("DateTime.MinValue", "false"); ! ValidationErrors errors = new ValidationErrors(); bool valid = validator.Validate(new object(), null, errors); --- 184,188 ---- { RequiredValidator validator = new RequiredValidator("DateTime.MinValue", "false"); ! IValidationErrors errors = new ValidationErrors(); bool valid = validator.Validate(new object(), null, errors); Index: ISBNValidatorTests.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Validation/Validators/ISBNValidatorTests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ISBNValidatorTests.cs 8 Feb 2007 02:18:58 -0000 1.1 --- ISBNValidatorTests.cs 5 Feb 2008 20:40:27 -0000 1.2 *************** *** 56,70 **** Assert.IsFalse(validator.Validate("a789g70002343", new ValidationErrors())); Assert.IsFalse(validator.Validate("978907000234x", new ValidationErrors())); ! Assert.IsFalse(validator.Validate("", new ValidationErrors())); ! Assert.IsFalse(validator.Validate(" ", new ValidationErrors())); } - - [Test] - [ExpectedException(typeof(ArgumentException))] - public void WithNull() - { - ISBNValidator validator = new ISBNValidator(); - Assert.IsFalse(validator.Validate(null, new ValidationErrors())); - } } } --- 56,63 ---- Assert.IsFalse(validator.Validate("a789g70002343", new ValidationErrors())); Assert.IsFalse(validator.Validate("978907000234x", new ValidationErrors())); ! Assert.IsTrue(validator.Validate("", new ValidationErrors())); ! Assert.IsTrue(validator.Validate(" ", new ValidationErrors())); ! Assert.IsTrue(validator.Validate(null, new ValidationErrors())); } } } Index: CreditCardValidatorTests.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Validation/Validators/CreditCardValidatorTests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CreditCardValidatorTests.cs 19 Feb 2007 17:56:42 -0000 1.2 --- CreditCardValidatorTests.cs 5 Feb 2008 20:40:27 -0000 1.3 *************** *** 42,55 **** Assert.IsTrue(validator.Validate("378282246310005", new ValidationErrors())); Assert.IsFalse(validator.Validate("444444444", new ValidationErrors())); ! Assert.IsFalse(validator.Validate(" ", new ValidationErrors())); ! Assert.IsFalse(validator.Validate("", new ValidationErrors())); ! } ! ! [Test] ! [ExpectedException(typeof(ArgumentException))] ! public void WithNull() ! { ! CreditCardValidator validator = new CreditCardValidator(); ! Assert.IsFalse(validator.Validate(null, new ValidationErrors())); } } --- 42,48 ---- Assert.IsTrue(validator.Validate("378282246310005", new ValidationErrors())); Assert.IsFalse(validator.Validate("444444444", new ValidationErrors())); ! Assert.IsTrue(validator.Validate(" ", new ValidationErrors())); ! Assert.IsTrue(validator.Validate("", new ValidationErrors())); ! Assert.IsTrue(validator.Validate(null, new ValidationErrors())); } } Index: UrlValidatorTests.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Validation/Validators/UrlValidatorTests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UrlValidatorTests.cs 8 Feb 2007 02:18:58 -0000 1.1 --- UrlValidatorTests.cs 5 Feb 2008 20:40:27 -0000 1.2 *************** *** 59,73 **** Assert.IsFalse(validator.Validate("http://1.1", new ValidationErrors())); Assert.IsFalse(validator.Validate("ht:1.1", new ValidationErrors())); ! Assert.IsFalse(validator.Validate("/:www.1.com", new ValidationErrors())); ! Assert.IsFalse(validator.Validate("", new ValidationErrors())); ! Assert.IsFalse(validator.Validate(" ", new ValidationErrors())); ! } ! ! [Test] ! [ExpectedException(typeof(ArgumentException))] ! public void WithNull() ! { ! UrlValidator validator = new UrlValidator(); ! Assert.IsFalse(validator.Validate(null, new ValidationErrors())); } } --- 59,66 ---- Assert.IsFalse(validator.Validate("http://1.1", new ValidationErrors())); Assert.IsFalse(validator.Validate("ht:1.1", new ValidationErrors())); ! Assert.IsFalse(validator.Validate("/:www.1.com", new ValidationErrors())); ! Assert.IsTrue(validator.Validate("", new ValidationErrors())); ! Assert.IsTrue(validator.Validate(" ", new ValidationErrors())); ! Assert.IsTrue(validator.Validate(null, new ValidationErrors())); } } Index: EmailValidatorTests.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Validation/Validators/EmailValidatorTests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EmailValidatorTests.cs 8 Feb 2007 02:18:58 -0000 1.1 --- EmailValidatorTests.cs 5 Feb 2008 20:40:27 -0000 1.2 *************** *** 55,68 **** Assert.IsFalse(validator.Validate("goran@@", new ValidationErrors())); Assert.IsFalse(validator.Validate("goran@eu s4hc.com", new ValidationErrors())); ! Assert.IsFalse(validator.Validate(" ", new ValidationErrors())); ! Assert.IsFalse(validator.Validate("", new ValidationErrors())); ! } ! ! [Test] ! [ExpectedException(typeof(ArgumentException))] ! public void WithNull() ! { ! EmailValidator validator = new EmailValidator(); ! Assert.IsFalse(validator.Validate(null, new ValidationErrors())); } } --- 55,61 ---- Assert.IsFalse(validator.Validate("goran@@", new ValidationErrors())); Assert.IsFalse(validator.Validate("goran@eu s4hc.com", new ValidationErrors())); ! Assert.IsTrue(validator.Validate(" ", new ValidationErrors())); ! Assert.IsTrue(validator.Validate("", new ValidationErrors())); ! Assert.IsTrue(validator.Validate(null, new ValidationErrors())); } } |
