Merged 5.1-MC1 (5.1.0) to HEAD (5.1)

119074 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117371 adavis: Fix compile error after:
         Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
            117260 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
               114674 gjames: BCRYPT MNT-14892 RA-604, Handling MD4 hashing as default


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
2015-12-10 10:01:44 +00:00
parent 76dfb467ff
commit 7f6a34d0ab

View File

@@ -487,7 +487,7 @@ public class AuthenticationTest extends TestCase
String hashedPassword = dao.getMD4HashedPassword(userName);
assertNotNull(hashedPassword);
UserDetails userDetails = (UserDetails) dao.loadUserByUsername(userName);
assertEquals(passwordEncoder.encodePassword(password, dao.getSalt(userDetails)), hashedPassword);
assertEquals(compositePasswordEncoder.encodePassword(password, dao.getSalt(userDetails)), hashedPassword);
}
public void testCreateAndyUserAndOtherCRUD() throws NoSuchAlgorithmException, UnsupportedEncodingException