From 5a64414e7f26c189a59ca1f40742d8b0ea168d7d Mon Sep 17 00:00:00 2001 From: nathan Date: Sat, 27 Jan 2018 23:05:45 +0100 Subject: [PATCH] Cleaned up exceptions in tests --- test/dorkbox/network/ChunkedDataIdleTest.java | 5 ++--- test/dorkbox/network/ClientSendTest.java | 3 +-- test/dorkbox/network/ConnectionTest.java | 11 +++++------ test/dorkbox/network/DiscoverHostTest.java | 14 +++++++------- test/dorkbox/network/IdleTest.java | 15 +++++---------- test/dorkbox/network/LargeResizeBufferTest.java | 3 +-- test/dorkbox/network/MultipleServerTest.java | 3 +-- test/dorkbox/network/MultipleThreadTest.java | 3 +-- test/dorkbox/network/PingPongLocalTest.java | 3 +-- test/dorkbox/network/PingPongTest.java | 3 +-- test/dorkbox/network/PingTest.java | 9 ++++----- test/dorkbox/network/ReconnectTest.java | 14 +++++++------- test/dorkbox/network/UnregisteredClassTest.java | 3 +-- test/dorkbox/network/rmi/RmiGlobalTest.java | 11 ++++------- .../rmi/RmiSendObjectOverrideMethodTest.java | 7 +++---- test/dorkbox/network/rmi/RmiSendObjectTest.java | 7 +++---- test/dorkbox/network/rmi/RmiTest.java | 11 ++++------- 17 files changed, 51 insertions(+), 74 deletions(-) diff --git a/test/dorkbox/network/ChunkedDataIdleTest.java b/test/dorkbox/network/ChunkedDataIdleTest.java index 3ceb59dd..ec715830 100644 --- a/test/dorkbox/network/ChunkedDataIdleTest.java +++ b/test/dorkbox/network/ChunkedDataIdleTest.java @@ -32,7 +32,6 @@ import dorkbox.network.connection.Connection; import dorkbox.network.connection.Listener; import dorkbox.network.connection.idle.IdleBridge; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; import dorkbox.util.serialization.SerializationManager; @@ -46,7 +45,7 @@ public class ChunkedDataIdleTest extends BaseTest { // have to test sending objects @Test - public void ObjectSender() throws InitializationException, SecurityException, IOException, InterruptedException { + public void ObjectSender() throws SecurityException, IOException { final Data mainData = new Data(); populateData(mainData); @@ -75,7 +74,7 @@ public class ChunkedDataIdleTest extends BaseTest { private void sendObject(final Data mainData, Configuration configuration, final ConnectionType type) - throws InitializationException, SecurityException, IOException, InterruptedException { + throws SecurityException, IOException { Server server = new Server(configuration); addEndPoint(server); diff --git a/test/dorkbox/network/ClientSendTest.java b/test/dorkbox/network/ClientSendTest.java index f3885e0a..01bddfce 100644 --- a/test/dorkbox/network/ClientSendTest.java +++ b/test/dorkbox/network/ClientSendTest.java @@ -29,7 +29,6 @@ import org.junit.Test; import dorkbox.network.connection.Connection; import dorkbox.network.connection.Listener; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; import dorkbox.util.serialization.SerializationManager; @@ -40,7 +39,7 @@ class ClientSendTest extends BaseTest { @Test public - void sendDataFromClientClass() throws InitializationException, SecurityException, IOException, InterruptedException { + void sendDataFromClientClass() throws SecurityException, IOException { Configuration configuration = new Configuration(); configuration.tcpPort = tcpPort; configuration.host = host; diff --git a/test/dorkbox/network/ConnectionTest.java b/test/dorkbox/network/ConnectionTest.java index 25fdfa86..d82d94a2 100644 --- a/test/dorkbox/network/ConnectionTest.java +++ b/test/dorkbox/network/ConnectionTest.java @@ -29,7 +29,6 @@ import dorkbox.network.connection.Connection; import dorkbox.network.connection.EndPoint; import dorkbox.network.connection.Listener; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; import dorkbox.util.serialization.SerializationManager; @@ -38,7 +37,7 @@ class ConnectionTest extends BaseTest { @Test public - void connectLocal() throws InitializationException, SecurityException, IOException, InterruptedException { + void connectLocal() throws SecurityException, IOException { System.out.println("---- " + "Local"); Configuration configuration = new Configuration(); @@ -54,7 +53,7 @@ class ConnectionTest extends BaseTest { @Test public - void connectTcp() throws InitializationException, SecurityException, IOException, InterruptedException { + void connectTcp() throws SecurityException, IOException { System.out.println("---- " + "TCP"); Configuration configuration = new Configuration(); @@ -72,7 +71,7 @@ class ConnectionTest extends BaseTest { @Test public - void connectTcpUdp() throws InitializationException, SecurityException, IOException, InterruptedException { + void connectTcpUdp() throws SecurityException, IOException { System.out.println("---- " + "TCP UDP"); Configuration configuration = new Configuration(); @@ -90,7 +89,7 @@ class ConnectionTest extends BaseTest { } private - Server startServer(Configuration configuration) throws InitializationException, SecurityException, IOException { + Server startServer(Configuration configuration) throws SecurityException { Server server = new Server(configuration); addEndPoint(server); @@ -126,7 +125,7 @@ class ConnectionTest extends BaseTest { } private - Client startClient(Configuration configuration) throws InitializationException, SecurityException, IOException, InterruptedException { + Client startClient(Configuration configuration) throws SecurityException, IOException { Client client; if (configuration != null) { client = new Client(configuration); diff --git a/test/dorkbox/network/DiscoverHostTest.java b/test/dorkbox/network/DiscoverHostTest.java index 797dc585..df83b3cd 100644 --- a/test/dorkbox/network/DiscoverHostTest.java +++ b/test/dorkbox/network/DiscoverHostTest.java @@ -19,15 +19,15 @@ */ package dorkbox.network; -import dorkbox.network.connection.Connection; -import dorkbox.network.connection.Listener; -import dorkbox.util.exceptions.InitializationException; -import dorkbox.util.exceptions.SecurityException; -import org.junit.Test; +import static org.junit.Assert.fail; import java.io.IOException; -import static org.junit.Assert.fail; +import org.junit.Test; + +import dorkbox.network.connection.Connection; +import dorkbox.network.connection.Listener; +import dorkbox.util.exceptions.SecurityException; public class DiscoverHostTest extends BaseTest { @@ -35,7 +35,7 @@ class DiscoverHostTest extends BaseTest { @Test public - void broadcast() throws InitializationException, SecurityException, IOException, InterruptedException { + void broadcast() throws SecurityException, IOException { Configuration configuration = new Configuration(); configuration.tcpPort = tcpPort; diff --git a/test/dorkbox/network/IdleTest.java b/test/dorkbox/network/IdleTest.java index 2cf4bf1e..4ad211ac 100644 --- a/test/dorkbox/network/IdleTest.java +++ b/test/dorkbox/network/IdleTest.java @@ -31,13 +31,8 @@ import org.junit.Test; import dorkbox.network.PingPongTest.TYPE; import dorkbox.network.connection.Connection; import dorkbox.network.connection.Listener; -import dorkbox.network.connection.idle.IdleBridge; -import dorkbox.network.connection.idle.IdleListener; -import dorkbox.network.connection.idle.IdleListenerTCP; -import dorkbox.network.connection.idle.IdleListenerUDP; -import dorkbox.network.connection.idle.InputStreamSender; +import dorkbox.network.connection.idle.*; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; import dorkbox.util.serialization.SerializationManager; @@ -54,7 +49,7 @@ class IdleTest extends BaseTest { @Test public - void InputStreamSender() throws InitializationException, SecurityException, IOException, InterruptedException { + void InputStreamSender() throws SecurityException, IOException { final int largeDataSize = 12345; System.err.println("-- TCP"); @@ -81,7 +76,7 @@ class IdleTest extends BaseTest { // have to test sending objects @Test public - void ObjectSender() throws InitializationException, SecurityException, IOException, InterruptedException { + void ObjectSender() throws SecurityException, IOException { final Data mainData = new Data(); populateData(mainData); @@ -111,7 +106,7 @@ class IdleTest extends BaseTest { private void sendObject(final Data mainData, Configuration configuration, final ConnectionType type) - throws InitializationException, SecurityException, IOException, InterruptedException { + throws SecurityException, IOException { Server server = new Server(configuration); addEndPoint(server); @@ -166,7 +161,7 @@ class IdleTest extends BaseTest { private void streamSpecificType(final int largeDataSize, Configuration configuration, final ConnectionType type) - throws InitializationException, SecurityException, IOException, InterruptedException { + throws SecurityException, IOException { Server server = new Server(configuration); addEndPoint(server); server.setIdleTimeout(100); diff --git a/test/dorkbox/network/LargeResizeBufferTest.java b/test/dorkbox/network/LargeResizeBufferTest.java index e192473a..d3f57e8e 100644 --- a/test/dorkbox/network/LargeResizeBufferTest.java +++ b/test/dorkbox/network/LargeResizeBufferTest.java @@ -30,7 +30,6 @@ import org.junit.Test; import dorkbox.network.connection.Connection; import dorkbox.network.connection.Listener; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; import dorkbox.util.serialization.SerializationManager; @@ -44,7 +43,7 @@ class LargeResizeBufferTest extends BaseTest { @Test public - void manyLargeMessages() throws InitializationException, SecurityException, IOException, InterruptedException { + void manyLargeMessages() throws SecurityException, IOException { final int messageCount = 1024; Configuration configuration = new Configuration(); diff --git a/test/dorkbox/network/MultipleServerTest.java b/test/dorkbox/network/MultipleServerTest.java index ed23fdb7..c042d0c7 100644 --- a/test/dorkbox/network/MultipleServerTest.java +++ b/test/dorkbox/network/MultipleServerTest.java @@ -29,7 +29,6 @@ import org.junit.Test; import dorkbox.network.connection.Connection; import dorkbox.network.connection.Listener; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; public @@ -38,7 +37,7 @@ class MultipleServerTest extends BaseTest { @Test public - void multipleServers() throws InitializationException, SecurityException, IOException, InterruptedException { + void multipleServers() throws SecurityException, IOException { Configuration configuration1 = new Configuration(); configuration1.tcpPort = tcpPort; configuration1.udpPort = udpPort; diff --git a/test/dorkbox/network/MultipleThreadTest.java b/test/dorkbox/network/MultipleThreadTest.java index 176ddc27..c93fc252 100644 --- a/test/dorkbox/network/MultipleThreadTest.java +++ b/test/dorkbox/network/MultipleThreadTest.java @@ -34,7 +34,6 @@ import dorkbox.network.connection.Connection; import dorkbox.network.connection.Listener; import dorkbox.network.connection.Listeners; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; public @@ -57,7 +56,7 @@ class MultipleThreadTest extends BaseTest { @Test public - void multipleThreads() throws InitializationException, SecurityException, IOException, InterruptedException { + void multipleThreads() throws SecurityException, IOException { Configuration configuration = new Configuration(); configuration.tcpPort = tcpPort; configuration.host = host; diff --git a/test/dorkbox/network/PingPongLocalTest.java b/test/dorkbox/network/PingPongLocalTest.java index adac7f4f..23d87772 100644 --- a/test/dorkbox/network/PingPongLocalTest.java +++ b/test/dorkbox/network/PingPongLocalTest.java @@ -31,7 +31,6 @@ import dorkbox.network.connection.Connection; import dorkbox.network.connection.Listener; import dorkbox.network.connection.Listeners; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; import dorkbox.util.serialization.SerializationManager; @@ -41,7 +40,7 @@ class PingPongLocalTest extends BaseTest { private volatile String fail; @Test - public void pingPongLocal() throws InitializationException, SecurityException, IOException, InterruptedException { + public void pingPongLocal() throws SecurityException, IOException { this.fail = "Data not received."; final Data dataLOCAL = new Data(); diff --git a/test/dorkbox/network/PingPongTest.java b/test/dorkbox/network/PingPongTest.java index 6e20f840..71b249ed 100644 --- a/test/dorkbox/network/PingPongTest.java +++ b/test/dorkbox/network/PingPongTest.java @@ -33,7 +33,6 @@ import dorkbox.network.connection.EndPoint; import dorkbox.network.connection.Listener; import dorkbox.network.connection.Listeners; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; import dorkbox.util.serialization.SerializationManager; @@ -50,7 +49,7 @@ class PingPongTest extends BaseTest { @Test public - void pingPong() throws InitializationException, SecurityException, IOException, InterruptedException { + void pingPong() throws SecurityException, IOException { // UDP data is kinda big. Make sure it fits into one packet. int origSize = EndPoint.udpMaxSize; EndPoint.udpMaxSize = 2048; diff --git a/test/dorkbox/network/PingTest.java b/test/dorkbox/network/PingTest.java index 7887f9cc..84895daf 100644 --- a/test/dorkbox/network/PingTest.java +++ b/test/dorkbox/network/PingTest.java @@ -24,7 +24,6 @@ import org.junit.Test; import dorkbox.network.connection.Connection; import dorkbox.network.connection.Ping; import dorkbox.network.connection.PingListener; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; public @@ -35,7 +34,7 @@ class PingTest extends BaseTest { // ping prefers the following order: UDP, TCP @Test public - void pingTCP() throws InitializationException, SecurityException, IOException, InterruptedException { + void pingTCP() throws SecurityException, IOException { this.response = -1; Configuration configuration = new Configuration(); @@ -69,7 +68,7 @@ class PingTest extends BaseTest { @Test public - void pingTCP_testListeners1() throws InitializationException, SecurityException, IOException, InterruptedException { + void pingTCP_testListeners1() throws SecurityException, IOException { this.response = -1; Configuration configuration = new Configuration(); @@ -124,7 +123,7 @@ class PingTest extends BaseTest { @Test public - void pingTCP_testListeners2() throws InitializationException, SecurityException, IOException, InterruptedException { + void pingTCP_testListeners2() throws SecurityException, IOException { this.response = -1; Configuration configuration = new Configuration(); @@ -170,7 +169,7 @@ class PingTest extends BaseTest { // ping prefers the following order: UDP, TCP @Test public - void pingUDP() throws InitializationException, SecurityException, IOException, InterruptedException { + void pingUDP() throws SecurityException, IOException { this.response = -1; Configuration configuration = new Configuration(); diff --git a/test/dorkbox/network/ReconnectTest.java b/test/dorkbox/network/ReconnectTest.java index 97bad79b..02025f24 100644 --- a/test/dorkbox/network/ReconnectTest.java +++ b/test/dorkbox/network/ReconnectTest.java @@ -15,25 +15,25 @@ */ package dorkbox.network; -import dorkbox.network.connection.Connection; -import dorkbox.network.connection.Listener; -import dorkbox.util.exceptions.InitializationException; -import dorkbox.util.exceptions.SecurityException; -import org.junit.Test; +import static org.junit.Assert.assertEquals; import java.io.IOException; import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.atomic.AtomicInteger; -import static org.junit.Assert.assertEquals; +import org.junit.Test; + +import dorkbox.network.connection.Connection; +import dorkbox.network.connection.Listener; +import dorkbox.util.exceptions.SecurityException; public class ReconnectTest extends BaseTest { @Test public - void reconnect() throws InitializationException, SecurityException, IOException, InterruptedException { + void reconnect() throws SecurityException, IOException { final Timer timer = new Timer(); Configuration configuration = new Configuration(); diff --git a/test/dorkbox/network/UnregisteredClassTest.java b/test/dorkbox/network/UnregisteredClassTest.java index e75cdc6f..d52c184c 100644 --- a/test/dorkbox/network/UnregisteredClassTest.java +++ b/test/dorkbox/network/UnregisteredClassTest.java @@ -33,7 +33,6 @@ import dorkbox.network.connection.EndPoint; import dorkbox.network.connection.Listener; import dorkbox.network.connection.Listeners; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; public @@ -46,7 +45,7 @@ class UnregisteredClassTest extends BaseTest { @Test public - void unregisteredClasses() throws InitializationException, SecurityException, IOException, InterruptedException { + void unregisteredClasses() throws SecurityException, IOException { int origSize = EndPoint.udpMaxSize; EndPoint.udpMaxSize = 2048; diff --git a/test/dorkbox/network/rmi/RmiGlobalTest.java b/test/dorkbox/network/rmi/RmiGlobalTest.java index 9d4b6146..965f7f7d 100644 --- a/test/dorkbox/network/rmi/RmiGlobalTest.java +++ b/test/dorkbox/network/rmi/RmiGlobalTest.java @@ -34,9 +34,7 @@ */ package dorkbox.network.rmi; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.io.IOException; @@ -51,7 +49,6 @@ import dorkbox.network.connection.ConnectionImpl; import dorkbox.network.connection.EndPoint; import dorkbox.network.connection.Listener; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; public @@ -189,7 +186,7 @@ class RmiGlobalTest extends BaseTest { @Test public - void rmiNetwork() throws InitializationException, SecurityException, IOException, InterruptedException { + void rmiNetwork() throws SecurityException, IOException { rmi(new Config() { @Override public @@ -203,7 +200,7 @@ class RmiGlobalTest extends BaseTest { @Test public - void rmiLocal() throws InitializationException, SecurityException, IOException, InterruptedException { + void rmiLocal() throws SecurityException, IOException { rmi(new Config() { @Override public @@ -214,7 +211,7 @@ class RmiGlobalTest extends BaseTest { } public - void rmi(final Config config) throws InitializationException, SecurityException, IOException, InterruptedException { + void rmi(final Config config) throws SecurityException, IOException { Configuration configuration = new Configuration(); config.apply(configuration); diff --git a/test/dorkbox/network/rmi/RmiSendObjectOverrideMethodTest.java b/test/dorkbox/network/rmi/RmiSendObjectOverrideMethodTest.java index aeb8d7c9..3f12f843 100644 --- a/test/dorkbox/network/rmi/RmiSendObjectOverrideMethodTest.java +++ b/test/dorkbox/network/rmi/RmiSendObjectOverrideMethodTest.java @@ -31,7 +31,6 @@ import dorkbox.network.connection.Connection; import dorkbox.network.connection.EndPoint; import dorkbox.network.connection.Listener; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; @SuppressWarnings("Duplicates") @@ -40,7 +39,7 @@ class RmiSendObjectOverrideMethodTest extends BaseTest { @Test public - void rmiNetwork() throws InitializationException, SecurityException, IOException, InterruptedException { + void rmiNetwork() throws SecurityException, IOException { rmi(new Config() { @Override public @@ -53,7 +52,7 @@ class RmiSendObjectOverrideMethodTest extends BaseTest { @Test public - void rmiLocal() throws InitializationException, SecurityException, IOException, InterruptedException { + void rmiLocal() throws SecurityException, IOException { rmi(new Config() { @Override public @@ -87,7 +86,7 @@ class RmiSendObjectOverrideMethodTest extends BaseTest { * instead of the method that would NORMALLY be called. */ public - void rmi(final Config config) throws InitializationException, SecurityException, IOException, InterruptedException { + void rmi(final Config config) throws SecurityException, IOException { Configuration configuration = new Configuration(); config.apply(configuration); diff --git a/test/dorkbox/network/rmi/RmiSendObjectTest.java b/test/dorkbox/network/rmi/RmiSendObjectTest.java index b259a00a..59d0fbc2 100644 --- a/test/dorkbox/network/rmi/RmiSendObjectTest.java +++ b/test/dorkbox/network/rmi/RmiSendObjectTest.java @@ -50,7 +50,6 @@ import dorkbox.network.connection.Connection; import dorkbox.network.connection.EndPoint; import dorkbox.network.connection.Listener; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; @SuppressWarnings("Duplicates") @@ -59,7 +58,7 @@ class RmiSendObjectTest extends BaseTest { @Test public - void rmiNetwork() throws InitializationException, SecurityException, IOException, InterruptedException { + void rmiNetwork() throws SecurityException, IOException { rmi(new Config() { @Override public @@ -72,7 +71,7 @@ class RmiSendObjectTest extends BaseTest { @Test public - void rmiLocal() throws InitializationException, SecurityException, IOException, InterruptedException { + void rmiLocal() throws SecurityException, IOException { rmi(new Config() { @Override public @@ -87,7 +86,7 @@ class RmiSendObjectTest extends BaseTest { * uses the first remote object to get the second remote object. */ public - void rmi(final Config config) throws InitializationException, SecurityException, IOException, InterruptedException { + void rmi(final Config config) throws SecurityException, IOException { Configuration configuration = new Configuration(); config.apply(configuration); diff --git a/test/dorkbox/network/rmi/RmiTest.java b/test/dorkbox/network/rmi/RmiTest.java index 8d95f85d..a5ae1cb0 100644 --- a/test/dorkbox/network/rmi/RmiTest.java +++ b/test/dorkbox/network/rmi/RmiTest.java @@ -34,9 +34,7 @@ */ package dorkbox.network.rmi; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.io.IOException; @@ -51,7 +49,6 @@ import dorkbox.network.connection.EndPoint; import dorkbox.network.connection.Listener; import dorkbox.network.connection.Listeners; import dorkbox.network.serialization.Serialization; -import dorkbox.util.exceptions.InitializationException; import dorkbox.util.exceptions.SecurityException; public @@ -178,7 +175,7 @@ class RmiTest extends BaseTest { @Test public - void rmiNetwork() throws InitializationException, SecurityException, IOException, InterruptedException { + void rmiNetwork() throws SecurityException, IOException, InterruptedException { rmi(new Config() { @Override public @@ -197,7 +194,7 @@ class RmiTest extends BaseTest { @Test public - void rmiLocal() throws InitializationException, SecurityException, IOException, InterruptedException { + void rmiLocal() throws SecurityException, IOException, InterruptedException { rmi(new Config() { @Override public @@ -214,7 +211,7 @@ class RmiTest extends BaseTest { public - void rmi(final Config config) throws InitializationException, SecurityException, IOException, InterruptedException { + void rmi(final Config config) throws SecurityException, IOException { Configuration configuration = new Configuration(); config.apply(configuration);