From 29f71f425fc2743cca3c4129b93f984f075dcb9c Mon Sep 17 00:00:00 2001 From: Robinson Date: Tue, 15 Mar 2022 12:44:52 +0100 Subject: [PATCH] Changed loopback -> localhost (loopback is invalid on macos) --- test/dorkboxTest/network/BaseTest.kt | 6 ++--- .../network/ConnectionFilterTest.kt | 22 +++++++++---------- .../network/DisconnectReconnectTest.kt | 22 +++++++++---------- test/dorkboxTest/network/ErrorLoggerTest.kt | 2 +- test/dorkboxTest/network/ListenerTest.kt | 2 +- .../dorkboxTest/network/MultipleServerTest.kt | 7 +++--- test/dorkboxTest/network/PingPongTest.kt | 4 ++-- test/dorkboxTest/network/PingTest.kt | 4 ++-- .../network/SerializationValidationTest.kt | 6 ++--- test/dorkboxTest/network/StorageTest.kt | 2 +- .../network/rmi/RmiDelayedInvocationTest.kt | 4 ++-- test/dorkboxTest/network/rmi/RmiNestedTest.kt | 10 ++++----- .../network/rmi/RmiSpamAsyncTest.kt | 4 ++-- .../network/rmi/multiJVM/TestClient.kt | 2 +- 14 files changed, 47 insertions(+), 50 deletions(-) diff --git a/test/dorkboxTest/network/BaseTest.kt b/test/dorkboxTest/network/BaseTest.kt index d144a70c..59ebcf09 100644 --- a/test/dorkboxTest/network/BaseTest.kt +++ b/test/dorkboxTest/network/BaseTest.kt @@ -58,9 +58,7 @@ import org.slf4j.LoggerFactory import java.lang.Thread.sleep import java.lang.reflect.Field import java.lang.reflect.Method -import java.util.concurrent.CopyOnWriteArrayList -import java.util.concurrent.CountDownLatch -import java.util.concurrent.TimeUnit +import java.util.concurrent.* abstract class BaseTest { @Volatile @@ -70,7 +68,7 @@ abstract class BaseTest { private var autoFailThread: Thread? = null companion object { - const val LOOPBACK = "loopback" + const val LOCALHOST = "localhost" fun clientConfig(block: Configuration.() -> Unit = {}): Configuration { val configuration = Configuration() diff --git a/test/dorkboxTest/network/ConnectionFilterTest.kt b/test/dorkboxTest/network/ConnectionFilterTest.kt index b624f202..501ee83b 100644 --- a/test/dorkboxTest/network/ConnectionFilterTest.kt +++ b/test/dorkboxTest/network/ConnectionFilterTest.kt @@ -45,7 +45,7 @@ class ConnectionFilterTest : BaseTest() { } try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: Exception) { stopEndPoints() throw e @@ -94,7 +94,7 @@ class ConnectionFilterTest : BaseTest() { } try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: Exception) { stopEndPoints() throw e @@ -142,7 +142,7 @@ class ConnectionFilterTest : BaseTest() { } try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: Exception) { stopEndPoints() throw e @@ -191,7 +191,7 @@ class ConnectionFilterTest : BaseTest() { } try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: Exception) { stopEndPoints() throw e @@ -232,7 +232,7 @@ class ConnectionFilterTest : BaseTest() { } try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: Exception) { e.printStackTrace() stopEndPoints() @@ -281,7 +281,7 @@ class ConnectionFilterTest : BaseTest() { } try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: Exception) { e.printStackTrace() stopEndPoints() @@ -321,7 +321,7 @@ class ConnectionFilterTest : BaseTest() { } try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: Exception) { stopEndPoints() throw e @@ -367,7 +367,7 @@ class ConnectionFilterTest : BaseTest() { } try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: Exception) { stopEndPoints() throw e @@ -419,7 +419,7 @@ class ConnectionFilterTest : BaseTest() { } try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: Exception) { stopEndPoints() throw e @@ -462,7 +462,7 @@ class ConnectionFilterTest : BaseTest() { } try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: Exception) { stopEndPoints() throw e @@ -500,7 +500,7 @@ class ConnectionFilterTest : BaseTest() { } try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: Exception) { stopEndPoints() throw e diff --git a/test/dorkboxTest/network/DisconnectReconnectTest.kt b/test/dorkboxTest/network/DisconnectReconnectTest.kt index d96210b8..4ec4d6f0 100644 --- a/test/dorkboxTest/network/DisconnectReconnectTest.kt +++ b/test/dorkboxTest/network/DisconnectReconnectTest.kt @@ -49,14 +49,14 @@ class DisconnectReconnectTest : BaseTest() { else { logger.error("Reconnecting: $count") try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: IOException) { e.printStackTrace() } } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } @@ -105,14 +105,14 @@ class DisconnectReconnectTest : BaseTest() { else { logger.error("Reconnecting: $count") try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: IOException) { e.printStackTrace() } } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } @@ -183,14 +183,14 @@ class DisconnectReconnectTest : BaseTest() { else { logger.error("Reconnecting: $count") try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: IOException) { e.printStackTrace() } } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } @@ -239,14 +239,14 @@ class DisconnectReconnectTest : BaseTest() { else { logger.error("Reconnecting: $count") try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: IOException) { e.printStackTrace() } } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } @@ -296,14 +296,14 @@ class DisconnectReconnectTest : BaseTest() { else { logger.error("Reconnecting: $count") try { - client.connect(LOOPBACK) + client.connect(LOCALHOST) } catch (e: IOException) { e.printStackTrace() } } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } @@ -347,7 +347,7 @@ class DisconnectReconnectTest : BaseTest() { stopEndPoints() } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } server.close() diff --git a/test/dorkboxTest/network/ErrorLoggerTest.kt b/test/dorkboxTest/network/ErrorLoggerTest.kt index f21072a5..10b28684 100644 --- a/test/dorkboxTest/network/ErrorLoggerTest.kt +++ b/test/dorkboxTest/network/ErrorLoggerTest.kt @@ -71,7 +71,7 @@ class ErrorLoggerTest : BaseTest() { stopEndPoints() } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() diff --git a/test/dorkboxTest/network/ListenerTest.kt b/test/dorkboxTest/network/ListenerTest.kt index d81829fa..aec5991b 100644 --- a/test/dorkboxTest/network/ListenerTest.kt +++ b/test/dorkboxTest/network/ListenerTest.kt @@ -151,7 +151,7 @@ class ListenerTest : BaseTest() { } - client.connect(LOOPBACK) + client.connect(LOCALHOST) waitForThreads() diff --git a/test/dorkboxTest/network/MultipleServerTest.kt b/test/dorkboxTest/network/MultipleServerTest.kt index ef528b40..21576d2f 100644 --- a/test/dorkboxTest/network/MultipleServerTest.kt +++ b/test/dorkboxTest/network/MultipleServerTest.kt @@ -43,8 +43,7 @@ import org.junit.Assert.assertTrue import org.junit.Test import java.io.File import java.io.IOException -import java.util.concurrent.atomic.AtomicBoolean -import java.util.concurrent.atomic.AtomicInteger +import java.util.concurrent.atomic.* class MultipleServerTest : BaseTest() { val total = 5 @@ -113,7 +112,7 @@ class MultipleServerTest : BaseTest() { send("client_$count") } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() @@ -188,7 +187,7 @@ class MultipleServerTest : BaseTest() { send("client_$count") } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() diff --git a/test/dorkboxTest/network/PingPongTest.kt b/test/dorkboxTest/network/PingPongTest.kt index dc06233c..14491304 100644 --- a/test/dorkboxTest/network/PingPongTest.kt +++ b/test/dorkboxTest/network/PingPongTest.kt @@ -40,7 +40,7 @@ import dorkbox.network.connection.Connection import dorkbox.network.serialization.Serialization import org.junit.Assert import org.junit.Test -import java.util.concurrent.atomic.AtomicInteger +import java.util.concurrent.atomic.* class PingPongTest : BaseTest() { @Volatile @@ -108,7 +108,7 @@ class PingPongTest : BaseTest() { } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } diff --git a/test/dorkboxTest/network/PingTest.kt b/test/dorkboxTest/network/PingTest.kt index 196f9761..10288ac1 100644 --- a/test/dorkboxTest/network/PingTest.kt +++ b/test/dorkboxTest/network/PingTest.kt @@ -49,7 +49,7 @@ class PingTest : BaseTest() { } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() @@ -106,7 +106,7 @@ class PingTest : BaseTest() { send(ping) } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() diff --git a/test/dorkboxTest/network/SerializationValidationTest.kt b/test/dorkboxTest/network/SerializationValidationTest.kt index a910f00a..6391bf7a 100644 --- a/test/dorkboxTest/network/SerializationValidationTest.kt +++ b/test/dorkboxTest/network/SerializationValidationTest.kt @@ -50,7 +50,7 @@ class SerializationValidationTest : BaseTest() { send(FinishedCommand()) } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() @@ -112,7 +112,7 @@ class SerializationValidationTest : BaseTest() { } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() @@ -158,7 +158,7 @@ class SerializationValidationTest : BaseTest() { } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() diff --git a/test/dorkboxTest/network/StorageTest.kt b/test/dorkboxTest/network/StorageTest.kt index 15d4bd7e..e64e0565 100644 --- a/test/dorkboxTest/network/StorageTest.kt +++ b/test/dorkboxTest/network/StorageTest.kt @@ -42,7 +42,7 @@ class StorageTest : BaseTest() { } val client = Client(config) - client.connect(LOOPBACK) + client.connect(LOCALHOST) Assert.assertTrue(server.storage.getSalt().contentEquals(client.storage.getSalt())) diff --git a/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt b/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt index cf055ad9..628506de 100644 --- a/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt +++ b/test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt @@ -23,7 +23,7 @@ import dorkbox.network.serialization.Serialization import dorkboxTest.network.BaseTest import kotlinx.coroutines.runBlocking import org.junit.Test -import java.util.concurrent.atomic.AtomicInteger +import java.util.concurrent.atomic.* class RmiDelayedInvocationTest : BaseTest() { private val iterateLock = Any() @@ -104,7 +104,7 @@ class RmiDelayedInvocationTest : BaseTest() { stopEndPoints() } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() diff --git a/test/dorkboxTest/network/rmi/RmiNestedTest.kt b/test/dorkboxTest/network/rmi/RmiNestedTest.kt index 27523476..5ad64075 100644 --- a/test/dorkboxTest/network/rmi/RmiNestedTest.kt +++ b/test/dorkboxTest/network/rmi/RmiNestedTest.kt @@ -21,7 +21,7 @@ import dorkbox.network.connection.Connection import dorkboxTest.network.BaseTest import org.junit.Assert import org.junit.Test -import java.util.concurrent.atomic.AtomicInteger +import java.util.concurrent.atomic.* @@ -116,7 +116,7 @@ class RmiNestedTest : BaseTest() { } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() } @@ -181,7 +181,7 @@ class RmiNestedTest : BaseTest() { } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() } @@ -240,7 +240,7 @@ class RmiNestedTest : BaseTest() { } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() } @@ -300,7 +300,7 @@ class RmiNestedTest : BaseTest() { } } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() } diff --git a/test/dorkboxTest/network/rmi/RmiSpamAsyncTest.kt b/test/dorkboxTest/network/rmi/RmiSpamAsyncTest.kt index ebf6b7f4..055cd737 100644 --- a/test/dorkboxTest/network/rmi/RmiSpamAsyncTest.kt +++ b/test/dorkboxTest/network/rmi/RmiSpamAsyncTest.kt @@ -24,7 +24,7 @@ import dorkbox.network.rmi.RemoteObject import dorkboxTest.network.BaseTest import org.junit.Assert import org.junit.Test -import java.util.concurrent.atomic.AtomicLong +import java.util.concurrent.atomic.* class RmiSpamAsyncTest : BaseTest() { private val counter = AtomicLong(0) @@ -112,7 +112,7 @@ class RmiSpamAsyncTest : BaseTest() { stopEndPoints() } - client.connect(LOOPBACK) + client.connect(LOCALHOST) } waitForThreads() diff --git a/test/dorkboxTest/network/rmi/multiJVM/TestClient.kt b/test/dorkboxTest/network/rmi/multiJVM/TestClient.kt index 539ba22e..ba3d0a8c 100644 --- a/test/dorkboxTest/network/rmi/multiJVM/TestClient.kt +++ b/test/dorkboxTest/network/rmi/multiJVM/TestClient.kt @@ -102,7 +102,7 @@ object TestClient { close() } - client.connect(BaseTest.LOOPBACK) + client.connect(BaseTest.LOCALHOST) runBlocking { client.waitForClose()