Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 347-config-rewrite

src/test/java/fr/xephi/authme/security/PasswordSecurityTest.java

@@ -10,6 +10,7 @@ import fr.xephi.authme.security.crypts.PHPBB;
 import org.bukkit.event.Event;
 import org.bukkit.plugin.PluginManager;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.invocation.InvocationOnMock;
@@ -70,9 +71,7 @@ public class PasswordSecurityTest {
         String playerLowerCase = playerName.toLowerCase();
         String clearTextPass = "myPassTest";
 
-        PlayerAuth auth = mock(PlayerAuth.class);
-        given(auth.getPassword()).willReturn(password);
-        given(dataSource.getAuth(playerName)).willReturn(auth);
+        given(dataSource.getPassword(playerName)).willReturn(password);
         given(method.comparePassword(clearTextPass, password, playerLowerCase)).willReturn(true);
         PasswordSecurity security = new PasswordSecurity(dataSource, HashAlgorithm.BCRYPT, pluginManager, false);
 
@@ -81,7 +80,7 @@ public class PasswordSecurityTest {
 
         // then
         assertThat(result, equalTo(true));
-        verify(dataSource).getAuth(playerName);
+        verify(dataSource).getPassword(playerName);
         verify(pluginManager).callEvent(any(PasswordEncryptionEvent.class));
         verify(method).comparePassword(clearTextPass, password, playerLowerCase);
     }
@@ -95,8 +94,7 @@ public class PasswordSecurityTest {
         String clearTextPass = "passw0Rd1";
 
         PlayerAuth auth = mock(PlayerAuth.class);
-        given(auth.getPassword()).willReturn(password);
-        given(dataSource.getAuth(playerName)).willReturn(auth);
+        given(dataSource.getPassword(playerName)).willReturn(password);
         given(method.comparePassword(clearTextPass, password, playerLowerCase)).willReturn(false);
         PasswordSecurity security = new PasswordSecurity(dataSource, HashAlgorithm.CUSTOM, pluginManager, false);
 
@@ -105,7 +103,7 @@ public class PasswordSecurityTest {
 
         // then
         assertThat(result, equalTo(false));
-        verify(dataSource).getAuth(playerName);
+        verify(dataSource).getPassword(playerName);
         verify(pluginManager).callEvent(any(PasswordEncryptionEvent.class));
         verify(method).comparePassword(clearTextPass, password, playerLowerCase);
     }
@@ -116,7 +114,7 @@ public class PasswordSecurityTest {
         String playerName = "bobby";
         String clearTextPass = "tables";
 
-        given(dataSource.getAuth(playerName)).willReturn(null);
+        given(dataSource.getPassword(playerName)).willReturn(null);
         PasswordSecurity security = new PasswordSecurity(dataSource, HashAlgorithm.MD5, pluginManager, false);
 
         // when
@@ -124,7 +122,7 @@ public class PasswordSecurityTest {
 
         // then
         assertThat(result, equalTo(false));
-        verify(dataSource).getAuth(playerName);
+        verify(dataSource).getPassword(playerName);
         verify(pluginManager, never()).callEvent(any(Event.class));
         verify(method, never()).comparePassword(anyString(), any(HashedPassword.class), anyString());
     }
@@ -141,11 +139,7 @@ public class PasswordSecurityTest {
         // MD5 hash for "Test"
         HashedPassword newPassword = new HashedPassword("0cbc6611f5540bd0809a388dc95a615b");
 
-        PlayerAuth auth = mock(PlayerAuth.class);
-        doCallRealMethod().when(auth).getPassword();
-        doCallRealMethod().when(auth).setPassword(any(HashedPassword.class));
-        auth.setPassword(password);
-        given(dataSource.getAuth(argThat(equalToIgnoringCase(playerName)))).willReturn(auth);
+        given(dataSource.getPassword(argThat(equalToIgnoringCase(playerName)))).willReturn(password);
         given(method.comparePassword(clearTextPass, password, playerLowerCase)).willReturn(false);
         given(method.computeHash(clearTextPass, playerLowerCase)).willReturn(newPassword);
         PasswordSecurity security = new PasswordSecurity(dataSource, HashAlgorithm.MD5, pluginManager, true);
@@ -158,14 +152,10 @@ public class PasswordSecurityTest {
         // Note ljacqu 20151230: We need to check the player name in a case-insensitive way because the methods within
         // PasswordSecurity may convert the name into all lower-case. This is desired because EncryptionMethod methods
         // should only be invoked with all lower-case names. Data source is case-insensitive itself, so this is fine.
-        verify(dataSource, times(2)).getAuth(argThat(equalToIgnoringCase(playerName)));
+        verify(dataSource).getPassword(argThat(equalToIgnoringCase(playerName)));
         verify(pluginManager, times(2)).callEvent(any(PasswordEncryptionEvent.class));
         verify(method).comparePassword(clearTextPass, password, playerLowerCase);
-        verify(auth).setPassword(newPassword);
-
-        ArgumentCaptor<PlayerAuth> captor = ArgumentCaptor.forClass(PlayerAuth.class);
-        verify(dataSource).updatePassword(captor.capture());
-        assertThat(captor.getValue().getPassword(), equalTo(newPassword));
+        verify(dataSource).updatePassword(playerLowerCase, newPassword);
     }
 
     @Test

src/test/java/fr/xephi/authme/security/crypts/BcryptTest.java

@@ -2,15 +2,15 @@ package fr.xephi.authme.security.crypts;
 
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.util.WrapperMock;
-import org.junit.Before;
+import org.junit.BeforeClass;
 
 /**
  * Test for {@link BCRYPT}.
  */
 public class BcryptTest extends AbstractEncryptionMethodTest {
 
-    @Before
-    public void setUpSettings() {
+    @BeforeClass
+    public static void setUpSettings() {
         WrapperMock.createInstance();
         Settings.bCryptLog2Rounds = 8;
     }

src/test/java/fr/xephi/authme/security/crypts/XFBCRYPTTest.java

@@ -0,0 +1,23 @@
+package fr.xephi.authme.security.crypts;
+
+import fr.xephi.authme.util.WrapperMock;
+import org.junit.BeforeClass;
+
+/**
+ * Test for {@link XFBCRYPT}.
+ */
+public class XFBCRYPTTest extends AbstractEncryptionMethodTest {
+
+    @BeforeClass
+    public static void setUpWrapper() {
+        WrapperMock.createInstance();
+    }
+
+    public XFBCRYPTTest() {
+        super(new XFBCRYPT(),
+            "$2a$10$UtuON/ZG.x8EWG/zQbryB.BHfQVrfxk3H7qykzP.UJQ8YiLjZyfqq",  // password
+            "$2a$10$Q.ocUo.YtHTdI4nu3pcpKun6BILcmWHm541ANULucmuU/ps1QKY4K",  // PassWord1
+            "$2a$10$yHjm02.K4HP5iFU1F..yLeTeo7PWZVbKAr/QGex5jU4.J3mdq/uuO",  // &^%te$t?Pw@_
+            "$2a$10$joIayhGStExKWxNbiqMMPOYFSpQ76HVNjpOB7.QwTmG5q.TiJJ.0e"); // âË_3(íù*
+    }
+}