Initial import, various supporting classes.

.gitignore

@@ -0,0 +1,7 @@
+# IDEA files
+/.idea
+/*.iml
+
+# Gradle intermediates
+/.gradle
+/out

build.gradle.kts

@@ -0,0 +1,51 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    kotlin("jvm") version "1.3.0-rc-80"
+}
+
+repositories {
+    jcenter()
+    mavenCentral()
+    maven("http://dl.bintray.com/kotlin/kotlin-eap")
+    maven("https://dl.bintray.com/kotlin/ktor")
+}
+
+dependencies {
+    implementation(kotlin("stdlib-jdk8"))
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.0-eap13")
+    implementation("io.ktor:ktor-network:0.9.6-alpha-1-rc13")
+
+    testCompile("org.junit.jupiter:junit-jupiter-api:5.3.1")
+    testCompile("org.junit.jupiter:junit-jupiter-params:5.3.1")
+    testRuntime("org.junit.jupiter:junit-jupiter-engine:5.3.1")
+    testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.0.0-RC3")
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+tasks.withType<KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+    testLogging {
+        events("passed", "skipped", "failed")
+    }
+    systemProperty("junit.jupiter.execution.parallel.enabled", "true")
+    systemProperty("junit.jupiter.execution.parallel.config.dynamic.factor", "5")
+}
+
+configurations.all {
+    resolutionStrategy.eachDependency {
+        if (requested.group == "org.jetbrains.kotlin") {
+            useVersion("1.3.0-rc-80")
+        }
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle.kts

@@ -0,0 +1,6 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven("http://dl.bintray.com/kotlin/kotlin-eap")
+    }
+}

src/main/kotlin/com/dmdirc/ktirc/io/CaseMapping.kt

@@ -0,0 +1,26 @@
+package com.dmdirc.ktirc.io
+
+enum class CaseMapping(private val lowerToUpperMapping: Pair<IntRange, IntRange>) {
+
+    Ascii(97..122 to 65..90),
+    Rfc(97..126 to 65..94),
+    RfcStrict(97..125 to 65..93);
+
+    companion object {
+        fun fromName(name: String) = when(name.toLowerCase()) {
+            "ascii" -> Ascii
+            "rfc1459" -> Rfc
+            "rfc1459-strict" -> RfcStrict
+            else -> Rfc
+        }
+    }
+
+    fun areEquivalent(string1: String, string2: String): Boolean {
+        return string1.length == string2.length
+                && string1.zip(string2).all { (c1, c2) -> areEquivalent(c1, c2) }
+    }
+
+    private fun areEquivalent(char1: Char, char2: Char) = char1 == char2 || char1.toUpper() == char2.toUpper()
+    private fun Char.toUpper() = this + if (this.toInt() in lowerToUpperMapping.first) lowerToUpperMapping.second.start - lowerToUpperMapping.first.start else 0
+
+}

src/main/kotlin/com/dmdirc/ktirc/io/LineBufferedSocket.kt

@@ -0,0 +1,91 @@
+package com.dmdirc.ktirc.io
+
+import io.ktor.network.selector.ActorSelectorManager
+import io.ktor.network.sockets.Socket
+import io.ktor.network.sockets.aSocket
+import io.ktor.network.sockets.openReadChannel
+import io.ktor.network.sockets.openWriteChannel
+import io.ktor.network.util.ioCoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.ReceiveChannel
+import kotlinx.coroutines.channels.produce
+import kotlinx.coroutines.io.ByteReadChannel
+import kotlinx.coroutines.io.ByteWriteChannel
+import java.net.InetSocketAddress
+
+interface LineBufferedSocket {
+
+    // TODO: This is a bit pants.
+    var debugReceiver: ((String) -> Unit)?
+
+    suspend fun connect()
+    fun disconnect()
+
+    suspend fun sendLine(line: ByteArray, offset: Int = 0, length: Int = line.size)
+    suspend fun sendLine(line: String)
+
+    fun readLines(coroutineScope: CoroutineScope): ReceiveChannel<ByteArray>
+
+}
+
+/**
+ * Asynchronous socket that buffers incoming data and emits individual lines.
+ */
+// TODO: TLS options
+class KtorLineBufferedSocket(private val host: String, private val port: Int): LineBufferedSocket {
+
+    companion object {
+        const val CARRIAGE_RETURN = '\r'.toByte()
+        const val LINE_FEED = '\n'.toByte()
+    }
+
+    // TODO: This is a bit pants.
+    override var debugReceiver: ((String) -> Unit)? = null
+
+    private lateinit var socket: Socket
+    private lateinit var readChannel: ByteReadChannel
+    private lateinit var writeChannel: ByteWriteChannel
+
+    override suspend fun connect() {
+        socket = aSocket(ActorSelectorManager(ioCoroutineDispatcher)).tcp().connect(InetSocketAddress(host, port))
+        readChannel = socket.openReadChannel()
+        writeChannel = socket.openWriteChannel()
+    }
+
+    override fun disconnect() {
+        socket.close()
+    }
+
+    override suspend fun sendLine(line: ByteArray, offset: Int, length: Int) {
+        with (writeChannel) {
+            debugReceiver?.let { it(">>> ${String(line, offset, length)}") }
+            writeAvailable(line, offset, length)
+            writeByte(CARRIAGE_RETURN)
+            writeByte(LINE_FEED)
+            flush()
+        }
+    }
+
+    override suspend fun sendLine(line: String) = sendLine(line.toByteArray())
+
+    override fun readLines(coroutineScope: CoroutineScope) = coroutineScope.produce {
+        val lineBuffer = ByteArray(4096)
+        var index = 0
+        while (!readChannel.isClosedForRead) {
+            var start = index
+            val count = readChannel.readAvailable(lineBuffer, index, lineBuffer.size - index)
+            for (i in index until index + count) {
+                if (lineBuffer[i] == CARRIAGE_RETURN || lineBuffer[i] == LINE_FEED) {
+                    if (start < i) {
+                        val line = lineBuffer.sliceArray(start until i)
+                        debugReceiver?.let { it("<<< ${String(line)}") }
+                        send(line)
+                    }
+                    start = i + 1
+                }
+            }
+            lineBuffer.copyInto(lineBuffer, 0, start)
+            index = count + index - start
+        }
+    }
+}

