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/10/14 09:44:04 UTC

[14/14] isis git commit: ISIS-1213: fixing failing unit test

ISIS-1213: fixing failing unit test


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e3295d8d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e3295d8d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e3295d8d

Branch: refs/heads/master
Commit: e3295d8d3d52bc2f1f52c38b02594a45b40329a0
Parents: 3d17689
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Oct 14 08:39:46 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 14 08:39:46 2015 +0100

----------------------------------------------------------------------
 .../layout/ActionLayoutAnnotationFacetFactoryTest.java        | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/e3295d8d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryTest.java
index bcfd4b5..8d4ce10 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryTest.java
@@ -33,6 +33,7 @@ import org.apache.isis.core.metamodel.facets.actions.position.ActionPositionFace
 import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
 import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
 import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
+import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
@@ -67,6 +68,9 @@ public class ActionLayoutAnnotationFacetFactoryTest extends AbstractFacetFactory
                 allowing(mockSpecificationLoaderSpi).loadSpecification(Customer.class);
                 will(returnValue(mockObjSpec));
 
+                allowing(mockObjSpec).getFacet(MixinFacet.class);
+                will(returnValue(null));
+
                 allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
                 will(returnValue(null));
             }
@@ -99,6 +103,9 @@ public class ActionLayoutAnnotationFacetFactoryTest extends AbstractFacetFactory
                 allowing(mockSpecificationLoaderSpi).loadSpecification(Customer.class);
                 will(returnValue(mockObjSpec));
 
+                allowing(mockObjSpec).getFacet(MixinFacet.class);
+                will(returnValue(null));
+
                 allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
                 will(returnValue(null));
             }