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

Fixed unit tests

Browse Source
This commit is contained in:
nathan 2020-09-03 14:34:50 +02:00
parent aa3540a8bb
commit 931b1c4fa1
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ class RmiSimpleTest : BaseTest() {
} }
@Test @Test
fun rmiIPcNetworkConnection() { fun rmiIpcNetworkConnection() {
rmi() rmi()
} }
@ -76,7 +76,10 @@ class RmiSimpleTest : BaseTest() {
run { run {
val configuration = serverConfig() val configuration = serverConfig()
config(configuration) config(configuration)
RmiCommonTest.register(configuration.serialization) configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
configuration.serialization.register(MessageWithTestCow::class.java)
configuration.serialization.register(UnsupportedOperationException::class.java)
val server = Server<Connection>(configuration) val server = Server<Connection>(configuration)
addEndPoint(server) addEndPoint(server)
@ -91,6 +94,7 @@ class RmiSimpleTest : BaseTest() {
System.err.println("Starting test for: Server -> Client") System.err.println("Starting test for: Server -> Client")
// NOTE: THIS IS BI-DIRECTIONAL!
connection.createObject<TestCow>(123) { rmiId, remoteObject -> connection.createObject<TestCow>(123) { rmiId, remoteObject ->
System.err.println("Running test for: Server -> Client") System.err.println("Running test for: Server -> Client")
RmiCommonTest.runTests(connection, remoteObject, 123) RmiCommonTest.runTests(connection, remoteObject, 123)
@ -102,6 +106,8 @@ class RmiSimpleTest : BaseTest() {
run { run {
val configuration = clientConfig() val configuration = clientConfig()
config(configuration) config(configuration)
// configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
val client = Client<Connection>(configuration) val client = Client<Connection>(configuration)
addEndPoint(client) addEndPoint(client)
@ -128,14 +134,16 @@ class RmiSimpleTest : BaseTest() {
} }
} }
waitForThreads(99999999) waitForThreads()
} }
fun rmiGlobal(config: (Configuration) -> Unit = {}) { fun rmiGlobal(config: (Configuration) -> Unit = {}) {
run { run {
val configuration = serverConfig() val configuration = serverConfig()
config(configuration) config(configuration)
RmiCommonTest.register(configuration.serialization) configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
configuration.serialization.register(MessageWithTestCow::class.java)
configuration.serialization.register(UnsupportedOperationException::class.java)
// for Client -> Server RMI // for Client -> Server RMI
configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java) configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
@ -166,6 +174,7 @@ class RmiSimpleTest : BaseTest() {
run { run {
val configuration = clientConfig() val configuration = clientConfig()
config(configuration) config(configuration)
// configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
val client = Client<Connection>(configuration) val client = Client<Connection>(configuration)
addEndPoint(client) addEndPoint(client)

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

@ -18,7 +18,6 @@ package dorkboxTest.network.rmi.multiJVM
import dorkbox.network.Server import dorkbox.network.Server
import dorkbox.network.connection.Connection import dorkbox.network.connection.Connection
import dorkboxTest.network.BaseTest import dorkboxTest.network.BaseTest
import dorkboxTest.network.rmi.RmiCommonTest
import dorkboxTest.network.rmi.cows.MessageWithTestCow import dorkboxTest.network.rmi.cows.MessageWithTestCow
import dorkboxTest.network.rmi.cows.TestBabyCowImpl import dorkboxTest.network.rmi.cows.TestBabyCowImpl
import dorkboxTest.network.rmi.cows.TestCow import dorkboxTest.network.rmi.cows.TestCow
@ -36,7 +35,10 @@ object TestServer {
val configuration = BaseTest.serverConfig() val configuration = BaseTest.serverConfig()
RmiCommonTest.register(configuration.serialization) configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
configuration.serialization.register(MessageWithTestCow::class.java)
configuration.serialization.register(UnsupportedOperationException::class.java)
configuration.serialization.register(TestBabyCowImpl::class.java) configuration.serialization.register(TestBabyCowImpl::class.java)
configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java) configuration.serialization.registerRmi(TestCow::class.java, TestCowImpl::class.java)
configuration.enableRemoteSignatureValidation = false configuration.enableRemoteSignatureValidation = false