src/main/kotlin/com/dmdirc/ktirc/io/MessageParser.kt

@@ -0,0 +1,121 @@
+package com.dmdirc.ktirc.io
+
+/**
+ * Parses a message received from an IRC server.
+ *
+ * IRC messages consist of:
+ *
+ * - Optionally, IRCv3 message tags. Identified with an '@' character
+ * - Optionally, a prefix, identified with an ':' character
+ * - A command in the form of a consecutive sequence of letters or exactly three numbers
+ * - Some number of space-separated parameters
+ * - Optionally, a final 'trailing' parameter prefixed with a ':' character
+ *
+ * For example:
+ *
+ * @aaa=bbb;ccc;example.com/ddd=eee :nick!ident@host.com PRIVMSG #someChannel :This is a test message
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^ ^^^^^^^ ^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^
+ * IRCv3 tags                       Prefix               Cmd     Param #1     Trailing parameter
+ *
+ * or:
+ *
+ * PING 12345678
+ * ^^^^ ^^^^^^^^
+ * Cmd  Param #1
+ */
+class MessageParser {
+
+    companion object {
+        private const val AT = '@'.toByte()
+        private const val COLON = ':'.toByte()
+    }
+
+    fun parse(message: ByteArray) = CursorByteArray(message).run {
+        IrcMessage(takeTags(), takePrefix(), String(takeWord()), takeParams().toList())
+    }
+
+    /**
+     * Attempts to read IRCv3 tags from the message.
+     */
+    private fun CursorByteArray.takeTags() = takeOptionalPrefixedSection(AT)
+
+    /**
+     * Attempts to read a prefix from the message.
+     */
+    private fun CursorByteArray.takePrefix() = takeOptionalPrefixedSection(COLON)
+
+    /**
+     * Read a single parameter from the message. If the parameter is a trailing one, the entire message will be
+     * consumed.
+     */
+    private fun CursorByteArray.takeParam() = when (peek()) {
+        COLON -> takeRemaining(skip = 1)
+        else -> takeWord()
+    }
+
+    /**
+     * Reads all remaining parameters from the message.
+     */
+    private fun CursorByteArray.takeParams() = sequence {
+        while (!exhausted()) {
+            yield(takeParam())
+        }
+    }
+
+    private fun CursorByteArray.takeOptionalPrefixedSection(prefix: Byte) = when {
+        exhausted() -> null
+        peek() == prefix -> takeWord(skip = 1)
+        else -> null
+    }
+
+}
+
+class IrcMessage(val tags: ByteArray?, val prefix: ByteArray?, val command: String, val params: List<ByteArray>)
+
+/**
+ * A ByteArray with a 'cursor' that tracks the current read position.
+ */
+internal class CursorByteArray(private val data: ByteArray, var cursor: Int = 0) {
+
+    companion object {
+        private const val SPACE = ' '.toByte()
+    }
+
+    /**
+     * Returns whether or not the cursor has reached the end of the array.
+     */
+    fun exhausted() = cursor >= data.size
+
+    /**
+     * Returns the next byte in the array without advancing the cursor.
+     *
+     * @throws ArrayIndexOutOfBoundsException If the array is [exhausted].
+     */
+    @Throws(ArrayIndexOutOfBoundsException::class)
+    fun peek() = data[cursor]
+
+    /**
+     * Returns the next "word" in the byte array - that is, all non-space characters up until the next space.
+     *
+     * After calling this method, the cursor will be advanced to the start of the next word (i.e., it will skip over
+     * any number of space characters).
+     *
+     * @param skip Number of bytes to omit from the start of the word
+     */
+    fun takeWord(skip: Int = 0) = data.sliceArray(cursor + skip until seekTo { it == SPACE }).apply { seekTo { it != SPACE } }
+
+    /**
+     * Takes all remaining bytes from the cursor until the end of the array.
+     *
+     * @param skip Number of bytes to omit from the start of the remainder
+     */
+    fun takeRemaining(skip: Int = 0) = data.sliceArray(cursor + skip until data.size).apply { cursor = data.size }
+
+    private fun seekTo(matcher: (Byte) -> Boolean): Int {
+        while (!exhausted() && !matcher(peek())) {
+            cursor++
+        }
+        return cursor
+    }
+
+}

