You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/11/18 16:08:09 UTC
svn commit: r1640361 - in /tomcat/trunk/test/org/apache/catalina/startup:
TestListener.java TestTomcat.java
Author: kkolinko
Date: Tue Nov 18 15:08:08 2014
New Revision: 1640361
URL: http://svn.apache.org/r1640361
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 '/'"...
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestListener.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestListener.java?rev=1640361&r1=1640360&r2=1640361&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestListener.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestListener.java Tue Nov 18 15:08:08 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/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1640361&r1=1640360&r2=1640361&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Tue Nov 18 15:08:08 2014
@@ -246,10 +246,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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org