Fix excluded tests for Weld injection in Jetty 12 ee9/10. Add asserti…

…on that servlets can be injected into (#198)
arquillian · Apr 26, 2024 · d611907 · d611907
1 parent a86f597
commit d611907
Show file tree

Hide file tree

Showing 16 changed files with 146 additions and 36 deletions.
diff --git a/jetty-embedded-12-ee10/pom.xml b/jetty-embedded-12-ee10/pom.xml
@@ -15,8 +15,7 @@
   <description>Jetty Embedded 12.0.x container integration for the Arquillian project</description>
 
   <properties>
-    <!-- when upgrading check if this fix JettyEmbeddedInContainerTestCase#shouldBeAbleToInjectMembersIntoTestClass -->
-    <version.weld>5.1.0.Final</version.weld>
+    <version.weld>5.1.2.Final</version.weld>
     <jakarta.servlet.api.version>6.0.0</jakarta.servlet.api.version>
 
     <!-- Jetty 12 need Java 17 -->
@@ -147,6 +146,11 @@
       <artifactId>alpn-api</artifactId>
       <version>1.1.3.v20160715</version>
     </dependency>
+    <!-- Needed for Jetty be able to perform injection into servlets/filters etc -->
+    <dependency>
+      <groupId>org.eclipse.jetty.ee10</groupId>
+      <artifactId>jetty-ee10-cdi</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.jboss.arquillian.junit5</groupId>
@@ -237,7 +241,6 @@
     <dependency>
       <groupId>org.jboss.weld.servlet</groupId>
       <artifactId>weld-servlet-core</artifactId>
-      <scope>test</scope>
     </dependency>
 
     <dependency>

diff --git a/...in/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/JettyEmbeddedContainer.java b/...in/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/JettyEmbeddedContainer.java
@@ -29,6 +29,8 @@
 import org.eclipse.jetty.deploy.App;
 import org.eclipse.jetty.deploy.AppLifeCycle;
 import org.eclipse.jetty.deploy.DeploymentManager;
+import org.eclipse.jetty.ee10.cdi.CdiDecoratingListener;
+import org.eclipse.jetty.ee10.cdi.CdiServletContainerInitializer;
 import org.eclipse.jetty.http.CookieCompliance;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
@@ -253,6 +255,15 @@ public ProtocolMetaData deploy(final Archive<?> archive) throws DeploymentExcept
             deployer.removeApp(app);
             WebAppContext webAppContext = getWebAppContext(app);
 
+            // Jetty setup telling Jetty's CdiDecoratingListener how to operate.
+            webAppContext.setInitParameter(CdiServletContainerInitializer.CDI_INTEGRATION_ATTRIBUTE, CdiDecoratingListener.MODE);
+            // jetty setup for layer between Weld and Jetty.
+            webAppContext.addServletContainerInitializer(new CdiServletContainerInitializer());
+            // Weld's org.jboss.weld.environment.servlet.EnhancedListener can be discovered automatically
+            // However, it won't happen if jetty-ee10-annotations JAR isn't present in runtime, hence we add it explicitly
+            // The listener will start up Weld container so long as there is an archive with any beans in it
+            webAppContext.addServletContainerInitializer(new org.jboss.weld.environment.servlet.EnhancedListener());
+
             if (containerConfig.areMimeTypesSet()) {
                 containerConfig.getMimeTypes().forEach((s, s2) -> webAppContext.getMimeTypes().addMimeMapping(s, s2));
             }

diff --git a/...va/org/jboss/arquillian/container/jetty/embedded_12_ee10/JettyEmbeddedClientTestCase.java b/...va/org/jboss/arquillian/container/jetty/embedded_12_ee10/JettyEmbeddedClientTestCase.java
@@ -30,11 +30,14 @@
 import org.jboss.arquillian.container.test.api.TargetsContainer;
 import org.jboss.arquillian.junit5.ArquillianExtension;
 import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.GenericArchive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptors;
 import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -59,15 +62,17 @@ public class JettyEmbeddedClientTestCase {
     @Deployment(testable = false)
     public static WebArchive getTestArchive() {
         return ShrinkWrap.create(WebArchive.class, "client-http.war")
-            .addClass(MyServlet.class)
+            .addClass(MyOtherServlet.class)
+            .addClass(MyOtherBean.class)
+            .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
             .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class)
                 .version("4.0")
                 .createServlet()
-                .servletClass(MyServlet.class.getName())
-                .servletName("MyServlet").up()
+                .servletClass(MyOtherServlet.class.getName())
+                .servletName("MyOtherServlet").up()
                 .createServletMapping()
-                .servletName("MyServlet")
-                .urlPattern(MyServlet.URL_PATTERN).up()
+                .servletName("MyOtherServlet")
+                .urlPattern(MyOtherServlet.URL_PATTERN).up()
                 .exportAsString()));
     }
 