src/main/kotlin/com/dmdirc/ktirc/messages/ISupportProcessor.kt

@@ -0,0 +1,51 @@
+package com.dmdirc.ktirc.messages
+
+import com.dmdirc.ktirc.io.CaseMapping
+import com.dmdirc.ktirc.io.IrcMessage
+import com.dmdirc.ktirc.state.ServerFeature
+import com.dmdirc.ktirc.state.ServerState
+import com.dmdirc.ktirc.state.serverFeatures
+import kotlin.reflect.KClass
+
+class ISupportProcessor(val serverState: ServerState) : MessageProcessor {
+
+    override val commands = arrayOf("005")
+
+    override fun process(message: IrcMessage) {
+        // Ignore the first (nickname) and last ("are supported by this server") params
+        for (i in 1 until message.params.size - 1) {
+            parseParam(message.params[i])
+        }
+    }
+
+    private fun parseParam(param: ByteArray) = when (param[0]) {
+        '-'.toByte() -> resetFeature(param.sliceArray(1 until param.size))
+        else -> when (val equals = param.indexOf('='.toByte())) {
+            -1 -> enableFeatureWithDefault(param)
+            else -> enableFeature(param.sliceArray(0 until equals), param.sliceArray(equals + 1 until param.size))
+        }
+    }
+
+    private fun resetFeature(name: ByteArray) = name.asFeature()?.let { serverState.resetFeature(it) }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun enableFeature(name: ByteArray, value: ByteArray) {
+        name.asFeature()?.let { feature ->
+            serverState.setFeature(feature, value.cast(feature.type))
+        }
+    }
+
+    private fun enableFeatureWithDefault(name: ByteArray) {
+        TODO("not implemented")
+    }
+
+    private fun ByteArray.asFeature() = serverFeatures[String(this)]
+
+    private fun ByteArray.cast(to: KClass<out Any>): Any = when (to) {
+        Int::class -> String(this).toInt()
+        String::class -> String(this)
+        CaseMapping::class -> CaseMapping.fromName(String(this))
+        else -> TODO("not implemented")
+    }
+
+}

src/main/kotlin/com/dmdirc/ktirc/messages/MessageBuilders.kt

@@ -0,0 +1,7 @@
+package com.dmdirc.ktirc.messages
+
+fun joinMessage(channel: String) = "JOIN :$channel"
+fun nickMessage(nick: String) = "NICK :$nick"
+fun passwordMessage(password: String) = "PASS :$password"
+fun pongMessage(nonce: ByteArray) = "PONG :${String(nonce)}"
+fun userMessage(userName: String, localHostName: String, serverHostName: String, realName: String) = "USER $userName $localHostName $serverHostName :$realName"

src/main/kotlin/com/dmdirc/ktirc/messages/MessageProcessor.kt

@@ -0,0 +1,17 @@
+package com.dmdirc.ktirc.messages
+
+import com.dmdirc.ktirc.io.IrcMessage
+
+interface MessageProcessor {
+
+    /**
+     * The messages which this handler can process.
+     */
+    val commands: Array<String>
+
+    /**
+     * Processes the given message.
+     */
+    fun process(message: IrcMessage)
+
+}

src/main/kotlin/com/dmdirc/ktirc/model/Profile.kt

@@ -0,0 +1,3 @@
+package com.dmdirc.ktirc.model
+
+data class Profile(val initialNick: String, val realName: String, val userName: String)

src/main/kotlin/com/dmdirc/ktirc/model/Server.kt

@@ -0,0 +1,3 @@
+package com.dmdirc.ktirc.model
+
+data class Server(val host: String, val port: Int, val ssl: Boolean = false, val password: String? = null)

src/main/kotlin/com/dmdirc/ktirc/state/ServerState.kt

@@ -0,0 +1,44 @@
+package com.dmdirc.ktirc.state
+
+import com.dmdirc.ktirc.io.CaseMapping
+import kotlin.reflect.KClass
+
+interface ServerState {
+
+    var localNickname: String
+
+    fun <T : Any> getFeature(feature: ServerFeature<T>): T?
+    fun setFeature(feature: ServerFeature<*>, value: Any)
+    fun resetFeature(feature: ServerFeature<*>): Any?
+
+}
+
+class IrcServerState(initialNickname: String) : ServerState {
+
+    override var localNickname: String = initialNickname
+
+    private val features = HashMap<ServerFeature<*>, Any>()
+
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : Any> getFeature(feature: ServerFeature<T>) = features.getOrDefault(feature, feature.default) as? T?
+
+    override fun setFeature(feature: ServerFeature<*>, value: Any) {
+        require(feature.type.isInstance(value))
+        features[feature] = value
+    }
+
+    override fun resetFeature(feature: ServerFeature<*>) = features.remove(feature)
+
+}
+
+
+sealed class ServerFeature<T : Any>(val name: String, val type: KClass<T>, val default: T? = null) {
+    object ServerCaseMapping : ServerFeature<CaseMapping>("CASEMAPPING", CaseMapping::class, CaseMapping.Rfc)
+    object MaximumChannels : ServerFeature<Int>("CHANLIMIT", Int::class)
+    object ChannelModes : ServerFeature<String>("CHANMODES", String::class)
+    object MaximumChannelNameLength : ServerFeature<Int>("CHANNELLEN", Int::class, 200)
+}
+
+val serverFeatures: Map<String, ServerFeature<*>> by lazy {
+    ServerFeature::class.nestedClasses.map { it.objectInstance as ServerFeature<*> }.associateBy { it.name }
+}

