dorkbox/Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
nathan 2020-09-01 14:37:43 +02:00
parent 36c805cc2f
commit 27be7d996a
12 changed files with 20 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/dorkboxTest/network/AeronServer.kt
View File

@ -24,7 +24,6 @@ import ch.qos.logback.core.ConsoleAppender
import dorkbox.network.Server import dorkbox.network.Server
import dorkbox.network.ServerConfiguration import dorkbox.network.ServerConfiguration
import dorkbox.network.connection.Connection import dorkbox.network.connection.Connection
import kotlinx.coroutines.runBlocking
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import sun.misc.Unsafe import sun.misc.Unsafe
import java.lang.reflect.Field import java.lang.reflect.Field
@ -107,14 +106,10 @@ object AeronServer {
} }
server.onMessage<String> { connection, message -> server.onMessage<String> { connection, message ->
runBlocking { connection.send("ECHO $message")
connection.send("ECHO $message")
}
} }
runBlocking { server.bind()
server.bind()
}
} }
init { init {

2
test/dorkboxTest/network/BaseTest.kt
View File

@ -84,8 +84,8 @@ abstract class BaseTest {
// rootLogger.setLevel(Level.OFF); // rootLogger.setLevel(Level.OFF);
// rootLogger.level = Level.INFO; // rootLogger.level = Level.INFO;
// rootLogger.level = Level.DEBUG
rootLogger.level = Level.TRACE; rootLogger.level = Level.TRACE;
// rootLogger.level = Level.DEBUG
// rootLogger.level = Level.ALL; // rootLogger.level = Level.ALL;

4
test/dorkboxTest/network/DisconnectReconnectTest.kt
View File

@ -20,9 +20,7 @@ class DisconnectReconnectTest : BaseTest() {
val server: Server<Connection> = Server(configuration) val server: Server<Connection> = Server(configuration)
addEndPoint(server) addEndPoint(server)
runBlocking { server.bind(false)
server.bind(false)
}
server.onConnect { connection -> server.onConnect { connection ->
connection.logger.error("Disconnecting after 2 seconds.") connection.logger.error("Disconnecting after 2 seconds.")

5
test/dorkboxTest/network/ListenerTest.kt
View File

@ -112,10 +112,7 @@ class ListenerTest : BaseTest() {
serverDisconnect.value = true serverDisconnect.value = true
} }
server.bind(false)
runBlocking {
server.bind(false)
}

4
test/dorkboxTest/network/MultipleServerTest.kt
View File

@ -83,9 +83,7 @@ class MultipleServerTest : BaseTest() {
} }
} }
runBlocking { server.bind(false)
server.bind(false)
}
serverAeronDir = File(configuration.aeronLogDirectory.toString() + count) serverAeronDir = File(configuration.aeronLogDirectory.toString() + count)
} }

6
test/dorkboxTest/network/PingPongTest.kt
View File

@ -64,10 +64,8 @@ class PingPongTest : BaseTest() {
val server: Server<Connection> = Server(configuration) val server: Server<Connection> = Server(configuration)
addEndPoint(server) addEndPoint(server)
runBlocking { server.bind(false)
server.bind(false)
}
server.onError { _, throwable -> server.onError { _, throwable ->
fail = "Error during processing. $throwable" fail = "Error during processing. $throwable"
} }

10
test/dorkboxTest/network/SerializationValidationTest.kt
View File

@ -36,10 +36,7 @@ class SerializationValidationTest : BaseTest() {
server.onMessage<FinishedCommand> { connection, message -> server.onMessage<FinishedCommand> { connection, message ->
stopEndPoints() stopEndPoints()
} }
server.bind(false)
runBlocking {
server.bind(false)
}
} }
@ -77,10 +74,7 @@ class SerializationValidationTest : BaseTest() {
server.onMessage<TestObject> { connection, message -> server.onMessage<TestObject> { connection, message ->
stopEndPoints() stopEndPoints()
} }
server.bind(false)
runBlocking {
server.bind(false)
}
} }

9
test/dorkboxTest/network/rmi/RmiDelayedInvocationSpamTest.kt
View File

@ -77,10 +77,7 @@ class RmiDelayedInvocationSpamTest : BaseTest() {
addEndPoint(server) addEndPoint(server)
server.saveGlobalObject(TestObjectImpl(counter), RMI_ID) server.saveGlobalObject(TestObjectImpl(counter), RMI_ID)
server.bind(false)
runBlocking {
server.bind(false)
}
} }
@ -123,9 +120,7 @@ class RmiDelayedInvocationSpamTest : BaseTest() {
stopEndPoints() stopEndPoints()
} }
runBlocking { client.connect()
client.connect()
}
} }
waitForThreads(200) waitForThreads(200)

9
test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt
View File

@ -67,10 +67,7 @@ class RmiDelayedInvocationTest : BaseTest() {
addEndPoint(server) addEndPoint(server)
server.saveGlobalObject(TestObjectImpl(iterateLock), OBJ_ID) server.saveGlobalObject(TestObjectImpl(iterateLock), OBJ_ID)
server.bind(false)
runBlocking {
server.bind(false)
}
} }
run { run {
@ -113,9 +110,7 @@ class RmiDelayedInvocationTest : BaseTest() {
stopEndPoints() stopEndPoints()
} }
runBlocking { client.connect(LOOPBACK)
client.connect(LOOPBACK)
}
} }
waitForThreads(9999999) waitForThreads(9999999)

12
test/dorkboxTest/network/rmi/RmiNestedTest.kt
View File

@ -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)
}
} }

9
test/dorkboxTest/network/rmi/RmiSimpleTest.kt
View File

@ -80,9 +80,7 @@ class RmiSimpleTest : BaseTest() {
val server = Server<Connection>(configuration) val server = Server<Connection>(configuration)
addEndPoint(server) addEndPoint(server)
runBlocking { server.bind(false)
server.bind(false)
}
server.onMessage<MessageWithTestCow> { connection, m -> server.onMessage<MessageWithTestCow> { connection, m ->
System.err.println("Received finish signal for test for: Client -> Server") System.err.println("Received finish signal for test for: Client -> Server")
@ -148,10 +146,7 @@ class RmiSimpleTest : BaseTest() {
val server = Server<Connection>(configuration) val server = Server<Connection>(configuration)
addEndPoint(server) addEndPoint(server)
server.bind(false)
runBlocking {
server.bind(false)
}
server.onMessage<MessageWithTestCow> { connection, m -> server.onMessage<MessageWithTestCow> { connection, m ->
System.err.println("Received finish signal for test for: Client -> Server") System.err.println("Received finish signal for test for: Client -> Server")

5
test/dorkboxTest/network/rmi/multiJVM/TestServer.kt
View File

@ -24,7 +24,6 @@ import dorkboxTest.network.rmi.cows.TestBabyCow
import dorkboxTest.network.rmi.cows.TestCow import dorkboxTest.network.rmi.cows.TestCow
import dorkboxTest.network.rmi.cows.TestCowImpl import dorkboxTest.network.rmi.cows.TestCowImpl
import dorkboxTest.network.rmi.multiJVM.TestClient.setup import dorkboxTest.network.rmi.multiJVM.TestClient.setup
import kotlinx.coroutines.runBlocking
import org.junit.Assert import org.junit.Assert
/** /**
@ -81,8 +80,6 @@ object TestServer {
// } // }
} }
runBlocking { server.bind(false)
server.bind(false)
}
} }
} }