Author: kkolinko
Date: Sun Jan 17 06:15:02 2016
New Revision: 1725066
URL: http://svn.apache.org/viewvc?rev=1725066&view=rev
Log:
Use implemented support for null docBase in the tests.
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/core/TestApplicationHttpRequest.java
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.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=1725066&r1=1725065&r2=1725066&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
Sun Jan 17 06:15:02 2016
@@ -180,13 +180,8 @@ public class TestApplicationHttpRequest
Map<String,String[]> expected) throws Exception {
Tomcat tomcat = getTomcatInstance();
- // // No file system docBase required
- // Context ctx = tomcat.addContext("", null);
-
- // Must have a real docBase - just use temp
- // FIXME: Implement support for null docBase (r1681953)
- Context ctx = tomcat.addContext("",
- System.getProperty("java.io.tmpdir"));
+ // No file system docBase required
+ Context ctx = tomcat.addContext("", null);
if (forwardQueryString == null) {
Tomcat.addServlet(ctx, "forward", new ForwardServlet("/display"));
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java?rev=1725066&r1=1725065&r2=1725066&view=diff
==============================================================================
---
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
(original)
+++
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TestTomcat.java
Sun Jan 17 06:15:02 2016
@@ -250,13 +250,8 @@ public class TestTomcat extends TomcatBa
public void testProgrammatic() throws Exception {
Tomcat tomcat = getTomcatInstance();
- // // No file system docBase required
- // org.apache.catalina.Context ctx = tomcat.addContext("", null);
-
- // Must have a real docBase - just use temp
- // FIXME: Implement support for null docBase (r1681953)
- org.apache.catalina.Context ctx = tomcat.addContext("",
- System.getProperty("java.io.tmpdir"));
+ // No file system docBase required
+ org.apache.catalina.Context ctx = tomcat.addContext("", null);
// You can customize the context by calling
// its API
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
