SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2018-07-15 10:00:00 +10:00
parent debc7172fd
commit 767e4f6ccf
199 changed files with 8301 additions and 3637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

199
paper-api/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java
View File

@@ -4,6 +4,7 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.TestPlugin;
import java.util.Collection;
import org.junit.Test;
import org.junit.Assert;
import static org.junit.Assert.*;
import static org.hamcrest.CoreMatchers.*;
@@ -21,11 +22,11 @@ public class StandardMessengerTest {
public void testIsReservedChannel() {
Messenger messenger = getMessenger();
assertTrue(messenger.isReservedChannel("REGISTER"));
assertFalse(messenger.isReservedChannel("register"));
assertTrue(messenger.isReservedChannel("UNREGISTER"));
assertFalse(messenger.isReservedChannel("unregister"));
assertFalse(messenger.isReservedChannel("notReserved"));
assertTrue(messenger.isReservedChannel("minecraft:register"));
assertFalse(messenger.isReservedChannel("test:register"));
assertTrue(messenger.isReservedChannel("minecraft:unregister"));
assertFalse(messenger.isReservedChannel("test:nregister"));
assertTrue(messenger.isReservedChannel("minecraft:something"));
}
@Test
@@ -33,13 +34,13 @@ public class StandardMessengerTest {
Messenger messenger = getMessenger();
TestPlugin plugin = getPlugin();
assertFalse(messenger.isOutgoingChannelRegistered(plugin, "foo"));
messenger.registerOutgoingPluginChannel(plugin, "foo");
assertTrue(messenger.isOutgoingChannelRegistered(plugin, "foo"));
assertFalse(messenger.isOutgoingChannelRegistered(plugin, "bar"));
assertFalse(messenger.isOutgoingChannelRegistered(plugin, "test:foo"));
messenger.registerOutgoingPluginChannel(plugin, "test:foo");
assertTrue(messenger.isOutgoingChannelRegistered(plugin, "test:foo"));
assertFalse(messenger.isOutgoingChannelRegistered(plugin, "test:bar"));
messenger.unregisterOutgoingPluginChannel(plugin, "foo");
assertFalse(messenger.isOutgoingChannelRegistered(plugin, "foo"));
messenger.unregisterOutgoingPluginChannel(plugin, "test:foo");
assertFalse(messenger.isOutgoingChannelRegistered(plugin, "test:foo"));
}
@Test(expected = ReservedChannelException.class)
@@ -47,7 +48,7 @@ public class StandardMessengerTest {
Messenger messenger = getMessenger();
TestPlugin plugin = getPlugin();
messenger.registerOutgoingPluginChannel(plugin, "REGISTER");
messenger.registerOutgoingPluginChannel(plugin, "minecraft:register");
}
@Test
@@ -55,36 +56,36 @@ public class StandardMessengerTest {
Messenger messenger = getMessenger();
TestPlugin plugin = getPlugin();
assertFalse(messenger.isOutgoingChannelRegistered(plugin, "foo"));
messenger.registerOutgoingPluginChannel(plugin, "foo");
messenger.registerOutgoingPluginChannel(plugin, "bar");
assertTrue(messenger.isOutgoingChannelRegistered(plugin, "foo"));
assertTrue(messenger.isOutgoingChannelRegistered(plugin, "bar"));
assertFalse(messenger.isOutgoingChannelRegistered(plugin, "test:foo"));
messenger.registerOutgoingPluginChannel(plugin, "test:foo");
messenger.registerOutgoingPluginChannel(plugin, "test:bar");
assertTrue(messenger.isOutgoingChannelRegistered(plugin, "test:foo"));
assertTrue(messenger.isOutgoingChannelRegistered(plugin, "test:bar"));
messenger.unregisterOutgoingPluginChannel(plugin);
assertFalse(messenger.isOutgoingChannelRegistered(plugin, "foo"));
assertFalse(messenger.isOutgoingChannelRegistered(plugin, "bar"));
assertFalse(messenger.isOutgoingChannelRegistered(plugin, "test:foo"));
assertFalse(messenger.isOutgoingChannelRegistered(plugin, "test:bar"));
}
@Test
public void testRegisterIncomingPluginChannel() {
Messenger messenger = getMessenger();
TestPlugin plugin = getPlugin();
TestMessageListener listener = new TestMessageListener("foo", "bar".getBytes());
TestMessageListener listener = new TestMessageListener("test:foo", "test:bar".getBytes());
Player player = TestPlayer.getInstance();
PluginMessageListenerRegistration registration = messenger.registerIncomingPluginChannel(plugin, "foo", listener);
PluginMessageListenerRegistration registration = messenger.registerIncomingPluginChannel(plugin, "test:foo", listener);
assertTrue(registration.isValid());
assertTrue(messenger.isIncomingChannelRegistered(plugin, "foo"));
messenger.dispatchIncomingMessage(player, "foo", "bar".getBytes());
assertTrue(messenger.isIncomingChannelRegistered(plugin, "test:foo"));
messenger.dispatchIncomingMessage(player, "test:foo", "test:bar".getBytes());
assertTrue(listener.hasReceived());
messenger.unregisterIncomingPluginChannel(plugin, "foo", listener);
messenger.unregisterIncomingPluginChannel(plugin, "test:foo", listener);
listener.reset();
assertFalse(registration.isValid());
assertFalse(messenger.isIncomingChannelRegistered(plugin, "foo"));
messenger.dispatchIncomingMessage(player, "foo", "bar".getBytes());
assertFalse(messenger.isIncomingChannelRegistered(plugin, "test:foo"));
messenger.dispatchIncomingMessage(player, "test:foo", "test:bar".getBytes());
assertFalse(listener.hasReceived());
}
@@ -93,44 +94,44 @@ public class StandardMessengerTest {
Messenger messenger = getMessenger();
TestPlugin plugin = getPlugin();
messenger.registerIncomingPluginChannel(plugin, "REGISTER", new TestMessageListener("foo", "bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin, "minecraft:register", new TestMessageListener("test:foo", "test:bar".getBytes()));
}
@Test(expected = IllegalArgumentException.class)
public void testDuplicateIncomingRegistration() {
Messenger messenger = getMessenger();
TestPlugin plugin = getPlugin();
TestMessageListener listener = new TestMessageListener("foo", "bar".getBytes());
TestMessageListener listener = new TestMessageListener("test:foo", "test:bar".getBytes());
messenger.registerIncomingPluginChannel(plugin, "baz", listener);
messenger.registerIncomingPluginChannel(plugin, "baz", listener);
messenger.registerIncomingPluginChannel(plugin, "test:baz", listener);
messenger.registerIncomingPluginChannel(plugin, "test:baz", listener);
}
@Test
public void testUnregisterIncomingPluginChannel_Plugin_String() {
Messenger messenger = getMessenger();
TestPlugin plugin = getPlugin();
TestMessageListener listener1 = new TestMessageListener("foo", "bar".getBytes());
TestMessageListener listener2 = new TestMessageListener("baz", "qux".getBytes());
TestMessageListener listener1 = new TestMessageListener("test:foo", "test:bar".getBytes());
TestMessageListener listener2 = new TestMessageListener("test:baz", "test:qux".getBytes());
Player player = TestPlayer.getInstance();
PluginMessageListenerRegistration registration1 = messenger.registerIncomingPluginChannel(plugin, "foo", listener1);
PluginMessageListenerRegistration registration2 = messenger.registerIncomingPluginChannel(plugin, "baz", listener2);
PluginMessageListenerRegistration registration1 = messenger.registerIncomingPluginChannel(plugin, "test:foo", listener1);
PluginMessageListenerRegistration registration2 = messenger.registerIncomingPluginChannel(plugin, "test:baz", listener2);
assertTrue(registration1.isValid());
assertTrue(registration2.isValid());
messenger.dispatchIncomingMessage(player, "foo", "bar".getBytes());
messenger.dispatchIncomingMessage(player, "baz", "qux".getBytes());
messenger.dispatchIncomingMessage(player, "test:foo", "test:bar".getBytes());
messenger.dispatchIncomingMessage(player, "test:baz", "test:qux".getBytes());
assertTrue(listener1.hasReceived());
assertTrue(listener2.hasReceived());
messenger.unregisterIncomingPluginChannel(plugin, "foo");
messenger.unregisterIncomingPluginChannel(plugin, "test:foo");
listener1.reset();
listener2.reset();
assertFalse(registration1.isValid());
assertTrue(registration2.isValid());
messenger.dispatchIncomingMessage(player, "foo", "bar".getBytes());
messenger.dispatchIncomingMessage(player, "baz", "qux".getBytes());
messenger.dispatchIncomingMessage(player, "test:foo", "test:bar".getBytes());
messenger.dispatchIncomingMessage(player, "test:baz", "test:qux".getBytes());
assertFalse(listener1.hasReceived());
assertTrue(listener2.hasReceived());
}
@@ -139,16 +140,16 @@ public class StandardMessengerTest {
public void testUnregisterIncomingPluginChannel_Plugin() {
Messenger messenger = getMessenger();
TestPlugin plugin = getPlugin();
TestMessageListener listener1 = new TestMessageListener("foo", "bar".getBytes());
TestMessageListener listener2 = new TestMessageListener("baz", "qux".getBytes());
TestMessageListener listener1 = new TestMessageListener("test:foo", "test:bar".getBytes());
TestMessageListener listener2 = new TestMessageListener("test:baz", "test:qux".getBytes());
Player player = TestPlayer.getInstance();
PluginMessageListenerRegistration registration1 = messenger.registerIncomingPluginChannel(plugin, "foo", listener1);
PluginMessageListenerRegistration registration2 = messenger.registerIncomingPluginChannel(plugin, "baz", listener2);
PluginMessageListenerRegistration registration1 = messenger.registerIncomingPluginChannel(plugin, "test:foo", listener1);
PluginMessageListenerRegistration registration2 = messenger.registerIncomingPluginChannel(plugin, "test:baz", listener2);
assertTrue(registration1.isValid());
assertTrue(registration2.isValid());
messenger.dispatchIncomingMessage(player, "foo", "bar".getBytes());
messenger.dispatchIncomingMessage(player, "baz", "qux".getBytes());
messenger.dispatchIncomingMessage(player, "test:foo", "test:bar".getBytes());
messenger.dispatchIncomingMessage(player, "test:baz", "test:qux".getBytes());
assertTrue(listener1.hasReceived());
assertTrue(listener2.hasReceived());
@@ -158,8 +159,8 @@ public class StandardMessengerTest {
assertFalse(registration1.isValid());
assertFalse(registration2.isValid());
messenger.dispatchIncomingMessage(player, "foo", "bar".getBytes());
messenger.dispatchIncomingMessage(player, "baz", "qux".getBytes());
messenger.dispatchIncomingMessage(player, "test:foo", "test:bar".getBytes());
messenger.dispatchIncomingMessage(player, "test:baz", "test:qux".getBytes());
assertFalse(listener1.hasReceived());
assertFalse(listener2.hasReceived());
}
@@ -172,12 +173,12 @@ public class StandardMessengerTest {
assertEquals(messenger.getOutgoingChannels());
messenger.registerOutgoingPluginChannel(plugin1, "foo");
messenger.registerOutgoingPluginChannel(plugin1, "bar");
messenger.registerOutgoingPluginChannel(plugin2, "baz");
messenger.registerOutgoingPluginChannel(plugin2, "baz");
messenger.registerOutgoingPluginChannel(plugin1, "test:foo");
messenger.registerOutgoingPluginChannel(plugin1, "test:bar");
messenger.registerOutgoingPluginChannel(plugin2, "test:baz");
messenger.registerOutgoingPluginChannel(plugin2, "test:baz");
assertEquals(messenger.getOutgoingChannels(), "foo", "bar", "baz");
assertEquals(messenger.getOutgoingChannels(), "test:foo", "test:bar", "test:baz");
}
@Test
@@ -187,13 +188,13 @@ public class StandardMessengerTest {
TestPlugin plugin2 = getPlugin();
TestPlugin plugin3 = getPlugin();
messenger.registerOutgoingPluginChannel(plugin1, "foo");
messenger.registerOutgoingPluginChannel(plugin1, "bar");
messenger.registerOutgoingPluginChannel(plugin2, "baz");
messenger.registerOutgoingPluginChannel(plugin2, "qux");
messenger.registerOutgoingPluginChannel(plugin1, "test:foo");
messenger.registerOutgoingPluginChannel(plugin1, "test:bar");
messenger.registerOutgoingPluginChannel(plugin2, "test:baz");
messenger.registerOutgoingPluginChannel(plugin2, "test:qux");
assertEquals(messenger.getOutgoingChannels(plugin1), "foo", "bar");
assertEquals(messenger.getOutgoingChannels(plugin2), "baz", "qux");
assertEquals(messenger.getOutgoingChannels(plugin1), "test:foo", "test:bar");
assertEquals(messenger.getOutgoingChannels(plugin2), "test:baz", "test:qux");
assertEquals(messenger.getOutgoingChannels(plugin3));
}
@@ -205,12 +206,12 @@ public class StandardMessengerTest {
assertEquals(messenger.getIncomingChannels());
messenger.registerIncomingPluginChannel(plugin1, "foo", new TestMessageListener("foo", "bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin1, "bar", new TestMessageListener("foo", "bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin2, "baz", new TestMessageListener("foo", "bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin2, "baz", new TestMessageListener("foo", "bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin1, "test:foo", new TestMessageListener("test:foo", "test:bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin1, "test:bar", new TestMessageListener("test:foo", "test:bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin2, "test:baz", new TestMessageListener("test:foo", "test:bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin2, "test:baz", new TestMessageListener("test:foo", "test:bar".getBytes()));
assertEquals(messenger.getIncomingChannels(), "foo", "bar", "baz");
assertEquals(messenger.getIncomingChannels(), "test:foo", "test:bar", "test:baz");
}
@Test
@@ -220,13 +221,13 @@ public class StandardMessengerTest {
TestPlugin plugin2 = getPlugin();
TestPlugin plugin3 = getPlugin();
messenger.registerIncomingPluginChannel(plugin1, "foo", new TestMessageListener("foo", "bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin1, "bar", new TestMessageListener("foo", "bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin2, "baz", new TestMessageListener("foo", "bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin2, "qux", new TestMessageListener("foo", "bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin1, "test:foo", new TestMessageListener("test:foo", "test:bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin1, "test:bar", new TestMessageListener("test:foo", "test:bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin2, "test:baz", new TestMessageListener("test:foo", "test:bar".getBytes()));
messenger.registerIncomingPluginChannel(plugin2, "test:qux", new TestMessageListener("test:foo", "test:bar".getBytes()));
assertEquals(messenger.getIncomingChannels(plugin1), "foo", "bar");
assertEquals(messenger.getIncomingChannels(plugin2), "baz", "qux");
assertEquals(messenger.getIncomingChannels(plugin1), "test:foo", "test:bar");
assertEquals(messenger.getIncomingChannels(plugin2), "test:baz", "test:qux");
assertEquals(messenger.getIncomingChannels(plugin3));
}
@@ -236,10 +237,10 @@ public class StandardMessengerTest {
TestPlugin plugin1 = getPlugin();
TestPlugin plugin2 = getPlugin();
TestPlugin plugin3 = getPlugin();
PluginMessageListenerRegistration registration1 = messenger.registerIncomingPluginChannel(plugin1, "foo", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration2 = messenger.registerIncomingPluginChannel(plugin1, "bar", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration3 = messenger.registerIncomingPluginChannel(plugin2, "baz", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration4 = messenger.registerIncomingPluginChannel(plugin2, "qux", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration1 = messenger.registerIncomingPluginChannel(plugin1, "test:foo", new TestMessageListener("test:foo", "test:bar".getBytes()));
PluginMessageListenerRegistration registration2 = messenger.registerIncomingPluginChannel(plugin1, "test:bar", new TestMessageListener("test:foo", "test:bar".getBytes()));
PluginMessageListenerRegistration registration3 = messenger.registerIncomingPluginChannel(plugin2, "test:baz", new TestMessageListener("test:foo", "test:bar".getBytes()));
PluginMessageListenerRegistration registration4 = messenger.registerIncomingPluginChannel(plugin2, "test:qux", new TestMessageListener("test:foo", "test:bar".getBytes()));
assertEquals(messenger.getIncomingChannelRegistrations(plugin1), registration1, registration2);
assertEquals(messenger.getIncomingChannelRegistrations(plugin2), registration3, registration4);
@@ -251,14 +252,14 @@ public class StandardMessengerTest {
Messenger messenger = getMessenger();
TestPlugin plugin1 = getPlugin();
TestPlugin plugin2 = getPlugin();
PluginMessageListenerRegistration registration1 = messenger.registerIncomingPluginChannel(plugin1, "foo", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration2 = messenger.registerIncomingPluginChannel(plugin1, "bar", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration3 = messenger.registerIncomingPluginChannel(plugin2, "foo", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration4 = messenger.registerIncomingPluginChannel(plugin2, "bar", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration1 = messenger.registerIncomingPluginChannel(plugin1, "test:foo", new TestMessageListener("test:foo", "test:bar".getBytes()));
PluginMessageListenerRegistration registration2 = messenger.registerIncomingPluginChannel(plugin1, "test:bar", new TestMessageListener("test:foo", "test:bar".getBytes()));
PluginMessageListenerRegistration registration3 = messenger.registerIncomingPluginChannel(plugin2, "test:foo", new TestMessageListener("test:foo", "test:bar".getBytes()));
PluginMessageListenerRegistration registration4 = messenger.registerIncomingPluginChannel(plugin2, "test:bar", new TestMessageListener("test:foo", "test:bar".getBytes()));
assertEquals(messenger.getIncomingChannelRegistrations("foo"), registration1, registration3);
assertEquals(messenger.getIncomingChannelRegistrations("bar"), registration2, registration4);
assertEquals(messenger.getIncomingChannelRegistrations("baz"));
assertEquals(messenger.getIncomingChannelRegistrations("test:foo"), registration1, registration3);
assertEquals(messenger.getIncomingChannelRegistrations("test:bar"), registration2, registration4);
assertEquals(messenger.getIncomingChannelRegistrations("test:baz"));
}
@Test
@@ -267,19 +268,33 @@ public class StandardMessengerTest {
TestPlugin plugin1 = getPlugin();
TestPlugin plugin2 = getPlugin();
TestPlugin plugin3 = getPlugin();
PluginMessageListenerRegistration registration1 = messenger.registerIncomingPluginChannel(plugin1, "foo", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration2 = messenger.registerIncomingPluginChannel(plugin1, "foo", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration3 = messenger.registerIncomingPluginChannel(plugin1, "bar", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration4 = messenger.registerIncomingPluginChannel(plugin2, "bar", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration5 = messenger.registerIncomingPluginChannel(plugin2, "baz", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration6 = messenger.registerIncomingPluginChannel(plugin2, "baz", new TestMessageListener("foo", "bar".getBytes()));
PluginMessageListenerRegistration registration1 = messenger.registerIncomingPluginChannel(plugin1, "test:foo", new TestMessageListener("test:foo", "test:bar".getBytes()));
PluginMessageListenerRegistration registration2 = messenger.registerIncomingPluginChannel(plugin1, "test:foo", new TestMessageListener("test:foo", "test:bar".getBytes()));
PluginMessageListenerRegistration registration3 = messenger.registerIncomingPluginChannel(plugin1, "test:bar", new TestMessageListener("test:foo", "test:bar".getBytes()));
PluginMessageListenerRegistration registration4 = messenger.registerIncomingPluginChannel(plugin2, "test:bar", new TestMessageListener("test:foo", "test:bar".getBytes()));
PluginMessageListenerRegistration registration5 = messenger.registerIncomingPluginChannel(plugin2, "test:baz", new TestMessageListener("test:foo", "test:bar".getBytes()));
PluginMessageListenerRegistration registration6 = messenger.registerIncomingPluginChannel(plugin2, "test:baz", new TestMessageListener("test:foo", "test:bar".getBytes()));
assertEquals(messenger.getIncomingChannelRegistrations(plugin1, "foo"), registration1, registration2);
assertEquals(messenger.getIncomingChannelRegistrations(plugin1, "bar"), registration3);
assertEquals(messenger.getIncomingChannelRegistrations(plugin2, "bar"), registration4);
assertEquals(messenger.getIncomingChannelRegistrations(plugin2, "baz"), registration5, registration6);
assertEquals(messenger.getIncomingChannelRegistrations(plugin1, "baz"));
assertEquals(messenger.getIncomingChannelRegistrations(plugin3, "qux"));
assertEquals(messenger.getIncomingChannelRegistrations(plugin1, "test:foo"), registration1, registration2);
assertEquals(messenger.getIncomingChannelRegistrations(plugin1, "test:bar"), registration3);
assertEquals(messenger.getIncomingChannelRegistrations(plugin2, "test:bar"), registration4);
assertEquals(messenger.getIncomingChannelRegistrations(plugin2, "test:baz"), registration5, registration6);
assertEquals(messenger.getIncomingChannelRegistrations(plugin1, "test:baz"));
assertEquals(messenger.getIncomingChannelRegistrations(plugin3, "test:qux"));
}
@Test(expected = IllegalArgumentException.class)
public void testInvalidChannel() {
Messenger messenger = getMessenger();
TestPlugin plugin = getPlugin();
messenger.registerOutgoingPluginChannel(plugin, "foo");
}
@Test
public void testValidateAndCorrectChannel() {
Assert.assertEquals("bungeecord:main", StandardMessenger.validateAndCorrectChannel("BungeeCord"));
Assert.assertEquals("BungeeCord", StandardMessenger.validateAndCorrectChannel("bungeecord:main"));
}
private static <T> void assertEquals(Collection<T> actual, T... expected) {