mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
[CI skip] Updated MockBukkit and re-enabled Deathpoint tests
This commit is contained in:
parent
23c2ab0f65
commit
f38c895780
@ -58,6 +58,7 @@
|
||||
* Fixed #1926
|
||||
* Fixed #1933
|
||||
* Fixed random errors because of Mojang's new player heads backend (Why... Mojang... why?)
|
||||
* Fixed Butcher Androids doing incorrect amounts of damage
|
||||
|
||||
## Release Candidate 11 (25 Apr 2020)
|
||||
|
||||
|
2
pom.xml
2
pom.xml
@ -288,7 +288,7 @@
|
||||
<dependency>
|
||||
<groupId>com.github.seeseemelk</groupId>
|
||||
<artifactId>MockBukkit</artifactId>
|
||||
<version>v1.15-742f0ba511-1</version>
|
||||
<version>v1.15-c79a603b7c-1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
@ -113,7 +113,7 @@ public class Translators {
|
||||
addTranslator("dhtdht020", EmbeddedLanguage.HEBREW, false);
|
||||
|
||||
// Translators - Japanese
|
||||
addTranslator("bito-blosh", "Bloshop", EmbeddedLanguage.JAPANESE, true);
|
||||
addTranslator("bito-blosh", "Bloshop", EmbeddedLanguage.JAPANESE, false);
|
||||
|
||||
// Translators - Korean
|
||||
addTranslator("kwonms871", EmbeddedLanguage.KOREAN, true);
|
||||
|
@ -157,6 +157,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon {
|
||||
if (minecraftVersion == MinecraftVersion.UNIT_TEST) {
|
||||
instance = this;
|
||||
local = new LocalizationService(this, "", null);
|
||||
gpsNetwork = new GPSNetwork();
|
||||
}
|
||||
else if (getServer().getPluginManager().isPluginEnabled("CS-CoreLib")) {
|
||||
long timestamp = System.nanoTime();
|
||||
|
@ -4,30 +4,26 @@ import org.bukkit.entity.Player;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import be.seeseemelk.mockbukkit.MockBukkit;
|
||||
import be.seeseemelk.mockbukkit.ServerMock;
|
||||
import io.github.thebusybiscuit.slimefun4.api.events.WaypointCreateEvent;
|
||||
import io.github.thebusybiscuit.slimefun4.api.gps.GPSNetwork;
|
||||
import io.github.thebusybiscuit.slimefun4.implementation.listeners.DeathpointListener;
|
||||
import io.github.thebusybiscuit.slimefun4.mocks.TestUtilities;
|
||||
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
||||
import me.mrCookieSlime.Slimefun.Lists.SlimefunItems;
|
||||
|
||||
public class TestDeathpointListener {
|
||||
|
||||
private static SlimefunPlugin plugin;
|
||||
private static DeathpointListener listener;
|
||||
private static GPSNetwork network;
|
||||
private static ServerMock server;
|
||||
|
||||
@BeforeAll
|
||||
public static void load() {
|
||||
server = MockBukkit.mock();
|
||||
plugin = MockBukkit.load(SlimefunPlugin.class);
|
||||
listener = new DeathpointListener(plugin);
|
||||
network = new GPSNetwork();
|
||||
new DeathpointListener(plugin);
|
||||
}
|
||||
|
||||
@AfterAll
|
||||
@ -36,18 +32,18 @@ public class TestDeathpointListener {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Disabled("MockBukkit does not implement Inventory#getStorageContents()")
|
||||
public void testNoTransmitter() {
|
||||
public void testNoTransmitter() throws InterruptedException {
|
||||
Player player = server.addPlayer();
|
||||
TestUtilities.awaitProfile(player);
|
||||
|
||||
player.setHealth(0);
|
||||
Assertions.assertThrows(AssertionError.class, () -> server.getPluginManager().assertEventFired(WaypointCreateEvent.class, event -> event.getPlayer() == player && event.isDeathpoint()));
|
||||
}
|
||||
|
||||
@Test
|
||||
@Disabled("MockBukkit does not implement Inventory#getStorageContents()")
|
||||
public void testTransmitter() {
|
||||
public void testTransmitter() throws InterruptedException {
|
||||
Player player = server.addPlayer();
|
||||
TestUtilities.awaitProfile(player);
|
||||
player.getInventory().setItem(8, SlimefunItems.GPS_EMERGENCY_TRANSMITTER.clone());
|
||||
|
||||
player.setHealth(0);
|
||||
|
Loading…
Reference in New Issue
Block a user