QPID-1503 : Updates based on code review

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

2 files changed, 5 insertions, 66 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
index 5a74160b95..ededb1cb26 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
@@ -38,44 +38,19 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends TestCase
 {
 
     Base64MD5PasswordFilePrincipalDatabase _database;
-    private String QPID_HOME;
     private static final String TEST_COMMENT = "# Test Comment";
     private String USERNAME = "testUser";
-    private static final String TEST_FILE_NAME = "B64Test.tmp";
 
     public void setUp()
     {
         _database = new Base64MD5PasswordFilePrincipalDatabase();
-
-        QPID_HOME = System.getProperty("QPID_HOME");
-
-        assertNotNull("QPID_HOME not set", QPID_HOME);
-    }
-
-    public void tearDown()
-    {
-        File testFile = new File(QPID_HOME + File.separator + TEST_FILE_NAME);
-        if (testFile.exists())
-        {
-            testFile.delete();
-        }
-
-        testFile = new File(QPID_HOME + File.separator + TEST_FILE_NAME + ".old");
-        if (testFile.exists())
-        {
-            testFile.delete();
-        }
     }
 
     private File createPasswordFile(int commentLines, int users)
     {
         try
         {
-            File testFile = new File(QPID_HOME + File.separator + TEST_FILE_NAME);
-            if (testFile.exists())
-            {
-                testFile.delete();
-            }
+            File testFile = File.createTempFile("Base64MD5PDPDTest","tmp");
             testFile.deleteOnExit();
 
             BufferedWriter writer = new BufferedWriter(new FileWriter(testFile));
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/UserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
index 99902ef4c5..a7d951cb5b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/UserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
@@ -29,7 +29,7 @@ import java.io.UnsupportedEncodingException;
 /*
     Note User is mainly tested by Base64MD5PFPDTest this is just to catch the extra methods
  */
-public class UserTest extends TestCase
+public class HashedUserTest extends TestCase
 {
 
     String USERNAME = "username";
@@ -40,7 +40,7 @@ public class UserTest extends TestCase
     {
         try
         {
-            User user = new User(new String[]{USERNAME, PASSWORD, USERNAME});
+            HashedUser user = new HashedUser(new String[]{USERNAME, PASSWORD, USERNAME});
             fail("Error expected");
         }
         catch (IllegalArgumentException e)
@@ -57,7 +57,7 @@ public class UserTest extends TestCase
     {
         try
         {
-            User user = new User(new String[]{USERNAME, HASHED_PASSWORD});
+            HashedUser user = new HashedUser(new String[]{USERNAME, HASHED_PASSWORD});
             assertEquals("Username incorrect", USERNAME, user.getName());
             int index = 0;
 
@@ -65,7 +65,7 @@ public class UserTest extends TestCase
 
             try
             {
-                for (byte c : user.getEncodePassword())
+                for (byte c : user.getEncodedPassword())
                 {
                     assertEquals("Password incorrect", hash[index], (char) c);
                     index++;
@@ -91,41 +91,5 @@ public class UserTest extends TestCase
             fail(e.getMessage());
         }
     }
-
-    public void testToString()
-    {
-
-        User user = new User(USERNAME, PASSWORD.toCharArray());
-
-        // Test logger debug case
-        Logger.getLogger(User.class).setLevel(Level.DEBUG);
-
-        assertEquals("User toString encoding not as expected", USERNAME, user.toString());
-
-        try
-        {
-            char[] hash = HASHED_PASSWORD.toCharArray();
-            int index = 0;
-            for (byte c : user.getEncodePassword())
-            {
-
-                assertEquals("Hash not as expected", hash[index], (char) c);
-                index++;
-            }
-        }
-        catch (Exception e)
-        {
-            fail(e.getMessage());
-        }
-
-        assertEquals("User toString encoding not as expected", USERNAME + ":" + HASHED_PASSWORD,
-                     user.toString());
-
-         Logger.getLogger(User.class).setLevel(Level.INFO);
-
-        // Test normal case
-        assertEquals("User toString encoding not as expected", USERNAME, user.toString());
-    }
-
 }