QPID-2042: update test to ensure all test files created are cleared up

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@827590 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 2 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java
index 958ee35476..dab98095c9 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBeanTest.java
@@ -65,8 +65,13 @@ public class AMQUserManagementMBeanTest extends TestCase
     @Override
     protected void tearDown() throws Exception
     {
-            _passwordFile.delete();
-            _accessFile.delete();
+        //clean up test password/access files
+        File _oldPasswordFile = new File(_passwordFile.getAbsolutePath() + ".old");
+        File _oldAccessFile = new File(_accessFile.getAbsolutePath() + ".old");
+        _oldPasswordFile.delete();
+        _oldAccessFile.delete();
+        _passwordFile.delete();
+        _accessFile.delete();
     }
 
     public void testDeleteUser()