Skip to content

Commit

Permalink
Create test base, and run them in tomcat and jetty
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmuir
pmuir committed Aug 13, 2010
1 parent b3aecba commit d5c7513
Show file tree
Hide file tree
Showing 53 changed files with 800 additions and 131 deletions.
28 changes: 25 additions & 3 deletions environments/servlet/pom.xml
View file
Expand Up @@ -5,18 +5,21 @@
<artifactId>weld-servlet-parent</artifactId>
<name>Weld Servlet Parent</name>
<packaging>pom</packaging>
<version>1.1.0-SNAPSHOT</version>

<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
<version>1.1.0-SNAPSHOT</version>
</parent>

<modules>
<module>core</module>
<module>build</module>
<module>tests</module>
<module>tests/base</module>
<module>tests/tomcat</module>
<module>tests/jetty</module>
</modules>

<description>
Expand Down Expand Up @@ -68,7 +71,7 @@

<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>coyote</artifactId>
<artifactId>coyote</artifactId>
<version>${tomcat.version}</version>
</dependency>

Expand All @@ -78,11 +81,30 @@
<version>${jetty.version}</version>
</dependency>

<!-- plus and naming requires for using JNDI -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<version>${jetty.version}</version>
</dependency>

<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-naming</artifactId>
<version>${jetty.version}</version>
</dependency>

<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
<version>${uel.glassfish.version}</version>
</dependency>

<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet-test-base</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
66 changes: 66 additions & 0 deletions environments/servlet/tests/base/pom.xml
View file
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>weld-servlet-parent</artifactId>
<groupId>org.jboss.weld.servlet</groupId>
<version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet-test-base</artifactId>
<packaging>jar</packaging>
<name>Weld Servlet Integration Tests (Base)</name>

<dependencies>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-api</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>jboss-jaxrpc</artifactId>
<groupId>jbossws</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-jaxrpc</artifactId>
<groupId>jboss.jbossws</groupId>
</exclusion>
<exclusion>
<artifactId>jboss-transaction-api</artifactId>
<groupId>org.jboss.javaee</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</dependency>

<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-junit</artifactId>
</dependency>

</dependencies>

</project>
0 ...ronments/servlet/tests/src/etc/header.txt → ...nts/servlet/tests/base/src/etc/header.txt
View file
File renamed without changes.
11 changes: 3 additions & 8 deletions ...nt/servlet/test/examples/ExampleTest.java → ...ervlet/test/examples/ExampleTestBase.java
View file
@@ -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
Expand Down
0 ...vironment/servlet/test/examples/Game.java → ...vironment/servlet/test/examples/Game.java
View file
File renamed without changes.
0 ...ment/servlet/test/examples/Generator.java → ...ment/servlet/test/examples/Generator.java
View file
File renamed without changes.
11 changes: 3 additions & 8 deletions ...ervlet/test/examples/MockExampleTest.java → ...et/test/examples/MockExampleTestBase.java
View file
@@ -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
Expand Down
0 ...test/examples/MockSentenceTranslator.java → ...test/examples/MockSentenceTranslator.java
View file
File renamed without changes.
0 ...ronment/servlet/test/examples/Random.java → ...ronment/servlet/test/examples/Random.java
View file
File renamed without changes.
0 ...servlet/test/examples/SentenceParser.java → ...servlet/test/examples/SentenceParser.java
View file
File renamed without changes.
0 ...let/test/examples/SentenceTranslator.java → ...let/test/examples/SentenceTranslator.java
View file
File renamed without changes.
0 ...servlet/test/examples/TextTranslator.java → ...servlet/test/examples/TextTranslator.java
View file
File renamed without changes.
0 ...ent/servlet/test/examples/Translator.java → ...ent/servlet/test/examples/Translator.java
View file
File renamed without changes.
9 changes: 5 additions & 4 deletions ...rvlet/test/tomcat/lookup/BatListener.java → ...t/servlet/test/injection/BatListener.java
View file
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion ...ervlet/test/tomcat/lookup/BatServlet.java → ...nt/servlet/test/injection/BatServlet.java
View file
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...servlet/test/tomcat/lookup/CatFilter.java → ...ent/servlet/test/injection/CatFilter.java
View file
@@ -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;

