You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2009/10/20 16:45:51 UTC
svn commit: r827588 -
/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
Author: robbie
Date: Tue Oct 20 14:45:51 2009
New Revision: 827588
URL: http://svn.apache.org/viewvc?rev=827588&view=rev
Log:
QPID-2041: update test to ensure all test files created are cleared up
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java?rev=827588&r1=827587&r2=827588&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java Tue Oct 20 14:45:51 2009
@@ -37,6 +37,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.Principal;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
@@ -54,6 +55,7 @@
private static final Principal PRINCIPAL = new UsernamePrincipal(PRINCIPAL_USERNAME);
private Base64MD5PasswordFilePrincipalDatabase _database;
private File _pwdFile;
+ private List<File> _testPwdFiles = new ArrayList<File>();
static
{
@@ -84,6 +86,31 @@
_pwdFile = File.createTempFile(this.getClass().getName(), "pwd");
_pwdFile.deleteOnExit();
_database.setPasswordFile(_pwdFile.getAbsolutePath());
+ _testPwdFiles.clear();
+ }
+
+ public void tearDown() throws Exception
+ {
+ //clean up the created default password file and any backup
+ File oldPwdFile = new File(_pwdFile.getAbsolutePath() + ".old");
+ if(oldPwdFile.exists())
+ {
+ oldPwdFile.delete();
+ }
+
+ _pwdFile.delete();
+
+ //clean up any additional files and their backups
+ for(File f : _testPwdFiles)
+ {
+ oldPwdFile = new File(f.getAbsolutePath() + ".old");
+ if(oldPwdFile.exists())
+ {
+ oldPwdFile.delete();
+ }
+
+ f.delete();
+ }
}
private File createPasswordFile(int commentLines, int users)
@@ -109,6 +136,8 @@
writer.flush();
writer.close();
+
+ _testPwdFiles.add(testFile);
return testFile;
@@ -178,8 +207,6 @@
assertNotNull("Created User was not saved", _database.getUser(USERNAME));
assertFalse("Duplicate user created.", _database.createPrincipal(principal, PASSWORD.toCharArray()));
-
- testFile.delete();
}
public void testCreatePrincipalIsSavedToFile()
@@ -229,7 +256,6 @@
{
fail("Unable to valdate file contents due to:" + e.getMessage());
}
- testFile.delete();
}
@@ -274,8 +300,6 @@
}
assertNull("Deleted user still present.", _database.getUser(USERNAME + "0"));
-
- testFile.delete();
}
public void testGetUsers()
@@ -313,8 +337,6 @@
{
assertTrue("User " + i + " missing", verify[i]);
}
-
- testFile.delete();
}
public void testUpdatePasswordIsSavedToFile()
@@ -365,7 +387,6 @@
{
fail("Unable to valdate file contents due to:" + e.getMessage());
}
- testFile.delete();
}
public void testSetPasswordFileWithMissingFile()
@@ -404,8 +425,6 @@
{
fail("Password File was not created." + e.getMessage());
}
-
- testFile.delete();
}
public void testCreateUserPrincipal() throws IOException
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org