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 2017/06/01 10:59:27 UTC
[2/2] isis git commit: ISIS-1592: fixes unit tests
ISIS-1592: fixes unit tests
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/65dd791d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/65dd791d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/65dd791d
Branch: refs/heads/master
Commit: 65dd791d8052aa4b5627ce8e300db7db452f6a08
Parents: 76896f8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 1 11:59:21 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 1 11:59:21 2017 +0100
----------------------------------------------------------------------
.../CollectionFieldMethodsFacetFactoryTest.java | 11 ++++++++++-
.../properties/PropertyMethodsFacetFactoryTest.java | 9 +++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/65dd791d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
index cce1ea6..75da9e6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
@@ -24,6 +24,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
+import org.jmock.auto.Mock;
+
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -66,16 +68,21 @@ import org.apache.isis.core.metamodel.facets.members.hidden.staticmethod.HiddenF
import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethod;
import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+ @Mock
+ private ObjectSpecification mockSpecification;
+
public void setUp() throws Exception {
super.setUp();
-
+ // expecting
+ allowing_specificationLoader_loadSpecification_any_willReturn(mockSpecification);
}
public void testPropertyAccessorFacetIsInstalledForJavaUtilCollectionAndMethodRemoved() {
@@ -102,6 +109,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(collectionAccessorMethod));
}
+
public void testPropertyAccessorFacetIsInstalledForJavaUtilListAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
@@ -115,6 +123,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
final Method collectionAccessorMethod = findMethod(Customer.class, "getOrders");
+
facetFactory.process(new ProcessMethodContext(CustomerStatic.class, null, null, collectionAccessorMethod, methodRemover, facetedMethod));
final Facet facet = facetedMethod.getFacet(PropertyOrCollectionAccessorFacet.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/65dd791d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
index 9b649c1..dc585c2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
@@ -21,6 +21,8 @@ package org.apache.isis.core.metamodel.facets.properties;
import java.lang.reflect.Method;
+import org.jmock.auto.Mock;
+
import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
@@ -76,14 +78,21 @@ import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySe
import org.apache.isis.core.metamodel.facets.properties.validating.PropertyValidateFacet;
import org.apache.isis.core.metamodel.facets.properties.validating.method.PropertyValidateFacetViaMethod;
import org.apache.isis.core.metamodel.facets.properties.validating.method.PropertyValidateFacetViaMethodFactory;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+ @Mock
+ private ObjectSpecification mockSpecification;
+
public void setUp() throws Exception {
super.setUp();
+
+ // expecting
+ allowing_specificationLoader_loadSpecification_any_willReturn(mockSpecification);
}
public void testPropertyAccessorFacetIsInstalledAndMethodRemoved() {