Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-6400: Use Mockito instead of InvocationHandler

Browse Source
This commit is contained in:
DerFrZocker 2023-10-07 15:42:18 +11:00 committed by md_5
parent 38c599f9de
commit b3efca57ac
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
3 changed files with 33 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -275,6 +275,12 @@
<version>2.2</version> <version>2.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<!-- This builds a completely 'ready to start' jar with all dependencies inside --> <!-- This builds a completely 'ready to start' jar with all dependencies inside -->

2
src/test/java/org/bukkit/craftbukkit/inventory/FactoryItemMaterialTest.java
View File

@ -11,10 +11,12 @@ import org.bukkit.inventory.ItemFactory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.support.AbstractTestingBase; import org.bukkit.support.AbstractTestingBase;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.MethodSource;
@EnabledIfSystemProperty(named = "testEnv", matches = "full", disabledReason = "Disable for now, since Mockito's Location feature is too heavy in combination with this test")
public class FactoryItemMaterialTest extends AbstractTestingBase { public class FactoryItemMaterialTest extends AbstractTestingBase {
static final ItemFactory factory = CraftItemFactory.instance(); static final ItemFactory factory = CraftItemFactory.instance();
static final StringBuilder buffer = new StringBuilder(); static final StringBuilder buffer = new StringBuilder();

127
src/test/java/org/bukkit/support/DummyServer.java
View File

@ -1,13 +1,9 @@
package org.bukkit.support; package org.bukkit.support;
import java.lang.reflect.InvocationHandler; import static org.mockito.Mockito.*;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.HashMap;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.craftbukkit.CraftLootTable; import org.bukkit.craftbukkit.CraftLootTable;
import org.bukkit.craftbukkit.CraftRegistry; import org.bukkit.craftbukkit.CraftRegistry;
@ -17,96 +13,32 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.craftbukkit.util.CraftNamespacedKey;
import org.bukkit.craftbukkit.util.Versioning; import org.bukkit.craftbukkit.util.Versioning;
public final class DummyServer implements InvocationHandler { public final class DummyServer {
private static interface MethodHandler {
Object handle(DummyServer server, Object[] args);
}
private static final HashMap<Method, MethodHandler> methods = new HashMap<Method, MethodHandler>();
static { static {
try { try {
methods.put( Server instance = mock(withSettings().stubOnly());
Server.class.getMethod("getItemFactory"),
new MethodHandler() { when(instance.getItemFactory()).thenAnswer(mock -> CraftItemFactory.instance());
@Override
public Object handle(DummyServer server, Object[] args) { when(instance.getName()).thenReturn(DummyServer.class.getName());
return CraftItemFactory.instance();
} when(instance.getVersion()).thenReturn(DummyServer.class.getPackage().getImplementationVersion());
}
); when(instance.getBukkitVersion()).thenReturn(Versioning.getBukkitVersion());
methods.put(
Server.class.getMethod("getName"), when(instance.getLogger()).thenReturn(Logger.getLogger(DummyServer.class.getCanonicalName()));
new MethodHandler() {
@Override when(instance.getUnsafe()).then(mock -> CraftMagicNumbers.INSTANCE);
public Object handle(DummyServer server, Object[] args) {
return DummyServer.class.getName(); when(instance.createBlockData(any(Material.class))).then(mock -> CraftBlockData.newData(mock.getArgument(0), null));
}
} when(instance.getLootTable(any())).then(mock -> new CraftLootTable(mock.getArgument(0),
); AbstractTestingBase.DATA_PACK.getLootData().getLootTable(CraftNamespacedKey.toMinecraft(mock.getArgument(0)))));
methods.put(
Server.class.getMethod("getVersion"), when(instance.getRegistry(any())).then(mock -> CraftRegistry.createRegistry(mock.getArgument(0), AbstractTestingBase.REGISTRY_CUSTOM));
new MethodHandler() {
@Override Bukkit.setServer(instance);
public Object handle(DummyServer server, Object[] args) {
return DummyServer.class.getPackage().getImplementationVersion();
}
}
);
methods.put(
Server.class.getMethod("getBukkitVersion"),
new MethodHandler() {
@Override
public Object handle(DummyServer server, Object[] args) {
return Versioning.getBukkitVersion();
}
}
);
methods.put(
Server.class.getMethod("getLogger"),
new MethodHandler() {
final Logger logger = Logger.getLogger(DummyServer.class.getCanonicalName());
@Override
public Object handle(DummyServer server, Object[] args) {
return logger;
}
}
);
methods.put(
Server.class.getMethod("getUnsafe"),
new MethodHandler() {
@Override
public Object handle(DummyServer server, Object[] args) {
return CraftMagicNumbers.INSTANCE;
}
}
);
methods.put(
Server.class.getMethod("createBlockData", Material.class),
new MethodHandler() {
final Logger logger = Logger.getLogger(DummyServer.class.getCanonicalName());
@Override
public Object handle(DummyServer server, Object[] args) {
return CraftBlockData.newData((Material) args[0], null);
}
}
);
methods.put(Server.class.getMethod("getLootTable", NamespacedKey.class),
new MethodHandler() {
@Override
public Object handle(DummyServer server, Object[] args) {
NamespacedKey key = (NamespacedKey) args[0];
return new CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootData().getLootTable(CraftNamespacedKey.toMinecraft(key)));
}
}
);
methods.put(Server.class.getMethod("getRegistry", Class.class),
new MethodHandler() {
@Override
public Object handle(DummyServer server, Object[] args) {
return CraftRegistry.createRegistry((Class) args[0], AbstractTestingBase.REGISTRY_CUSTOM);
}
}
);
Bukkit.setServer(Proxy.getProxyClass(Server.class.getClassLoader(), Server.class).asSubclass(Server.class).getConstructor(InvocationHandler.class).newInstance(new DummyServer()));
} catch (Throwable t) { } catch (Throwable t) {
throw new Error(t); throw new Error(t);
} }
@ -115,13 +47,4 @@ public final class DummyServer implements InvocationHandler {
public static void setup() {} public static void setup() {}
private DummyServer() {}; private DummyServer() {};
@Override
public Object invoke(Object proxy, Method method, Object[] args) {
MethodHandler handler = methods.get(method);
if (handler != null) {
return handler.handle(this, args);
}
throw new UnsupportedOperationException(String.valueOf(method));
}
} }