From a0fcd47554c56ecaf417a3f27d97437f9e78c5ce Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 26 Sep 2017 02:22:17 +0200
Subject: [PATCH] Minor improvements for unit tests
---
.../java/de/kuschku/libquassel/session/Session.kt | 3 +++
.../de/kuschku/libquassel/ConnectionUnitTest.kt | 14 ++++----------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/Session.kt b/lib/src/main/java/de/kuschku/libquassel/session/Session.kt
index e77a42c70..180c9e307 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/Session.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/Session.kt
@@ -161,4 +161,7 @@ class Session(
super.cleanUp()
}
+
+ fun connection(): ICoreConnection?
+ = connection.value
}
diff --git a/lib/src/test/java/de/kuschku/libquassel/ConnectionUnitTest.kt b/lib/src/test/java/de/kuschku/libquassel/ConnectionUnitTest.kt
index 08de3201d..7d7f5009f 100644
--- a/lib/src/test/java/de/kuschku/libquassel/ConnectionUnitTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/ConnectionUnitTest.kt
@@ -6,11 +6,9 @@ import de.kuschku.libquassel.protocol.Quassel_Feature
import de.kuschku.libquassel.protocol.UShort
import de.kuschku.libquassel.quassel.ProtocolFeature
import de.kuschku.libquassel.quassel.QuasselFeature
-import de.kuschku.libquassel.session.CoreConnection
import de.kuschku.libquassel.session.Session
import de.kuschku.libquassel.session.SocketAddress
import de.kuschku.libquassel.util.compatibility.reference.JavaHandlerService
-import de.kuschku.libquassel.util.compatibility.reference.JavaLoggingHandler
import org.junit.BeforeClass
import org.junit.Test
import org.threeten.bp.Instant
@@ -23,9 +21,8 @@ class ConnectionUnitTest {
@JvmStatic
@BeforeClass
fun before() {
- JavaLoggingHandler.init()
- LogManager.getLogManager().readConfiguration(
- this::class.java.getResourceAsStream("/logging.properties"))
+ LogManager.getLogManager()
+ .readConfiguration(this::class.java.getResourceAsStream("/logging.properties"))
}
}
@@ -52,10 +49,7 @@ class ConnectionUnitTest {
})
session.userData = user to pass
- session.connection.onNext(
- CoreConnection(session, SocketAddress(host, port),
- JavaHandlerService()))
- session.connection.value.start()
- session.connection.value.join()
+ session.connect(SocketAddress(host, port), JavaHandlerService())
+ session.connection()?.join()
}
}
--
GitLab