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/01/06 08:27:28 UTC

[isis] branch v2 updated: ISIS-2050: fixes junit tests that were marked 'broken'

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 52350cc  ISIS-2050: fixes junit tests that were marked 'broken'
52350cc is described below

commit 52350cce3c5e4675639798756805a5a03adaa9a7
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Jan 6 09:27:20 2019 +0100

    ISIS-2050: fixes junit tests that were marked 'broken'
---
 .../facets/all/i18n/TranslationFacetFactory.java   |  2 +-
 .../SpecificationLoaderTestAbstract.java           | 31 +++++++++++++++++-----
 .../specloader/SpecificationLoaderTest_array.java  |  7 +----
 .../SpecificationLoaderTest_collection.java        |  7 +----
 .../specloader/SpecificationLoaderTest_value.java  |  3 ---
 .../ObjectReflectorDefaultTest_object.java         |  6 -----
 .../ObjectReflectorDefaultTest_object.java         |  6 -----
 7 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/TranslationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/TranslationFacetFactory.java
index bbea804..8ee5072 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/TranslationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/TranslationFacetFactory.java
@@ -130,7 +130,7 @@ public class TranslationFacetFactory extends FacetFactoryAbstract implements Con
      */
     TranslationService lookupTranslationService() {
         if(translationService == null) {
-            translationService = servicesInjector.lookupService(TranslationService.class).orElse(null);;
+            translationService = servicesInjector.lookupServiceElseFail(TranslationService.class);
         }
         return translationService;
     }
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
index 84d9cac..d711cc3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -19,18 +19,21 @@
 
 package org.apache.isis.core.metamodel.specloader;
 
+import org.hamcrest.Description;
 import org.jmock.Expectations;
+import org.jmock.api.Action;
+import org.jmock.api.Invocation;
 import org.jmock.auto.Mock;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import org.apache.isis.applib.AppManifest;
 import org.apache.isis.applib.services.grid.GridService;
+import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.applib.services.message.MessageService;
 import org.apache.isis.commons.internal.collections._Sets;
 import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -65,6 +68,8 @@ public abstract class SpecificationLoaderTestAbstract {
     private PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
     @Mock
     private MessageService mockMessageService;
+    @Mock
+    private TranslationService mockTranslationService;
     
     ServicesInjector stubServicesInjector;
 
@@ -85,6 +90,24 @@ public abstract class SpecificationLoaderTestAbstract {
 
             ignoring(mockPersistenceSessionServiceInternal);
             ignoring(mockMessageService);
+            
+            allowing(mockTranslationService).getMode();
+            will(returnValue(TranslationService.Mode.DISABLED));
+            
+            context.checking(new Expectations() {{
+                allowing(mockTranslationService).translate(with(any(String.class)), with(any(String.class)));
+                will(new Action() {
+                    @Override
+                    public Object invoke(final Invocation invocation) throws Throwable {
+                        return invocation.getParameter(1);
+                    }
+
+                    @Override
+                    public void describeTo(final Description description) {
+                        description.appendText("Returns parameter #1");
+                    }
+                });
+            }});
 
         }});
 