@@ -119,12 +124,12 @@ public void shutdown() throws Exception {
     @Test
     public void shouldBeAbleToInvokeServletInDeployedWebApp() throws Exception {
 
-        String body = httpClient.GET(new URL(url, MyServlet.URL_PATTERN).toURI()).getContentAsString();
+        String body = httpClient.GET(new URL(url, MyOtherServlet.URL_PATTERN).toURI()).getContentAsString();
 
         assertThat(
             "Verify that the servlet was deployed and returns expected result",
             body,
-            Matchers.is(MyServlet.MESSAGE));
+            Matchers.is(MyOtherServlet.MESSAGE));
     }
 
     @Test

diff --git a/...g/jboss/arquillian/container/jetty/embedded_12_ee10/JettyEmbeddedInContainerTestCase.java b/...g/jboss/arquillian/container/jetty/embedded_12_ee10/JettyEmbeddedInContainerTestCase.java
@@ -115,9 +115,8 @@ public void shouldBeAbleToInjectMembersIntoTestClass() throws Exception {
         try (Connection c = ds.getConnection()) {
             assertThat(c.getMetaData().getDatabaseProductName(), is("H2"));
         }
-//      FIXME not working anymore with weld 5.1.0.Final
-//        assertThat(testBean, notNullValue());
-//        assertThat(testBean.getName(), is("Jetty"));
+        assertThat(testBean, notNullValue());
+        assertThat(testBean.getName(), is("Jetty"));
     }
 
     @Test

diff --git a/...d-12-ee10/src/test/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/MyBean.java b/...d-12-ee10/src/test/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/MyBean.java
@@ -17,7 +17,9 @@
 package org.jboss.arquillian.container.jetty.embedded_12_ee10;
 
 import jakarta.annotation.Resource;
+import jakarta.enterprise.context.Dependent;
 
+@Dependent
 public class MyBean {
     @Resource(name = "name")
     private String name;

diff --git a/...ee10/src/test/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/MyOtherBean.java b/...ee10/src/test/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/MyOtherBean.java
@@ -0,0 +1,11 @@
+package org.jboss.arquillian.container.jetty.embedded_12_ee10;
+
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
+public class MyOtherBean {
+
+    public String ping() {
+        return MyOtherBean.class.getSimpleName();
+    }
+}
diff --git a/...0/src/test/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/MyOtherServlet.java b/...0/src/test/java/org/jboss/arquillian/container/jetty/embedded_12_ee10/MyOtherServlet.java
@@ -0,0 +1,30 @@
+package org.jboss.arquillian.container.jetty.embedded_12_ee10;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+
+public class MyOtherServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+
+    public static final String URL_PATTERN = "Test2";
+
+    public static final String MESSAGE = "hey there";
+
+    @Inject
+    MyOtherBean bean;
+
+    @Override
+    protected void service(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        assertThat(bean.ping(), is(MyOtherBean.class.getSimpleName()));
+        response.getWriter().append(MESSAGE);
+    }
+}
diff --git a/jetty-embedded-12-ee10/src/test/resources/in-container-web.xml b/jetty-embedded-12-ee10/src/test/resources/in-container-web.xml
@@ -17,8 +17,4 @@
     <env-entry-value>Remote</env-entry-value>
   </env-entry>
 