Expand Down
18 changes: 5 additions & 13 deletions ...st/tomcat/lookup/FilterInjectionTest.java → ...st/injection/FilterInjectionTestBase.java
View file
@@ -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(("<web-app><listener><listener-class>org.jboss.weld.environment.servlet.Listener</listener-class></listener> <filter><filter-name>Cat Filter</filter-name><filter-class>" + CatFilter.class.getName() + "</filter-class></filter><filter-mapping><filter-name>Cat Filter</filter-name><url-pattern>/cat</url-pattern></filter-mapping> <servlet><servlet-name>Wolverine Servlet</servlet-name><servlet-class>" + WolverineServlet.class.getName() + "</servlet-class></servlet> <servlet-mapping><servlet-name>Wolverine Servlet</servlet-name><url-pattern>/</url-pattern></servlet-mapping></web-app>").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
Expand Down
19 changes: 6 additions & 13 deletions .../tomcat/lookup/ListenerInjectionTest.java → .../injection/ListenerInjectionTestBase.java
View file
@@ -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(("<web-app> <listener><listener-class>org.jboss.weld.environment.servlet.Listener</listener-class></listener> <listener><listener-class>" + BatListener.class.getName() + "</listener-class></listener> <servlet><servlet-name>Bat Servlet</servlet-name><servlet-class>org.jboss.weld.test.tomcat.lookup.BatServlet</servlet-class></servlet> <servlet-mapping><servlet-name>Bat Servlet</servlet-name><url-pattern>/bat</url-pattern></servlet-mapping> </web-app>").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
Expand Down
14 changes: 5 additions & 9 deletions ...ervlet/test/tomcat/lookup/LookupTest.java → ...ervlet/test/injection/LookupTestBase.java
View file
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ent/servlet/test/tomcat/lookup/Mouse.java → ...ronment/servlet/test/injection/Mouse.java
View file
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ervlet/test/tomcat/lookup/RatServlet.java → ...nt/servlet/test/injection/RatServlet.java
View file
@@ -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;

Expand Down
18 changes: 5 additions & 13 deletions ...t/tomcat/lookup/ServletInjectionTest.java → ...t/injection/ServletInjectionTestBase.java
View file
@@ -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(("<web-app> <listener><listener-class>org.jboss.weld.environment.servlet.Listener</listener-class></listener> <servlet><servlet-name>Rat Servlet</servlet-name><servlet-class>" + RatServlet.class.getName() + "</servlet-class></servlet> <servlet-mapping><servlet-name>Rat Servlet</servlet-name><url-pattern>/rat</url-pattern></servlet-mapping> </web-app>").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
Expand Down
2 changes: 1 addition & 1 deletion ...ent/servlet/test/tomcat/lookup/Sewer.java → ...ronment/servlet/test/injection/Sewer.java
View file
@@ -1,4 +1,4 @@
package org.jboss.weld.environment.servlet.test.tomcat.lookup;
package org.jboss.weld.environment.servlet.test.injection;

public class Sewer
{
Expand Down
2 changes: 1 addition & 1 deletion ...ment/servlet/test/tomcat/lookup/Vole.java → ...ironment/servlet/test/injection/Vole.java
View file
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../test/tomcat/lookup/WolverineServlet.java → ...vlet/test/injection/WolverineServlet.java
View file
@@ -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;

Expand Down
0 ...vironment/servlet/test/util/BeansXml.java → ...vironment/servlet/test/util/BeansXml.java
View file
File renamed without changes.

0 comments on commit d5c7513

Please sign in to comment.