QPID-1536 : Reverted r727057

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

2 files changed, 7 insertions, 6 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 6af042dee6..b5034d9f5d 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
@@ -228,9 +228,8 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends TestCase
 
         assertNotNull(testUser);
 
-        String NEW_PASSWORD = "guest";
-        
-        String NEW_PASSWORD_HASH = "CE4DQ6BIb/BVMN9scFyLtA==";
+        String NEW_PASSWORD = "NewPassword";
+        String NEW_PASSWORD_HASH = "TmV3UGFzc3dvcmQ=";
         try
         {
             _database.updatePassword(testUser, NEW_PASSWORD.toCharArray());
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64HashedUserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
index 4c69edcac7..a7d951cb5b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64HashedUserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
@@ -21,13 +21,15 @@
 package org.apache.qpid.server.security.auth.database;
 
 import junit.framework.TestCase;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
 
 import java.io.UnsupportedEncodingException;
 
 /*
     Note User is mainly tested by Base64MD5PFPDTest this is just to catch the extra methods
  */
-public class Base64HashedUserTest extends TestCase
+public class HashedUserTest extends TestCase
 {
 
     String USERNAME = "username";
@@ -38,7 +40,7 @@ public class Base64HashedUserTest extends TestCase
     {
         try
         {
-            Base64HashedUser user = new Base64HashedUser(new String[]{USERNAME, PASSWORD, USERNAME});
+            HashedUser user = new HashedUser(new String[]{USERNAME, PASSWORD, USERNAME});
             fail("Error expected");
         }
         catch (IllegalArgumentException e)
@@ -55,7 +57,7 @@ public class Base64HashedUserTest extends TestCase
     {
         try
         {
-            Base64HashedUser user = new Base64HashedUser(new String[]{USERNAME, HASHED_PASSWORD});
+            HashedUser user = new HashedUser(new String[]{USERNAME, HASHED_PASSWORD});
             assertEquals("Username incorrect", USERNAME, user.getName());
             int index = 0;