From d5c75130c3b1324423d46bdb6be9b01fc937daf6 Mon Sep 17 00:00:00 2001 From: Pete Muir Date: Fri, 13 Aug 2010 01:01:33 +0100 Subject: [PATCH] Create test base, and run them in tomcat and jetty --- environments/servlet/pom.xml | 28 +- environments/servlet/tests/base/pom.xml | 66 +++++ .../tests/{ => base}/src/etc/header.txt | 0 .../test/examples/ExampleTestBase.java} | 11 +- .../servlet/test/examples/Game.java | 0 .../servlet/test/examples/Generator.java | 0 .../test/examples/MockExampleTestBase.java} | 11 +- .../test/examples/MockSentenceTranslator.java | 0 .../servlet/test/examples/Random.java | 0 .../servlet/test/examples/SentenceParser.java | 0 .../test/examples/SentenceTranslator.java | 0 .../servlet/test/examples/TextTranslator.java | 0 .../servlet/test/examples/Translator.java | 0 .../servlet/test/injection}/BatListener.java | 9 +- .../servlet/test/injection}/BatServlet.java | 2 +- .../servlet/test/injection}/CatFilter.java | 2 +- .../injection/FilterInjectionTestBase.java} | 18 +- .../injection/ListenerInjectionTestBase.java} | 19 +- .../test/injection/LookupTestBase.java} | 14 +- .../servlet/test/injection}/Mouse.java | 2 +- .../servlet/test/injection}/RatServlet.java | 2 +- .../injection/ServletInjectionTestBase.java} | 18 +- .../servlet/test/injection}/Sewer.java | 2 +- .../servlet/test/injection}/Vole.java | 2 +- .../test/injection}/WolverineServlet.java | 2 +- .../servlet/test/util/BeansXml.java | 0 .../servlet/test/util/Deployments.java} | 19 +- .../test/util/MavenArtifactResolver.java | 57 +++-- environments/servlet/tests/jetty/pom.xml | 241 ++++++++++++++++++ .../servlet/tests/jetty/src/etc/header.txt | 14 + .../META-INF/jboss-test-harness.properties | 0 .../servlet/test/examples/.DS_Store | Bin .../servlet/test/examples/ExampleTest.java | 20 ++ .../test/examples/MockExampleTest.java | 21 ++ .../tomcat/lookup/FilterInjectionTest.java | 25 ++ .../tomcat/lookup/ListenerInjectionTest.java | 25 ++ .../test/tomcat/lookup/LookupTest.java | 24 ++ .../tomcat/lookup/ServletInjectionTest.java | 25 ++ .../servlet/test/util/JettyDeployments.java | 13 + .../jetty/src/test/resources/arquillian.xml | 10 + .../servlet/tests/{ => tomcat}/pom.xml | 44 ++-- .../servlet/tests/tomcat/src/etc/header.txt | 14 + .../META-INF/jboss-test-harness.properties | 7 + .../servlet/test/examples/.DS_Store | Bin 0 -> 6148 bytes .../servlet/test/examples/ExampleTest.java | 20 ++ .../test/examples/MockExampleTest.java | 20 ++ .../tomcat/lookup/FilterInjectionTest.java | 24 ++ .../tomcat/lookup/ListenerInjectionTest.java | 25 ++ .../test/tomcat/lookup/LookupTest.java | 23 ++ .../tomcat/lookup/ServletInjectionTest.java | 23 ++ .../servlet/test/util/TomcatDeployments.java | 11 + .../src/test/resources/arquillian.xml | 0 parent/pom.xml | 18 +- 53 files changed, 800 insertions(+), 131 deletions(-) create mode 100644 environments/servlet/tests/base/pom.xml rename environments/servlet/tests/{ => base}/src/etc/header.txt (100%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/examples/ExampleTest.java => base/src/main/java/org/jboss/weld/environment/servlet/test/examples/ExampleTestBase.java} (73%) rename environments/servlet/tests/{src/test => base/src/main}/java/org/jboss/weld/environment/servlet/test/examples/Game.java (100%) rename environments/servlet/tests/{src/test => base/src/main}/java/org/jboss/weld/environment/servlet/test/examples/Generator.java (100%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTest.java => base/src/main/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTestBase.java} (54%) rename environments/servlet/tests/{src/test => base/src/main}/java/org/jboss/weld/environment/servlet/test/examples/MockSentenceTranslator.java (100%) rename environments/servlet/tests/{src/test => base/src/main}/java/org/jboss/weld/environment/servlet/test/examples/Random.java (100%) rename environments/servlet/tests/{src/test => base/src/main}/java/org/jboss/weld/environment/servlet/test/examples/SentenceParser.java (100%) rename environments/servlet/tests/{src/test => base/src/main}/java/org/jboss/weld/environment/servlet/test/examples/SentenceTranslator.java (100%) rename environments/servlet/tests/{src/test => base/src/main}/java/org/jboss/weld/environment/servlet/test/examples/TextTranslator.java (100%) rename environments/servlet/tests/{src/test => base/src/main}/java/org/jboss/weld/environment/servlet/test/examples/Translator.java (100%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup => base/src/main/java/org/jboss/weld/environment/servlet/test/injection}/BatListener.java (77%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup => base/src/main/java/org/jboss/weld/environment/servlet/test/injection}/BatServlet.java (90%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup => base/src/main/java/org/jboss/weld/environment/servlet/test/injection}/CatFilter.java (90%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/FilterInjectionTest.java => base/src/main/java/org/jboss/weld/environment/servlet/test/injection/FilterInjectionTestBase.java} (69%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ListenerInjectionTest.java => base/src/main/java/org/jboss/weld/environment/servlet/test/injection/ListenerInjectionTestBase.java} (68%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/LookupTest.java => base/src/main/java/org/jboss/weld/environment/servlet/test/injection/LookupTestBase.java} (58%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup => base/src/main/java/org/jboss/weld/environment/servlet/test/injection}/Mouse.java (86%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup => base/src/main/java/org/jboss/weld/environment/servlet/test/injection}/RatServlet.java (91%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ServletInjectionTest.java => base/src/main/java/org/jboss/weld/environment/servlet/test/injection/ServletInjectionTestBase.java} (67%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup => base/src/main/java/org/jboss/weld/environment/servlet/test/injection}/Sewer.java (68%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup => base/src/main/java/org/jboss/weld/environment/servlet/test/injection}/Vole.java (80%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup => base/src/main/java/org/jboss/weld/environment/servlet/test/injection}/WolverineServlet.java (86%) rename environments/servlet/tests/{src/test => base/src/main}/java/org/jboss/weld/environment/servlet/test/util/BeansXml.java (100%) rename environments/servlet/tests/{src/test/java/org/jboss/weld/environment/servlet/test/util/DeploymentDescriptor.java => base/src/main/java/org/jboss/weld/environment/servlet/test/util/Deployments.java} (54%) rename environments/servlet/tests/{src/test => base/src/main}/java/org/jboss/weld/environment/servlet/test/util/MavenArtifactResolver.java (58%) create mode 100644 environments/servlet/tests/jetty/pom.xml create mode 100644 environments/servlet/tests/jetty/src/etc/header.txt rename environments/servlet/tests/{ => jetty}/src/test/debug-resources/META-INF/jboss-test-harness.properties (100%) rename environments/servlet/tests/{ => jetty}/src/test/java/org/jboss/weld/environment/servlet/test/examples/.DS_Store (100%) create mode 100644 environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/examples/ExampleTest.java create mode 100644 environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTest.java create mode 100644 environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/FilterInjectionTest.java create mode 100644 environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ListenerInjectionTest.java create mode 100644 environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/LookupTest.java create mode 100644 environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ServletInjectionTest.java create mode 100644 environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/util/JettyDeployments.java create mode 100755 environments/servlet/tests/jetty/src/test/resources/arquillian.xml rename environments/servlet/tests/{ => tomcat}/pom.xml (89%) create mode 100644 environments/servlet/tests/tomcat/src/etc/header.txt create mode 100644 environments/servlet/tests/tomcat/src/test/debug-resources/META-INF/jboss-test-harness.properties create mode 100644 environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/examples/.DS_Store create mode 100644 environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/examples/ExampleTest.java create mode 100644 environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTest.java create mode 100644 environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/FilterInjectionTest.java create mode 100644 environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ListenerInjectionTest.java create mode 100644 environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/LookupTest.java create mode 100644 environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ServletInjectionTest.java create mode 100644 environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/util/TomcatDeployments.java rename environments/servlet/tests/{ => tomcat}/src/test/resources/arquillian.xml (100%) diff --git a/environments/servlet/pom.xml b/environments/servlet/pom.xml index 12365a77a85..513fcebd114 100644 --- a/environments/servlet/pom.xml +++ b/environments/servlet/pom.xml @@ -5,18 +5,21 @@ weld-servlet-parent Weld Servlet Parent pom + 1.1.0-SNAPSHOT org.jboss.weld weld-core-parent - 1.1.0-SNAPSHOT ../../parent/pom.xml + 1.1.0-SNAPSHOT core build - tests + tests/base + tests/tomcat + tests/jetty @@ -68,7 +71,7 @@ org.apache.tomcat - coyote + coyote ${tomcat.version} @@ -78,11 +81,30 @@ ${jetty.version} + + + org.mortbay.jetty + jetty-plus + ${jetty.version} + + + + org.mortbay.jetty + jetty-naming + ${jetty.version} + + org.glassfish.web el-impl ${uel.glassfish.version} + + + org.jboss.weld.servlet + weld-servlet-test-base + ${project.version} + diff --git a/environments/servlet/tests/base/pom.xml b/environments/servlet/tests/base/pom.xml new file mode 100644 index 00000000000..72beaf7dfb9 --- /dev/null +++ b/environments/servlet/tests/base/pom.xml @@ -0,0 +1,66 @@ + + + + weld-servlet-parent + org.jboss.weld.servlet + 1.1.0-SNAPSHOT + ../../pom.xml + + 4.0.0 + org.jboss.weld.servlet + weld-servlet-test-base + jar + Weld Servlet Integration Tests (Base) + + + + + javax.servlet + servlet-api + provided + + + + org.jboss.ejb3 + jboss-ejb3-api + test + + + jboss-jaxrpc + jbossws + + + jboss-jaxrpc + jboss.jbossws + + + jboss-transaction-api + org.jboss.javaee + + + + + + javax.enterprise + cdi-api + + + + commons-httpclient + commons-httpclient + + + + junit + junit + + + + org.jboss.arquillian + arquillian-junit + + + + + diff --git a/environments/servlet/tests/src/etc/header.txt b/environments/servlet/tests/base/src/etc/header.txt similarity index 100% rename from environments/servlet/tests/src/etc/header.txt rename to environments/servlet/tests/base/src/etc/header.txt diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/ExampleTest.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/ExampleTestBase.java similarity index 73% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/ExampleTest.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/ExampleTestBase.java index a638ceadad6..7436feab444 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/ExampleTest.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/ExampleTestBase.java @@ -1,24 +1,19 @@ package org.jboss.weld.environment.servlet.test.examples; +import static org.jboss.weld.environment.servlet.test.util.Deployments.baseDeployment; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; -import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.weld.environment.servlet.test.util.DeploymentDescriptor; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(Arquillian.class) -public class ExampleTest +public class ExampleTestBase { - @Deployment public static WebArchive deployment() { - return DeploymentDescriptor.deployment().addPackage(ExampleTest.class.getPackage()); + return baseDeployment().addPackage(ExampleTestBase.class.getPackage()); } @Test diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/Game.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/Game.java similarity index 100% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/Game.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/Game.java diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/Generator.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/Generator.java similarity index 100% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/Generator.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/Generator.java diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTest.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTestBase.java similarity index 54% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTest.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTestBase.java index fb2f3d961d6..737b82ba03d 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTest.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTestBase.java @@ -1,21 +1,16 @@ package org.jboss.weld.environment.servlet.test.examples; +import static org.jboss.weld.environment.servlet.test.util.Deployments.baseDeployment; -import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.weld.environment.servlet.test.util.BeansXml; -import org.jboss.weld.environment.servlet.test.util.DeploymentDescriptor; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(Arquillian.class) -public class MockExampleTest +public class MockExampleTestBase { - @Deployment public static WebArchive deployment() { - return DeploymentDescriptor.deployment(new BeansXml().alternatives(MockSentenceTranslator.class)).addPackage(MockExampleTest.class.getPackage()); + return baseDeployment(new BeansXml().alternatives(MockSentenceTranslator.class)).addPackage(MockExampleTestBase.class.getPackage()); } @Test diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/MockSentenceTranslator.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/MockSentenceTranslator.java similarity index 100% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/MockSentenceTranslator.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/MockSentenceTranslator.java diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/Random.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/Random.java similarity index 100% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/Random.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/Random.java diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/SentenceParser.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/SentenceParser.java similarity index 100% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/SentenceParser.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/SentenceParser.java diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/SentenceTranslator.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/SentenceTranslator.java similarity index 100% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/SentenceTranslator.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/SentenceTranslator.java diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/TextTranslator.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/TextTranslator.java similarity index 100% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/TextTranslator.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/TextTranslator.java diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/Translator.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/Translator.java similarity index 100% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/Translator.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/examples/Translator.java diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/BatListener.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/BatListener.java similarity index 77% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/BatListener.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/BatListener.java index 77c3b4c979d..e7c06cf39c4 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/BatListener.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/BatListener.java @@ -1,13 +1,14 @@ -package org.jboss.weld.environment.servlet.test.tomcat.lookup; +package org.jboss.weld.environment.servlet.test.injection; import javax.inject.Inject; import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; import javax.servlet.ServletRequestEvent; +import javax.servlet.ServletRequestListener; import javax.servlet.http.HttpSessionEvent; +import javax.servlet.http.HttpSessionListener; -import org.jboss.weld.servlet.api.ServletListener; - -public class BatListener implements ServletListener +public class BatListener implements ServletContextListener, HttpSessionListener, ServletRequestListener { public static final String BAT_ATTRIBUTE_NAME = "batAttribute"; diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/BatServlet.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/BatServlet.java similarity index 90% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/BatServlet.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/BatServlet.java index 48321ae5874..8401421ce7f 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/BatServlet.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/BatServlet.java @@ -1,4 +1,4 @@ -package org.jboss.weld.environment.servlet.test.tomcat.lookup; +package org.jboss.weld.environment.servlet.test.injection; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/CatFilter.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/CatFilter.java similarity index 90% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/CatFilter.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/CatFilter.java index eeb1a408134..35881204948 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/CatFilter.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/CatFilter.java @@ -1,4 +1,4 @@ -package org.jboss.weld.environment.servlet.test.tomcat.lookup; +package org.jboss.weld.environment.servlet.test.injection; import java.io.IOException; diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/FilterInjectionTest.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/FilterInjectionTestBase.java similarity index 69% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/FilterInjectionTest.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/FilterInjectionTestBase.java index ac92dfdaebb..a38279125f9 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/FilterInjectionTest.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/FilterInjectionTestBase.java @@ -1,34 +1,26 @@ -package org.jboss.weld.environment.servlet.test.tomcat.lookup; +package org.jboss.weld.environment.servlet.test.injection; -import static org.jboss.arquillian.api.RunModeType.AS_CLIENT; -import static org.jboss.weld.environment.servlet.test.util.DeploymentDescriptor.CONTEXT_PATH; +import static org.jboss.weld.environment.servlet.test.util.Deployments.CONTEXT_PATH; +import static org.jboss.weld.environment.servlet.test.util.Deployments.baseDeployment; import javax.servlet.http.HttpServletResponse; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.methods.GetMethod; -import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.api.Run; -import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.asset.Asset; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.weld.environment.servlet.test.util.DeploymentDescriptor; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(Arquillian.class) -@Run(AS_CLIENT) -public class FilterInjectionTest +public class FilterInjectionTestBase { public static final Asset WEB_XML = new ByteArrayAsset(("org.jboss.weld.environment.servlet.Listener Cat Filter" + CatFilter.class.getName() + "Cat Filter/cat Wolverine Servlet" + WolverineServlet.class.getName() + " Wolverine Servlet/").getBytes()); - @Deployment public static WebArchive deployment() { - return DeploymentDescriptor.deployment(WEB_XML).addClasses(CatFilter.class, Sewer.class, RatServlet.class); + return baseDeployment(WEB_XML).addClasses(CatFilter.class, Sewer.class, RatServlet.class); } @Test diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ListenerInjectionTest.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/ListenerInjectionTestBase.java similarity index 68% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ListenerInjectionTest.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/ListenerInjectionTestBase.java index 05382174ed8..49200c65836 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ListenerInjectionTest.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/ListenerInjectionTestBase.java @@ -1,34 +1,27 @@ -package org.jboss.weld.environment.servlet.test.tomcat.lookup; +package org.jboss.weld.environment.servlet.test.injection; -import static org.jboss.arquillian.api.RunModeType.AS_CLIENT; -import static org.jboss.weld.environment.servlet.test.util.DeploymentDescriptor.CONTEXT_PATH; +import static org.jboss.weld.environment.servlet.test.util.Deployments.CONTEXT_PATH; +import static org.jboss.weld.environment.servlet.test.util.Deployments.baseDeployment; import javax.servlet.http.HttpServletResponse; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.methods.GetMethod; -import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.api.Run; -import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.asset.Asset; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.weld.environment.servlet.test.util.DeploymentDescriptor; import org.junit.Ignore; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(Arquillian.class) -@Run(AS_CLIENT) -public class ListenerInjectionTest + +public class ListenerInjectionTestBase { public static final Asset WEB_XML = new ByteArrayAsset((" org.jboss.weld.environment.servlet.Listener " + BatListener.class.getName() + " Bat Servletorg.jboss.weld.test.tomcat.lookup.BatServlet Bat Servlet/bat ").getBytes()); - @Deployment public static WebArchive deployment() { - return DeploymentDescriptor.deployment(WEB_XML).addClasses(BatListener.class, BatServlet.class, Sewer.class); + return baseDeployment(WEB_XML).addClasses(BatListener.class, BatServlet.class, Sewer.class); } @Test @Ignore diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/LookupTest.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/LookupTestBase.java similarity index 58% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/LookupTest.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/LookupTestBase.java index 770ad598ab6..eb07064d419 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/LookupTest.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/LookupTestBase.java @@ -1,24 +1,20 @@ -package org.jboss.weld.environment.servlet.test.tomcat.lookup; +package org.jboss.weld.environment.servlet.test.injection; +import static org.jboss.weld.environment.servlet.test.util.Deployments.baseDeployment; + import javax.enterprise.inject.spi.BeanManager; -import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.weld.environment.servlet.test.util.DeploymentDescriptor; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(Arquillian.class) -public class LookupTest +public class LookupTestBase { - @Deployment public static WebArchive deployment() { - return DeploymentDescriptor.deployment().addClasses(Mouse.class, Vole.class, LookupTest.class); + return baseDeployment().addClasses(Mouse.class, Vole.class, LookupTestBase.class); } @Test diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/Mouse.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/Mouse.java similarity index 86% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/Mouse.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/Mouse.java index 75740641de1..295580484dd 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/Mouse.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/Mouse.java @@ -1,4 +1,4 @@ -package org.jboss.weld.environment.servlet.test.tomcat.lookup; +package org.jboss.weld.environment.servlet.test.injection; import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/RatServlet.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/RatServlet.java similarity index 91% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/RatServlet.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/RatServlet.java index bf778eae772..1f2b072143f 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/RatServlet.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/RatServlet.java @@ -1,4 +1,4 @@ -package org.jboss.weld.environment.servlet.test.tomcat.lookup; +package org.jboss.weld.environment.servlet.test.injection; import java.io.IOException; diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ServletInjectionTest.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/ServletInjectionTestBase.java similarity index 67% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ServletInjectionTest.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/ServletInjectionTestBase.java index 81d9ba1c2d0..7257f30ec8e 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ServletInjectionTest.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/ServletInjectionTestBase.java @@ -1,34 +1,26 @@ -package org.jboss.weld.environment.servlet.test.tomcat.lookup; +package org.jboss.weld.environment.servlet.test.injection; -import static org.jboss.arquillian.api.RunModeType.AS_CLIENT; -import static org.jboss.weld.environment.servlet.test.util.DeploymentDescriptor.CONTEXT_PATH; +import static org.jboss.weld.environment.servlet.test.util.Deployments.CONTEXT_PATH; +import static org.jboss.weld.environment.servlet.test.util.Deployments.baseDeployment; import javax.servlet.http.HttpServletResponse; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.methods.GetMethod; -import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.api.Run; -import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.asset.Asset; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.weld.environment.servlet.test.util.DeploymentDescriptor; import org.junit.Test; -import org.junit.runner.RunWith; -@RunWith(Arquillian.class) -@Run(AS_CLIENT) -public class ServletInjectionTest +public class ServletInjectionTestBase { public static final Asset WEB_XML = new ByteArrayAsset((" org.jboss.weld.environment.servlet.Listener Rat Servlet" + RatServlet.class.getName() + " Rat Servlet/rat ").getBytes()); - @Deployment public static WebArchive deployment() { - return DeploymentDescriptor.deployment(WEB_XML).addClasses(RatServlet.class, Sewer.class); + return baseDeployment(WEB_XML).addClasses(RatServlet.class, Sewer.class); } @Test diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/Sewer.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/Sewer.java similarity index 68% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/Sewer.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/Sewer.java index cdbb5c3c66e..44723ebe8e0 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/Sewer.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/Sewer.java @@ -1,4 +1,4 @@ -package org.jboss.weld.environment.servlet.test.tomcat.lookup; +package org.jboss.weld.environment.servlet.test.injection; public class Sewer { diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/Vole.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/Vole.java similarity index 80% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/Vole.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/Vole.java index c4c1e819da1..450ef908c15 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/Vole.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/Vole.java @@ -1,4 +1,4 @@ -package org.jboss.weld.environment.servlet.test.tomcat.lookup; +package org.jboss.weld.environment.servlet.test.injection; import javax.annotation.Resource; import javax.enterprise.inject.spi.BeanManager; diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/WolverineServlet.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/WolverineServlet.java similarity index 86% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/WolverineServlet.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/WolverineServlet.java index 18c25056c96..67cae28660f 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/WolverineServlet.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/injection/WolverineServlet.java @@ -1,4 +1,4 @@ -package org.jboss.weld.environment.servlet.test.tomcat.lookup; +package org.jboss.weld.environment.servlet.test.injection; import java.io.IOException; diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/util/BeansXml.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/util/BeansXml.java similarity index 100% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/util/BeansXml.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/util/BeansXml.java diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/util/DeploymentDescriptor.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/util/Deployments.java similarity index 54% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/util/DeploymentDescriptor.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/util/Deployments.java index 421665e420f..69b30525270 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/util/DeploymentDescriptor.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/util/Deployments.java @@ -5,33 +5,32 @@ import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -public class DeploymentDescriptor +public class Deployments { public static final String WELD_SERVLET_ARTIFACT_NAME = "org.jboss.weld.servlet:weld-servlet"; public static final String CONTEXT_PATH = "http://localhost:8888/test"; public static final Asset ARQUILLIAN_WEB_XML = new ByteArrayAsset(" ServletTestRunnerorg.jboss.arquillian.protocol.servlet_3.ServletTestRunner ServletTestRunner/ArquillianServletRunner org.jboss.weld.environment.servlet.Listener ".getBytes()); - public static final Asset CONTEXT_XML = new ByteArrayAsset(" ".getBytes()); - public static WebArchive deployment(BeansXml beansXml, Asset webXml) + public static WebArchive baseDeployment(BeansXml beansXml, Asset webXml) { - return ShrinkWrap.create(WebArchive.class, "test.war").addWebResource(beansXml, "beans.xml").add(CONTEXT_XML, "/META-INF/context.xml").addLibrary(MavenArtifactResolver.resolve(WELD_SERVLET_ARTIFACT_NAME)).setWebXML(webXml); + return ShrinkWrap.create(WebArchive.class, "test.war").addWebResource(beansXml, "beans.xml").addLibrary(MavenArtifactResolver.resolve(WELD_SERVLET_ARTIFACT_NAME)).setWebXML(webXml); } - public static WebArchive deployment(BeansXml beansXml) + public static WebArchive baseDeployment(BeansXml beansXml) { - return deployment(beansXml, ARQUILLIAN_WEB_XML); + return baseDeployment(beansXml, ARQUILLIAN_WEB_XML); } - public static WebArchive deployment() + public static WebArchive baseDeployment() { - return deployment(new BeansXml(), ARQUILLIAN_WEB_XML); + return baseDeployment(new BeansXml(), ARQUILLIAN_WEB_XML); } - public static WebArchive deployment(Asset webXml) + public static WebArchive baseDeployment(Asset webXml) { - return deployment(new BeansXml(), webXml); + return baseDeployment(new BeansXml(), webXml); } } diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/util/MavenArtifactResolver.java b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/util/MavenArtifactResolver.java similarity index 58% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/util/MavenArtifactResolver.java rename to environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/util/MavenArtifactResolver.java index 2fc90032a9f..1d3541da4f5 100644 --- a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/util/MavenArtifactResolver.java +++ b/environments/servlet/tests/base/src/main/java/org/jboss/weld/environment/servlet/test/util/MavenArtifactResolver.java @@ -27,30 +27,43 @@ public static File resolve(String groupId, String artifactId) if (!matches.find()) { - // find a resource from the local build - String localClasses = Pattern.quote("target" + File.separatorChar + "classes"); - Pattern localClassesPattern = Pattern.compile("[^:]*" + localClasses + "[^:]*", Pattern.CASE_INSENSITIVE); - Matcher localClassesMatcher = localClassesPattern.matcher(classPath); - if (!localClassesMatcher.find()) - { - throw new IllegalArgumentException("Unable to find maven archive " + groupId + ":" + artifactId + " in the local build"); - } - else + // Find a jar from the build which is in the classpath + pathString = "target" + File.separatorChar + artifactId; + p = Pattern.compile("[^:]*" + Pattern.quote(pathString) + "[^:]*", Pattern.CASE_INSENSITIVE); + matches = p.matcher(classPath); + + if (!matches.find()) { - List targetPaths = new ArrayList(); - do + // Find a resource from the local build (not on classpath) + String localClasses = Pattern.quote("target" + File.separatorChar + "classes"); + Pattern localClassesPattern = Pattern.compile("[^:]*" + localClasses + "[^:]*", Pattern.CASE_INSENSITIVE); + Matcher localClassesMatcher = localClassesPattern.matcher(classPath); + if (!localClassesMatcher.find()) + { + throw new IllegalArgumentException("Unable to find maven archive " + groupId + ":" + artifactId + " in the local build"); + } + else { - String path = localClassesMatcher.group(); - targetPaths.add(path.substring(0, path.length() - 8)); + List targetPaths = new ArrayList(); + do + { + String path = localClassesMatcher.group(); + targetPaths.add(path.substring(0, path.length() - 8)); + } + while (localClassesMatcher.find()); + String fileName = findBuiltArtifact(targetPaths, artifactId); + if (fileName == null) + { + throw new IllegalStateException("Unable to locate artifact for " + groupId + ":" + artifactId); + } + else + { + return new File(fileName); + } } - while (localClassesMatcher.find()); - return new File(findBuiltArtifact(targetPaths, artifactId)); } } - else - { - return new File(matches.group(0)); - } + return new File(matches.group(0)); } public static File resolve(String qualifiedArtifactId) @@ -58,7 +71,7 @@ public static File resolve(String qualifiedArtifactId) String[] segments = qualifiedArtifactId.split(":"); return resolve(segments[0], segments[1]); } - + public static String findBuiltArtifact(List targetPaths, String artifactId) { final String regex = "^" + artifactId + "-[\\d+\\.]+(?:\\-\\p{Upper}*)?.jar$"; @@ -73,12 +86,12 @@ public static String findBuiltArtifact(List targetPaths, String artifact } String[] possibleFiles = target.list(new FilenameFilter() { - + public boolean accept(File dir, String name) { return name.matches(regex); } - + }); if (possibleFiles.length == 1) { diff --git a/environments/servlet/tests/jetty/pom.xml b/environments/servlet/tests/jetty/pom.xml new file mode 100644 index 00000000000..0c21cc6aeb4 --- /dev/null +++ b/environments/servlet/tests/jetty/pom.xml @@ -0,0 +1,241 @@ + + + + weld-servlet-parent + org.jboss.weld.servlet + 1.1.0-SNAPSHOT + ../../pom.xml + + 4.0.0 + org.jboss.weld.servlet + weld-servlet-test-jetty + jar + Weld Servlet Integration Tests (Jetty) + + + + + javax.servlet + servlet-api + provided + + + + org.jboss.ejb3 + jboss-ejb3-api + test + + + jboss-jaxrpc + jbossws + + + jboss-jaxrpc + jboss.jbossws + + + jboss-transaction-api + org.jboss.javaee + + + + + + commons-httpclient + commons-httpclient + + + + junit + junit + + + + org.jboss.arquillian + arquillian-junit + test + + + + org.jboss.weld.servlet + weld-servlet-test-base + test + + + + + + test + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + generate-test-report + test + + report-only + + + + + ${project.build.directory}/surefire-reports + test-report + + + + org.apache.maven.plugins + maven-surefire-plugin + + + none + true + + + + surefire-it + integration-test + + test + + + false + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce + + enforce + + + + + [${minimum.maven.version},) + + + + org.apache.maven.plugins:maven-eclipse-plugin + org.codehaus.mojo:versions-maven-plugin + org.apache.maven.plugins:maven-surefire-plugin + + + + + + + + + + + + + default + + true + + default + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + true + + + + + + + incontainer + + + incontainer + + + + + org.jboss.arquillian.container + arquillian-jetty-embedded-6.1 + test + + + + + + org.mortbay.jetty + jetty-plus + test + + + + org.mortbay.jetty + jetty-naming + test + + + + + org.jboss.weld.servlet + weld-servlet + test + + + + org.glassfish.web + el-impl + test + + + + javax.servlet.jsp + jsp-api + test + + + + org.slf4j + slf4j-simple + test + + + + + + + surefireSnapshot + + + surefireSnapshot + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.6-SNAPSHOT + + + + + + + + diff --git a/environments/servlet/tests/jetty/src/etc/header.txt b/environments/servlet/tests/jetty/src/etc/header.txt new file mode 100644 index 00000000000..dbb6b5591f2 --- /dev/null +++ b/environments/servlet/tests/jetty/src/etc/header.txt @@ -0,0 +1,14 @@ +JBoss, Home of Professional Open Source +Copyright 2008, Red Hat Middleware LLC, and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/environments/servlet/tests/src/test/debug-resources/META-INF/jboss-test-harness.properties b/environments/servlet/tests/jetty/src/test/debug-resources/META-INF/jboss-test-harness.properties similarity index 100% rename from environments/servlet/tests/src/test/debug-resources/META-INF/jboss-test-harness.properties rename to environments/servlet/tests/jetty/src/test/debug-resources/META-INF/jboss-test-harness.properties diff --git a/environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/.DS_Store b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/examples/.DS_Store similarity index 100% rename from environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/examples/.DS_Store rename to environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/examples/.DS_Store diff --git a/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/examples/ExampleTest.java b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/examples/ExampleTest.java new file mode 100644 index 00000000000..79172418790 --- /dev/null +++ b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/examples/ExampleTest.java @@ -0,0 +1,20 @@ +package org.jboss.weld.environment.servlet.test.examples; +import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_ENV; +import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_WEB; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.runner.RunWith; + +@RunWith(Arquillian.class) +public class ExampleTest extends ExampleTestBase +{ + + @Deployment + public static WebArchive deployment() + { + return ExampleTestBase.deployment().addWebResource(JETTY_ENV, "jetty-env.xml").addWebResource(JETTY_WEB, "jetty-web.xml"); + } + +} diff --git a/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTest.java b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTest.java new file mode 100644 index 00000000000..9df2546b764 --- /dev/null +++ b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/examples/MockExampleTest.java @@ -0,0 +1,21 @@ +package org.jboss.weld.environment.servlet.test.examples; + +import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_ENV; +import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_WEB; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.runner.RunWith; + +@RunWith(Arquillian.class) +public class MockExampleTest extends MockExampleTestBase +{ + + @Deployment + public static WebArchive deployment() + { + return MockExampleTestBase.deployment().addWebResource(JETTY_ENV, "jetty-env.xml").addWebResource(JETTY_WEB, "jetty-web.xml"); + } + +} diff --git a/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/FilterInjectionTest.java b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/FilterInjectionTest.java new file mode 100644 index 00000000000..1ea41f72fbe --- /dev/null +++ b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/FilterInjectionTest.java @@ -0,0 +1,25 @@ +package org.jboss.weld.environment.servlet.test.tomcat.lookup; + +import static org.jboss.arquillian.api.RunModeType.AS_CLIENT; +import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_ENV; +import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_WEB; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.api.Run; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.weld.environment.servlet.test.injection.FilterInjectionTestBase; +import org.junit.runner.RunWith; + +@RunWith(Arquillian.class) +@Run(AS_CLIENT) +public class FilterInjectionTest extends FilterInjectionTestBase +{ + + @Deployment + public static WebArchive deployment() + { + return FilterInjectionTestBase.deployment().addWebResource(JETTY_ENV, "jetty-env.xml").addWebResource(JETTY_WEB, "jetty-web.xml"); + } + +} diff --git a/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ListenerInjectionTest.java b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ListenerInjectionTest.java new file mode 100644 index 00000000000..78d50c7a9a6 --- /dev/null +++ b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ListenerInjectionTest.java @@ -0,0 +1,25 @@ +package org.jboss.weld.environment.servlet.test.tomcat.lookup; + +import static org.jboss.arquillian.api.RunModeType.AS_CLIENT; +import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_ENV; +import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_WEB; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.api.Run; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.weld.environment.servlet.test.injection.ListenerInjectionTestBase; +import org.junit.runner.RunWith; + +@RunWith(Arquillian.class) +@Run(AS_CLIENT) +public class ListenerInjectionTest extends ListenerInjectionTestBase +{ + + @Deployment + public static WebArchive deployment() + { + return ListenerInjectionTestBase.deployment().addWebResource(JETTY_ENV, "jetty-env.xml").addWebResource(JETTY_WEB, "jetty-web.xml"); + } + +} diff --git a/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/LookupTest.java b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/LookupTest.java new file mode 100644 index 00000000000..cc431fe911d --- /dev/null +++ b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/LookupTest.java @@ -0,0 +1,24 @@ +package org.jboss.weld.environment.servlet.test.tomcat.lookup; + + + +import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_ENV; +import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_WEB; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.weld.environment.servlet.test.injection.LookupTestBase; +import org.junit.runner.RunWith; + +@RunWith(Arquillian.class) +public class LookupTest extends LookupTestBase +{ + + @Deployment + public static WebArchive deployment() + { + return LookupTestBase.deployment().addWebResource(JETTY_ENV, "jetty-env.xml").addWebResource(JETTY_WEB, "jetty-web.xml"); + } + +} diff --git a/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ServletInjectionTest.java b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ServletInjectionTest.java new file mode 100644 index 00000000000..c55a9b4d059 --- /dev/null +++ b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/tomcat/lookup/ServletInjectionTest.java @@ -0,0 +1,25 @@ +package org.jboss.weld.environment.servlet.test.tomcat.lookup; + +import static org.jboss.arquillian.api.RunModeType.AS_CLIENT; +import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_ENV; +import static org.jboss.weld.environment.servlet.test.util.JettyDeployments.JETTY_WEB; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.api.Run; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.weld.environment.servlet.test.injection.ServletInjectionTestBase; +import org.junit.runner.RunWith; + +@RunWith(Arquillian.class) +@Run(AS_CLIENT) +public class ServletInjectionTest extends ServletInjectionTestBase +{ + + @Deployment + public static WebArchive deployment() + { + return ServletInjectionTestBase.deployment().addWebResource(JETTY_ENV, "jetty-env.xml").addWebResource(JETTY_WEB, "jetty-web.xml"); + } + +} diff --git a/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/util/JettyDeployments.java b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/util/JettyDeployments.java new file mode 100644 index 00000000000..6028eb799e9 --- /dev/null +++ b/environments/servlet/tests/jetty/src/test/java/org/jboss/weld/environment/servlet/test/util/JettyDeployments.java @@ -0,0 +1,13 @@ +package org.jboss.weld.environment.servlet.test.util; + +import org.jboss.shrinkwrap.api.asset.Asset; +import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; + +public class JettyDeployments +{ + + public static final Asset JETTY_ENV = new ByteArrayAsset("BeanManagerjavax.enterprise.inject.spi.BeanManagerorg.jboss.weld.resources.ManagerObjectFactorytrue".getBytes()); + + public static final Asset JETTY_WEB = new ByteArrayAsset("".getBytes()); + +} diff --git a/environments/servlet/tests/jetty/src/test/resources/arquillian.xml b/environments/servlet/tests/jetty/src/test/resources/arquillian.xml new file mode 100755 index 00000000000..eef95990094 --- /dev/null +++ b/environments/servlet/tests/jetty/src/test/resources/arquillian.xml @@ -0,0 +1,10 @@ + + + + + 8888 + + + \ No newline at end of file diff --git a/environments/servlet/tests/pom.xml b/environments/servlet/tests/tomcat/pom.xml similarity index 89% rename from environments/servlet/tests/pom.xml rename to environments/servlet/tests/tomcat/pom.xml index f6201cf2bbf..a5a4efce1fc 100644 --- a/environments/servlet/tests/pom.xml +++ b/environments/servlet/tests/tomcat/pom.xml @@ -5,12 +5,13 @@ weld-servlet-parent org.jboss.weld.servlet 1.1.0-SNAPSHOT + ../../pom.xml 4.0.0 org.jboss.weld.servlet - weld-servlet-test + weld-servlet-test-tomcat jar - Weld Servlet Integration Tests + Weld Servlet Integration Tests (Tomcat) @@ -40,12 +41,6 @@ - - org.jboss.weld.servlet - weld-servlet-int - test - - org.apache.tomcat catalina @@ -74,6 +69,19 @@ test + + org.jboss.weld.servlet + weld-servlet-test-base + test + + + + + org.jboss.weld.servlet + weld-servlet + test + + @@ -106,7 +114,20 @@ http://old.nabble.com/Maven-Surefire-and-newer-junit-features-td28539796.html --> none + true + + + surefire-it + integration-test + + test + + + false + + + org.apache.maven.plugins @@ -191,13 +212,6 @@ provided - - - org.jboss.weld.servlet - weld-servlet - test - - org.glassfish.web el-impl diff --git a/environments/servlet/tests/tomcat/src/etc/header.txt b/environments/servlet/tests/tomcat/src/etc/header.txt new file mode 100644 index 00000000000..dbb6b5591f2 --- /dev/null +++ b/environments/servlet/tests/tomcat/src/etc/header.txt @@ -0,0 +1,14 @@ +JBoss, Home of Professional Open Source +Copyright 2008, Red Hat Middleware LLC, and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/environments/servlet/tests/tomcat/src/test/debug-resources/META-INF/jboss-test-harness.properties b/environments/servlet/tests/tomcat/src/test/debug-resources/META-INF/jboss-test-harness.properties new file mode 100644 index 00000000000..6a106537ceb --- /dev/null +++ b/environments/servlet/tests/tomcat/src/test/debug-resources/META-INF/jboss-test-harness.properties @@ -0,0 +1,7 @@ +# Configuration for running incontainer tests from your IDE +# Alter the path weld accordingly (relative from the tck/impl dir) +org.jboss.testharness.standalone=false +org.jboss.testharness.container.extraConfigurationDir=../ +org.jboss.testharness.container.forceRestart=false +org.jboss.testharness.libraryDirectory=target/dependency/lib +org.jboss.testharness.runIntegrationTests=true diff --git a/environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/examples/.DS_Store b/environments/servlet/tests/tomcat/src/test/java/org/jboss/weld/environment/servlet/test/examples/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 ".getBytes()); + +} diff --git a/environments/servlet/tests/src/test/resources/arquillian.xml b/environments/servlet/tests/tomcat/src/test/resources/arquillian.xml similarity index 100% rename from environments/servlet/tests/src/test/resources/arquillian.xml rename to environments/servlet/tests/tomcat/src/test/resources/arquillian.xml diff --git a/parent/pom.xml b/parent/pom.xml index 4a1d7afb198..f8f82a590ac 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -169,9 +169,15 @@ - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - ${jboss.spec.servlet.version} + org.jboss.arquillian.container + arquillian-jetty-embedded-6.1 + ${arquillian.version} + + + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec + ${jboss.spec.servlet.version} @@ -187,9 +193,9 @@ - org.jboss.metadata - jboss-metadata - ${jboss.metadata.version} + org.jboss.metadata + jboss-metadata + ${jboss.metadata.version}