Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make new JspMatchingTest work with jsp2.2 for jetty-8

This commit is contained in:
Jan Bartel 2013-01-07 12:34:57 +11:00
parent d2c2e8693f
commit 64df770b42
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test-integration/pom.xml
View File

@ -82,6 +82,8 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<forkMode>always</forkMode> <forkMode>always</forkMode>
<useSystemClassLoader>true</useSystemClassLoader>
<useManifestOnlyJar>false</useManifestOnlyJar>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
@ -112,16 +114,6 @@
<artifactId>jetty-monitor</artifactId> <artifactId>jetty-monitor</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.toolchain</groupId> <groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-test-helper</artifactId> <artifactId>jetty-test-helper</artifactId>

13
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
View File

@ -25,6 +25,8 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URI; import java.net.URI;
import java.net.URL;
import java.net.URLClassLoader;
import org.apache.jasper.servlet.JspServlet; import org.apache.jasper.servlet.JspServlet;
import org.eclipse.jetty.security.HashLoginService; import org.eclipse.jetty.security.HashLoginService;
@ -35,6 +37,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.Loader;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Assert; import org.junit.Assert;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -66,7 +69,8 @@ public class JspMatchingTest
context.setContextPath("/"); context.setContextPath("/");
File webappBase = MavenTestingUtils.getTestResourceDir("docroots/jsp"); File webappBase = MavenTestingUtils.getTestResourceDir("docroots/jsp");
context.setResourceBase(webappBase.getAbsolutePath()); context.setResourceBase(webappBase.getAbsolutePath());
context.setClassLoader(Thread.currentThread().getContextClassLoader()); URLClassLoader contextLoader = new URLClassLoader(new URL[]{}, Server.class.getClassLoader());
context.setClassLoader(contextLoader);
// add default servlet // add default servlet
ServletHolder defaultServHolder = context.addServlet(DefaultServlet.class,"/"); ServletHolder defaultServHolder = context.addServlet(DefaultServlet.class,"/");
@ -74,7 +78,8 @@ public class JspMatchingTest
// add jsp // add jsp
ServletHolder jsp = context.addServlet(JspServlet.class,"*.jsp"); ServletHolder jsp = context.addServlet(JspServlet.class,"*.jsp");
jsp.setInitParameter("classpath",context.getClassPath()); context.setAttribute("org.apache.catalina.jsp_classpath", context.getClassPath());
jsp.setInitParameter("com.sun.appserv.jsp.classpath", Loader.getClassPath(Server.class.getClassLoader()));
// add context // add context
server.setHandler(context); server.setHandler(context);
@ -101,8 +106,8 @@ public class JspMatchingTest
try try
{ {
conn = (HttpURLConnection)uri.toURL().openConnection(); conn = (HttpURLConnection)uri.toURL().openConnection();
conn.setConnectTimeout(1000); conn.setConnectTimeout(5000);
conn.setReadTimeout(1000); conn.setReadTimeout(5000);
Assert.assertThat(conn.getResponseCode(),is(200)); Assert.assertThat(conn.getResponseCode(),is(200));
// make sure that jsp actually ran, and didn't just get passed onto // make sure that jsp actually ran, and didn't just get passed onto