-  <listener>
-    <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
-  </listener>
-
 </web-app>
diff --git a/jetty-embedded-12-ee9/pom.xml b/jetty-embedded-12-ee9/pom.xml
@@ -15,9 +15,7 @@
   <description>Jetty Embedded 12.0.x container integration for the Arquillian project</description>
 
   <properties>
-    <!-- when upgrading check if this fix JettyEmbeddedInContainerTestCase#shouldBeAbleToInjectMembersIntoTestClass -->
-    <version.weld>5.1.0.Final</version.weld>
-<!--    <jakarta.servlet.api.version>6.0.0</jakarta.servlet.api.version>-->
+    <version.weld>5.1.2.Final</version.weld>
 
     <!-- Jetty 12 need Java 17 -->
     <maven.compiler.target>17</maven.compiler.target>
@@ -31,7 +29,6 @@
         <groupId>org.jboss.weld.servlet</groupId>
         <artifactId>weld-servlet-core</artifactId>
         <version>${version.weld}</version>
-        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
@@ -143,6 +140,11 @@
       <artifactId>alpn-api</artifactId>
       <version>1.1.3.v20160715</version>
     </dependency>
+    <!-- Needed for Jetty be able to perform injection into servlets/filters etc -->
+    <dependency>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-cdi</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.jboss.arquillian.junit5</groupId>
@@ -225,7 +227,6 @@
     <dependency>
       <groupId>org.jboss.weld.servlet</groupId>
       <artifactId>weld-servlet-core</artifactId>
-      <scope>test</scope>
     </dependency>
 
     <dependency>

diff --git a/...ain/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/JettyEmbeddedContainer.java b/...ain/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/JettyEmbeddedContainer.java
@@ -29,6 +29,8 @@
 import org.eclipse.jetty.deploy.App;
 import org.eclipse.jetty.deploy.AppLifeCycle;
 import org.eclipse.jetty.deploy.DeploymentManager;
+import org.eclipse.jetty.ee9.cdi.CdiDecoratingListener;
+import org.eclipse.jetty.ee9.cdi.CdiServletContainerInitializer;
 import org.eclipse.jetty.http.CookieCompliance;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
@@ -253,6 +255,15 @@ public ProtocolMetaData deploy(final Archive<?> archive) throws DeploymentExcept
              appProvider.createContextHandler(app);
             WebAppContext webAppContext = getWebAppContext(app);
 
+            // Jetty setup telling Jetty's CdiDecoratingListener how to operate.
+            webAppContext.setInitParameter(CdiServletContainerInitializer.CDI_INTEGRATION_ATTRIBUTE, CdiDecoratingListener.MODE);
+            // jetty setup for layer between Weld and Jetty.
+            webAppContext.addServletContainerInitializer(new CdiServletContainerInitializer());
+            // Weld's org.jboss.weld.environment.servlet.EnhancedListener can be discovered automatically
+            // However, it won't happen if jetty-ee9-annotations JAR isn't present in runtime, hence we add it explicitly
+            // The listener will start up Weld container so long as there is an archive with any beans in it
+            webAppContext.addServletContainerInitializer(new org.jboss.weld.environment.servlet.EnhancedListener());
+
             if (containerConfig.areMimeTypesSet()) {
                 containerConfig.getMimeTypes().forEach((s, s2) -> webAppContext.getMimeTypes().addMimeMapping(s, s2));
             }

diff --git a/...ava/org/jboss/arquillian/container/jetty/embedded_12_ee9/JettyEmbeddedClientTestCase.java b/...ava/org/jboss/arquillian/container/jetty/embedded_12_ee9/JettyEmbeddedClientTestCase.java
@@ -31,6 +31,7 @@
 import org.jboss.arquillian.junit5.ArquillianExtension;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptors;