src/test/kotlin/com/dmdirc/ktirc/IrcClientTest.kt

@@ -0,0 +1,100 @@
+package com.dmdirc.ktirc
+
+import com.dmdirc.ktirc.io.KtorLineBufferedSocket
+import com.dmdirc.ktirc.io.LineBufferedSocket
+import com.dmdirc.ktirc.model.Profile
+import com.dmdirc.ktirc.model.Server
+import com.nhaarman.mockitokotlin2.*
+import kotlinx.coroutines.channels.ArrayChannel
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.ReceiveChannel
+import kotlinx.coroutines.runBlocking
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
+import java.lang.IllegalStateException
+
+internal class IrcClientTest {
+
+    companion object {
+        private const val HOST = "thegibson.com"
+        private const val PORT = 12345
+        private const val NICK = "AcidBurn"
+        private const val REAL_NAME = "Kate Libby"
+        private const val USER_NAME = "acidb"
+        private const val PASSWORD = "HackThePlanet"
+    }
+
+    private val readLineChannel = Channel<ByteArray>(10)
+
+    private val mockSocket = mock<LineBufferedSocket> {
+        on { readLines(any()) } doReturn readLineChannel
+    }
+
+    private val mockSocketFactory = mock<(String, Int) -> LineBufferedSocket> {
+        on { invoke(HOST, PORT) } doReturn mockSocket
+    }
+
+    @Test
+    fun `IrcClient uses socket factory to create a new socket on connect`() {
+        runBlocking {
+            val client = IrcClient(Server(HOST, PORT), Profile(NICK, REAL_NAME, USER_NAME))
+            client.socketFactory = mockSocketFactory
+            readLineChannel.close()
+
+            client.connect()
+
+            verify(mockSocketFactory).invoke(HOST, PORT)
+        }
+    }
+
+    @Test
+    fun `IrcClient throws if socket already exists`() {
+        runBlocking {
+            val client = IrcClient(Server(HOST, PORT), Profile(NICK, REAL_NAME, USER_NAME))
+            client.socketFactory = mockSocketFactory
+            readLineChannel.close()
+
+            client.connect()
+
+            assertThrows<IllegalStateException> {
+                runBlocking {
+                    client.connect()
+                }
+            }
+        }
+    }
+
+    @Test
+    fun `IrcClient sends basic connection strings`() {
+        runBlocking {
+            val client = IrcClient(Server(HOST, PORT), Profile(NICK, REAL_NAME, USER_NAME))
+            client.socketFactory = mockSocketFactory
+            readLineChannel.close()
+
+            client.connect()
+
+            with(inOrder(mockSocket).verify(mockSocket)) {
+                sendLine("NICK :$NICK")
+                sendLine("USER $USER_NAME localhost $HOST :$REAL_NAME")
+            }
+        }
+    }
+
+    @Test
+    fun `IrcClient sends password first, when present`() {
+        runBlocking {
+            val client = IrcClient(Server(HOST, PORT, password = PASSWORD), Profile(NICK, REAL_NAME, USER_NAME))
+            client.socketFactory = mockSocketFactory
+            readLineChannel.close()
+
+            client.connect()
+
+            with(inOrder(mockSocket).verify(mockSocket)) {
+                sendLine("PASS :$PASSWORD")
+                sendLine("NICK :$NICK")
+            }
+        }
+    }
+
+}

src/test/kotlin/com/dmdirc/ktirc/io/CaseMappingTest.kt

