[Cdi2] Use Junit 5

Author: mpkorstanje

cdi2/pom.xml

@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-junit</artifactId>
+            <artifactId>cucumber-junit-platform-engine</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -68,8 +68,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

cdi2/src/test/java/io/cucumber/cdi2/ApplicationScopedBean.java

@@ -3,6 +3,9 @@
 import io.cucumber.core.backend.ObjectFactory;
 import org.junit.jupiter.api.Test;
 
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Vetoed;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
@@ -15,6 +18,11 @@ class Cdi2FactoryTest {
 
     final ObjectFactory factory = new Cdi2Factory();
 
+    @Vetoed
+    static class VetoedBean {
+
+    }
+
     @Test
     void shouldCreateNewInstancesForEachScenario() {
         factory.addClass(VetoedBean.class);
@@ -34,9 +42,14 @@ void shouldCreateNewInstancesForEachScenario() {
         // VetoedBean makes it possible to compare the object outside the
         // scenario/application scope
         assertAll(
-                () -> assertThat(a1, is(notNullValue())),
-                () -> assertThat(a1, is(not(equalTo(b1)))),
-                () -> assertThat(b1, is(not(equalTo(a1)))));
+            () -> assertThat(a1, is(notNullValue())),
+            () -> assertThat(a1, is(not(equalTo(b1)))),
+            () -> assertThat(b1, is(not(equalTo(a1)))));
+    }
+
+    @ApplicationScoped
+    static class ApplicationScopedBean {
+
     }
 
     @Test
@@ -45,9 +58,9 @@ void shouldCreateApplicationScopedInstance() {
         factory.start();
         ApplicationScopedBean cdiStep = factory.getInstance(ApplicationScopedBean.class);
         assertAll(
-                // assert that it is is a CDI proxy
-                () -> assertThat(cdiStep.getClass(), not(is(ApplicationScopedBean.class))),
-                () -> assertThat(cdiStep.getClass().getSuperclass(), is(ApplicationScopedBean.class)));
+            // assert that it is is a CDI proxy
+            () -> assertThat(cdiStep.getClass(), not(is(ApplicationScopedBean.class))),
+            () -> assertThat(cdiStep.getClass().getSuperclass(), is(ApplicationScopedBean.class)));
         factory.stop();
     }
 
@@ -56,7 +69,13 @@ void shouldCreateUnmanagedInstance() {
         factory.addClass(UnmanagedBean.class);
         factory.start();
         assertNotNull(factory.getInstance(UnmanagedBean.class));
+        UnmanagedBean cdiStep = factory.getInstance(UnmanagedBean.class);
+        assertThat(cdiStep.getClass(), is(UnmanagedBean.class));
         factory.stop();
     }
 
+    static class UnmanagedBean {
+
+    }
+
 }

cdi2/src/test/java/io/cucumber/cdi2/Cdi2FactoryTest.java

@@ -1,4 +1,4 @@
-package io.cucumber.cdi2;
+package io.cucumber.cdi2.example;
 
 import javax.enterprise.context.ApplicationScoped;
 

cdi2/src/test/java/io/cucumber/cdi2/UnmanagedBean.java

@@ -1,6 +1,5 @@
 package io.cucumber.cdi2.example;
 
-import io.cucumber.cdi2.Belly;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 
@@ -28,5 +27,4 @@ public void checkCukes(int n) {
         assertEquals(n, belly.getCukes());
     }
 
-
 }

cdi2/src/test/java/io/cucumber/cdi2/VetoedBean.java

@@ -1,9 +1,8 @@
 package io.cucumber.cdi2.example;
 
-import io.cucumber.junit.Cucumber;
-import org.junit.runner.RunWith;
+import io.cucumber.junit.platform.engine.Cucumber;
 
-@RunWith(Cucumber.class)
+@Cucumber
 public class RunCucumberTest {
 
 }

cdi2/src/test/java/io/cucumber/cdi2/Belly.java renamed to cdi2/src/test/java/io/cucumber/cdi2/example/Belly.java

@@ -5,6 +5,6 @@
     <!-- Exclude the class to force it to be loaded as an unmanaged dependency -->
     <scan>
         <exclude
-            name="io.cucumber.cdi2.UnmanagedBean" />
+            name="io.cucumber.cdi2.Cdi2FactoryTest$UnmanagedBean" />
     </scan>
 </beans>