From 270cdfca2f8b522469c2df39a7a2ab113f6011fd Mon Sep 17 00:00:00 2001 From: Dan Mulloy Date: Wed, 3 Jun 2015 16:28:09 -0400 Subject: [PATCH] Handle package seal --- .../wrappers/WrappedServerPingTest.java | 50 +++++++++++-------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java b/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java index cab13f1e..af9ee9e1 100644 --- a/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java +++ b/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java @@ -2,8 +2,7 @@ package com.comphenix.protocol.wrappers; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; - -import java.io.IOException; +import static org.junit.Assert.fail; import org.junit.BeforeClass; import org.junit.Test; @@ -20,27 +19,36 @@ public class WrappedServerPingTest { } @Test - public void test() throws IOException { - CompressedImage tux = CompressedImage.fromPng(Resources.getResource("tux.png").openStream()); - byte[] original = tux.getDataCopy(); + public void test() { + try { + CompressedImage tux = CompressedImage.fromPng(Resources.getResource("tux.png").openStream()); + byte[] original = tux.getDataCopy(); - WrappedServerPing serverPing = new WrappedServerPing(); - serverPing.setMotD("Hello, this is a test."); - serverPing.setPlayersOnline(5); - serverPing.setPlayersMaximum(10); - serverPing.setVersionName("Minecraft 123"); - serverPing.setVersionProtocol(4); - serverPing.setFavicon(tux); + WrappedServerPing serverPing = new WrappedServerPing(); + serverPing.setMotD("Hello, this is a test."); + serverPing.setPlayersOnline(5); + serverPing.setPlayersMaximum(10); + serverPing.setVersionName("Minecraft 123"); + serverPing.setVersionProtocol(4); + serverPing.setFavicon(tux); - assertEquals(5, serverPing.getPlayersOnline()); - assertEquals(10, serverPing.getPlayersMaximum()); - assertEquals("Minecraft 123", serverPing.getVersionName()); - assertEquals(4, serverPing.getVersionProtocol()); + assertEquals(5, serverPing.getPlayersOnline()); + assertEquals(10, serverPing.getPlayersMaximum()); + assertEquals("Minecraft 123", serverPing.getVersionName()); + assertEquals(4, serverPing.getVersionProtocol()); - assertArrayEquals(original, serverPing.getFavicon().getData()); + assertArrayEquals(original, serverPing.getFavicon().getData()); - CompressedImage copy = CompressedImage.fromBase64Png(Base64Coder.encodeLines(tux.getData())); - assertArrayEquals(copy.getData(), serverPing.getFavicon().getData()); + CompressedImage copy = CompressedImage.fromBase64Png(Base64Coder.encodeLines(tux.getData())); + assertArrayEquals(copy.getData(), serverPing.getFavicon().getData()); + } catch (Throwable ex) { + if (ex.getCause() instanceof SecurityException) { + // There was a global package seal for a while, but not anymore + System.err.println("Encountered a SecurityException, update your Spigot jar!"); + } else { + ex.printStackTrace(); + fail("Encountered an exception testing ServerPing"); + } + } } - -} +} \ No newline at end of file