fix(plugin): test amber from tower and fix oversights

Author: xeruf

plugin/src/main/sc/plugin2022/Coordinates.kt

@@ -11,7 +11,7 @@ data class Coordinates(
         @XStreamAsAttribute val x: Int,
         @XStreamAsAttribute val y: Int) {
 
-    override fun toString(): String = "[$x, $y]"
+    override fun toString(): String = "[$x|$y]"
 
     /** Addiere den [Vector] auf die [Coordinates] auf. */
     operator fun plus(vector: Vector): Coordinates {

plugin/src/main/sc/plugin2022/Piece.kt

@@ -35,7 +35,7 @@ data class Piece(
         get() = type.possibleMoves.map { it.copy(dy = it.dy * team.direction) }
 
     val isAmber
-        get() = count > 3
+        get() = count >= 3
 
     fun capture(other: Piece) {
         count += other.count
@@ -50,9 +50,9 @@ data class Piece(
         @OptIn(ExperimentalStdlibApi::class)
         fun fromString(string: String): Piece {
             val type = string.first()
-            return Piece(PieceType.values().first { it.char == type },
+            return Piece(PieceType.values().first { it.char.equals(type, true) },
                     if(type.isLowerCase()) Team.TWO else Team.ONE,
-                    string.last().digitToIntOrNull() ?: 0)
+                    string.last().digitToIntOrNull() ?: 1)
         }
     }
 }

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

@@ -8,6 +8,7 @@ import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder
 import io.kotest.matchers.maps.shouldBeEmpty
 import io.kotest.matchers.maps.shouldHaveSize
 import io.kotest.matchers.maps.shouldNotBeEmpty
+import io.kotest.matchers.nulls.shouldBeNull
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldHaveLineCount
 import io.kotest.matchers.string.shouldNotContain
@@ -72,7 +73,7 @@ class BoardTest: FunSpec({
             test("from position")  {
                 val moewe = Piece(Moewe, Team.ONE)
                 val board = Board(mutableMapOf(coords to moewe))
-                board.movePiece(Move(coords, coords.copy(y = 7))) shouldBe null
+                board.movePiece(Move(coords, coords.copy(y = 7))).shouldBeNull()
                 board.shouldBeEmpty()
             }
             test("not from Robbe in position") {
@@ -81,9 +82,20 @@ class BoardTest: FunSpec({
                 board.movePiece(Move(coords, Coordinates(2, 7))) shouldBe robbe
                 board.shouldNotBeEmpty()
             }
-            test("from tower") {
-                val tower = Piece(Herzmuschel, Team.ONE, 2)
-                val board = Board(mutableMapOf())
+            context("from tower") {
+                val board = makeBoard(0 y 1 to "M", 0 y 0 to "S2", 1 y 0 to "m", 1 y 1 to "r")
+                test("not onto own") {
+                    shouldThrow<InvalidMoveException> {
+                        board.movePiece(Move(0 y 0, 0 y 1))
+                    }.mistake shouldBe MoveMistake.DESTINATION_BLOCKED
+                }
+                test("move tower") {
+                    board.movePiece(Move(0 y 0, 1 y 1)).shouldBeNull()
+                }
+                test("move onto tower") {
+                    // TODO that should be a double amber
+                    board.movePiece(Move(1 y 0, 0 y 0)).shouldBeNull()
+                }
             }
         }
     }