@@ -59,15 +60,17 @@ public class JettyEmbeddedClientTestCase {
     @Deployment(testable = false)
     public static WebArchive getTestArchive() {
         return ShrinkWrap.create(WebArchive.class, "client-http.war")
-            .addClass(MyServlet.class)
+            .addClass(MyOtherServlet.class)
+            .addClass(MyOtherBean.class)
+            .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
             .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class)
                 .version("4.0")
                 .createServlet()
-                .servletClass(MyServlet.class.getName())
-                .servletName("MyServlet").up()
+                .servletClass(MyOtherServlet.class.getName())
+                .servletName("MyOtherServlet").up()
                 .createServletMapping()
-                .servletName("MyServlet")
-                .urlPattern(MyServlet.URL_PATTERN).up()
+                .servletName("MyOtherServlet")
+                .urlPattern(MyOtherServlet.URL_PATTERN).up()
                 .exportAsString()));
     }
 
@@ -119,12 +122,12 @@ public void shutdown() throws Exception {
     @Test
     public void shouldBeAbleToInvokeServletInDeployedWebApp() throws Exception {
 
-        String body = httpClient.GET(new URL(url, MyServlet.URL_PATTERN).toURI()).getContentAsString();
+        String body = httpClient.GET(new URL(url, MyOtherServlet.URL_PATTERN).toURI()).getContentAsString();
 
         assertThat(
             "Verify that the servlet was deployed and returns expected result",
             body,
-            Matchers.is(MyServlet.MESSAGE));
+            Matchers.is(MyOtherServlet.MESSAGE));
     }
 
     @Test

diff --git a/...rg/jboss/arquillian/container/jetty/embedded_12_ee9/JettyEmbeddedInContainerTestCase.java b/...rg/jboss/arquillian/container/jetty/embedded_12_ee9/JettyEmbeddedInContainerTestCase.java
@@ -116,9 +116,8 @@ public void shouldBeAbleToInjectMembersIntoTestClass() throws Exception {
         try (Connection c = ds.getConnection()) {
             assertThat(c.getMetaData().getDatabaseProductName(), is("H2"));
         }
-//      FIXME not working anymore with weld 5.1.0.Final
-//        assertThat(testBean, notNullValue());
-//        assertThat(testBean.getName(), is("Jetty"));
+        assertThat(testBean, notNullValue());
+        assertThat(testBean.getName(), is("Jetty"));
     }
 
     @Test

diff --git a/...ded-12-ee9/src/test/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/MyBean.java b/...ded-12-ee9/src/test/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/MyBean.java
@@ -17,7 +17,9 @@
 package org.jboss.arquillian.container.jetty.embedded_12_ee9;
 
 import jakarta.annotation.Resource;
+import jakarta.enterprise.context.Dependent;
 
+@Dependent
 public class MyBean {
     @Resource(name = "name")
     private String name;

diff --git a/...2-ee9/src/test/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/MyOtherBean.java b/...2-ee9/src/test/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/MyOtherBean.java
@@ -0,0 +1,11 @@
+package org.jboss.arquillian.container.jetty.embedded_12_ee9;
+
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
+public class MyOtherBean {
+
+    public String ping() {
+        return MyOtherBean.class.getSimpleName();
+    }
+}
diff --git a/...e9/src/test/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/MyOtherServlet.java b/...e9/src/test/java/org/jboss/arquillian/container/jetty/embedded_12_ee9/MyOtherServlet.java
@@ -0,0 +1,30 @@
+package org.jboss.arquillian.container.jetty.embedded_12_ee9;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+
+public class MyOtherServlet extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+
+    public static final String URL_PATTERN = "Test2";
+
+    public static final String MESSAGE = "hey there";
+
+    @Inject
+    MyOtherBean bean;
+
+    @Override
+    protected void service(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        assertThat(bean.ping(), is(MyOtherBean.class.getSimpleName()));
+        response.getWriter().append(MESSAGE);
+    }
+}
diff --git a/jetty-embedded-12-ee9/src/test/resources/in-container-web.xml b/jetty-embedded-12-ee9/src/test/resources/in-container-web.xml
@@ -17,8 +17,4 @@
     <env-entry-value>Remote</env-entry-value>
   </env-entry>
 
-  <listener>
-    <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
-  </listener>
-
 </web-app>