You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/11/27 09:25:34 UTC
[2/5] isis git commit: ISIS-1241: Tidy up a test
ISIS-1241: Tidy up a test
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/00869358
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/00869358
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/00869358
Branch: refs/heads/master
Commit: 008693584febfd5c03e5de8583eedf37de4c4806
Parents: e1b5dbd
Author: Sander Ginn <sa...@users.noreply.github.com>
Authored: Fri Nov 13 13:12:09 2015 +0100
Committer: Sander Ginn <sa...@users.noreply.github.com>
Committed: Fri Nov 13 13:12:09 2015 +0100
----------------------------------------------------------------------
.../validate/regex/RegExFacetAnnotationTest.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/00869358/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java
index ab30927..a896216 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/regex/RegExFacetAnnotationTest.java
@@ -53,12 +53,12 @@ public class RegExFacetAnnotationTest {
@Test
public void shouldBeAbleToInstantiate() {
- regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation(".*", "", true, facetHolder, "Doesn't match pattern");
+ regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation(".*", "", true, facetHolder, null);
}
@Test
public void shouldAllowDotStar() {
- regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation(".*", "", true, facetHolder, "Doesn't match pattern");
+ regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation(".*", "", true, facetHolder, null);
assertThat(regExFacetOnTypeAnnotation.doesNotMatch("abc"), equalTo(false)); // ie
// does
// match
@@ -66,7 +66,7 @@ public class RegExFacetAnnotationTest {
@Test
public void shouldAllowWhenCaseSensitive() {
- regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation("^abc$", "", true, facetHolder, "Doesn't match pattern");
+ regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation("^abc$", "", true, facetHolder, null);
assertThat(regExFacetOnTypeAnnotation.doesNotMatch("abc"), equalTo(false)); // ie
// does
// match
@@ -74,7 +74,7 @@ public class RegExFacetAnnotationTest {
@Test
public void shouldAllowWhenCaseInsensitive() {
- regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation("^abc$", "", false, facetHolder, "Doesn't match pattern");
+ regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation("^abc$", "", false, facetHolder, null);
assertThat(regExFacetOnTypeAnnotation.doesNotMatch("ABC"), equalTo(false)); // ie
// does
// match
@@ -82,19 +82,19 @@ public class RegExFacetAnnotationTest {
@Test
public void shouldDisallowWhenCaseSensitive() {
- regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation("^abc$", "", true, facetHolder, "Doesn't match pattern");
+ regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation("^abc$", "", true, facetHolder, null);
assertThat(regExFacetOnTypeAnnotation.doesNotMatch("abC"), equalTo(true));
}
@Test
public void shouldDisallowWhenCaseInsensitive() {
- regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation("^abc$", "", false, facetHolder, "Doesn't match pattern");
+ regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation("^abc$", "", false, facetHolder, null);
assertThat(regExFacetOnTypeAnnotation.doesNotMatch("aBd"), equalTo(true));
}
@Test
public void shouldReformat() {
- regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation("^([0-9]{2})([0-9]{2})([0-9]{2})$", "$1-$2-$3", false, facetHolder, "Doesn't match pattern");
+ regExFacetOnTypeAnnotation = new RegExFacetOnTypeAnnotation("^([0-9]{2})([0-9]{2})([0-9]{2})$", "$1-$2-$3", false, facetHolder, null);
assertThat(regExFacetOnTypeAnnotation.doesNotMatch("123456"), equalTo(false));
assertThat(regExFacetOnTypeAnnotation.format("123456"), equalTo("12-34-56"));
}