Clean up Lobby & Server in general

gradle/build.gradle.kts

@@ -285,43 +285,6 @@ allprojects {
     }
 }
 
-project("sdk") {
-    sourceSets {
-        main.get().java.srcDirs("src/framework", "src/server-api")
-        test.get().java.srcDir("src/test")
-    }
-
-    dependencies {
-        api(kotlin("stdlib"))
-        api("com.thoughtworks.xstream", "xstream", "1.4.12")
-        api("jargs", "jargs", "1.0")
-        api("ch.qos.logback", "logback-classic", "1.2.3")
-
-        implementation("org.hamcrest", "hamcrest-core", "2.2")
-        implementation("net.sf.kxml", "kxml2", "2.3.0")
-        implementation("xmlpull", "xmlpull", "1.1.3.1")
-
-        testImplementation("junit", "junit", "4.13")
-        testImplementation("io.kotlintest", "kotlintest-runner-junit5", "3.4.2")
-    }
-}
-
-project("plugin") {
-    sourceSets {
-        main.get().java.srcDirs("src/client", "src/server", "src/shared")
-        test.get().java.srcDir("src/test")
-    }
-
-    dependencies {
-        api(project(":sdk"))
-
-        testImplementation("junit", "junit", "4.13")
-        testImplementation("io.kotlintest", "kotlintest-runner-junit5", "3.4.2")
-    }
-
-    tasks.jar.get().archiveBaseName.set(game)
-}
-
 // == Utilities ==
 
 fun InputStream.dump(name: String? = null) {

helpers/test-client/src/sc/TestClient.java

@@ -196,8 +196,9 @@ protected void onObject(ProtocolMessage message) {
           irregularGames++;
         StringBuilder log = new StringBuilder("Game {} ended " +
                 (result.isRegular() ? "regularly -" : "abnormally!") + " Winner: ");
-        for (Player winner : result.getWinners())
-          log.append(winner.getDisplayName()).append(", ");
+        if (result.getWinners() != null)
+          for (Player winner : result.getWinners())
+            log.append(winner.getDisplayName()).append(", ");
         logger.warn(log.substring(0, log.length() - 2), finishedTests);
 
         finishedTests++;

plugin/build.gradle.kts

@@ -1,6 +1,24 @@
-tasks.withType<Test> {
-  useJUnitPlatform()
+val game: String by project
+
+sourceSets {
+    main.get().java.srcDirs("src/client", "src/server", "src/shared")
+    test.get().java.srcDir("src/test")
 }
+
 dependencies {
+    api(project(":sdk"))
+
+    testImplementation("junit", "junit", "4.13")
+    testImplementation("io.kotest", "kotest-runner-junit5-jvm", "4.0.5")
+    testImplementation("io.kotest", "kotest-assertions-core", "4.0.5")
     testImplementation(kotlin("script-runtime"))
-}
+}
+
+tasks{
+    jar {
+        archiveBaseName.set(game)
+    }
+    test {
+        useJUnitPlatform()
+    }
+}

plugin/src/server/sc/plugin2020/GamePlugin.java

@@ -18,15 +18,11 @@ public class GamePlugin implements IGamePlugin {
   public static final String PLUGIN_AUTHOR = "";
   public static final String PLUGIN_UUID = "swc_2020_hive";
 
-  public static final ScoreDefinition SCORE_DEFINITION;
-
-  static {
-    SCORE_DEFINITION = new ScoreDefinition();
-    SCORE_DEFINITION.add("Gewinner");
-    // NOTE: Always write the XML representation of unicode characters, not the character directly, as it confuses the
-    // parsers which consume the server messages!
-    SCORE_DEFINITION.add(new ScoreFragment("\u2205 freie Felder", ScoreAggregation.AVERAGE));
-  }
+  // NOTE: Always write the XML representation of unicode characters, not the character directly, as it confuses the
+  // parsers which consume the server messages!
+  public static final ScoreDefinition SCORE_DEFINITION = new ScoreDefinition(new ScoreFragment[]{
+          new ScoreFragment("Gewinner"),
+          new ScoreFragment("\u2205 freie Felder", ScoreAggregation.AVERAGE)});
 
   @Override
   public IGameInstance createGame() {

plugin/src/server/sc/plugin2021/Game.kt

@@ -42,12 +42,12 @@ class Game(UUID: String = GamePlugin.PLUGIN_UUID): RoundBasedGameInstance<Player
     }
 
     override fun getWinners(): MutableList<Player> {
-        if (players.first().violated) {
-            if (players.last().violated)
+        if (players.first().hasViolated()) {
+            if (players.last().hasViolated())
                 return mutableListOf()
             return players.subList(1, 2)
         }
-        if (players.last().violated)
+        if (players.last().hasViolated())
             return players.subList(0, 1)
 
         val first = gameState.getPointsForPlayer(players.first().color)

plugin/src/server/sc/plugin2021/GamePlugin.kt

@@ -16,10 +16,10 @@ class GamePlugin: IGamePlugin {
         val PLUGIN_AUTHOR = ""
         val PLUGIN_UUID = "swc_2021_blokus"
 
-        val SCORE_DEFINITION = ScoreDefinition().apply {
-            add("Gewinner")
-            add(ScoreFragment("\u2205 Punkte", ScoreAggregation.AVERAGE))
-        }
+        val SCORE_DEFINITION = ScoreDefinition(arrayOf(
+                ScoreFragment("Gewinner"),
+                ScoreFragment("\u2205 Punkte", ScoreAggregation.AVERAGE)
+        ))
     }
 
     override fun createGame(): IGameInstance {

plugin/src/shared/sc/plugin2020/Team.kt

@@ -4,15 +4,10 @@ import sc.api.plugins.ITeam
 
 enum class Team(override val index: Int, val displayName: String): ITeam {
     RED(0, "Rot") {
-        val letter = name.first()
-
         override fun opponent(): Team = BLUE
-        override fun toString(): String = displayName
     },
     BLUE(1, "Blau") {
-        val letter = name.first()
-
         override fun opponent(): Team = RED
-        override fun toString(): String = displayName
     };
+    override fun toString(): String = displayName
 }

plugin/src/test/sc/plugin2020/CloneTest.kt

@@ -1,8 +1,8 @@
 package sc.plugin2020
 
-import io.kotlintest.matchers.types.shouldNotBeSameInstanceAs
-import io.kotlintest.shouldBe
-import io.kotlintest.specs.StringSpec
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.types.shouldNotBeSameInstanceAs
+import io.kotest.core.spec.style.StringSpec
 import sc.framework.plugins.Player
 
 class CloneTest: StringSpec({

plugin/src/test/sc/plugin2020/GamePlayTest.kt

@@ -1,9 +1,10 @@
 package sc.plugin2020
 
-import io.kotlintest.matchers.collections.shouldContain
-import io.kotlintest.matchers.collections.shouldNotContain
-import io.kotlintest.shouldThrow
-import io.kotlintest.specs.AnnotationSpec
+import io.kotest.assertions.throwables.shouldThrow
+import io.kotest.matchers.collections.shouldContain
+import io.kotest.matchers.collections.shouldNotContain
+import io.kotest.matchers.shouldBe
+import io.kotest.core.spec.style.AnnotationSpec
 import org.junit.Assert.*
 import sc.plugin2020.util.Constants
 import sc.plugin2020.util.CubeCoordinates

plugin/src/test/sc/plugin2020/GameRuleTest.kt

@@ -1,9 +1,9 @@
 package sc.plugin2020
 
-import io.kotlintest.matchers.collections.shouldHaveSize
-import io.kotlintest.shouldBe
-import io.kotlintest.shouldNotBe
-import io.kotlintest.specs.StringSpec
+import io.kotest.matchers.collections.shouldHaveSize
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNotBe
+import io.kotest.core.spec.style.StringSpec
 import sc.plugin2020.util.CubeCoordinates
 import sc.plugin2020.util.GameRuleLogic
 import sc.api.plugins.ITeam

plugin/src/test/sc/plugin2020/XMLTest.kt

@@ -283,14 +283,12 @@ class XMLTest {
         val xstream = Configuration.xStream
         val xml = xstream.toXML(RoomPacket(roomId, move))
         val expect = """
-            |<room roomId="$roomId">
-            |  <data class="setmove">
-            |    <piece type="ANT">
-            |      <owner class="sc.plugin2020.Team">RED</owner>
-            |    </piece>
-            |    <destination x="1" y="2" z="-3"/>
-            |  </data>
-            |</room>""".trimMargin()
+            <room roomId="$roomId">
+              <data class="setmove">
+                <piece owner="RED" type="ANT"/>
+                <destination x="1" y="2" z="-3"/>
+              </data>
+            </room>""".trimIndent()
         Assert.assertEquals(expect, xml)
     }
 

plugin/src/test/sc/plugin2021/BoardTest.kt

@@ -1,9 +1,8 @@
 package sc.plugin2021
 
-import io.kotlintest.matchers.types.shouldNotBeSameInstanceAs
-
-import io.kotlintest.shouldBe
-import io.kotlintest.specs.StringSpec
+import io.kotest.matchers.shouldBe
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.types.shouldNotBeSameInstanceAs
 import sc.plugin2021.util.Constants
 
 class BoardTest : StringSpec({

plugin/src/test/sc/plugin2021/ComparisonTest.kt

@@ -1,15 +1,13 @@
 package sc.plugin2021
 
-import io.kotlintest.matchers.types.shouldNotBeSameInstanceAs
-import io.kotlintest.shouldBe
-import io.kotlintest.shouldNotBe
-import io.kotlintest.specs.StringSpec
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNotBe
+import io.kotest.core.spec.style.StringSpec
 import sc.plugin2021.util.Constants
 
 class ComparisonTest: StringSpec({
     "Coordinate comparison" {
         Coordinates(3, 2) shouldBe Coordinates(3, 2)
-        Coordinates(3, 2) shouldNotBeSameInstanceAs  Coordinates(3, 2)
         Coordinates(3, 2) shouldNotBe Coordinates(2, 3)
         Coordinates(3, 2) shouldNotBe Board()
     }

plugin/src/test/sc/plugin2021/GameRuleLogicTest.kt

@@ -1,9 +1,9 @@
 package sc.plugin2021
 
-import io.kotlintest.matchers.collections.shouldContainExactlyInAnyOrder
-import io.kotlintest.shouldBe
-import io.kotlintest.shouldNotBe
-import io.kotlintest.specs.StringSpec
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNotBe
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder
 import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.jupiter.api.assertThrows
 import sc.plugin2021.util.Constants

plugin/src/test/sc/plugin2021/GameStateTest.kt

@@ -1,7 +1,7 @@
 package sc.plugin2021
 
-import io.kotlintest.shouldBe
-import io.kotlintest.specs.StringSpec
+import io.kotest.matchers.shouldBe
+import io.kotest.core.spec.style.StringSpec
 import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.jupiter.api.assertThrows
 import sc.plugin2021.util.Configuration

plugin/src/test/sc/plugin2021/GameTest.kt

@@ -1,13 +1,11 @@
 package sc.plugin2021
 
-import io.kotlintest.matchers.collections.shouldContainExactly
-import io.kotlintest.shouldBe
-import io.kotlintest.shouldNotBe
-import io.kotlintest.specs.StringSpec
-import org.junit.jupiter.api.assertThrows
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNotBe
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.collections.shouldContainExactly
 import sc.plugin2020.util.Constants
 import sc.plugin2021.util.GameRuleLogic
-import sc.shared.InvalidMoveException
 import sc.shared.PlayerScore
 import sc.shared.ScoreCause
 

plugin/src/test/sc/plugin2021/PieceTest.kt

@@ -1,11 +1,11 @@
 package sc.plugin2021
 
-import io.kotlintest.data.forall
-import io.kotlintest.matchers.maps.shouldContain
-import io.kotlintest.matchers.maps.shouldContainExactly
-import io.kotlintest.shouldBe
-import io.kotlintest.specs.StringSpec
-import io.kotlintest.tables.row
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.data.forAll
+import io.kotest.data.row
+import io.kotest.matchers.maps.shouldContain
+import io.kotest.matchers.maps.shouldContainExactly
+import io.kotest.matchers.shouldBe
 import org.opentest4j.AssertionFailedError
 import sc.plugin2021.util.*
 
@@ -164,7 +164,7 @@ class PieceTest: StringSpec({
         piece.coordinates shouldBe coordinates
     }
     "XML conversion" {
-        forall(
+        forAll(
             row(Piece(Color.YELLOW, PieceShape.TETRO_O, Rotation.RIGHT, false), """
                     <piece color="YELLOW" kind="TETRO_O" rotation="RIGHT" isFlipped="false">
                       <position x="0" y="0"/>

plugin/src/test/sc/plugin2021/RotationTest.kt

@@ -1,7 +1,7 @@
 package sc.plugin2021
 
-import io.kotlintest.shouldBe
-import io.kotlintest.specs.StringSpec
+import io.kotest.matchers.shouldBe
+import io.kotest.core.spec.style.StringSpec
 
 class RotationTest: StringSpec ({
     "Rotations can get rotated" {

plugin/src/test/sc/plugin2021/helper/MoveParser.kt

@@ -1,6 +1,6 @@
 package sc.plugin2021.helper
 
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertDoesNotThrow
 import sc.plugin2021.*

sdk/build.gradle.kts

@@ -0,0 +1,25 @@
+sourceSets {
+    main.get().java.srcDirs("src/framework", "src/server-api")
+    test.get().java.srcDir("src/test")
+}
+
+dependencies {
+    api(kotlin("stdlib"))
+    api("com.thoughtworks.xstream", "xstream", "1.4.11.1")
+    api("jargs", "jargs", "1.0")
+    api("ch.qos.logback", "logback-classic", "1.2.3")
+
+    implementation("org.hamcrest", "hamcrest-core", "2.2")
+    implementation("net.sf.kxml", "kxml2", "2.3.0")
+    implementation("xmlpull", "xmlpull", "1.1.3.1")
+
+    testImplementation("junit", "junit", "4.13")
+    testImplementation("io.kotest", "kotest-runner-junit5-jvm", "4.0.5")
+    testImplementation("io.kotest", "kotest-assertions-core", "4.0.5")
+}
+
+tasks{
+    test {
+        useJUnitPlatform()
+    }
+}

sdk/src/framework/sc/helpers/HelperMethods.java

@@ -37,7 +37,7 @@ public static String getCurrentDateTime() {
   public static String generateReplayFilename(String pluginUuid, List<SlotDescriptor> descriptors) {
     StringBuilder replayFileName = new StringBuilder("./replays/replay");
     replayFileName.append("_");
-    replayFileName.append(pluginUuid); // something like hui_2018
+    replayFileName.append(pluginUuid);
     for (SlotDescriptor descriptor : descriptors) {
       replayFileName.append("_");
       replayFileName.append(descriptor.getDisplayName().replace(' ', '_'));