Author: kkolinko
Date: Sat Sep 24 23:37:21 2011
New Revision: 1175284
URL: http://svn.apache.org/viewvc?rev=1175284&view=rev
Log:
Merged revision 1175283 from tomcat/trunk:
Cleanup temporary files created by tests:
register them and delete them in tearDown().
In TestRegistration also aligned mkdir calls with their usage elsewhere.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 24 23:37:21 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java?rev=1175284&r1=1175283&r2=1175284&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
Sat Sep 24 23:37:21 2011
@@ -87,6 +87,7 @@ public class TestCoyoteAdapter extends T
// Create the folder that will trigger the redirect
File foo = new File(docBase, "foo");
+ addDeleteOnTearDown(foo);
if (!foo.mkdirs() && !foo.isDirectory()) {
fail("Unable to create foo directory in docBase");
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1175284&r1=1175283&r2=1175284&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Sat Sep 24 23:37:21 2011
@@ -411,6 +411,7 @@ public class TestAsyncContextImpl extend
// Create the folder that will trigger the redirect
File foo = new File(docBase, "async");
+ addDeleteOnTearDown(foo);
if (!foo.mkdirs() && !foo.isDirectory()) {
fail("Unable to create async directory in docBase");
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1175284&r1=1175283&r2=1175284&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
Sat Sep 24 23:37:21 2011
@@ -116,9 +116,9 @@ public class TestRegistration extends To
final Tomcat tomcat = getTomcatInstance();
final File contextDir = new File(getTemporaryDirectory(), "webappFoo");
- if (!contextDir.exists()) {
- if (!contextDir.mkdir())
- fail("Failed to create: [" + contextDir.toString() + "]");
+ addDeleteOnTearDown(contextDir);
+ if (!contextDir.mkdirs() && !contextDir.isDirectory()) {
+ fail("Failed to create: [" + contextDir.toString() + "]");
}
tomcat.addContext(contextName, contextDir.getAbsolutePath());
tomcat.start();
@@ -172,9 +172,9 @@ public class TestRegistration extends To
tomcat.getEngine().addChild(host);
final File contextDir2 = new File(getTemporaryDirectory(),
"webappFoo2");
- if (!contextDir2.exists()) {
- if (!contextDir2.mkdir())
- fail("Failed to create: [" + contextDir2.toString() + "]");
+ addDeleteOnTearDown(contextDir2);
+ if (!contextDir2.mkdirs() && !contextDir2.isDirectory()) {
+ fail("Failed to create: [" + contextDir2.toString() + "]");
}
tomcat.addContext(host, contextName + "2",
contextDir2.getAbsolutePath());
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1175284&r1=1175283&r2=1175284&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
Sat Sep 24 23:37:21 2011
@@ -164,6 +164,7 @@ public class TestDefaultServlet extends
public void testCustomErrorPage() throws Exception {
File appDir = new File(getTemporaryDirectory(), "MyApp");
File webInf = new File(appDir, "WEB-INF");
+ addDeleteOnTearDown(appDir);
if (!webInf.mkdirs() && !webInf.isDirectory()) {
fail("Unable to create directory [" + webInf + "]");
}
@@ -249,6 +250,7 @@ public class TestDefaultServlet extends
public void testCustomErrorPageMissing() throws Exception {
File appDir = new File(getTemporaryDirectory(), "MyApp");
File webInf = new File(appDir, "WEB-INF");
+ addDeleteOnTearDown(appDir);
if (!webInf.mkdirs() && !webInf.isDirectory()) {
fail("Unable to create directory [" + webInf + "]");
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1175284&r1=1175283&r2=1175284&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Sat Sep 24 23:37:21 2011
@@ -24,6 +24,7 @@ import java.io.OutputStream;
import java.io.PrintWriter;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -61,6 +62,8 @@ public abstract class TomcatBaseTest {
public static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
+ private List<File> deleteOnTearDown = new ArrayList<File>();
+
/**
* Make Tomcat instance accessible to sub-classes.
*/
@@ -85,8 +88,15 @@ public abstract class TomcatBaseTest {
/**
* 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()}.
+ * the test runs. The directory is configured during {@link #setUp()}.
+ *
+ * <p>
+ * It is used as <code>${catalina.base}</code> for the instance of Tomcat
+ * that is being started, but can be used to store other temporary files as
+ * well. Its <code>work</code> and <code>webapps</code> subdirectories are
+ * deleted at {@link #tearDown()}. If you have other files or directories
+ * that have to be deleted on cleanup, register them with
+ * {@link #addDeleteOnTearDown(File)}.
*/
public File getTemporaryDirectory() {
return tempDir;
@@ -109,6 +119,17 @@ public abstract class TomcatBaseTest {
return accessLogEnabled;
}
+ /**
+ * Schedule the given file or directory to be deleted during after-test
+ * cleanup.
+ *
+ * @param file
+ * File or directory
+ */
+ public void addDeleteOnTearDown(File file) {
+ deleteOnTearDown.add(file);
+ }
+
@Before
public void setUp() throws Exception {
// Need to use JULI so log messages from the tests are visible
@@ -190,10 +211,14 @@ public abstract class TomcatBaseTest {
tomcat.destroy();
}
// Cannot delete the whole tempDir, because logs are there,
- // and they might be open for writing.
+ // and they might be open for writing.
// Delete known subdirectories of it.
- ExpandWar.delete(new File(tempDir, "webapps"));
- ExpandWar.delete(new File(tempDir, "work"));
+ deleteOnTearDown.add(new File(tempDir, "webapps"));
+ deleteOnTearDown.add(new File(tempDir, "work"));
+ for (File file : deleteOnTearDown) {
+ ExpandWar.delete(file);
+ }
+ deleteOnTearDown.clear();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
