From 14a794a5b1e590de0ed3e5d1fd9bfa788e741ff0 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sun, 28 Oct 2018 10:27:01 +0100 Subject: [PATCH] Lowercased some command class names to better fit how they are actually working in game --- .../admin/AdminClearResetsAllCommand.java | 4 ++-- .../admin/AdminClearResetsCommand.java | 4 ++-- .../commands/admin/AdminGetRankCommand.java | 4 ++-- .../commands/admin/AdminSetRankCommand.java | 4 ++-- .../admin/team/AdminTeamSetOwnerCommand.java | 4 ++-- .../admin/AdminClearResetsAllCommandTest.java | 2 +- .../admin/AdminClearResetsCommandTest.java | 10 ++++----- .../team/AdminTeamSetOwnerCommandTest.java | 22 +++++++++---------- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsAllCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsAllCommand.java index 66fda6a51..f4c468efe 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsAllCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsAllCommand.java @@ -9,9 +9,9 @@ import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.commands.ConfirmableCommand; import world.bentobox.bentobox.api.user.User; -public class AdminClearResetsAllCommand extends ConfirmableCommand { +public class AdminClearresetsallCommand extends ConfirmableCommand { - public AdminClearResetsAllCommand(CompositeCommand parent) { + public AdminClearresetsallCommand(CompositeCommand parent) { super(parent, "clearresetsall"); } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommand.java index 1b7957e31..b1add8224 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommand.java @@ -10,9 +10,9 @@ import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; -public class AdminClearResetsCommand extends CompositeCommand { +public class AdminClearresetsCommand extends CompositeCommand { - public AdminClearResetsCommand(CompositeCommand parent) { + public AdminClearresetsCommand(CompositeCommand parent) { super(parent, "clearresets"); } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminGetRankCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminGetRankCommand.java index 8ccff5752..bc7992a62 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminGetRankCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminGetRankCommand.java @@ -18,9 +18,9 @@ import world.bentobox.bentobox.managers.RanksManager; * @author tastybento * */ -public class AdminGetRankCommand extends CompositeCommand { +public class AdminGetrankCommand extends CompositeCommand { - public AdminGetRankCommand(CompositeCommand adminCommand) { + public AdminGetrankCommand(CompositeCommand adminCommand) { super(adminCommand, "getrank"); } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetRankCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetRankCommand.java index 28719e759..0293bbc58 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetRankCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetRankCommand.java @@ -16,9 +16,9 @@ import world.bentobox.bentobox.managers.RanksManager; * @author tastybento * */ -public class AdminSetRankCommand extends CompositeCommand { +public class AdminSetrankCommand extends CompositeCommand { - public AdminSetRankCommand(CompositeCommand adminCommand) { + public AdminSetrankCommand(CompositeCommand adminCommand) { super(adminCommand, "setrank"); } diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetOwnerCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetOwnerCommand.java index 8788aac2c..9558695ef 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetOwnerCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetOwnerCommand.java @@ -7,9 +7,9 @@ import world.bentobox.bentobox.api.user.User; import java.util.List; import java.util.UUID; -public class AdminTeamSetOwnerCommand extends CompositeCommand { +public class AdminTeamSetownerCommand extends CompositeCommand { - public AdminTeamSetOwnerCommand(CompositeCommand parent) { + public AdminTeamSetownerCommand(CompositeCommand parent) { super(parent, "setowner"); } diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsAllCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsAllCommandTest.java index 071519458..87502bd15 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsAllCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsAllCommandTest.java @@ -110,7 +110,7 @@ public class AdminClearResetsAllCommandTest { */ @Test public void testExecuteCheckConfirm() { - AdminClearResetsAllCommand itl = new AdminClearResetsAllCommand(ac); + AdminClearresetsallCommand itl = new AdminClearresetsallCommand(ac); assertFalse(itl.execute(user, itl.getLabel(), new ArrayList<>(Arrays.asList("tastybento", "bobby")))); assertTrue(itl.execute(user, itl.getLabel(), new ArrayList<>())); Mockito.verify(user).sendMessage(Mockito.eq("commands.confirmation.confirm"), Mockito.eq("[seconds]"), Mockito.any()); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommandTest.java index b2ff5e63a..b9783cd35 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminClearResetsCommandTest.java @@ -41,7 +41,7 @@ import world.bentobox.bentobox.managers.PlayersManager; */ @RunWith(PowerMockRunner.class) @PrepareForTest({Bukkit.class, BentoBox.class, User.class }) -public class AdminClearResetsCommandTest { +public class AdminClearresetsCommandTest { private CompositeCommand ac; private User user; @@ -119,7 +119,7 @@ public class AdminClearResetsCommandTest { */ @Test public void testExecuteNoTarget() { - AdminClearResetsCommand itl = new AdminClearResetsCommand(ac); + AdminClearresetsCommand itl = new AdminClearresetsCommand(ac); assertFalse(itl.execute(user, itl.getLabel(), new ArrayList<>())); // Show help Mockito.verify(user).sendMessage(Mockito.eq("commands.help.header"), Mockito.eq("[label]"), Mockito.any()); @@ -130,7 +130,7 @@ public class AdminClearResetsCommandTest { */ @Test public void testExecuteUnknownPlayer() { - AdminClearResetsCommand itl = new AdminClearResetsCommand(ac); + AdminClearresetsCommand itl = new AdminClearresetsCommand(ac); String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); @@ -142,7 +142,7 @@ public class AdminClearResetsCommandTest { */ @Test public void testExecutePlayerNoIsland() { - AdminClearResetsCommand itl = new AdminClearResetsCommand(ac); + AdminClearresetsCommand itl = new AdminClearresetsCommand(ac); String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(notUUID); when(im.hasIsland(Mockito.any(), Mockito.any(UUID.class))).thenReturn(false); @@ -155,7 +155,7 @@ public class AdminClearResetsCommandTest { String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(notUUID); - AdminClearResetsCommand itl = new AdminClearResetsCommand(ac); + AdminClearresetsCommand itl = new AdminClearresetsCommand(ac); assertTrue(itl.execute(user, itl.getLabel(), Arrays.asList(name))); // Add other verifications Mockito.verify(user).sendMessage("commands.admin.clearresets.cleared"); diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetOwnerCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetOwnerCommandTest.java index 0f24034ae..639a31e9e 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetOwnerCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetOwnerCommandTest.java @@ -41,7 +41,7 @@ import world.bentobox.bentobox.managers.PlayersManager; */ @RunWith(PowerMockRunner.class) @PrepareForTest({Bukkit.class, BentoBox.class, User.class }) -public class AdminTeamSetOwnerCommandTest { +public class AdminTeamSetownerCommandTest { private CompositeCommand ac; private UUID uuid; @@ -114,21 +114,21 @@ public class AdminTeamSetOwnerCommandTest { /** - * Test method for {@link AdminTeamSetOwnerCommand#execute(User, String, List)}. + * Test method for {@link AdminTeamSetownerCommand#execute(User, String, List)}. */ @Test public void testExecuteNoTarget() { - AdminTeamSetOwnerCommand itl = new AdminTeamSetOwnerCommand(ac); + AdminTeamSetownerCommand itl = new AdminTeamSetownerCommand(ac); assertFalse(itl.execute(user, itl.getLabel(), new ArrayList<>())); // Show help } /** - * Test method for {@link AdminTeamSetOwnerCommand#execute(User, String, List)}. + * Test method for {@link AdminTeamSetownerCommand#execute(User, String, List)}. */ @Test public void testExecuteUnknownPlayer() { - AdminTeamSetOwnerCommand itl = new AdminTeamSetOwnerCommand(ac); + AdminTeamSetownerCommand itl = new AdminTeamSetownerCommand(ac); String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(null); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); @@ -136,11 +136,11 @@ public class AdminTeamSetOwnerCommandTest { } /** - * Test method for {@link AdminTeamSetOwnerCommand#execute(User, String, List)}. + * Test method for {@link AdminTeamSetownerCommand#execute(User, String, List)}. */ @Test public void testExecutePlayerNotInTeam() { - AdminTeamSetOwnerCommand itl = new AdminTeamSetOwnerCommand(ac); + AdminTeamSetownerCommand itl = new AdminTeamSetownerCommand(ac); String[] name = {"tastybento"}; when(pm.getUUID(Mockito.any())).thenReturn(notUUID); when(im.getMembers(Mockito.any(), Mockito.any())).thenReturn(new HashSet<>()); @@ -149,7 +149,7 @@ public class AdminTeamSetOwnerCommandTest { } /** - * Test method for {@link AdminTeamSetOwnerCommand#execute(User, String, List)}. + * Test method for {@link AdminTeamSetownerCommand#execute(User, String, List)}. */ @Test public void testExecuteMakeLeaderAlreadyLeader() { @@ -161,13 +161,13 @@ public class AdminTeamSetOwnerCommandTest { when(im.getTeamLeader(Mockito.any(), Mockito.eq(notUUID))).thenReturn(notUUID); - AdminTeamSetOwnerCommand itl = new AdminTeamSetOwnerCommand(ac); + AdminTeamSetownerCommand itl = new AdminTeamSetownerCommand(ac); assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); Mockito.verify(user).sendMessage("commands.admin.team.setowner.already-owner"); } /** - * Test method for {@link AdminTeamSetOwnerCommand#execute(User, String, List)}. + * Test method for {@link AdminTeamSetownerCommand#execute(User, String, List)}. */ @Test public void testExecuteSuccess() { @@ -185,7 +185,7 @@ public class AdminTeamSetOwnerCommandTest { members.add(notUUID); when(im.getMembers(Mockito.any(), Mockito.any())).thenReturn(members); - AdminTeamSetOwnerCommand itl = new AdminTeamSetOwnerCommand(ac); + AdminTeamSetownerCommand itl = new AdminTeamSetownerCommand(ac); assertTrue(itl.execute(user, itl.getLabel(), Arrays.asList(name))); // Add other verifications Mockito.verify(im).setOwner(Mockito.any(), Mockito.eq(user), Mockito.eq(notUUID));