You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/10/09 14:58:32 UTC
[isis] branch v2 updated: ISIS-2158: fixing tests
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new b431397 ISIS-2158: fixing tests
b431397 is described below
commit b43139712dca0e209a1ece5d85cd9b48fd39bcca
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Oct 9 16:58:23 2019 +0200
ISIS-2158: fixing tests
---
.../isis/commons/internal/assertions/_Ensure.java | 8 +++----
...AnnotationFacetFactoryTest_refineMetaModel.java | 25 +++++++++++++++++++---
2 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Ensure.java b/core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Ensure.java
index 4ae9e05..ad213aa 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Ensure.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Ensure.java
@@ -50,7 +50,7 @@ public final class _Ensure {
* @throws IllegalArgumentException
* if predicate tests to false.
*/
- public static <T> T ensureThatArg(final T arg, final Predicate<T> predicate, final String message) {
+ public static <T> T ensureThatArg(final T arg, final Predicate<? super T> predicate, final String message) {
requires(predicate, "predicate");
if (!predicate.test(arg)) {
throw new IllegalArgumentException(message);
@@ -58,7 +58,7 @@ public final class _Ensure {
return arg;
}
- public static <T> T ensureThatArg(final T arg, final Predicate<T> predicate, final Supplier<String> messageSupplier) {
+ public static <T> T ensureThatArg(final T arg, final Predicate<? super T> predicate, final Supplier<String> messageSupplier) {
requires(predicate, "predicate");
if (!predicate.test(arg)) {
requires(messageSupplier, "messageSupplier");
@@ -74,7 +74,7 @@ public final class _Ensure {
* @throws IllegalStateException
* if predicate tests to false.
*/
- public static <T> T ensureThatState(final T field, final Predicate<T> predicate, final String message) {
+ public static <T> T ensureThatState(final T field, final Predicate<? super T> predicate, final String message) {
requires(predicate, "predicate");
if (!predicate.test(field)) {
throw new IllegalStateException(message);
@@ -88,7 +88,7 @@ public final class _Ensure {
* @throws IllegalThreadStateException
* if predicate tests to false.
*/
- public static <T> T ensureThatContext(final T contextProperty, final Predicate<T> predicate, final String message) {
+ public static <T> T ensureThatContext(final T contextProperty, final Predicate<? super T> predicate, final String message) {
requires(predicate, "predicate");
if (!predicate.test(contextProperty)) {
throw new IllegalThreadStateException(message);
diff --git a/core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java b/core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
index 1195be8..8f716e2 100644
--- a/core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
+++ b/core/plugins/jdo/common/src/test/java/org/apache/isis/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
@@ -39,6 +39,8 @@ import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import lombok.val;
+
public class JdoVersionAnnotationFacetFactoryTest_refineMetaModel {
@Rule
@@ -49,7 +51,6 @@ public class JdoVersionAnnotationFacetFactoryTest_refineMetaModel {
private ObjectSpecification mockGrandParentType;
private Visitor newValidatorVisitor;
- private ValidationFailures failures;
private MetaModelValidator validator;
private Sequence sequence;
@@ -62,9 +63,9 @@ public class JdoVersionAnnotationFacetFactoryTest_refineMetaModel {
sequence = context.sequence("inorder");
- failures = new ValidationFailures();
validator = new MetaModelValidatorAbstract() {};
newValidatorVisitor = new JdoVersionAnnotationFacetFactory().newValidatorVisitor();
+
}
@Test
@@ -80,7 +81,10 @@ public class JdoVersionAnnotationFacetFactoryTest_refineMetaModel {
});
newValidatorVisitor.visit(mockChildType, validator);
-
+
+ val failures = new ValidationFailures();
+ ((MetaModelValidatorAbstract)validator).collectFailuresInto(failures);
+
assertThat(failures.getNumberOfFailures(), is(0));
}
@@ -104,6 +108,9 @@ public class JdoVersionAnnotationFacetFactoryTest_refineMetaModel {
newValidatorVisitor.visit(mockChildType, validator);
+ val failures = new ValidationFailures();
+ ((MetaModelValidatorAbstract)validator).collectFailuresInto(failures);
+
assertThat(failures.getNumberOfFailures(), is(0));
}
@@ -137,6 +144,9 @@ public class JdoVersionAnnotationFacetFactoryTest_refineMetaModel {
newValidatorVisitor.visit(mockChildType, validator);
+ val failures = new ValidationFailures();
+ ((MetaModelValidatorAbstract)validator).collectFailuresInto(failures);
+
assertThat(failures.getNumberOfFailures(), is(0));
}
@@ -185,6 +195,9 @@ public class JdoVersionAnnotationFacetFactoryTest_refineMetaModel {
newValidatorVisitor.visit(mockChildType, validator);
+ val failures = new ValidationFailures();
+ ((MetaModelValidatorAbstract)validator).collectFailuresInto(failures);
+
assertThat(failures.getNumberOfFailures(), is(1));
assertThat(failures.getMessages().iterator().next(), is("mockChildType: cannot have @Version annotated on this subclass and any of its supertypes; superclass: mockParentType"));
}
@@ -235,12 +248,18 @@ public class JdoVersionAnnotationFacetFactoryTest_refineMetaModel {
oneOf(mockGrandParentType).getFullIdentifier();
inSequence(sequence);
will(returnValue("mockGrandParentType"));
+
+ oneOf(mockChildType).getFacet(DeficiencyFacet.class);
+ will(returnValue(null));
}
});
newValidatorVisitor.visit(mockChildType, validator);
+ val failures = new ValidationFailures();
+ ((MetaModelValidatorAbstract)validator).collectFailuresInto(failures);
+
assertThat(failures.getNumberOfFailures(), is(1));
assertThat(failures.getMessages().iterator().next(), is("mockChildType: cannot have @Version annotated on this subclass and any of its supertypes; superclass: mockGrandParentType"));
}