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/05/14 10:07:24 UTC
[isis] 02/02: ISIS-2112: fixes 'dn-5' junit tests
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2112_SpringBoot
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7a4e271b8f575dd31dba028bf73239635618ed12
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue May 14 12:07:14 2019 +0200
ISIS-2112: fixes 'dn-5' junit tests
- bumping jmock version
- also fixes jmock issues when building with jdk-11
- also solving 'asm' convergence issues
Task-Url: https://issues.apache.org/jira/browse/ISIS-2112
---
.../SpecificationLoaderTestAbstract.java | 25 ++++++--------
core/plugins/jdo-datanucleus-5/pom.xml | 6 ++++
.../ObjectReflectorDefaultTest_object.java | 38 ++++++++++++----------
.../WrapperFactoryDefaultTest_wrappedObject.java | 21 +++++++-----
...FactoryDefaultTest_wrappedObject_transient.java | 35 +++++++-------------
core/pom.xml | 9 ++++-
.../modules/sse/ServerSentEventsServlet.java | 3 +-
.../core/runtime/system/context/IsisContext.java | 15 ++++++---
core/unittestsupport/pom.xml | 18 ++++++++++
9 files changed, 100 insertions(+), 70 deletions(-)
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 d8e30c2..e6d556b 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,12 +19,6 @@
package org.apache.isis.core.metamodel.specloader;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.when;
-
-import javax.enterprise.inject.Produces;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -35,7 +29,6 @@ import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.i18n.TranslationService.Mode;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.commons.internal.base._Timing;
-import org.apache.isis.config.internal._Config;
import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
@@ -50,40 +43,44 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.when;
+
import lombok.val;
abstract class SpecificationLoaderTestAbstract {
static class Producers {
- @Produces
+ //@Produces
AuthenticationSessionProvider mockAuthenticationSessionProvider() {
return Mockito.mock(AuthenticationSessionProvider.class);
}
- @Produces
+ //@Produces
GridService mockGridService() {
return Mockito.mock(GridService.class);
}
- @Produces
+ //@Produces
ObjectAdapterService mockPersistenceSessionServiceInternal() {
return Mockito.mock(ObjectAdapterService.class);
}
- @Produces
+ //@Produces
MessageService mockMessageService() {
return Mockito.mock(MessageService.class);
}
- @Produces
+ //@Produces
TranslationService mockTranslationService() {
val mock = Mockito.mock(TranslationService.class);
when(mock.getMode()).thenReturn(Mode.DISABLED);
return mock;
}
- @Produces
+ //@Produces
SpecificationLoader getSpecificationLoader() {
return new SpecificationLoaderDefault(
new ProgrammingModelFacetsJava5(DeprecatedPolicy.HONOUR),
@@ -113,8 +110,6 @@ abstract class SpecificationLoaderTestAbstract {
MetaModelContext.preset(MetaModelContext.builder()
.specificationLoader(specificationLoader = producers.getSpecificationLoader())
-// .serviceInjector(mockServiceInjector)
-// .serviceRegistry(mockServiceRegistry)
.translationService(producers.mockTranslationService())
.objectAdapterProvider(mockPersistenceSessionServiceInternal = producers.mockPersistenceSessionServiceInternal())
.authenticationSessionProvider(mockAuthenticationSessionProvider = producers.mockAuthenticationSessionProvider())
diff --git a/core/plugins/jdo-datanucleus-5/pom.xml b/core/plugins/jdo-datanucleus-5/pom.xml
index 2b4d1f3..9ff6720 100644
--- a/core/plugins/jdo-datanucleus-5/pom.xml
+++ b/core/plugins/jdo-datanucleus-5/pom.xml
@@ -114,6 +114,12 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime-extensions</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime-services</artifactId>
<scope>compile</scope>
</dependency>
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 99b1d5b..4c13a0f 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
@@ -20,8 +20,7 @@
package org.apache.isis.core.metamodel.specloader;
import org.datanucleus.enhancement.Persistable;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
@@ -33,7 +32,12 @@ import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-public class ObjectReflectorDefaultTest_object extends SpecificationLoaderTestAbstract {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class ObjectReflectorDefaultTest_object extends SpecificationLoaderTestAbstract {
public abstract static class TestDomainObject implements Persistable {
}
@@ -44,34 +48,34 @@ public class ObjectReflectorDefaultTest_object extends SpecificationLoaderTestAb
}
@Test
- public void testType() throws Exception {
- Assert.assertTrue(specification.isNotCollection());
+ void testType() throws Exception {
+ assertTrue(specification.isNotCollection());
}
@Test
- public void testName() throws Exception {
- Assert.assertEquals(TestDomainObject.class.getName(), specification.getFullIdentifier());
+ void testName() throws Exception {
+ assertEquals(TestDomainObject.class.getName(), specification.getFullIdentifier());
}
@Test
- public void testStandardFacets() throws Exception {
- Assert.assertNotNull(specification.getFacet(NamedFacet.class));
- Assert.assertNotNull(specification.getFacet(DescribedAsFacet.class));
- Assert.assertNotNull(specification.getFacet(TitleFacet.class));
- Assert.assertNotNull(specification.getFacet(PluralFacet.class));
- Assert.assertNotNull(specification.getFacet(ObjectValidPropertiesFacet.class));
+ void testStandardFacets() throws Exception {
+ assertNotNull(specification.getFacet(NamedFacet.class));
+ assertNotNull(specification.getFacet(DescribedAsFacet.class));
+ assertNotNull(specification.getFacet(TitleFacet.class));
+ assertNotNull(specification.getFacet(PluralFacet.class));
+ assertNotNull(specification.getFacet(ObjectValidPropertiesFacet.class));
}
@Test
- public void testNoCollectionFacet() throws Exception {
+ void testNoCollectionFacet() throws Exception {
final Facet facet = specification.getFacet(CollectionFacet.class);
- Assert.assertNull(facet);
+ assertNull(facet);
}
@Test
- public void testNoTypeOfFacet() throws Exception {
+ void testNoTypeOfFacet() throws Exception {
final TypeOfFacet facet = specification.getFacet(TypeOfFacet.class);
- Assert.assertNull(facet);
+ assertNull(facet);
}
}
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index 66d2569..718aee9 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -37,6 +37,7 @@ import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.HiddenException;
import org.apache.isis.applib.services.wrapper.InvalidException;
import org.apache.isis.config.internal._Config;
+import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
@@ -50,7 +51,6 @@ import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyCle
import org.apache.isis.core.metamodel.facets.properties.update.init.PropertyInitializationFacetViaSetterMethod;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetViaModifyMethod;
import org.apache.isis.core.metamodel.facets.properties.validating.method.PropertyValidateFacetViaMethod;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
@@ -91,8 +91,6 @@ public class WrapperFactoryDefaultTest_wrappedObject {
@Mock
private MessageService mockMessageService;
@Mock
- private ServicesInjector mockServicesInjector;
- @Mock
private CommandContext mockCommandContext;
@Mock
private Command mockCommand;
@@ -136,7 +134,14 @@ public class WrapperFactoryDefaultTest_wrappedObject {
// PRODUCTION
- _Config.clear();
+ MetaModelContext.preset(MetaModelContext.builder()
+ .specificationLoader(mockSpecificationLoader)
+ .objectAdapterProvider(mockPersistenceSessionServiceInternal)
+ .authenticationSessionProvider(mockAuthenticationSessionProvider)
+ .singleton(wrapperFactory = createWrapperFactory())
+ .singleton(mockCommandContext)
+ .singleton(mockCommandDtoServiceInternal)
+ .build());
employeeRepository = new EmployeeRepositoryImpl();
@@ -149,9 +154,6 @@ public class WrapperFactoryDefaultTest_wrappedObject {
// allowing(mockIsisSessionFactory).getServicesInjector();
// will(returnValue(mockServicesInjector));
- allowing(mockIsisSessionFactory).getSpecificationLoader();
- will(returnValue(mockSpecificationLoader));
-
// allowing(mockServicesInjector).getPersistenceSessionServiceInternal();
// will(returnValue(mockPersistenceSessionServiceInternal));
@@ -228,7 +230,6 @@ public class WrapperFactoryDefaultTest_wrappedObject {
});
- wrapperFactory = createWrapperFactory();
wrapperFactory.persistenceSessionServiceInternal = mockPersistenceSessionServiceInternal;
wrapperFactory.isisSessionFactory = mockIsisSessionFactory;
wrapperFactory.authenticationSessionProvider = mockAuthenticationSessionProvider;
@@ -301,6 +302,8 @@ public class WrapperFactoryDefaultTest_wrappedObject {
@Test
public void shouldBeAbleToReadVisibleProperty() {
+ _Config.clear();
+
allowingEmployeeHasSmithAdapter();
_Config.put("isis.reflector.facet.filterVisibility", true);
@@ -340,6 +343,8 @@ public class WrapperFactoryDefaultTest_wrappedObject {
@Test
public void shouldBeAbleToModifyEnabledPropertyUsingSetter() {
+ _Config.clear();
+
allowingJonesStringValueAdapter();
_Config.put("isis.reflector.facet.filterVisibility", true);
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index c1f961e..08588a9 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -36,10 +36,10 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.wrapper.DisabledException;
-import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.events.PropertyModifyEvent;
import org.apache.isis.applib.services.wrapper.events.PropertyUsabilityEvent;
import org.apache.isis.applib.services.wrapper.events.PropertyVisibilityEvent;
+import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.consent.Allow;
@@ -121,6 +121,13 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
public void setUp() throws Exception {
// PRODUCTION
+
+ MetaModelContext.preset(MetaModelContext.builder()
+ .specificationLoader(mockSpecificationLoader)
+ .objectAdapterProvider(mockPersistenceSessionServiceInternal)
+ .authenticationSessionProvider(mockAuthenticationSessionProvider)
+ .singleton(wrapperFactory = createWrapperFactory())
+ .build());
employeeDO = new Employee();
employeeDO.setName("Smith");
@@ -128,33 +135,15 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
getPasswordMethod = Employee.class.getMethod("getPassword");
setPasswordMethod = Employee.class.getMethod("setPassword", String.class);
- wrapperFactory = createWrapperFactory();
wrapperFactory.authenticationSessionProvider = mockAuthenticationSessionProvider;
wrapperFactory.persistenceSessionServiceInternal = mockPersistenceSessionServiceInternal;
wrapperFactory.isisSessionFactory = mockIsisSessionFactory;
context.checking(new Expectations() {
{
-// allowing(mockIsisSessionFactory).getServiceInjector();
-// will(returnValue(mockServicesInjector));
-
- allowing(mockIsisSessionFactory).getSpecificationLoader();
- will(returnValue(mockSpecificationLoader));
-
-// allowing(mockServiceRegistry).getPersistenceSessionServiceInternal();
-// will(returnValue(mockPersistenceSessionServiceInternal));
-//
-// allowing(mockPersistenceSessionServiceInternal).adapterFor(employeeDO);
-// will(returnValue(mockEmployeeAdapter));
-//
-// allowing(mockServicesInjector).getAuthenticationSessionProvider();
-// will(returnValue(mockAuthenticationSessionProvider));
-//
-// allowing(mockServicesInjector).getSpecificationLoader();
-// will(returnValue(mockSpecificationLoader));
-
-// allowing(mockAdapterManager).lookupAdapterFor(employeeDO);
-// will(returnValue(mockEmployeeAdapter));
+
+ allowing(mockPersistenceSessionServiceInternal).adapterFor(employeeDO);
+ will(returnValue(mockEmployeeAdapter));
allowing(mockAdapterManager).adapterFor(employeeDO);
will(returnValue(mockEmployeeAdapter));
@@ -195,8 +184,6 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
allowing(mockPasswordMember).isOneToManyAssociation();
will(returnValue(false));
-// allowing(mockServicesInjector).lookupServiceElseFail(WrapperFactory.class);
-// will(returnValue(wrapperFactory));
}
});
diff --git a/core/pom.xml b/core/pom.xml
index 483308a..c542544 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -175,7 +175,7 @@
<mockito.version>2.23.4</mockito.version>
<!-- 2.8.1 depends on cglib-nodep 3.1 whereas axonframework depends on 2.2.2 -->
- <jmock.version>2.6.0</jmock.version>
+ <jmock.version>2.11.0</jmock.version>
<easymock.version>2.5.2</easymock.version>
<cucumber.version>1.2.4</cucumber.version>
@@ -2002,6 +2002,13 @@ ${license.additional-notes}
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
+ <exclusions>
+ <!-- version clash with org.jmock:jmock:2.11.0, which requires org.ow2.asm:asm:6.2.1 -->
+ <exclusion>
+ <artifactId>org.ow2.asm</artifactId>
+ <groupId>asm</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- MOCKITO -->
diff --git a/core/runtime-extensions/src/main/java/org/apache/isis/core/webapp/modules/sse/ServerSentEventsServlet.java b/core/runtime-extensions/src/main/java/org/apache/isis/core/webapp/modules/sse/ServerSentEventsServlet.java
index a1d6245..6c4fb11 100644
--- a/core/runtime-extensions/src/main/java/org/apache/isis/core/webapp/modules/sse/ServerSentEventsServlet.java
+++ b/core/runtime-extensions/src/main/java/org/apache/isis/core/webapp/modules/sse/ServerSentEventsServlet.java
@@ -91,7 +91,8 @@ public class ServerSentEventsServlet extends HttpServlet {
final AsyncContext asyncContext = request.startAsync();
- threadPool.submit(()->fork(asyncContext, eventStream));
+ //XXX javac explicitly requires curly-braces here (to tell it we want a Runnable)
+ threadPool.submit(()->{fork(asyncContext, eventStream);});
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index 3c49d4f..1fd85f6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -26,6 +26,8 @@ import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import java.util.function.Supplier;
+import javax.persistence.metamodel.Metamodel;
+
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.base._Strings;
@@ -34,6 +36,7 @@ import org.apache.isis.commons.internal.spring._Spring;
import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
+import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
@@ -133,7 +136,8 @@ public interface IsisContext {
* @throws NoSuchElementException - if IsisConfiguration not managed
*/
public static IsisConfiguration getConfiguration() {
- return _Config.getConfiguration(); //TODO[2112] currently not utilizing CDI, to support unit testing
+ return MetaModelContext.current().getConfiguration();
+ //return _Config.getConfiguration();
}
/**
@@ -141,7 +145,8 @@ public interface IsisContext {
* @throws NoSuchElementException - if SpecificationLoader not managed
*/
public static SpecificationLoader getSpecificationLoader() {
- return _Spring.getSingletonElseFail(SpecificationLoader.class);
+ return MetaModelContext.current().getSpecificationLoader();
+ //return _Spring.getSingletonElseFail(SpecificationLoader.class);
}
/**
@@ -149,7 +154,8 @@ public interface IsisContext {
* @throws NoSuchElementException - if ServicesInjector not managed
*/
public static ServiceInjector getServiceInjector() {
- return _Spring.getSingletonElseFail(ServiceInjector.class);
+ return MetaModelContext.current().getServiceInjector();
+ //return _Spring.getSingletonElseFail(ServiceInjector.class);
}
/**
@@ -157,7 +163,8 @@ public interface IsisContext {
* @throws NoSuchElementException - if ServiceRegistry not managed
*/
public static ServiceRegistry getServiceRegistry() {
- return _Spring.getSingletonElseFail(ServiceRegistry.class);
+ return MetaModelContext.current().getServiceRegistry();
+ //return _Spring.getSingletonElseFail(ServiceRegistry.class);
}
/**
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index d4d8f39..958c11a 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -56,6 +56,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- JUPITER -->
@@ -103,11 +109,23 @@
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- JDO API (non transient, provided by plugin) -->