Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-13 19:01:33 +01:00
Code Issues Projects Releases Wiki Activity

[Test] Removed some unnecessary test utilities

Browse Source 
ConsoleSenders can be mocked on the spot, so a concrete implementation
is not required.
This commit is contained in:
Rsl1122 2018-09-19 13:44:54 +03:00
parent 5fc5494da9
commit 1a638ca4c9
6 changed files with 20 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Plan/src/test/java/com/djrapitops/plan/utilities/MiscUtilsTest.java
View File

@ -12,14 +12,16 @@ import com.djrapitops.plan.system.database.databases.sql.tables.UsersTable;
import com.djrapitops.plugin.StaticHolder;
import com.djrapitops.plugin.command.ISender;
import com.djrapitops.plugin.command.bukkit.BukkitCMDSender;
import org.bukkit.command.CommandSender;
import org.junit.*;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import utilities.RandomData;
import utilities.TestConstants;
import utilities.mocks.SystemMockUtil;
import utilities.mocks.objects.MockUtils;
import utilities.mocks.objects.MockPlayers;
import java.util.List;
import java.util.UUID;
@ -57,7 +59,7 @@ public class MiscUtilsTest {
@Test
public void testGetPlayerDisplayNameArgsPerm() {
String[] args = new String[]{"Rsl1122", "Test"};
ISender sender = new BukkitCMDSender(MockUtils.mockPlayer());
ISender sender = new BukkitCMDSender(MockPlayers.mockPlayer());
String expResult = "Rsl1122";
String result = MiscUtils.getPlayerName(args, sender);
@ -68,7 +70,7 @@ public class MiscUtilsTest {
@Test
public void testGetPlayerDisplayNameArgsNoPerm() {
String[] args = new String[]{"Rsl1122", "Test"};
ISender sender = new BukkitCMDSender(MockUtils.mockPlayer2());
ISender sender = new BukkitCMDSender(MockPlayers.mockPlayer2());
String result = MiscUtils.getPlayerName(args, sender);
@ -78,7 +80,7 @@ public class MiscUtilsTest {
@Test
public void testGetPlayerDisplayNameNoArgsPerm() {
String[] args = new String[]{};
ISender sender = new BukkitCMDSender(MockUtils.mockPlayer());
ISender sender = new BukkitCMDSender(MockPlayers.mockPlayer());
String expResult = "TestName";
String result = MiscUtils.getPlayerName(args, sender);
@ -89,7 +91,7 @@ public class MiscUtilsTest {
@Test
public void testGetPlayerDisplayNameNoArgsNoPerm() {
String[] args = new String[]{};
ISender sender = new BukkitCMDSender(MockUtils.mockPlayer2());
ISender sender = new BukkitCMDSender(MockPlayers.mockPlayer2());
String expResult = "TestName2";
String result = MiscUtils.getPlayerName(args, sender);
@ -100,7 +102,7 @@ public class MiscUtilsTest {
@Test
public void testGetPlayerDisplayNameOwnNameNoPerm() {
String[] args = new String[]{"testname2"};
ISender sender = new BukkitCMDSender(MockUtils.mockPlayer2());
ISender sender = new BukkitCMDSender(MockPlayers.mockPlayer2());
String expResult = "TestName2";
String result = MiscUtils.getPlayerName(args, sender);
@ -111,7 +113,7 @@ public class MiscUtilsTest {
@Test
public void testGetPlayerDisplayNameConsole() {
String[] args = new String[]{"TestConsoleSender"};
ISender sender = new BukkitCMDSender(MockUtils.mockConsoleSender());
ISender sender = new BukkitCMDSender(Mockito.mock(CommandSender.class));
String expResult = "TestConsoleSender";
String result = MiscUtils.getPlayerName(args, sender);

4
Plan/src/test/java/utilities/mocks/BukkitMockUtil.java
View File

@ -11,13 +11,13 @@ import com.djrapitops.plugin.logging.error.ConsoleErrorLogger;
import com.djrapitops.plugin.task.thread.ThreadRunnable;
import com.djrapitops.plugin.task.thread.ThreadRunnableFactory;
import org.bukkit.Server;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.plugin.InvalidDescriptionException;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.scheduler.BukkitScheduler;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import utilities.TestConstants;
import utilities.mocks.objects.FakeConsoleCmdSender;
import utilities.mocks.objects.TestLogger;
import java.io.File;
@ -102,7 +102,7 @@ public class BukkitMockUtil extends MockUtil {
doReturn("1.12.2").when(serverMock).getVersion();
doReturn("32423").when(serverMock).getBukkitVersion();
doReturn(TestConstants.BUKKIT_MAX_PLAYERS).when(serverMock).getMaxPlayers();
FakeConsoleCmdSender sender = new FakeConsoleCmdSender();
ConsoleCommandSender sender = Mockito.mock(ConsoleCommandSender.class);
doReturn(sender).when(serverMock).getConsoleSender();
BukkitScheduler bukkitScheduler = Mockito.mock(BukkitScheduler.class);

3
Plan/src/test/java/utilities/mocks/BungeeMockUtil.java
View File

@ -18,7 +18,6 @@ import net.md_5.bungee.api.plugin.PluginManager;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import utilities.TestConstants;
import utilities.mocks.objects.FakeBungeeConsole;
import utilities.mocks.objects.TestLogger;
import java.io.File;
@ -85,7 +84,7 @@ public class BungeeMockUtil extends MockUtil {
ProxyServer proxyMock = Mockito.mock(ProxyServer.class);
doReturn("1.12.2").when(proxyMock).getVersion();
CommandSender console = new FakeBungeeConsole();
CommandSender console = Mockito.mock(CommandSender.class);
doReturn(console).when(proxyMock).getConsole();
ProxyConfig proxyConfig = Mockito.mock(ProxyConfig.class);

79
Plan/src/test/java/utilities/mocks/objects/FakeBungeeConsole.java
View File

@ -1,79 +0,0 @@
/*
* License is provided in the jar as LICENSE also here:
* https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
*/
package utilities.mocks.objects;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.chat.BaseComponent;
import java.util.Collection;
/**
* Fake console to return as mock for Bungee.
* <p>
* Logs with System.out.print.
*
* @author Rsl1122
*/
public class FakeBungeeConsole implements CommandSender {
@Override
public String getName() {
return null;
}
@Override
public void sendMessage(String s) {
System.out.println(s);
}
@Override
public void sendMessages(String... strings) {
for (String string : strings) {
sendMessage(string);
}
}
@Override
public void sendMessage(BaseComponent... baseComponents) {
for (BaseComponent baseComponent : baseComponents) {
sendMessage(baseComponent);
}
}
@Override
public void sendMessage(BaseComponent baseComponent) {
sendMessage(baseComponent.toPlainText());
}
@Override
public Collection<String> getGroups() {
return null;
}
@Override
public void addGroups(String... strings) {
}
@Override
public void removeGroups(String... strings) {
}
@Override
public boolean hasPermission(String s) {
return true;
}
@Override
public void setPermission(String s, boolean b) {
}
@Override
public Collection<String> getPermissions() {
return null;
}
}

147
Plan/src/test/java/utilities/mocks/objects/FakeConsoleCmdSender.java
View File

@ -1,147 +0,0 @@
/*
* License is provided in the jar as LICENSE also here:
* https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
*/
package utilities.mocks.objects;
import org.bukkit.Server;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.conversations.Conversation;
import org.bukkit.conversations.ConversationAbandonedEvent;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin;
import java.util.Set;
/**
* Fake ConsoleCommandSender
*
* @author Rsl1122
*/
public class FakeConsoleCmdSender implements ConsoleCommandSender {
@Override
public void sendMessage(String s) {
System.out.println("Log: " + s);
}
@Override
public void sendMessage(String[] strings) {
for (String string : strings) {
sendMessage(string);
}
}
@Override
public Server getServer() {
return null;
}
@Override
public String getName() {
return null;
}
@Override
public Spigot spigot() {
return null;
}
@Override
public boolean isConversing() {
return false;
}
@Override
public void acceptConversationInput(String s) {
}
@Override
public boolean beginConversation(Conversation conversation) {
return false;
}
@Override
public void abandonConversation(Conversation conversation) {
}
@Override
public void abandonConversation(Conversation conversation, ConversationAbandonedEvent conversationAbandonedEvent) {
}
@Override
public void sendRawMessage(String s) {
}
@Override
public boolean isPermissionSet(String s) {
return false;
}
@Override
public boolean isPermissionSet(Permission permission) {
return false;
}
@Override
public boolean hasPermission(String s) {
return false;
}
@Override
public boolean hasPermission(Permission permission) {
return false;
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, String s, boolean b) {
return null;
}
@Override
public PermissionAttachment addAttachment(Plugin plugin) {
return null;
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, String s, boolean b, int i) {
return null;
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, int i) {
return null;
}
@Override
public void removeAttachment(PermissionAttachment permissionAttachment) {
}
@Override
public void recalculatePermissions() {
}
@Override
public Set<PermissionAttachmentInfo> getEffectivePermissions() {
return null;
}
@Override
public boolean isOp() {
return false;
}
@Override
public void setOp(boolean b) {
}
}

29
Plan/src/test/java/utilities/mocks/objects/MockUtils.java → Plan/src/test/java/utilities/mocks/objects/MockPlayers.java
View File

@ -3,31 +3,17 @@ package utilities.mocks.objects;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.mockito.Mockito;
import java.util.UUID;
import utilities.TestConstants;
import static org.mockito.Mockito.when;
/**
* @author Rsl1122
* @deprecated To Be Refactored into multiple classes.
*/
@Deprecated
public class MockUtils {
public static World mockWorld() {
World mockWorld = Mockito.mock(World.class);
when(mockWorld.toString()).thenReturn("World");
return mockWorld;
}
public class MockPlayers {
public static Player mockPlayer() {
Player p = Mockito.mock(Player.class);
when(p.getGameMode()).thenReturn(GameMode.SURVIVAL);
when(p.getUniqueId()).thenReturn(UUID.fromString("45b0dfdb-f71d-4cf3-8c21-27c9d4c651db"));
when(p.getUniqueId()).thenReturn(TestConstants.PLAYER_ONE_UUID);
when(p.getFirstPlayed()).thenReturn(1234567L);
World mockWorld = mockWorld();
when(p.getLocation()).thenReturn(new Location(mockWorld, 0, 0, 0));
@ -42,7 +28,7 @@ public class MockUtils {
public static Player mockPlayer2() {
Player p = Mockito.mock(Player.class);
when(p.getGameMode()).thenReturn(GameMode.SPECTATOR);
when(p.getUniqueId()).thenReturn(UUID.fromString("ec94a954-1fa1-445b-b09b-9b698519af80"));
when(p.getUniqueId()).thenReturn(TestConstants.PLAYER_TWO_UUID);
when(p.getFirstPlayed()).thenReturn(3423434L);
World mockWorld = mockWorld();
when(p.getLocation()).thenReturn(new Location(mockWorld, 1, 0, 1));
@ -54,8 +40,9 @@ public class MockUtils {
return p;
}
public static CommandSender mockConsoleSender() {
return Mockito.mock(CommandSender.class);
private static World mockWorld() {
World mockWorld = Mockito.mock(World.class);
when(mockWorld.toString()).thenReturn("World");
return mockWorld;
}
}