@@ -0,0 +1,68 @@
+package com.dmdirc.ktirc.io
+
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
+
+internal class CaseMappingTest {
+
+    @Test
+    fun `Equal unicode strings are equivalent regardless of case mapping`() {
+        val unicode = "\uD83D\uDC69\u200D\uD83C\uDF73 \uD83D\uDC68\u200D\uD83C\uDF73 \uD83D\uDC69\u200D\uD83C\uDF93 \uD83D\uDC68\u200D\uD83C\uDF93"
+        assertTrue(CaseMapping.Ascii.areEquivalent(unicode, unicode))
+        assertTrue(CaseMapping.Rfc.areEquivalent(unicode, unicode))
+        assertTrue(CaseMapping.RfcStrict.areEquivalent(unicode, unicode))
+    }
+
+    @Test
+    fun `Different length strings are always not equivalent`() {
+        val left = "abc"
+        val right = "ABC "
+        assertFalse(CaseMapping.Ascii.areEquivalent(left, right))
+        assertFalse(CaseMapping.Rfc.areEquivalent(left, right))
+        assertFalse(CaseMapping.RfcStrict.areEquivalent(left, right))
+    }
+
+    @Test
+    fun `ASCII characters are equivalent for all mappings`() {
+        val left = "the Quick Brown fox Jumps over the lazy dog"
+        val right = "THE qUICK bROWN fox jUMPS OVER THE LAZY DOG"
+        assertTrue(CaseMapping.Ascii.areEquivalent(left, right))
+        assertTrue(CaseMapping.Rfc.areEquivalent(left, right))
+        assertTrue(CaseMapping.RfcStrict.areEquivalent(left, right))
+    }
+
+    @Test
+    fun `RFC characters are equivalent for RFC mappings not ASCII`() {
+        val left = "[Hello\\There}"
+        val right = "{Hello|There]"
+        assertFalse(CaseMapping.Ascii.areEquivalent(left, right))
+        assertTrue(CaseMapping.Rfc.areEquivalent(left, right))
+        assertTrue(CaseMapping.RfcStrict.areEquivalent(left, right))
+    }
+
+    @Test
+    fun `Tilde and caret are equivalent only for RFC mapping`() {
+        val left = "~~^~~"
+        val right = "~^^^^"
+        assertFalse(CaseMapping.Ascii.areEquivalent(left, right))
+        assertTrue(CaseMapping.Rfc.areEquivalent(left, right))
+        assertFalse(CaseMapping.RfcStrict.areEquivalent(left, right))
+    }
+
+    @Test
+    fun `FromName returns matching mapping`() {
+        assertEquals(CaseMapping.Ascii, CaseMapping.fromName("ascii"))
+        assertEquals(CaseMapping.Ascii, CaseMapping.fromName("Ascii"))
+        assertEquals(CaseMapping.Rfc, CaseMapping.fromName("rfc1459"))
+        assertEquals(CaseMapping.Rfc, CaseMapping.fromName("RFC1459"))
+        assertEquals(CaseMapping.RfcStrict, CaseMapping.fromName("rfc1459-strict"))
+        assertEquals(CaseMapping.RfcStrict, CaseMapping.fromName("Rfc1459-Strict"))
+    }
+
+    @Test
+    fun `FromName falls back to RFC`() {
+        assertEquals(CaseMapping.Rfc, CaseMapping.fromName(""))
+        assertEquals(CaseMapping.Rfc, CaseMapping.fromName("foo"))
+    }
+
+}

src/test/kotlin/com/dmdirc/ktirc/io/KtorLineBufferedSocketTest.kt

