From f603841a7e8fe54027122b265d52bf22602595a2 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Mon, 18 May 2020 11:34:26 +0200 Subject: [PATCH] [CI skip] Updated MockBukkit test dependency --- pom.xml | 2 +- .../items/TestSlimefunItemRegistration.java | 11 ----------- .../TestVanillaMachinesListener.java | 11 +++++++---- .../researches/TestResearchUnlocking.java | 19 ++++++++++--------- 4 files changed, 18 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index 10d5f2c47..a6bac43b7 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ com.github.seeseemelk MockBukkit - v1.15-d69d9ca9cb-1 + v1.15-431f3a3fbc-1 test diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/tests/items/TestSlimefunItemRegistration.java b/src/test/java/io/github/thebusybiscuit/slimefun4/tests/items/TestSlimefunItemRegistration.java index 9cbb9d83f..9df8dab88 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/tests/items/TestSlimefunItemRegistration.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/tests/items/TestSlimefunItemRegistration.java @@ -2,14 +2,12 @@ package io.github.thebusybiscuit.slimefun4.tests.items; import java.util.Optional; -import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; 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; @@ -79,15 +77,6 @@ public class TestSlimefunItemRegistration { Assertions.assertEquals("https://github.com/TheBusyBiscuit/Slimefun4/wiki/Test", wiki.get()); } - @Disabled("This Test provokes a ClassNotFoundException") - @Test - public void testGetItemName() { - SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "ITEM_NAME_TEST", new CustomItem(Material.DIAMOND, "&cTest")); - item.register(plugin); - - Assertions.assertEquals(ChatColor.RED + "Test", item.getItemName()); - } - @Test public void testVanillaItemFallback() { VanillaItem item = TestUtilities.mockVanillaItem(plugin, Material.ACACIA_SIGN, false); diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/tests/listeners/TestVanillaMachinesListener.java b/src/test/java/io/github/thebusybiscuit/slimefun4/tests/listeners/TestVanillaMachinesListener.java index 5bd6c57e6..8b0584b91 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/tests/listeners/TestVanillaMachinesListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/tests/listeners/TestVanillaMachinesListener.java @@ -3,6 +3,7 @@ package io.github.thebusybiscuit.slimefun4.tests.listeners; import org.apache.commons.lang.mutable.MutableObject; import org.bukkit.Material; import org.bukkit.NamespacedKey; +import org.bukkit.block.BrewingStand; import org.bukkit.entity.Player; import org.bukkit.event.Event.Result; import org.bukkit.event.inventory.ClickType; @@ -78,10 +79,12 @@ public class TestVanillaMachinesListener { private InventoryClickEvent mockBrewingEvent(ItemStack item) { Player player = server.addPlayer(); Inventory inv = TestUtilities.mockInventory(InventoryType.BREWING); + Mockito.when(inv.getHolder()).thenReturn(Mockito.mock(BrewingStand.class)); + Mockito.when(inv.getSize()).thenReturn(5); + InventoryView view = player.openInventory(inv); view.setCursor(item); InventoryClickEvent event = new InventoryClickEvent(view, SlotType.CONTAINER, 1, ClickType.LEFT, InventoryAction.PICKUP_ONE); - listener.onPreBrew(event); return event; } @@ -242,12 +245,12 @@ public class TestVanillaMachinesListener { @Test public void testBrewingWithoutSlimefunItems() { InventoryClickEvent event = mockBrewingEvent(new ItemStack(Material.BLAZE_POWDER)); - Assertions.assertEquals(Result.DEFAULT, event.getResult()); + Assertions.assertEquals(Result.ALLOW, event.getResult()); } @Test public void testBrewingWithSlimefunItem() { - SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "MOCK_POWDER", new CustomItem(Material.BLAZE_POWDER, "&6Mock")); + SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "MOCK_POWDER", new CustomItem(Material.BLAZE_POWDER, "&6Magic Mock Powder")); item.register(plugin); InventoryClickEvent event = mockBrewingEvent(item.getItem()); @@ -260,6 +263,6 @@ public class TestVanillaMachinesListener { item.register(plugin); InventoryClickEvent event = mockBrewingEvent(item.getItem()); - Assertions.assertEquals(Result.DEFAULT, event.getResult()); + Assertions.assertEquals(Result.ALLOW, event.getResult()); } } diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/tests/researches/TestResearchUnlocking.java b/src/test/java/io/github/thebusybiscuit/slimefun4/tests/researches/TestResearchUnlocking.java index ad68171d1..b5354fefd 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/tests/researches/TestResearchUnlocking.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/tests/researches/TestResearchUnlocking.java @@ -7,9 +7,9 @@ import java.util.concurrent.atomic.AtomicReference; import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; -import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -22,17 +22,17 @@ import me.mrCookieSlime.Slimefun.SlimefunPlugin; public class TestResearchUnlocking { - private static ServerMock server; - private static SlimefunPlugin plugin; + private ServerMock server; + private SlimefunPlugin plugin; - @BeforeAll - public static void load() throws InterruptedException { + @BeforeEach + public void load() throws InterruptedException { server = MockBukkit.mock(); plugin = MockBukkit.load(SlimefunPlugin.class); } - @AfterAll - public static void unload() { + @AfterEach + public void unload() { MockBukkit.unmock(); } @@ -61,11 +61,12 @@ public class TestResearchUnlocking { Optional profile = PlayerProfile.find(p); server.getPluginManager().assertEventFired(ResearchUnlockEvent.class, event -> { - Assertions.assertEquals(player, event.getPlayer()); + Assertions.assertEquals(p, event.getPlayer()); Assertions.assertEquals(research, event.getResearch()); Assertions.assertFalse(event.isCancelled()); return true; }); + Assertions.assertEquals(player, p); Assertions.assertTrue(profile.isPresent()); Assertions.assertTrue(profile.get().hasUnlocked(research));