diff --git a/test/dorkboxTest/network/AeronServer.kt b/test/dorkboxTest/network/AeronServer.kt index 29c6b812..c99b5bfb 100644 --- a/test/dorkboxTest/network/AeronServer.kt +++ b/test/dorkboxTest/network/AeronServer.kt @@ -24,7 +24,6 @@ import ch.qos.logback.core.ConsoleAppender import dorkbox.network.Server import dorkbox.network.ServerConfiguration import dorkbox.network.connection.Connection -import kotlinx.coroutines.runBlocking import org.slf4j.LoggerFactory import sun.misc.Unsafe import java.lang.reflect.Field @@ -107,14 +106,10 @@ object AeronServer { } server.onMessage { connection, message -> - runBlocking { - connection.send("ECHO $message") - } + connection.send("ECHO $message") } - runBlocking { - server.bind() - } + server.bind() } init { diff --git a/test/dorkboxTest/network/BaseTest.kt b/test/dorkboxTest/network/BaseTest.kt index a893d41e..452fed4d 100644 --- a/test/dorkboxTest/network/BaseTest.kt +++ b/test/dorkboxTest/network/BaseTest.kt @@ -84,8 +84,8 @@ abstract class BaseTest { // rootLogger.setLevel(Level.OFF); // rootLogger.level = Level.INFO; -// rootLogger.level = Level.DEBUG rootLogger.level = Level.TRACE; +// rootLogger.level = Level.DEBUG // rootLogger.level = Level.ALL; diff --git a/test/dorkboxTest/network/DisconnectReconnectTest.kt b/test/dorkboxTest/network/DisconnectReconnectTest.kt index d3cbfa64..1aa157e0 100644 --- a/test/dorkboxTest/network/DisconnectReconnectTest.kt +++ b/test/dorkboxTest/network/DisconnectReconnectTest.kt @@ -20,9 +20,7 @@ class DisconnectReconnectTest : BaseTest() { val server: Server = Server(configuration) addEndPoint(server) - runBlocking { - server.bind(false) - } + server.bind(false) server.onConnect { connection -> connection.logger.error("Disconnecting after 2 seconds.") diff --git a/test/dorkboxTest/network/ListenerTest.kt b/test/dorkboxTest/network/ListenerTest.kt index 1d7dd650..bb01727a 100644 --- a/test/dorkboxTest/network/ListenerTest.kt +++ b/test/dorkboxTest/network/ListenerTest.kt @@ -112,10 +112,7 @@ class ListenerTest : BaseTest() { serverDisconnect.value = true } - - runBlocking { - server.bind(false) - } + server.bind(false) diff --git a/test/dorkboxTest/network/MultipleServerTest.kt b/test/dorkboxTest/network/MultipleServerTest.kt index f39f5cd7..f4dfa304 100644 --- a/test/dorkboxTest/network/MultipleServerTest.kt +++ b/test/dorkboxTest/network/MultipleServerTest.kt @@ -83,9 +83,7 @@ class MultipleServerTest : BaseTest() { } } - runBlocking { - server.bind(false) - } + server.bind(false) serverAeronDir = File(configuration.aeronLogDirectory.toString() + count) } diff --git a/test/dorkboxTest/network/PingPongTest.kt b/test/dorkboxTest/network/PingPongTest.kt index 559df696..4716016d 100644 --- a/test/dorkboxTest/network/PingPongTest.kt +++ b/test/dorkboxTest/network/PingPongTest.kt @@ -64,10 +64,8 @@ class PingPongTest : BaseTest() { val server: Server = Server(configuration) addEndPoint(server) - runBlocking { - server.bind(false) - } - + server.bind(false) + server.onError { _, throwable -> fail = "Error during processing. $throwable" } diff --git a/test/dorkboxTest/network/SerializationValidationTest.kt b/test/dorkboxTest/network/SerializationValidationTest.kt index 7a5b1bdc..e56227f3 100644 --- a/test/dorkboxTest/network/SerializationValidationTest.kt +++ b/test/dorkboxTest/network/SerializationValidationTest.kt @@ -36,10 +36,7 @@ class SerializationValidationTest : BaseTest() { server.onMessage { connection, message -> stopEndPoints() } - - runBlocking { - server.bind(false) - } + server.bind(false) } @@ -77,10 +74,7 @@ class SerializationValidationTest : BaseTest() { server.onMessage { connection, message -> stopEndPoints() } - - runBlocking { - server.bind(false) - } + server.bind(false) } diff --git a/test/dorkboxTest/network/rmi/RmiDelayedInvocationSpamTest.kt b/test/dorkboxTest/network/rmi/RmiDelayedInvocationSpamTest.kt index 70f378fa..e9191406 100644 --- a/test/dorkboxTest/network/rmi/RmiDelayedInvocationSpamTest.kt +++ b/test/dorkboxTest/network/rmi/RmiDelayedInvocationSpamTest.kt @@ -77,10 +77,7 @@ class RmiDelayedInvocationSpamTest : BaseTest() { addEndPoint(server) server.saveGlobalObject(TestObjectImpl(counter), RMI_ID) - - runBlocking { - server.bind(false) - } + server.bind(false) } @@ -123,9 +120,7 @@ class RmiDelayedInvocationSpamTest : BaseTest() { stopEndPoints() } - runBlocking { - client.connect() - } + client.connect() } waitForThreads(200) diff --git a/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt b/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt index 6c3734a3..e8c3c0a3 100644 --- a/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt +++ b/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt @@ -67,10 +67,7 @@ class RmiDelayedInvocationTest : BaseTest() { addEndPoint(server) server.saveGlobalObject(TestObjectImpl(iterateLock), OBJ_ID) - - runBlocking { - server.bind(false) - } + server.bind(false) } run { @@ -113,9 +110,7 @@ class RmiDelayedInvocationTest : BaseTest() { stopEndPoints() } - runBlocking { - client.connect(LOOPBACK) - } + client.connect(LOOPBACK) } waitForThreads(9999999) diff --git a/test/dorkboxTest/network/rmi/RmiNestedTest.kt b/test/dorkboxTest/network/rmi/RmiNestedTest.kt index 1187870f..2797348a 100644 --- a/test/dorkboxTest/network/rmi/RmiNestedTest.kt +++ b/test/dorkboxTest/network/rmi/RmiNestedTest.kt @@ -93,9 +93,7 @@ class RmiNestedTest : BaseTest() { } } - runBlocking { - server.bind(false) - } + server.bind(false) } @@ -165,9 +163,7 @@ class RmiNestedTest : BaseTest() { } } - runBlocking { - server.bind(false) - } + server.bind(false) } @@ -236,9 +232,7 @@ class RmiNestedTest : BaseTest() { } } - runBlocking { - server.bind(false) - } + server.bind(false) } diff --git a/test/dorkboxTest/network/rmi/RmiSimpleTest.kt b/test/dorkboxTest/network/rmi/RmiSimpleTest.kt index db4e1cf6..5fef4000 100644 --- a/test/dorkboxTest/network/rmi/RmiSimpleTest.kt +++ b/test/dorkboxTest/network/rmi/RmiSimpleTest.kt @@ -80,9 +80,7 @@ class RmiSimpleTest : BaseTest() { val server = Server(configuration) addEndPoint(server) - runBlocking { - server.bind(false) - } + server.bind(false) server.onMessage { connection, m -> System.err.println("Received finish signal for test for: Client -> Server") @@ -148,10 +146,7 @@ class RmiSimpleTest : BaseTest() { val server = Server(configuration) addEndPoint(server) - - runBlocking { - server.bind(false) - } + server.bind(false) server.onMessage { connection, m -> System.err.println("Received finish signal for test for: Client -> Server") diff --git a/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt b/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt index 1f1c52df..1c20be81 100644 --- a/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt +++ b/test/dorkboxTest/network/rmi/multiJVM/TestServer.kt @@ -24,7 +24,6 @@ import dorkboxTest.network.rmi.cows.TestBabyCow import dorkboxTest.network.rmi.cows.TestCow import dorkboxTest.network.rmi.cows.TestCowImpl import dorkboxTest.network.rmi.multiJVM.TestClient.setup -import kotlinx.coroutines.runBlocking import org.junit.Assert /** @@ -81,8 +80,6 @@ object TestServer { // } } - runBlocking { - server.bind(false) - } + server.bind(false) } }