svn commit: r1532349 - /tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java

[markt]

Author: markt
Date: Tue Oct 15 14:19:09 2013
New Revision: 1532349

URL: http://svn.apache.org/r1532349
Log:
Fix gzip test for default Servlet after it was disabled by default

Modified:
    tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java

Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1532349&r1=1532348&r2=1532349&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Tue 
Oct 15 14:19:09 2013
@@ -39,6 +39,8 @@ import org.junit.Test;
 
 import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
 
+import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
 import org.apache.catalina.startup.SimpleHttpClient;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -96,8 +98,7 @@ public class TestDefaultServlet extends 
 
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir =
-            new File("test/webapp");
+        File appDir = new File("test/webapp");
 
         File gzipIndex = new File(appDir, "index.html.gz");
         long gzipSize = gzipIndex.length();
@@ -106,7 +107,13 @@ public class TestDefaultServlet extends 
         long indexSize = index.length();
 
         // app dir is relative to server home
-        tomcat.addWebapp(null, "", appDir.getAbsolutePath());
+        Context ctxt = tomcat.addContext("", appDir.getAbsolutePath());
+        Wrapper defaultServlet = Tomcat.addServlet(ctxt, "default",
+                "org.apache.catalina.servlets.DefaultServlet");
+        defaultServlet.addInitParameter("gzip", "true");
+        ctxt.addServletMapping("/", "default");
+
+        ctxt.addMimeMapping("html", "text/html");
 
         tomcat.start();
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org