From e0c865681c651ca67eed2686349c5e8de050f441 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 01:14:18 -0400 Subject: [PATCH] Remove no longer needed tests due to last change --- ...deadlock-risk-in-firing-async-events.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/Spigot-API-Patches/Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/Remove-deadlock-risk-in-firing-async-events.patch index 9b948d78f1..ada45a3bee 100644 --- a/Spigot-API-Patches/Remove-deadlock-risk-in-firing-async-events.patch +++ b/Spigot-API-Patches/Remove-deadlock-risk-in-firing-async-events.patch @@ -78,4 +78,43 @@ index cb2b0b9cb..a7dd902fb 100644 HandlerList handlers = event.getHandlers(); RegisteredListener[] listeners = handlers.getRegisteredListeners(); +diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java +index 6b86128e1..56308c0c6 100644 +--- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java ++++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java +@@ -0,0 +0,0 @@ public class PluginManagerTest { + private static final PluginManager pm = TestServer.getInstance().getPluginManager(); + + private final MutableObject store = new MutableObject(); +- ++/* // Paper start - remove unneeded test + @Test + public void testAsyncSameThread() { + final Event event = new TestEvent(true); +@@ -0,0 +0,0 @@ public class PluginManagerTest { + return; + } + throw new IllegalStateException("No exception thrown"); +- } ++ }*/ // Paper end + + @Test + public void testSyncSameThread() { + final Event event = new TestEvent(false); + pm.callEvent(event); + } +- ++/* // Paper start - remove unneeded test + @Test + public void testAsyncLocked() throws InterruptedException { + final Event event = new TestEvent(true); +@@ -0,0 +0,0 @@ public class PluginManagerTest { + secondThread.join(); + assertThat(store.value, is(instanceOf(IllegalStateException.class))); + assertThat(event.getEventName() + " cannot be triggered asynchronously from inside synchronized code.", is(((Throwable) store.value).getMessage())); +- } ++ }*/ // Paper end + + @Test + public void testAsyncUnlocked() throws InterruptedException { -- \ No newline at end of file