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 2018/12/21 08:57:38 UTC

[isis] branch 2033-IoC updated: ISIS-2033: fixes eventbus plugin tests

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

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


The following commit(s) were added to refs/heads/2033-IoC by this push:
     new 75af867  ISIS-2033: fixes eventbus plugin tests
75af867 is described below

commit 75af86718913bc3ca282524bc4f2bc66310661a5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 21 09:57:32 2018 +0100

    ISIS-2033: fixes eventbus plugin tests
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
 .../metamodel/services/ServiceInjectorDefault.java | 10 +--
 core/plugins/eventbus-axon/pom.xml                 | 12 ++++
 .../EventBusServiceDefaultUsingAxonSimpleTest.java | 72 ++++++++++++++--------
 core/plugins/eventbus-guava/pom.xml                | 13 ++++
 .../EventBusServiceDefaultUsingGuavaTest.java      | 50 +++++++++++----
 .../eventbus/EventBusServiceDefaultTest.java       | 12 ++--
 6 files changed, 123 insertions(+), 46 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
index b244309..2de8324 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
@@ -125,18 +125,20 @@ public class ServiceInjectorDefault implements ServiceInjector {
 
     }
     
+    @SuppressWarnings("unchecked")
     private void injectToField_nonScalar(
             final Object targetPojo, 
             final Field field, 
             final Class<?> elementType) {
         
-        @SuppressWarnings("unchecked")
         final Class<? extends Collection<Object>> collectionTypeToBeInjected =
-        (Class<? extends Collection<Object>>) field.getType();
-
+                (Class<? extends Collection<Object>>) field.getType();
         
         serviceRegistry.getInstance(elementType, field.getAnnotations())
-        .map((Instance<?> instance)->((Instance<Object>)instance)) // explicit cast required by OpenJDK complier
+        
+        // explicit cast required by OpenJDK complier, not eclipse
+        .map((Instance<?> instance)->((Instance<Object>)instance))
+        
         .ifPresent(instance->{
             final Collection<Object> collectionOfServices = instance.stream()
                     .filter(isOfType(elementType))
diff --git a/core/plugins/eventbus-axon/pom.xml b/core/plugins/eventbus-axon/pom.xml
index 9237064..46d2470 100644
--- a/core/plugins/eventbus-axon/pom.xml
+++ b/core/plugins/eventbus-axon/pom.xml
@@ -83,6 +83,18 @@
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
+			<artifactId>isis-core-unittestsupport</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
+			<artifactId>isis-core-metamodel</artifactId>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>javax.jdo</groupId>
diff --git a/core/plugins/eventbus-axon/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultUsingAxonSimpleTest.java b/core/plugins/eventbus-axon/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultUsingAxonSimpleTest.java
index 1482e84..9a7c984 100644
--- a/core/plugins/eventbus-axon/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultUsingAxonSimpleTest.java
+++ b/core/plugins/eventbus-axon/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultUsingAxonSimpleTest.java
@@ -16,32 +16,59 @@
  */
 package org.apache.isis.core.runtime.services.eventbus;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
 
+import org.jboss.weld.junit5.EnableWeld;
+import org.jboss.weld.junit5.WeldInitiator;
+import org.jboss.weld.junit5.WeldSetup;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.config.internal._Config;
+import org.apache.isis.core.metamodel.BeansForTesting;
 import org.apache.isis.core.metamodel.services.ServiceInjectorDefault;
+import org.apache.isis.core.metamodel.services.registry.ServiceRegistryDefault;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class EventBusServiceDefaultUsingAxonSimpleTest {
-
-    EventBusServiceDefault eventBusService;
-
-    @Before
-    public void setUp() throws Exception {
-        eventBusService = new EventBusServiceDefault() {
-        	{
-        		servicesInjector = new ServiceInjectorDefault();
-        	}
-        };
+class EventBusServiceDefaultUsingAxonSimpleTest {
+    
+    @ApplicationScoped @DomainService
+    static class EventBusServiceForTest extends EventBusServiceDefault {
+        
     }
 
-    public static class Post extends EventBusServiceDefaultTest {
+    private static WeldInitiator weld() {
+        
+        return WeldInitiator.from(
+            
+            BeansForTesting.builder()
+            .injector()
+            .addAll(
+                    EventBusServiceForTest.class,
+                    ServiceInjectorDefault.class,
+                    ServiceRegistryDefault.class
+                    )
+            .build()
+            
+            )
+        .build();
+    }
+    
+    @EnableWeld
+    static class Post extends EventBusServiceDefaultTest {
+        
+        @WeldSetup
+        public WeldInitiator weld = weld();
+        
+        @Inject protected ServiceInjector injector;
+        @Inject protected EventBusServiceDefault eventBusService;
     	
     	private final static String EVENTBUS_IMPL_NAME = "axon";
     	
@@ -77,15 +104,11 @@ public class EventBusServiceDefaultUsingAxonSimpleTest {
             }
         }
         
-
-        @Rule
-        public ExpectedException expectedException = ExpectedException.none();
-
         Subscriber1 subscriber1;
         Subscriber2 subscriber2;
         Subscriber3 subscriber3;
 
-        @Before
+        @BeforeEach
         public void setUp() throws Exception {
             super.setUp();
             subscriber1 = new Subscriber1();
@@ -124,11 +147,10 @@ public class EventBusServiceDefaultUsingAxonSimpleTest {
 
             eventBusService.post(new Object());
 
-            // expect
-            expectedException.expect(IllegalStateException.class);
-
             // when
-            eventBusService.register(new Subscriber1());
+            assertThrows(IllegalStateException.class, 
+                    ()->eventBusService.register(new Subscriber1()));
+            
         }
 
         @Test
diff --git a/core/plugins/eventbus-guava/pom.xml b/core/plugins/eventbus-guava/pom.xml
index 36fa183..9fd7ef5 100644
--- a/core/plugins/eventbus-guava/pom.xml
+++ b/core/plugins/eventbus-guava/pom.xml
@@ -73,6 +73,19 @@
 		
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
+			<artifactId>isis-core-unittestsupport</artifactId>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
+			<artifactId>isis-core-metamodel</artifactId>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
 			<artifactId>isis-core-runtime</artifactId>
 			<type>test-jar</type>
 			<scope>test</scope>
diff --git a/core/plugins/eventbus-guava/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultUsingGuavaTest.java b/core/plugins/eventbus-guava/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultUsingGuavaTest.java
index c6f4a54..44a20eb 100644
--- a/core/plugins/eventbus-guava/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultUsingGuavaTest.java
+++ b/core/plugins/eventbus-guava/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultUsingGuavaTest.java
@@ -16,35 +16,63 @@
  */
 package org.apache.isis.core.runtime.services.eventbus;
 
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
 import com.google.common.eventbus.Subscribe;
 
+import org.jboss.weld.junit5.EnableWeld;
+import org.jboss.weld.junit5.WeldInitiator;
+import org.jboss.weld.junit5.WeldSetup;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.config.internal._Config;
+import org.apache.isis.core.metamodel.BeansForTesting;
 import org.apache.isis.core.metamodel.services.ServiceInjectorDefault;
+import org.apache.isis.core.metamodel.services.registry.ServiceRegistryDefault;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
-public class EventBusServiceDefaultUsingGuavaTest {
-
-    EventBusServiceDefault eventBusService;
+class EventBusServiceDefaultUsingGuavaTest {
 
-    @Before
-    public void setUp() throws Exception {
-        eventBusService = new EventBusServiceDefault() {
-        	{
-        	    servicesInjector = new ServiceInjectorDefault();
-        	}
-        };
+    @ApplicationScoped @DomainService
+    static class EventBusServiceForTest extends EventBusServiceDefault {
+        
     }
 
-    public static class Post extends EventBusServiceDefaultTest {
+    private static WeldInitiator weld() {
+        
+        return WeldInitiator.from(
+            
+            BeansForTesting.builder()
+            .injector()
+            .addAll(
+                    EventBusServiceForTest.class,
+                    ServiceInjectorDefault.class,
+                    ServiceRegistryDefault.class
+                    )
+            .build()
+            
+            )
+        .build();
+    }
+    
+    @EnableWeld
+    static class Post extends EventBusServiceDefaultTest {
     	
+        @WeldSetup
+        public WeldInitiator weld = weld();
+        
+        @Inject protected ServiceInjector injector;
+        @Inject protected EventBusServiceDefault eventBusService;
+        
     	private final static String EVENTBUS_IMPL_NAME = "guava";
     	
     	public static class Type1 {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultTest.java
index a7b2692..2ecdfc1 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.isis.core.runtime.services.eventbus;
 
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import org.apache.isis.config.internal._Config;
 import org.apache.isis.core.metamodel.services.ServiceInjectorDefault;
@@ -30,9 +30,9 @@ import static org.junit.Assert.assertThat;
 
 public class EventBusServiceDefaultTest {
 
-    EventBusServiceDefault eventBusService;
+    protected EventBusServiceDefault eventBusService;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         
         _Config.clear(); 
@@ -82,7 +82,7 @@ public class EventBusServiceDefaultTest {
             assertThat(eventBusService.isAllowLateRegistration(), is(false));
         }
 
-        @Test @Ignore("why would we allow this?")
+        @Test @Disabled("why would we allow this?")
         public void allowLateRegistration_setToGarbage() throws Exception {
             _Config.put(EventBusServiceDefault.KEY_ALLOW_LATE_REGISTRATION, "SDF$%FDVDFG");
             eventBusService.init();