summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVioleta Georgieva2010-09-10 06:22:26 (EDT)
committer Glyn Normington2010-09-10 06:22:26 (EDT)
commit5f28b4ba78d433cfeac33ead5cc66968dd1209b6 (patch)
tree0472b0f77083ab79340dd08464ef73d3a25d4c1c
parent55a07642379d61466785e41804cf9d68260c1f81 (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-5f28b4ba78d433cfeac33ead5cc66968dd1209b6.zip
org.eclipse.gemini.web.gemini-web-container-5f28b4ba78d433cfeac33ead5cc66968dd1209b6.tar.gz
org.eclipse.gemini.web.gemini-web-container-5f28b4ba78d433cfeac33ead5cc66968dd1209b6.tar.bz2
bug 307393: integration test improvements
-rw-r--r--org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
index 04acce7..1eaabd6 100644
--- a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
+++ b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
@@ -408,8 +408,12 @@ public class TomcatServletContainerTests {
public void testInstallWebAppDir() throws Exception {
//Create web app dir
File webAppDir = new File("target/test-classes/simple-web-app-dir");
- File indexHtml = new File(webAppDir, "index.html");
- createFileWithContent(indexHtml, "Hello World!");
+ File indexJsp = new File(webAppDir, "index.jsp");
+ createFileWithContent(
+ indexJsp,
+ "Hello World!\n" +
+ "config.getServletContext().getResourcePaths(/): <%=config.getServletContext().getResourcePaths(\"/\")%>\n" +
+ "config.getServletContext().getRealPath(/): <%=config.getServletContext().getRealPath(\"/\")%>");
Bundle bundle = this.bundleContext.installBundle(LOCATION_PREFIX + webAppDir.getAbsolutePath() + "?Web-ContextPath=/simple-web-app-dir");
bundle.start();
@@ -417,7 +421,7 @@ public class TomcatServletContainerTests {
WebApplicationHandle handle = this.container.createWebApplication("/simple-web-app-dir", bundle);
this.container.startWebApplication(handle);
try {
- validateURL("http://localhost:8080/simple-web-app-dir/index.html");
+ validateURL("http://localhost:8080/simple-web-app-dir/index.jsp");
} finally {
this.container.stopWebApplication(handle);
bundle.uninstall();