@@ -0,0 +1,215 @@
+package com.dmdirc.ktirc.io
+
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode
+import java.net.ServerSocket
+
+@Execution(ExecutionMode.SAME_THREAD)
+internal class KtorLineBufferedSocketTest {
+
+    @Test
+    fun `KtorLineBufferedSocket can connect to a server`() = runBlocking {
+        ServerSocket(12321).use { serverSocket ->
+            val socket = KtorLineBufferedSocket("localhost", 12321)
+            val clientSocketAsync = GlobalScope.async { serverSocket.accept() }
+
+            socket.connect()
+
+            assertNotNull(clientSocketAsync.await())
+        }
+    }
+
+    @Test
+    fun `KtorLineBufferedSocket can send a whole byte array to a server`() = runBlocking {
+        ServerSocket(12321).use { serverSocket ->
+            val socket = KtorLineBufferedSocket("localhost", 12321)
+            val clientBytesAsync = GlobalScope.async {
+                ByteArray(13).apply {
+                    serverSocket.accept().getInputStream().read(this)
+                }
+            }
+
+            socket.connect()
+            socket.sendLine("Hello World".toByteArray())
+
+            val bytes = clientBytesAsync.await()
+            assertNotNull(bytes)
+            assertEquals("Hello World\r\n", String(bytes))
+        }
+    }
+
+    @Test
+    fun `KtorLineBufferedSocket can send a string to a server`() = runBlocking {
+        ServerSocket(12321).use { serverSocket ->
+            val socket = KtorLineBufferedSocket("localhost", 12321)
+            val clientBytesAsync = GlobalScope.async {
+                ByteArray(13).apply {
+                    serverSocket.accept().getInputStream().read(this)
+                }
+            }
+
+            socket.connect()
+            socket.sendLine("Hello World")
+
+            val bytes = clientBytesAsync.await()
+            assertNotNull(bytes)
+            assertEquals("Hello World\r\n", String(bytes))
+        }
+    }
+
+    @Test
+    fun `KtorLineBufferedSocket can send a partial byte array to a server`() = runBlocking {
+        ServerSocket(12321).use { serverSocket ->
+            val socket = KtorLineBufferedSocket("localhost", 12321)
+            val clientBytesAsync = GlobalScope.async {
+                ByteArray(7).apply {
+                    serverSocket.accept().getInputStream().read(this)
+                }
+            }
+
+            socket.connect()
+            socket.sendLine("Hello World".toByteArray(), 6, 5)
+
+            val bytes = clientBytesAsync.await()
+            assertNotNull(bytes)
+            assertEquals("World\r\n", String(bytes))
+        }
+    }
+
+    @Test
+    fun `KtorLineBufferedSocket can receive a line of CRLF delimited text`() = runBlocking {
+        ServerSocket(12321).use { serverSocket ->
+            val socket = KtorLineBufferedSocket("localhost", 12321)
+            GlobalScope.launch {
+                serverSocket.accept().getOutputStream().write("Hi there\r\n".toByteArray())
+            }
+
+            socket.connect()
+            assertEquals("Hi there", String(socket.readLines(GlobalScope).receive()))
+        }
+    }
+
+    @Test
+    fun `KtorLineBufferedSocket can receive a line of LF delimited text`() = runBlocking {
+        ServerSocket(12321).use { serverSocket ->
+            val socket = KtorLineBufferedSocket("localhost", 12321)
+            GlobalScope.launch {
+                serverSocket.accept().getOutputStream().write("Hi there\n".toByteArray())
+            }
+
+            socket.connect()
+            assertEquals("Hi there", String(socket.readLines(GlobalScope).receive()))
+        }
+    }
+
+    @Test
+    fun `KtorLineBufferedSocket can receive multiple lines of text in one packet`() = runBlocking {
+        ServerSocket(12321).use { serverSocket ->
+            val socket = KtorLineBufferedSocket("localhost", 12321)
+            GlobalScope.launch {
+                serverSocket.accept().getOutputStream().write("Hi there\nThis is a test\r".toByteArray())
+            }
+
+            socket.connect()
+            val lineProducer = socket.readLines(GlobalScope)
+            assertEquals("Hi there", String(lineProducer.receive()))
+            assertEquals("This is a test", String(lineProducer.receive()))
+        }
+    }
+
+    @Test
+    fun `KtorLineBufferedSocket can receive one line of text over multiple packets`() = runBlocking {
+        ServerSocket(12321).use { serverSocket ->
+            val socket = KtorLineBufferedSocket("localhost", 12321)
+            GlobalScope.launch {
+                with(serverSocket.accept().getOutputStream()) {
+                    write("Hi".toByteArray())
+                    flush()
+                    write(" t".toByteArray())
+                    flush()
+                    write("here\r\n".toByteArray())
+                    flush()
+                }
+            }
+
+            socket.connect()
+            val lineProducer = socket.readLines(GlobalScope)
+            assertEquals("Hi there", String(lineProducer.receive()))
+        }
+    }
+
+    @Test
+    fun `KtorLineBufferedSocket returns from readLines when socket is closed`() = runBlocking {
+        ServerSocket(12321).use { serverSocket ->
+            val socket = KtorLineBufferedSocket("localhost", 12321)
+            GlobalScope.launch {
+                with(serverSocket.accept()) {
+                    getOutputStream().write("Hi there\r\n".toByteArray())
+                    close()
+                }
+            }
+
+            socket.connect()
+            val lineProducer = socket.readLines(GlobalScope)
+            assertEquals("Hi there", String(lineProducer.receive()))
+        }
+    }
+
+    @Test
+    fun `KtorLineBufferedSocket disconnects from server`() = runBlocking {
+        ServerSocket(12321).use { serverSocket ->
+            val socket = KtorLineBufferedSocket("localhost", 12321)
+            val clientSocketAsync = GlobalScope.async { serverSocket.accept() }
+
+            socket.connect()
+            socket.disconnect()
+
+            assertEquals(-1, clientSocketAsync.await().getInputStream().read()) { "Server socket should EOF after KtorLineBufferedSocket disconnects" }
+        }
+    }
+
+    @Test
+    fun `KtorLineBufferedSocket reports sent lines to debug receiver`() = runBlocking {
+        ServerSocket(12321).use { serverSocket ->
+            val socket = KtorLineBufferedSocket("localhost", 12321)
+            GlobalScope.launch {
+                serverSocket.accept()
+            }
+
+            var received = ""
+            socket.debugReceiver = { str -> received = str }
+            socket.connect()
+            socket.sendLine("Test 123")
+
+            assertEquals(">>> Test 123", received)
+        }
+    }
+
+    @Test
+    fun `KtorLineBufferedSocket reports received lines to debug receiver`() = runBlocking {
+        ServerSocket(12321).use { serverSocket ->
+            val socket = KtorLineBufferedSocket("localhost", 12321)
+            GlobalScope.launch {
+                with(serverSocket.accept()) {
+                    getOutputStream().write("Hi there\r\n".toByteArray())
+                    close()
+                }
+            }
+
+            var received = ""
+            socket.debugReceiver = { str -> received = str }
+            socket.connect()
+            socket.readLines(this).receive()
+
+            assertEquals("<<< Hi there", received)
+        }
+    }
+
+}

src/test/kotlin/com/dmdirc/ktirc/io/MessageParserTest.kt

