mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
Remove no longer needed tests due to last change
This commit is contained in:
parent
5228a4f24c
commit
6793fee387
1 changed files with 40 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
||||||
From cc0de4b8d6d4373fada1806dc617c7dc71160094 Mon Sep 17 00:00:00 2001
|
From 77036b521bed13898c2987f64afdf0b260b60548 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 9 Sep 2018 00:32:05 -0400
|
Date: Sun, 9 Sep 2018 00:32:05 -0400
|
||||||
Subject: [PATCH] Remove deadlock risk in firing async events
|
Subject: [PATCH] Remove deadlock risk in firing async events
|
||||||
|
@ -78,6 +78,45 @@ index cb2b0b9cb..a7dd902fb 100644
|
||||||
HandlerList handlers = event.getHandlers();
|
HandlerList handlers = event.getHandlers();
|
||||||
RegisteredListener[] listeners = handlers.getRegisteredListeners();
|
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
|
2.18.0
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue