Skip to content
Snippets Groups Projects
Commit a0fcd475 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Minor improvements for unit tests

parent 1fc86078
No related branches found
No related tags found
No related merge requests found
...@@ -161,4 +161,7 @@ class Session( ...@@ -161,4 +161,7 @@ class Session(
super.cleanUp() super.cleanUp()
} }
fun connection(): ICoreConnection?
= connection.value
} }
...@@ -6,11 +6,9 @@ import de.kuschku.libquassel.protocol.Quassel_Feature ...@@ -6,11 +6,9 @@ import de.kuschku.libquassel.protocol.Quassel_Feature
import de.kuschku.libquassel.protocol.UShort import de.kuschku.libquassel.protocol.UShort
import de.kuschku.libquassel.quassel.ProtocolFeature import de.kuschku.libquassel.quassel.ProtocolFeature
import de.kuschku.libquassel.quassel.QuasselFeature import de.kuschku.libquassel.quassel.QuasselFeature
import de.kuschku.libquassel.session.CoreConnection
import de.kuschku.libquassel.session.Session import de.kuschku.libquassel.session.Session
import de.kuschku.libquassel.session.SocketAddress import de.kuschku.libquassel.session.SocketAddress
import de.kuschku.libquassel.util.compatibility.reference.JavaHandlerService import de.kuschku.libquassel.util.compatibility.reference.JavaHandlerService
import de.kuschku.libquassel.util.compatibility.reference.JavaLoggingHandler
import org.junit.BeforeClass import org.junit.BeforeClass
import org.junit.Test import org.junit.Test
import org.threeten.bp.Instant import org.threeten.bp.Instant
...@@ -23,9 +21,8 @@ class ConnectionUnitTest { ...@@ -23,9 +21,8 @@ class ConnectionUnitTest {
@JvmStatic @JvmStatic
@BeforeClass @BeforeClass
fun before() { fun before() {
JavaLoggingHandler.init() LogManager.getLogManager()
LogManager.getLogManager().readConfiguration( .readConfiguration(this::class.java.getResourceAsStream("/logging.properties"))
this::class.java.getResourceAsStream("/logging.properties"))
} }
} }
...@@ -52,10 +49,7 @@ class ConnectionUnitTest { ...@@ -52,10 +49,7 @@ class ConnectionUnitTest {
}) })
session.userData = user to pass session.userData = user to pass
session.connection.onNext( session.connect(SocketAddress(host, port), JavaHandlerService())
CoreConnection(session, SocketAddress(host, port), session.connection()?.join()
JavaHandlerService()))
session.connection.value.start()
session.connection.value.join()
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment