[Cdi2] Correctly cast the UnmanagedInstance values (#2244)

Co-authored-by: Daniel Beland <daniel.beland@ca.thalesgroup.com>
Co-authored-by: M.P. Korstanje <rien.korstanje@gmail.com>

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Removed
 
 ### Fixed
+ * [Cdi2] Correctly cast the UnmanagedInstance values ([#2242](https://github.com/cucumber/cucumber-jvm/pull/2242), [#2244](https://github.com/cucumber/cucumber-jvm/pull/2244) Daniel Beland)
 
 ## [6.10.0] (2021-02-14)
 

cdi2/src/main/java/io/cucumber/cdi2/Cdi2Factory.java

@@ -53,9 +53,9 @@ public boolean addClass(final Class<?> clazz) {
 
     @Override
     public <T> T getInstance(final Class<T> type) {
-        final Object instance = standaloneInstances.get(type);
+        final Unmanaged.UnmanagedInstance<?> instance = standaloneInstances.get(type);
         if (instance != null) {
-            return type.cast(instance);
+            return type.cast(instance.get());
         }
         final Instance<T> selected = container.select(type);
         if (selected.isUnsatisfied()) {

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

@@ -0,0 +1,8 @@
+package io.cucumber.cdi2;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class ApplicationScopedBean {
+
+}

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

@@ -9,35 +9,54 @@
 import static org.hamcrest.core.IsNot.not;
 import static org.hamcrest.core.IsNull.notNullValue;
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 class Cdi2FactoryTest {
 
-    @Test
-    void shouldGiveUsNewInstancesForEachScenario() {
+    final ObjectFactory factory = new Cdi2Factory();
 
-        final ObjectFactory factory = new Cdi2Factory();
-        factory.addClass(BellyStepDefinitions.class);
-        factory.addClass(CdiBellyStepDefinitions.class);
+    @Test
+    void shouldCreateNewInstancesForEachScenario() {
+        factory.addClass(VetoedBean.class);
 
         // Scenario 1
         factory.start();
-        final BellyStepDefinitions o1 = factory.getInstance(BellyStepDefinitions.class);
-        final CdiBellyStepDefinitions cdiStep = factory.getInstance(CdiBellyStepDefinitions.class);
-        assertAll(
-            // assert that it is is a CDI proxy
-            () -> assertThat(cdiStep.getClass(), not(is(CdiBellyStepDefinitions.class))),
-            () -> assertThat(cdiStep.getClass().getSuperclass(), is(CdiBellyStepDefinitions.class)));
+        VetoedBean a1 = factory.getInstance(VetoedBean.class);
+        VetoedBean a2 = factory.getInstance(VetoedBean.class);
+        assertThat(a1, is(equalTo(a2)));
         factory.stop();
 
         // Scenario 2
         factory.start();
-        final BellyStepDefinitions o2 = factory.getInstance(BellyStepDefinitions.class);
+        VetoedBean b1 = factory.getInstance(VetoedBean.class);
         factory.stop();
 
+        // 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)))));
+    }
+
+    @Test
+    void shouldCreateApplicationScopedInstance() {
+        factory.addClass(ApplicationScopedBean.class);
+        factory.start();
+        ApplicationScopedBean cdiStep = factory.getInstance(ApplicationScopedBean.class);
         assertAll(
-            () -> assertThat(o1, is(notNullValue())),
-            () -> assertThat(o1, is(not(equalTo(o2)))),
-            () -> assertThat(o2, is(not(equalTo(o1)))));
+                // assert that it is is a CDI proxy
+                () -> assertThat(cdiStep.getClass(), not(is(ApplicationScopedBean.class))),
+                () -> assertThat(cdiStep.getClass().getSuperclass(), is(ApplicationScopedBean.class)));
+        factory.stop();
+    }
+
+    @Test
+    void shouldCreateUnmanagedInstance() {
+        factory.addClass(UnmanagedBean.class);
+        factory.start();
+        assertNotNull(factory.getInstance(UnmanagedBean.class));
+        factory.stop();
     }
 
 }

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

@@ -0,0 +1,5 @@
+package io.cucumber.cdi2;
+
+public class UnmanagedBean {
+
+}

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

@@ -0,0 +1,7 @@
+package io.cucumber.cdi2;
+
+import javax.enterprise.inject.Vetoed;
+
+@Vetoed
+public class VetoedBean {
+}

cdi2/src/test/java/io/cucumber/cdi2/example/BellyStepDefinitions.java

@@ -0,0 +1,32 @@
+package io.cucumber.cdi2.example;
+
+import io.cucumber.cdi2.Belly;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+
+import javax.inject.Inject;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class BellyStepDefinitions {
+
+    @Inject
+    private Belly belly;
+
+    @Given("I have {int} cukes in my belly")
+    public void haveCukes(int n) {
+        belly.setCukes(n);
+    }
+
+    @Given("I eat {int} more cukes")
+    public void addCukes(int n) {
+        belly.setCukes(belly.getCukes() + n);
+    }
+
+    @Then("there are {int} cukes in my belly")
+    public void checkCukes(int n) {
+        assertEquals(n, belly.getCukes());
+    }
+
+
+}

cdi2/src/test/java/io/cucumber/cdi2/RunCucumberTest.java → cdi2/src/test/java/io/cucumber/cdi2/example/RunCucumberTest.java

@@ -1,4 +1,4 @@
-package io.cucumber.cdi2;
+package io.cucumber.cdi2.example;
 
 import io.cucumber.junit.Cucumber;
 import org.junit.runner.RunWith;

cdi2/src/test/resources/META-INF/beans.xml

@@ -1,7 +1,10 @@
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns="http://java.sun.com/xml/ns/javaee"
-       xsi:schemaLocation="
-      http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+    bean-discovery-mode="all" version="2.0">
+    <!-- Exclude the class to force it to be loaded as an unmanaged dependency -->
+    <scan>
+        <exclude
+            name="io.cucumber.cdi2.UnmanagedBean" />
+    </scan>
 </beans>

cdi2/src/test/resources/io/cucumber/cdi2/cukes.feature → cdi2/src/test/resources/io/cucumber/cdi2/example/cukes.feature

@@ -6,4 +6,5 @@ Feature: Cukes
 
   Scenario: Eat some more cukes
     Given I have 6 cukes in my belly
-    Then there are 6 cukes in my belly
+    And I eat 2 more cukes
+    Then there are 8 cukes in my belly