@@ -0,0 +1,105 @@
+package com.dmdirc.ktirc.io
+
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.Arguments
+import org.junit.jupiter.params.provider.Arguments.arguments
+import org.junit.jupiter.params.provider.MethodSource
+import java.util.stream.Stream
+
+
+internal class MessageParserTest {
+
+    companion object {
+        @JvmStatic
+        @Suppress("unused")
+        fun ircMessageArgumentsProvider(): Stream<Arguments> = Stream.of(
+                arguments("test", null, null, "test", emptyList<String>()),
+                arguments("test 1 2", null, null, "test", listOf("1", "2")),
+                arguments("test    1     2     ", null, null, "test", listOf("1", "2")),
+                arguments("test :1 2", null, null, "test", listOf("1 2")),
+                arguments("test :1 2    ", null, null, "test", listOf("1 2    ")),
+                arguments("123 :1 2    ", null, null, "123", listOf("1 2    ")),
+                arguments(":test abc 1 2    ", null, "test", "abc", listOf("1", "2")),
+                arguments("@tags :test abc 1 2 :three four", "tags", "test", "abc", listOf("1", "2", "three four")),
+                arguments("@tags abc 1 2 : three four ", "tags", null, "abc", listOf("1", "2", " three four "))
+        )
+    }
+
+    @ParameterizedTest
+    @MethodSource("ircMessageArgumentsProvider")
+    fun `Parses IRC messages`(input: String, tags: String?, prefix: String?, command: String, params: List<String>) {
+        val parsed = MessageParser().parse(input.toByteArray())
+
+        assertEquals(tags, parsed.tags?.let { String(it) }) { "Expected '$input' to have tags '$tags'" }
+        assertEquals(prefix, parsed.prefix?.let { String(it) }) { "Expected '$input' to have prefix '$prefix'" }
+        assertEquals(command, parsed.command) { "Expected '$input' to have command '$command'" }
+        assertEquals(params, parsed.params.map { String(it) }) { "Expected '$input' to have params '$params'" }
+    }
+
+}
+
+internal class CursorByteArrayTest {
+
+    @Test
+    fun `Peek returns next byte without advancing cursor`() {
+        val cursorByteArray = CursorByteArray(byteArrayOf(0x08, 0x09, 0x10))
+        assertEquals(0x08, cursorByteArray.peek()) { "Peek should return the byte at the start" }
+        assertEquals(0x08, cursorByteArray.peek()) { "Peek shouldn't advance the cursor" }
+
+        cursorByteArray.cursor = 2
+        assertEquals(0x10, cursorByteArray.peek()) { "Peek should return the byte at the current cursor" }
+
+        cursorByteArray.cursor = 3
+        assertThrows(ArrayIndexOutOfBoundsException::class.java, { cursorByteArray.peek() }) { "Peek should throw if cursor is out of bounds" }
+    }
+
+    @Test
+    fun `Exhausted returns true when no more bytes available`() {
+        val cursorByteArray = CursorByteArray(byteArrayOf(0x08, 0x09, 0x10))
+        assertFalse(cursorByteArray.exhausted()) { "Exhausted should be false with a new array" }
+
+        cursorByteArray.cursor = 1
+        assertFalse(cursorByteArray.exhausted()) { "Exhausted should be false with an in-bound cursor" }
+
+        cursorByteArray.cursor = 2
+        assertFalse(cursorByteArray.exhausted()) { "Exhausted should be false at the last element" }
+
+        cursorByteArray.cursor = 3
+        assertTrue(cursorByteArray.exhausted()) { "Exhausted should be true when past the last element" }
+
+        assertTrue(CursorByteArray(byteArrayOf()).exhausted()) { "Exhausted should be true on an empty array" }
+    }
+
+    @Test
+    fun `TakeWord reads next word and advances cursor beyond trailing whitespace`() {
+        val cursorByteArray = CursorByteArray("Hello this    is a    test".toByteArray())
+
+        assertEquals("Hello", String(cursorByteArray.takeWord())) { "TakeWord should read first word" }
+        assertEquals(6, cursorByteArray.cursor) { "TakeWord should advance cursor to next word" }
+
+        assertEquals("this", String(cursorByteArray.takeWord())) { "TakeWord should read word at cursor" }
+        assertEquals(14, cursorByteArray.cursor) { "TakeWord should advance cursor past trailing whitespace" }
+
+        assertEquals("s", String(cursorByteArray.takeWord(1))) { "TakeWord should skip given number of bytes" }
+
+        cursorByteArray.cursor = 22
+        assertEquals("test", String(cursorByteArray.takeWord())) { "TakeWord should read word at end" }
+        assertEquals(26, cursorByteArray.cursor) { "TakeWord should advance cursor past last word" }
+    }
+
+    @Test
+    fun `TakeRemaining takes all remaining bytes and advances the cursor to exhaustion`() {
+        var cursorByteArray = CursorByteArray("Test1234".toByteArray(), 4)
+        assertEquals("1234", String(cursorByteArray.takeRemaining())) { "TakeRemaining should return remaining bytes" }
+        assertEquals(8, cursorByteArray.cursor) { "TakeRemaining should advance cursor to end of array" }
+
+        cursorByteArray = CursorByteArray("Test1234".toByteArray(), 0)
+        assertEquals("est1234", String(cursorByteArray.takeRemaining(1))) { "TakeRemaining should skip specified number of bytes" }
+        assertEquals(8, cursorByteArray.cursor) { "TakeRemaining should advance cursor to end of array when skipping" }
+    }
+
+    private fun byteArrayOf(vararg bytes: Byte) = ByteArray(bytes.size) { i -> bytes[i] }
+
+}

src/test/kotlin/com/dmdirc/ktirc/messages/ISupportProcessorTest.kt

