From 6793fee387df5bbec72d09fd82974274d80df0ac 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 | 41 ++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/Spigot-API-Patches/0133-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0133-Remove-deadlock-risk-in-firing-async-events.patch index e1afc9dd9..abebdf9b9 100644 --- a/Spigot-API-Patches/0133-Remove-deadlock-risk-in-firing-async-events.patch +++ b/Spigot-API-Patches/0133-Remove-deadlock-risk-in-firing-async-events.patch @@ -1,4 +1,4 @@ -From cc0de4b8d6d4373fada1806dc617c7dc71160094 Mon Sep 17 00:00:00 2001 +From 77036b521bed13898c2987f64afdf0b260b60548 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 00:32:05 -0400 Subject: [PATCH] Remove deadlock risk in firing async events @@ -78,6 +78,45 @@ 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 +@@ -19,7 +19,7 @@ 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); +@@ -30,14 +30,14 @@ 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); +@@ -58,7 +58,7 @@ 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 { -- 2.18.0