svn commit: r1224980 - /tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestTomcat.java

[olamy]

Author: olamy
Date: Tue Dec 27 19:10:34 2011
New Revision: 1224980

URL: http://svn.apache.org/viewvc?rev=1224980&view=rev
Log:
fix path in test

Modified:
    
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestTomcat.java

Modified: 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestTomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestTomcat.java?rev=1224980&r1=1224979&r2=1224980&view=diff
==============================================================================
--- 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestTomcat.java
 (original)
+++ 
tomcat/sandbox/trunk-mvn-build/tomcat-tests/src/test/java/org/apache/catalina/startup/TestTomcat.java
 Tue Dec 27 19:10:34 2011
@@ -27,6 +27,7 @@ import java.security.Principal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.naming.Context;
@@ -228,7 +229,7 @@ public class TestTomcat extends TomcatBa
     public void testSingleWebapp() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File(getBuildDirectory(), "webapps/examples");
+        File appDir = new File(getBuildDirectory(), "examples");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
 
@@ -236,6 +237,7 @@ public class TestTomcat extends TomcatBa
 
         ByteChunk res = getUrl("http://localhost:"; + getPort() +
                 "/examples/servlets/servlet/HelloWorldExample");
+        // this test is Locale sensitive so can fail on fr,es machines
         assertTrue(res.toString().indexOf("<h1>Hello World!</h1>") > 0);
     }
 
@@ -243,7 +245,7 @@ public class TestTomcat extends TomcatBa
     public void testJsps() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        File appDir = new File(getBuildDirectory(), "webapps/examples");
+        File appDir = new File(getBuildDirectory(), "examples");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
 
@@ -361,7 +363,7 @@ public class TestTomcat extends TomcatBa
 
         String contextPath = "/examples";
 
-        File appDir = new File(getBuildDirectory(), "webapps" + contextPath);
+        File appDir = new File(getBuildDirectory(), contextPath);
         // app dir is relative to server home
         org.apache.catalina.Context ctx =
             tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());



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