[isis] branch master updated: ISIS-1866 further fixing tests

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 1187898  ISIS-1866 further fixing tests
1187898 is described below

commit 1187898a35ea4b1d2640320f54b40b4ccbc43e68
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Thu Feb 22 07:38:32 2018 +0100

    ISIS-1866 further fixing tests
    
    fix test logic for contributed = Contributed.AS_BOTH
---
 .../layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
index 3b8d8a2..77d8a00 100644
--- 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
+++ 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
@@ -20,6 +20,7 @@
 package org.apache.isis.core.metamodel.facets.actions.layout;
 
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.Matchers;
 import org.jmock.Expectations;
 import org.junit.Before;
 import org.junit.Test;
@@ -39,6 +40,7 @@ import 
org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
 
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
 public class ActionLayoutAnnotationFacetFactoryJunit4Test extends 
AbstractFacetFactoryJUnit4TestCase {
@@ -125,9 +127,9 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test 
extends AbstractFacetF
                        CustomerService.class, null, facetedMethod.getMethod(), 
mockMethodRemover, facetedMethod));
 
             // then
-            final Facet facet = 
facetedMethod.getFacet(NotContributedFacet.class);
-            assertThat(facet, CoreMatchers.is(nullValue())); //FIXME test fails
-
+            final NotContributedFacet facet = 
facetedMethod.getFacet(NotContributedFacet.class);
+            assertThat(facet, CoreMatchers.is(notNullValue()));
+            assertThat(facet.contributed(), 
CoreMatchers.is(Contributed.AS_BOTH));
         }
 
         @Test
@@ -168,7 +170,6 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test 
extends AbstractFacetF
             assertThat(facet, CoreMatchers.is(not(nullValue())));
             assertThat(facet instanceof 
NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
             final NotContributedFacetForActionLayoutAnnotation facetImpl = 
(NotContributedFacetForActionLayoutAnnotation) facet;
-            assertThat(facetImpl.notContributed(), 
CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.ACTION));
             assertThat(facetImpl.contributed(), 
CoreMatchers.equalTo(Contributed.AS_ASSOCIATION));
 
         }
@@ -211,7 +212,6 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test 
extends AbstractFacetF
             assertThat(facet, CoreMatchers.is(not(nullValue())));
             assertThat(facet instanceof 
NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
             final NotContributedFacetForActionLayoutAnnotation facetImpl = 
(NotContributedFacetForActionLayoutAnnotation) facet;
-            assertThat(facetImpl.notContributed(), 
CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.ASSOCIATION));
             assertThat(facetImpl.contributed(), 
CoreMatchers.equalTo(Contributed.AS_ACTION));
         }
 
@@ -252,7 +252,6 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test 
extends AbstractFacetF
             assertThat(facet, CoreMatchers.is(not(nullValue())));
             assertThat(facet instanceof 
NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
             final NotContributedFacetForActionLayoutAnnotation facetImpl = 
(NotContributedFacetForActionLayoutAnnotation) facet;
-            assertThat(facetImpl.notContributed(), 
CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.EITHER));
             assertThat(facetImpl.contributed(), 
CoreMatchers.equalTo(Contributed.AS_NEITHER));
 
         }
@@ -295,7 +294,6 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test 
extends AbstractFacetF
             assertThat(facet, CoreMatchers.is(not(nullValue())));
             assertThat(facet instanceof 
NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
             final NotContributedFacetForActionLayoutAnnotation facetImpl = 
(NotContributedFacetForActionLayoutAnnotation) facet;
-            assertThat(facetImpl.notContributed(), 
CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.EITHER));
             assertThat(facetImpl.contributed(), 
CoreMatchers.equalTo(Contributed.AS_NEITHER));
 
         }

-- 
To stop receiving notification emails like this one, please contact
ahu...@apache.org.