You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by mb...@apache.org on 2017/11/03 22:27:44 UTC
[19/51] [abbrv] bval git commit: elaborate on composed constraint
tests to verify that BVAL-105 is fixed
elaborate on composed constraint tests to verify that BVAL-105 is fixed
Project: http://git-wip-us.apache.org/repos/asf/bval/repo
Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/8f08f7c7
Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/8f08f7c7
Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/8f08f7c7
Branch: refs/heads/master
Commit: 8f08f7c702b76bba9291791cb2b4b666d8904b87
Parents: 1071590
Author: Matt Benson <mb...@apache.org>
Authored: Thu Oct 20 22:21:14 2016 +0000
Committer: Matt Benson <mb...@apache.org>
Committed: Thu Oct 20 22:21:14 2016 +0000
----------------------------------------------------------------------
.../bval/jsr/ComposedConstraintsTest.java | 28 ++++++++++----------
.../apache/bval/jsr/example/FrenchAddress.java | 14 +++++++---
2 files changed, 25 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bval/blob/8f08f7c7/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java
----------------------------------------------------------------------
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java
index b985d71..3b4361e 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java
@@ -67,36 +67,36 @@ public class ComposedConstraintsTest extends ValidationTestBase {
@Test
public void testValidateComposed() {
FrenchAddress adr = new FrenchAddress();
- Set<ConstraintViolation<FrenchAddress>> findings = validator.validate(adr);
- assertEquals(1, findings.size()); // with @ReportAsSingleConstraintViolation
- ConstraintViolation<FrenchAddress> finding = findings.iterator().next();
- assertEquals("Wrong zipcode", finding.getMessage());
+ {
+ Set<ConstraintViolation<FrenchAddress>> findings = validator.validate(adr);
+ assertEquals(1, findings.size()); // with @ReportAsSingleConstraintViolation
+ ConstraintViolation<FrenchAddress> finding = findings.iterator().next();
+ assertEquals("Wrong zipcode", finding.getMessage());
+ }
adr.setZipCode("1234567");
- findings = validator.validate(adr);
- assertEquals(0, findings.size());
+ assertTrue(validator.validate(adr).isEmpty());
adr.setZipCode("1234567234567");
- findings = validator.validate(adr);
- assertTrue(findings.size() > 0); // too long
+ assertEquals(1, validator.validate(adr).size());
+
+ adr.setZipCode2(null);
+ assertEquals(2, validator.validate(adr).size());
}
@Test
public void testOverridesAttributeConstraintIndex() {
- CompanyAddress adr = new CompanyAddress("invalid-string");
- Set<ConstraintViolation<CompanyAddress>> findings = validator.validate(adr);
+ Set<ConstraintViolation<CompanyAddress>> findings = validator.validate(new CompanyAddress("invalid-string"));
assertEquals(2, findings.size()); // without @ReportAsSingleConstraintViolation
assertNotNull(TestUtils.getViolationWithMessage(findings, "Not COMPANY"));
assertNotNull(TestUtils.getViolationWithMessage(findings, "Not an email"));
- adr = new CompanyAddress("JOHN_DO@WEB.DE");
- findings = validator.validate(adr);
+ findings = validator.validate(new CompanyAddress("JOHN_DO@WEB.DE"));
assertEquals(1, findings.size());
assertNotNull(TestUtils.getViolationWithMessage(findings, "Not COMPANY"));
- adr = new CompanyAddress("JOHN_DO@COMPANY.DE");
- findings = validator.validate(adr);
+ findings = validator.validate(new CompanyAddress("JOHN_DO@COMPANY.DE"));
assertTrue(findings.isEmpty());
}
http://git-wip-us.apache.org/repos/asf/bval/blob/8f08f7c7/bval-jsr/src/test/java/org/apache/bval/jsr/example/FrenchAddress.java
----------------------------------------------------------------------
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/FrenchAddress.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/FrenchAddress.java
index 97aab7d..87dbb85 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/FrenchAddress.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/FrenchAddress.java
@@ -27,13 +27,16 @@ public class FrenchAddress {
@FrenchZipCode(size = 7)
String zipCode;
+ @FrenchZipCode
+ String zipCode2 = "123456";
+
public FrenchAddress() {
}
public FrenchAddress(String zipCode) {
this.zipCode = zipCode;
}
-
+
public String getZipCode() {
return zipCode;
}
@@ -42,7 +45,12 @@ public class FrenchAddress {
this.zipCode = zipCode;
}
- @FrenchZipCode
- String zipCode2 = "123456";
+ public String getZipCode2() {
+ return zipCode2;
+ }
+
+ public void setZipCode2(String zipCode2) {
+ this.zipCode2 = zipCode2;
+ }
}