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

Refactored player permissions enum, to make the name suit better

Browse Source
This commit is contained in:
Tim Visée
2015-12-01 16:19:05 +01:00
parent 7f54838ad4
commit fdc747d007
13 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/permission/UserPermissionTest.java → src/test/java/fr/xephi/authme/permission/PlayerPermissionTest.java
+4 -4
View File
@@ -8,9 +8,9 @@ import java.util.Set;
import static org.junit.Assert.fail;
/**
* Test for {@link UserPermission}.
* Test for {@link PlayerPermission}.
*/
public class UserPermissionTest {
public class PlayerPermissionTest {
@Test
public void shouldStartWithRegularAuthMePrefix() {
@@ -19,7 +19,7 @@ public class UserPermissionTest {
String adminPrefix = "authme.admin";
// when/then
for (UserPermission perm : UserPermission.values()) {
for (PlayerPermission perm : PlayerPermission.values()) {
if (!perm.getNode().startsWith(requiredPrefix)) {
fail("The permission '" + perm + "' does not start with the required prefix '" + requiredPrefix + "'");
} else if (perm.getNode().startsWith(adminPrefix)) {
@@ -35,7 +35,7 @@ public class UserPermissionTest {
Set<String> nodes = new HashSet<>();
// when/then
for (UserPermission perm : UserPermission.values()) {
for (PlayerPermission perm : PlayerPermission.values()) {
if (nodes.contains(perm.getNode())) {
fail("More than one enum value defines the node '" + perm.getNode() + "'");
}
src/test/java/fr/xephi/authme/util/UtilsTest.java
+4 -4
View File
@@ -3,7 +3,7 @@ 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.UserPermission;
import fr.xephi.authme.permission.PlayerPermission;
import fr.xephi.authme.settings.Settings;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
@@ -54,7 +54,7 @@ public class UtilsTest {
public void shouldForceSurvivalGameMode() {
// given
Player player = mock(Player.class);
given(permissionsManagerMock.hasPermission(player, UserPermission.BYPASS_FORCE_SURVIVAL)).willReturn(false);
given(permissionsManagerMock.hasPermission(player, PlayerPermission.BYPASS_FORCE_SURVIVAL)).willReturn(false);
// when
Utils.forceGM(player);
@@ -68,14 +68,14 @@ public class UtilsTest {
public void shouldNotForceGameModeForUserWithBypassPermission() {
// given
Player player = mock(Player.class);
given(permissionsManagerMock.hasPermission(player, UserPermission.BYPASS_FORCE_SURVIVAL)).willReturn(true);
given(permissionsManagerMock.hasPermission(player, PlayerPermission.BYPASS_FORCE_SURVIVAL)).willReturn(true);
// when
Utils.forceGM(player);
// then
verify(authMeMock).getPermissionsManager();
verify(permissionsManagerMock).hasPermission(player, UserPermission.BYPASS_FORCE_SURVIVAL);
verify(permissionsManagerMock).hasPermission(player, PlayerPermission.BYPASS_FORCE_SURVIVAL);
verify(player, never()).setGameMode(any(GameMode.class));
}