Author: kkolinko
Date: Wed May 19 15:55:33 2010
New Revision: 946241
URL: http://svn.apache.org/viewvc?rev=946241&view=rev
Log:
Add method TomcatBaseTest#getTemporaryDirectory()
Use mkdirs() to create tempDir directory in TomcatBaseTest#setUp()
Fix issue with TestRegistration test failing when ${tomcat.output} ant property
had non-default value.
The failure was due to the contextDir.mkdir() call in
TestRegistration#testMBeanDeregistration() failing to create a subdirectory
because its parent directory did not exist.
Modified:
tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=946241&r1=946240&r2=946241&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Wed May
19 15:55:33 2010
@@ -45,7 +45,7 @@ public class TestRegistration extends To
assertEquals("Remaining: " + onames, 0, onames.size());
final Tomcat tomcat = getTomcatInstance();
- final File contextDir = new File("output/webappFoo");
+ final File contextDir = new File(getTemporaryDirectory(), "webappFoo");
contextDir.mkdir();
tomcat.addContext("/foo", contextDir.getAbsolutePath());
tomcat.start();
@@ -69,7 +69,7 @@ public class TestRegistration extends To
host.setName("otherhost");
tomcat.getEngine().addChild(host);
- final File contextDir2 = new File("output/webappFoo2");
+ final File contextDir2 = new File(getTemporaryDirectory(),
"webappFoo2");
contextDir2.mkdir();
tomcat.addContext(host, "/foo2", contextDir2.getAbsolutePath());
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=946241&r1=946240&r2=946241&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Wed May
19 15:55:33 2010
@@ -68,6 +68,15 @@ public abstract class TomcatBaseTest ext
}
/**
+ * Helper method that returns the path of the temporary directory used by
+ * the test runs. The directory is configured during {...@link #setUp()}
and is
+ * deleted at {...@link #tearDown()}.
+ */
+ public File getTemporaryDirectory() {
+ return tempDir;
+ }
+
+ /**
* Helper method that returns the directory where Tomcat build resides. It
* is used to access resources that are part of default Tomcat deployment.
* E.g. the examples webapp.
@@ -84,7 +93,7 @@ public abstract class TomcatBaseTest ext
"org.apache.juli.ClassLoaderLogManager");
tempDir = new File(System.getProperty("tomcat.test.temp",
"output/tmp"));
- if (!tempDir.exists() && !tempDir.mkdir()) {
+ if (!tempDir.exists() && !tempDir.mkdirs()) {
fail("Unable to create temporary directory for test");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