@@ -0,0 +1,55 @@
+package com.dmdirc.ktirc.messages
+
+import com.dmdirc.ktirc.io.CaseMapping
+import com.dmdirc.ktirc.io.IrcMessage
+import com.dmdirc.ktirc.state.ServerFeature
+import com.dmdirc.ktirc.state.ServerState
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
+
+internal class ISupportProcessorTest {
+
+    private val state = mock<ServerState>()
+    private val processor = ISupportProcessor(state)
+
+    @Test
+    fun `ISupportProcessor can handle 005s`() {
+        assertTrue(processor.commands.contains("005")) { "ISupportProcessor should handle 005 messages" }
+    }
+
+    @Test
+    fun `ISupportProcessor handles multiple numeric arguments`() {
+        processor.process(IrcMessage(null, "server.com".toByteArray(), "005",
+                listOf("nickname", "CHANLIMIT=123", "CHANNELLEN=456", "are supported blah blah").map { it.toByteArray() }))
+
+        verify(state).setFeature(ServerFeature.MaximumChannels, 123)
+        verify(state).setFeature(ServerFeature.MaximumChannelNameLength, 456)
+    }
+
+    @Test
+    fun `ISupportProcessor handles string arguments`() {
+        processor.process(IrcMessage(null, "server.com".toByteArray(), "005",
+                listOf("nickname", "CHANMODES=abcd", "are supported blah blah").map { it.toByteArray() }))
+
+        verify(state).setFeature(ServerFeature.ChannelModes, "abcd")
+    }
+
+    @Test
+    fun `ISupportProcessor handles resetting arguments`() {
+        processor.process(IrcMessage(null, "server.com".toByteArray(), "005",
+                listOf("nickname", "-CHANMODES", "are supported blah blah").map { it.toByteArray() }))
+
+        verify(state).resetFeature(ServerFeature.ChannelModes)
+    }
+
+    @Test
+    fun `ISupportProcessor handles case mapping arguments`() {
+        processor.process(IrcMessage(null, "server.com".toByteArray(), "005",
+                listOf("nickname", "CASEMAPPING=rfc1459-strict", "are supported blah blah").map { it.toByteArray() }))
+
+        verify(state).setFeature(ServerFeature.ServerCaseMapping, CaseMapping.RfcStrict)
+    }
+
+}

src/test/kotlin/com/dmdirc/ktirc/messages/MessageBuildersTest.kt

@@ -0,0 +1,23 @@
+package com.dmdirc.ktirc.messages
+
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
+
+internal class MessageBuildersTest {
+
+    @Test
+    fun `JoinMessage creates correct JOIN message`() = assertEquals("JOIN :#Test123", joinMessage("#Test123"))
+
+    @Test
+    fun `NickMessage creates correct NICK message`() = assertEquals("NICK :AcidBurn", nickMessage("AcidBurn"))
+
+    @Test
+    fun `PasswordMessage creates correct PASS message`() = assertEquals("PASS :abcdef", passwordMessage("abcdef"))
+
+    @Test
+    fun `PongMessage creates correct PONG message`() = assertEquals("PONG :abcdef", pongMessage("abcdef".toByteArray()))
+
+    @Test
+    fun `UserMessage creates correct USER message`() = assertEquals("USER AcidBurn localhost gibson :Kate", userMessage("AcidBurn", "localhost", "gibson", "Kate"))
+
+}

src/test/kotlin/com/dmdirc/ktirc/state/IrcServerStateTest.kt

@@ -0,0 +1,50 @@
+package com.dmdirc.ktirc.state
+
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
+import java.lang.IllegalArgumentException
+
+internal class IrcServerStateTest {
+
+    @Test
+    fun `IrcServerState should return defaults for unspecified features`() {
+        val serverState = IrcServerState("")
+        assertEquals(200, serverState.getFeature(ServerFeature.MaximumChannelNameLength))
+    }
+
+    @Test
+    fun `IrcServerState should return null for unspecified features with no default`() {
+        val serverState = IrcServerState("")
+        assertNull(serverState.getFeature(ServerFeature.ChannelModes))
+    }
+
+    @Test
+    fun `IrcServerState should return previously set value for features`() {
+        val serverState = IrcServerState("")
+        serverState.setFeature(ServerFeature.MaximumChannels, 123)
+        assertEquals(123, serverState.getFeature(ServerFeature.MaximumChannels))
+    }
+
+    @Test
+    fun `IrcServerState should return default set value for features that were reset`() {
+        val serverState = IrcServerState("")
+        serverState.setFeature(ServerFeature.MaximumChannels, 123)
+        serverState.resetFeature(ServerFeature.MaximumChannels)
+        assertNull(serverState.getFeature(ServerFeature.MaximumChannels))
+    }
+
+    @Test
+    fun `IrcServerState should throw if a feature is set with the wrong type`() {
+        val serverState = IrcServerState("")
+        assertThrows(IllegalArgumentException::class.java) {
+            serverState.setFeature(ServerFeature.MaximumChannels, "123")
+        }
+    }
+
+    @Test
+    fun `IrcServerState should use the initial nickname as local nickname`() {
+        val serverState = IrcServerState("acidBurn")
+        assertEquals("acidBurn", serverState.localNickname)
+    }
+
+}