Repository: deltaspike Updated Branches: refs/heads/master 39308d33f -> 299e8dc82
DELTASPIKE-653 Added tests for Tomcat. Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/299e8dc8 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/299e8dc8 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/299e8dc8 Branch: refs/heads/master Commit: 299e8dc82b01d1df2346e604d7cf81a85e8d81ac Parents: 39308d3 Author: John D. Ament <[email protected]> Authored: Sat Aug 9 18:26:38 2014 -0400 Committer: John D. Ament <[email protected]> Committed: Sat Aug 9 18:26:38 2014 -0400 ---------------------------------------------------------------------- deltaspike/cdictrl/servlet/pom.xml | 32 ++++++++++ .../servlet/test/EmbeddedServletContainer.java | 2 +- .../cdise/servlet/test/TomcatTest.java | 62 ++++++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/299e8dc8/deltaspike/cdictrl/servlet/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet/pom.xml b/deltaspike/cdictrl/servlet/pom.xml index 67dcd1b..a4cd076 100644 --- a/deltaspike/cdictrl/servlet/pom.xml +++ b/deltaspike/cdictrl/servlet/pom.xml @@ -33,6 +33,8 @@ <properties> <jetty.version>8.1.9.v20130131</jetty.version> + <version.org.apache.tomcat>7.0.54</version.org.apache.tomcat> + <tomcat.home>${project.build.directory}/apache-tomcat-${version.org.apache.tomcat}</tomcat.home> </properties> <dependencies> @@ -98,6 +100,36 @@ <version>${jetty.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <version>${version.org.apache.tomcat}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-logging-juli</artifactId> + <version>${version.org.apache.tomcat}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-jasper</artifactId> + <version>${version.org.apache.tomcat}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jasper</artifactId> + <version>${version.org.apache.tomcat}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jasper-el</artifactId> + <version>${version.org.apache.tomcat}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jsp-api</artifactId> + <version>${version.org.apache.tomcat}</version> + </dependency> </dependencies> <profiles> <profile> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/299e8dc8/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java index 09464f3..dc620c0 100644 --- a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java +++ b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/EmbeddedServletContainer.java @@ -34,7 +34,7 @@ import java.util.Random; import static org.junit.Assert.assertEquals; /** - * Created by johnament on 8/5/14. + * Base test for testing embedded servlet runtimes. */ public abstract class EmbeddedServletContainer { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/299e8dc8/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/TomcatTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/TomcatTest.java b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/TomcatTest.java new file mode 100644 index 0000000..7d28cc7 --- /dev/null +++ b/deltaspike/cdictrl/servlet/src/test/java/org/apache/deltaspike/cdise/servlet/test/TomcatTest.java @@ -0,0 +1,62 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ +package org.apache.deltaspike.cdise.servlet.test; + +import org.apache.catalina.Context; +import org.apache.catalina.Wrapper; +import org.apache.catalina.core.StandardContext; +import org.apache.catalina.startup.Tomcat; +import org.apache.deltaspike.cdise.servlet.CdiServletContextListener; +import org.apache.deltaspike.cdise.servlet.test.content.RequestServlet; + +import java.io.File; + +/** + * Embedded servlet tests for Tomcat. + */ +public class TomcatTest extends EmbeddedServletContainer +{ + private Tomcat tomcat; + @Override + protected int createServer() throws Exception + { + tomcat = new Tomcat(); + int port = super.getPort(); + tomcat.setPort(port); + File base = new File("target/webapp-runner"); + if (!base.exists()) + { + base.mkdirs(); + } + Context ctx = tomcat.addContext("/",base.getAbsolutePath()); + StandardContext standardContext = (StandardContext)ctx; + standardContext.addApplicationListener(CdiServletContextListener.class.getName()); + + Wrapper wrapper = Tomcat.addServlet(ctx,"RequestServlet",RequestServlet.class.getName()); + wrapper.addMapping("/*"); + tomcat.start(); + return port; + } + + @Override + protected void shutdown() throws Exception + { + tomcat.stop(); + } +}
