svn commit: r907717 - /tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

[markt]

Author: markt
Date: Mon Feb  8 16:25:13 2010
New Revision: 907717

URL: http://svn.apache.org/viewvc?rev=907717&view=rev
Log:
Ensure appBase is valid. Prevents spurious stacktraces in tests

Modified:
    tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=907717&r1=907716&r2=907717&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Mon Feb  
8 16:25:13 2010
@@ -44,7 +44,7 @@
 public abstract class TomcatBaseTest extends TestCase {
     private Tomcat tomcat;
     private File tempDir;
-    private static int port = 8001;
+    private static int port = 8000;
 
     /**
      * Make Tomcat instance accessible to sub-classes.
@@ -79,15 +79,16 @@
 
         tempDir = new File("output/tmp");
         tempDir.mkdir();
+        File appBase = new File(tempDir, "webapps");
+        appBase.mkdir();
         
         tomcat = new Tomcat();
         tomcat.setBaseDir(tempDir.getAbsolutePath());
-        tomcat.getHost().setAppBase(tempDir.getAbsolutePath() + "/webapps");
+        tomcat.getHost().setAppBase(appBase.getAbsolutePath());
           
         // If each test is running on same port - they
         // may interfere with each other (on unix at least)
-        port++;
-        tomcat.setPort(port);
+        tomcat.setPort(getNextPort());
     }
     
     @Override



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