Author: robbie
Date: Tue Oct 20 14:46:51 2009
New Revision: 827592
URL: http://svn.apache.org/viewvc?rev=827592&view=rev
Log:
QPID-2055: update test to ensure all test files created are cleared up
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java?rev=827592&r1=827591&r2=827592&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
Tue Oct 20 14:46:51 2009
@@ -41,7 +41,7 @@
File tmpFile = null;
try
{
- tmpFile = File.createTempFile("LogManMBeanTestLog4jConfig",
".tmp");
+ tmpFile =
File.createTempFile("QpidLog4JConfiguratorTestLog4jConfig", ".tmp");
tmpFile.deleteOnExit();
FileWriter fstream = new FileWriter(tmpFile);
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java?rev=827592&r1=827591&r2=827592&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
Tue Oct 20 14:46:51 2009
@@ -59,6 +59,17 @@
{
_testConfigFile = createTempTestLog4JConfig();
}
+
+ protected void tearDown() throws Exception
+ {
+ File oldTestConfigFile = new File(_testConfigFile.getAbsolutePath() +
".old");
+ if(oldTestConfigFile.exists())
+ {
+ oldTestConfigFile.delete();
+ }
+
+ _testConfigFile.delete();
+ }
private File createTempTestLog4JConfig()
{
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
