Author: ritchiem Date: Wed Oct 28 15:34:32 2009 New Revision: 830604 URL: http://svn.apache.org/viewvc?rev=830604&view=rev Log: QPID-2055: update test to ensure all test files created are cleared up
Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java?rev=830604&r1=830603&r2=830604&view=diff ============================================================================== --- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java (original) +++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java Wed Oct 28 15:34:32 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/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java?rev=830604&r1=830603&r2=830604&view=diff ============================================================================== --- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java (original) +++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java Wed Oct 28 15:34:32 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