QPID-3789 : [Java Broker] Remove duplication between two password file database implementations

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

2 files changed, 21 insertions, 31 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
index f687cc4a09..abb0b15a76 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
@@ -45,49 +45,39 @@ public class HashedUserTest extends TestCase
         {
             assertEquals("User Data should be length 2, username, password", e.getMessage());
         }
-        catch (UnsupportedEncodingException e)
-        {
-            fail(e.getMessage());
-        }
+
     }
 
     public void testArrayConstructor()
     {
-        try
-        {
-            HashedUser user = new HashedUser(new String[]{USERNAME, B64_ENCODED_PASSWORD});
-            assertEquals("Username incorrect", USERNAME, user.getName());
-            int index = 0;
-
-            char[] hash = B64_ENCODED_PASSWORD.toCharArray();
-
-            try
-            {
-                for (byte c : user.getEncodedPassword())
-                {
-                    assertEquals("Password incorrect", hash[index], (char) c);
-                    index++;
-                }
-            }
-            catch (Exception e)
-            {
-                fail(e.getMessage());
-            }
+        HashedUser user = new HashedUser(new String[]{USERNAME, B64_ENCODED_PASSWORD});
+        assertEquals("Username incorrect", USERNAME, user.getName());
+        int index = 0;
 
-            hash = PASSWORD.toCharArray();
+        char[] hash = B64_ENCODED_PASSWORD.toCharArray();
 
-            index=0;
-            for (char c : user.getPassword())
+        try
+        {
+            for (byte c : user.getEncodedPassword())
             {
-                assertEquals("Password incorrect", hash[index], c);
+                assertEquals("Password incorrect", hash[index], (char) c);
                 index++;
             }
-
         }
-        catch (UnsupportedEncodingException e)
+        catch (Exception e)
         {
             fail(e.getMessage());
         }
+
+        hash = PASSWORD.toCharArray();
+
+        index=0;
+        for (char c : user.getPassword())
+        {
+            assertEquals("Password incorrect", hash[index], c);
+            index++;
+        }
+
     }
 }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
index a739f78958..44faa57dbe 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
@@ -54,7 +54,7 @@ public class PlainUserTest extends TestCase
 
         try            
         {
-            for (byte c : user.getPasswordBytes())
+            for (byte c : user.getEncodedPassword())
             {
                 assertEquals("Password incorrect", password[index], (char) c);
                 index++;