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 b9c25c5  ISIS-1866 further fixing tests
b9c25c5 is described below

commit b9c25c5950bd5f407db204feccd96152e8dcc7ba
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Thu Feb 22 09:00:10 2018 +0100

    ISIS-1866 further fixing tests
    
    correcting test logic, removing FIXME markers
---
 .../object/domainobject/DomainObjectAnnotationFacetFactoryTest.java  | 5 ++++-
 .../facets/param/parameter/ParameterAnnotationFacetFactoryTest.java  | 2 +-
 .../specimpl/ObjectAssociationAbstractTest_alwaysHidden.java         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 5e8b080..0a31bd3 100644
--- 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -442,6 +442,9 @@ public class DomainObjectAnnotationFacetFactoryTest extends 
AbstractFacetFactory
                     
allowing(mockServicesInjector).isRegisteredService(CustomerRepository.class);
                     will(returnValue(true));
 
+                    
allowing(mockServicesInjector).isRegisteredService(CustomerRepositoryWithDefaultMethodName.class);
+                    will(returnValue(true));
+                    
                     // anything else
                     ignoring(mockConfiguration);
                 }
@@ -481,7 +484,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends 
AbstractFacetFactory
 
             final AutoCompleteFacetForDomainObjectAnnotation autoCompleteFacet 
= (AutoCompleteFacetForDomainObjectAnnotation) facet;
 
-            
assertThat(CustomerRepository.class.isAssignableFrom(autoCompleteFacet.getRepositoryClass()),
 is(true));
+            
assertThat(CustomerRepositoryWithDefaultMethodName.class.isAssignableFrom(autoCompleteFacet.getRepositoryClass()),
 is(true));
             assertThat(autoCompleteFacet.getActionName(), is("autoComplete"));
 
             expectNoMethodsRemoved();
diff --git 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
index 289fefa..6628010 100644
--- 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
+++ 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
@@ -380,7 +380,7 @@ public class ParameterAnnotationFacetFactoryTest extends 
AbstractFacetFactoryJUn
 
             // then
             final RegExFacet regExFacet = 
facetedMethodParameter.getFacet(RegExFacet.class);
-            Assert.assertNotNull(regExFacet); //FIXME test fails, seems 
correct though
+            Assert.assertNotNull(regExFacet);
             
         }
 
diff --git 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index a4e5b5a..5bf71cb 100644
--- 
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ 
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -184,7 +184,7 @@ public class ObjectAssociationAbstractTest_alwaysHidden {
         addHiddenFacet(Where.EVERYWHERE, facetedMethod, false);
 
         // when, then
-        assertThat(objectAssociation.isAlwaysHidden(), is(true)); //FIXME test 
fails, seems correct though
+        assertThat(objectAssociation.isAlwaysHidden(), is(true));
     }
 
     @Test

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

Reply via email to