Author: kkolinko
Date: Tue Nov 18 15:25:21 2014
New Revision: 1640367
URL: http://svn.apache.org/r1640367
Log:
Correct tests to use the correct context path for ROOT webapp.
Those were printing the warning
"StandardContext.setPath A context path must either be an empty string or start
with a '/'"...
Merged r1640363, r1640366 from tomcat/tc8.0.x/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestListener.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1640361,1640365
Merged /tomcat/tc8.0.x/trunk:r1640363,1640366
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestListener.java?rev=1640367&r1=1640366&r2=1640367&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestListener.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestListener.java Tue
Nov 18 15:25:21 2014
@@ -42,7 +42,7 @@ public class TestListener extends Tomcat
public void testServletContainerInitializer() throws Exception {
Tomcat tomcat = getTomcatInstance();
- Context context = tomcat.addContext("/",
+ Context context = tomcat.addContext("",
System.getProperty("java.io.tmpdir"));
context.addServletContainerInitializer(new SCI(), null);
@@ -59,7 +59,7 @@ public class TestListener extends Tomcat
public void testServletContextListener() throws Exception {
Tomcat tomcat = getTomcatInstance();
- Context context = tomcat.addContext("/",
+ Context context = tomcat.addContext("",
System.getProperty("java.io.tmpdir"));
// SCL2 pretends to be in web.xml, and tries to install a
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1640367&r1=1640366&r2=1640367&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java Tue
Nov 18 15:25:21 2014
@@ -309,10 +309,10 @@ public class TestTomcat extends TomcatBa
public void testLaunchTime() throws Exception {
Tomcat tomcat = getTomcatInstance();
long t0 = System.currentTimeMillis();
- tomcat.addContext(null, "/", ".");
+ tomcat.addContext(null, "", ".");
tomcat.start();
- System.err.println("Test time: " +
- (System.currentTimeMillis() - t0));
+ log.info("Tomcat started in [" + (System.currentTimeMillis() - t0)
+ + "] ms");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
