Author: kkolinko
Date: Thu Jan 14 14:05:21 2016
New Revision: 1724615
URL: http://svn.apache.org/viewvc?rev=1724615&view=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58836
Adapt the test class to current Tomcat 6 testing framework.
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java?rev=1724615&r1=1724614&r2=1724615&view=diff
==============================================================================
---
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java
(original)
+++
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java
Thu Jan 14 14:05:21 2016
@@ -31,6 +31,8 @@ import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
+import org.apache.catalina.Host;
+import org.apache.catalina.startup.Embedded;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -165,10 +167,18 @@ public class TestApplicationHttpRequest
private void doQueryStringTest(String originalQueryString, String
forwardQueryString,
Map<String,String[]> expected) throws Exception {
- Tomcat tomcat = getTomcatInstance();
+ Embedded tomcat = getTomcatInstance();
- // No file system docBase required
- Context ctx = tomcat.addContext("", null);
+ // // No file system docBase required
+ // Context ctx = tomcat.addContext("", null);
+
+ // Must have a real docBase - just use temp
+ // FIXME: Implement getHost() method.
+ // FIXME: Implement support for null docBase (r1681953)
+ Host host = (Host) tomcat.getContainer().findChildren()[0];
+ Tomcat helper = new Tomcat();
+ Context ctx = helper.addContext(host, "",
+ System.getProperty("java.io.tmpdir"));
if (forwardQueryString == null) {
Tomcat.addServlet(ctx, "forward", new ForwardServlet("/display"));
@@ -231,6 +241,7 @@ public class TestApplicationHttpRequest
resp.setContentType("text/plain");
resp.setCharacterEncoding("UTF-8");
PrintWriter w = resp.getWriter();
+ @SuppressWarnings("unchecked")
Map<String,String[]> actual = req.getParameterMap();
boolean ok = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
