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 e77a42c700f267b5c5d19809cd5c64cb038d3e6b..180c9e307c06737b4854edad36f919e89ab3c43a 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 08de3201d0593736ff52d89e93ca469a50fe6d53..7d7f5009f6f6e3041c05897d201a901bf0b88da0 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() } }