From 247a0431e44e167d29442819cb3191d7b59f8e4b Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Tue, 20 Oct 2009 14:46:51 +0000 Subject: QPID-2055: update test to ensure all test files created are cleared up git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@827592 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java | 2 +- .../server/logging/management/LoggingManagementMBeanTest.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'java') diff --git a/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java b/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java index 9f350033d6..445c7d57f2 100644 --- a/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java +++ b/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java @@ -41,7 +41,7 @@ public class QpidLog4JConfiguratorTest extends TestCase File tmpFile = null; try { - tmpFile = File.createTempFile("LogManMBeanTestLog4jConfig", ".tmp"); + tmpFile = File.createTempFile("QpidLog4JConfiguratorTestLog4jConfig", ".tmp"); tmpFile.deleteOnExit(); FileWriter fstream = new FileWriter(tmpFile); diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java index da60db2772..eff6a6f59f 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java @@ -59,6 +59,17 @@ public class LoggingManagementMBeanTest extends TestCase { _testConfigFile = createTempTestLog4JConfig(); } + + protected void tearDown() throws Exception + { + File oldTestConfigFile = new File(_testConfigFile.getAbsolutePath() + ".old"); + if(oldTestConfigFile.exists()) + { + oldTestConfigFile.delete(); + } + + _testConfigFile.delete(); + } private File createTempTestLog4JConfig() { -- cgit v1.2.1