Messed aroung with tests, adding back in the ability for craftbukkit.
This commit is contained in:
parent
112895c3e3
commit
9473928d5f
8
pom.xml
8
pom.xml
@ -55,6 +55,14 @@
|
|||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.bukkit</groupId>
|
||||||
|
<artifactId>craftbukkit</artifactId>
|
||||||
|
<version>1.8-R0.1-SNAPSHOT</version>
|
||||||
|
<type>jar</type>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sk89q</groupId>
|
<groupId>com.sk89q</groupId>
|
||||||
<artifactId>worldedit</artifactId>
|
<artifactId>worldedit</artifactId>
|
||||||
|
@ -28,6 +28,7 @@ import org.bukkit.WorldCreator;
|
|||||||
import org.bukkit.WorldType;
|
import org.bukkit.WorldType;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.command.ConsoleCommandSender;
|
import org.bukkit.command.ConsoleCommandSender;
|
||||||
|
import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftItemFactory;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.permissions.Permission;
|
import org.bukkit.permissions.Permission;
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
@ -42,9 +43,11 @@ import org.mockito.invocation.InvocationOnMock;
|
|||||||
import org.mockito.stubbing.Answer;
|
import org.mockito.stubbing.Answer;
|
||||||
import org.powermock.api.mockito.PowerMockito;
|
import org.powermock.api.mockito.PowerMockito;
|
||||||
import org.powermock.core.MockGateway;
|
import org.powermock.core.MockGateway;
|
||||||
|
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||||
|
|
||||||
import com.graywolf336.jail.JailMain;
|
import com.graywolf336.jail.JailMain;
|
||||||
|
|
||||||
|
@PrepareForTest({ CraftItemFactory.class })
|
||||||
public class TestInstanceCreator {
|
public class TestInstanceCreator {
|
||||||
private JailMain main;
|
private JailMain main;
|
||||||
private Server mockServer;
|
private Server mockServer;
|
||||||
@ -71,6 +74,7 @@ public class TestInstanceCreator {
|
|||||||
Logger.getLogger("Minecraft").setParent(Util.logger);
|
Logger.getLogger("Minecraft").setParent(Util.logger);
|
||||||
when(mockServer.getLogger()).thenReturn(Util.logger);
|
when(mockServer.getLogger()).thenReturn(Util.logger);
|
||||||
when(mockServer.getWorldContainer()).thenReturn(worldsDirectory);
|
when(mockServer.getWorldContainer()).thenReturn(worldsDirectory);
|
||||||
|
when(mockServer.getItemFactory()).thenReturn(CraftItemFactory.instance());
|
||||||
|
|
||||||
MockWorldFactory.makeNewMockWorld("world", Environment.NORMAL, WorldType.NORMAL);
|
MockWorldFactory.makeNewMockWorld("world", Environment.NORMAL, WorldType.NORMAL);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user