Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 306-command-service

Browse Source
This commit is contained in:
ljacqu
2015-12-23 18:09:21 +01:00
parent be942c2b36 0beb937b8f
commit a9fc658db0
23 changed files with 335 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/security/crypts/AbstractEncryptionMethodTest.java
-2
View File
@@ -35,8 +35,6 @@ public abstract class AbstractEncryptionMethodTest {
}
@Test
@Ignore
// TODO #375 Fix and unignore tests
public void testGivenPasswords() {
for (String password : GIVEN_PASSWORDS) {
try {
src/test/java/fr/xephi/authme/util/UtilsTest.java
+1 -31
View File
@@ -3,9 +3,8 @@ package fr.xephi.authme.util;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ReflectionTestUtils;
import fr.xephi.authme.permission.PermissionsManager;
import fr.xephi.authme.permission.PlayerPermission;
import fr.xephi.authme.settings.Settings;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -50,35 +49,6 @@ public class UtilsTest {
when(authMeMock.getPermissionsManager()).thenReturn(permissionsManagerMock);
}
@Test
public void shouldForceSurvivalGameMode() {
// given
Player player = mock(Player.class);
given(permissionsManagerMock.hasPermission(player, PlayerPermission.BYPASS_FORCE_SURVIVAL)).willReturn(false);
// when
Utils.forceGM(player);
// then
verify(authMeMock).getPermissionsManager();
verify(player).setGameMode(GameMode.SURVIVAL);
}
@Test
public void shouldNotForceGameModeForUserWithBypassPermission() {
// given
Player player = mock(Player.class);
given(permissionsManagerMock.hasPermission(player, PlayerPermission.BYPASS_FORCE_SURVIVAL)).willReturn(true);
// when
Utils.forceGM(player);
// then
verify(authMeMock).getPermissionsManager();
verify(permissionsManagerMock).hasPermission(player, PlayerPermission.BYPASS_FORCE_SURVIVAL);
verify(player, never()).setGameMode(any(GameMode.class));
}
@Test
public void shouldNotAddToNormalGroupIfPermissionsAreDisabled() {
// given