@@ -93,6 +116,7 @@ public abstract class SpecificationLoaderTestAbstract {
                     .addService(mockPersistenceSessionServiceInternal)
                     .addService(mockMessageService)
                     .addService(mockGridService)
+                    .addService(mockTranslationService)
                     .build();
 
         specificationLoader = new SpecificationLoader(
@@ -121,35 +145,30 @@ public abstract class SpecificationLoaderTestAbstract {
 
     protected abstract ObjectSpecification loadSpecification(SpecificationLoader reflector);
 
-    @Ignore("broken")
     @Test
     public void testCollectionFacet() throws Exception {
         final Facet facet = specification.getFacet(CollectionFacet.class);
         Assert.assertNull(facet);
     }
 
-    @Ignore("broken")
     @Test
     public void testTypeOfFacet() throws Exception {
         final TypeOfFacet facet = specification.getFacet(TypeOfFacet.class);
         Assert.assertNull(facet);
     }
 
-    @Ignore("broken")
     @Test
     public void testNamedFaced() throws Exception {
         final Facet facet = specification.getFacet(NamedFacet.class);
         Assert.assertNotNull(facet);
     }
 
-    @Ignore("broken")
     @Test
     public void testPluralFaced() throws Exception {
         final Facet facet = specification.getFacet(PluralFacet.class);
         Assert.assertNotNull(facet);
     }
 
-    @Ignore("broken")
     @Test
     public void testDescriptionFacet() throws Exception {
         final Facet facet = specification.getFacet(DescribedAsFacet.class);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java
index 5f14480..89950be 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java
@@ -20,12 +20,11 @@
 package org.apache.isis.core.metamodel.specloader;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
 
@@ -36,19 +35,16 @@ public class SpecificationLoaderTest_array extends SpecificationLoaderTestAbstra
         return reflector.loadSpecification(ReflectorTestPojo[].class, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
     }
 
-    @Ignore("broken")
     @Test
     public void testType() throws Exception {
         Assert.assertTrue(specification.isParentedOrFreeCollection());
     }
 
-    @Ignore("broken")
     @Test
     public void testName() throws Exception {
         Assert.assertEquals(ReflectorTestPojo[].class.getName(), specification.getFullIdentifier());
     }
 
-    @Ignore("broken")
     @Test
     @Override
     public void testCollectionFacet() throws Exception {
@@ -56,7 +52,6 @@ public class SpecificationLoaderTest_array extends SpecificationLoaderTestAbstra
         Assert.assertNotNull(facet);
     }
 
-    @Ignore("broken")
     @Test
     @Override
     public void testTypeOfFacet() throws Exception {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java
index 3d237fb..d3f04e2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java
@@ -22,12 +22,11 @@ package org.apache.isis.core.metamodel.specloader;
 import java.util.Vector;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
 
@@ -38,19 +37,16 @@ public class SpecificationLoaderTest_collection extends SpecificationLoaderTestA
         return reflector.loadSpecification(Vector.class, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
     }
 
-    @Ignore("broken")
     @Test
     public void testType() throws Exception {
         Assert.assertTrue(specification.isParentedOrFreeCollection());
     }
 
-    @Ignore("broken")
     @Test
     public void testName() throws Exception {
         Assert.assertEquals(Vector.class.getName(), specification.getFullIdentifier());
     }
 
-    @Ignore("broken")
     @Test
     @Override
     public void testCollectionFacet() throws Exception {
@@ -58,7 +54,6 @@ public class SpecificationLoaderTest_collection extends SpecificationLoaderTestA
         Assert.assertNotNull(facet);
     }
 
-    @Ignore("broken")
     @Test
     @Override
     public void testTypeOfFacet() throws Exception {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
index 7f6b8ef..c9d0088 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java
@@ -20,7 +20,6 @@
 package org.apache.isis.core.metamodel.specloader;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -33,13 +32,11 @@ public class SpecificationLoaderTest_value extends SpecificationLoaderTestAbstra
         return reflector.loadSpecification(String.class, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
     }
 
-    @Ignore("broken")
     @Test
     public void testType() throws Exception {
         Assert.assertTrue(specification.isNotCollection());
     }
 
-    @Ignore("broken")
     @Test
     public void testName() throws Exception {
         Assert.assertEquals(String.class.getName(), specification.getFullIdentifier());
diff --git a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java
index efec0ac..fdc4b89 100644
--- a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java
+++ b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.specloader;
 
 import org.datanucleus.enhancement.Persistable;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -44,19 +43,16 @@ public class ObjectReflectorDefaultTest_object extends SpecificationLoaderTestAb
         return reflector.loadSpecification(TestDomainObject.class);
     }
 
-    @Ignore("broken")
     @Test
     public void testType() throws Exception {
         Assert.assertTrue(specification.isNotCollection());
     }
 
-    @Ignore("broken")
     @Test
     public void testName() throws Exception {
         Assert.assertEquals(TestDomainObject.class.getName(), specification.getFullIdentifier());
     }
 
-    @Ignore("broken")
     @Test
     public void testStandardFacets() throws Exception {
         Assert.assertNotNull(specification.getFacet(NamedFacet.class));
@@ -66,14 +62,12 @@ public class ObjectReflectorDefaultTest_object extends SpecificationLoaderTestAb
         Assert.assertNotNull(specification.getFacet(ObjectValidPropertiesFacet.class));
     }
 
-    @Ignore("broken")
     @Test
     public void testNoCollectionFacet() throws Exception {
         final Facet facet = specification.getFacet(CollectionFacet.class);
         Assert.assertNull(facet);
     }
 
-    @Ignore("broken")
     @Test
     public void testNoTypeOfFacet() throws Exception {
         final TypeOfFacet facet = specification.getFacet(TypeOfFacet.class);
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java
index ba6dc72..99b1d5b 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.specloader;
 
 import org.datanucleus.enhancement.Persistable;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -44,19 +43,16 @@ public class ObjectReflectorDefaultTest_object extends SpecificationLoaderTestAb
         return reflector.loadSpecification(TestDomainObject.class);
     }
 
-    @Ignore("broken")
     @Test
     public void testType() throws Exception {
         Assert.assertTrue(specification.isNotCollection());
     }
 
-    @Ignore("broken")
     @Test
     public void testName() throws Exception {
         Assert.assertEquals(TestDomainObject.class.getName(), specification.getFullIdentifier());
     }
 
-    @Ignore("broken")
     @Test
     public void testStandardFacets() throws Exception {
         Assert.assertNotNull(specification.getFacet(NamedFacet.class));
@@ -66,14 +62,12 @@ public class ObjectReflectorDefaultTest_object extends SpecificationLoaderTestAb
         Assert.assertNotNull(specification.getFacet(ObjectValidPropertiesFacet.class));
     }
 
-    @Ignore("broken")
     @Test
     public void testNoCollectionFacet() throws Exception {
         final Facet facet = specification.getFacet(CollectionFacet.class);
         Assert.assertNull(facet);
     }
 
-    @Ignore("broken")
     @Test
     public void testNoTypeOfFacet() throws Exception {
         final TypeOfFacet facet = specification.getFacet(TypeOfFacet.class);