fix(plugin): Board coordinate validation

Author: xeruf

plugin/src/main/kotlin/sc/plugin2023/Board.kt

@@ -46,6 +46,7 @@ class Board(fields: TwoDBoard<Field> = generateFields()): RectangularBoard<Field
 
     override fun isValid(coordinates: Coordinates) =
             (coordinates.x + coordinates.y) % 2 == 0 &&
+                coordinates.x >= 0 &&
                 super.isValid(coordinates.copy(coordinates.x / 2))
 
     /** Gibt das Feld an den gegebenen Koordinaten zurück. */

plugin/src/test/kotlin/sc/plugin2023/BoardTest.kt

@@ -1,27 +1,18 @@
 package sc.plugin2023
 
-import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.inspectors.forAll
-import io.kotest.matchers.booleans.shouldBeFalse
+import io.kotest.matchers.*
 import io.kotest.matchers.collections.*
 import io.kotest.matchers.ints.*
-import io.kotest.matchers.maps.shouldBeEmpty
 import io.kotest.matchers.maps.shouldHaveSize
 import io.kotest.matchers.nulls.*
-import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.*
+import sc.api.plugins.Coordinates
 import sc.api.plugins.Team
 import sc.helpers.shouldSerializeTo
 import sc.helpers.testXStream
-import sc.plugin2023.Move
-import sc.api.plugins.Coordinates
-import sc.api.plugins.TwoDBoard
-import sc.framework.plugins.Constants
-import sc.helpers.checkSerialization
 import sc.plugin2023.util.PluginConstants
-import sc.shared.MoveMistake
-import sc.shared.InvalidMoveException
 
 class BoardTest: FunSpec({
     context("Board generation") {
@@ -32,9 +23,19 @@ class BoardTest: FunSpec({
                 it.penguin.shouldBeNull()
                 it.fish shouldBeInRange 1..4
             }
+            
             generatedBoard.getPenguins() shouldHaveSize 0
-            generatedBoard[0 y 0] = Team.ONE
+            generatedBoard[1 y 1] = Team.ONE
             generatedBoard.getPenguins() shouldHaveSize 1
+            
+            arrayOf(-1 y 1, -2 y 0, -1 y 3, -1 y 0).forAll {
+                generatedBoard.getOrNull(it).shouldBeNull()
+            }
+            (0 until PluginConstants.BOARD_SIZE).map { (it * 2) y 2 }.forAll {
+                val field = generatedBoard[it]
+                field.fish shouldBeInRange 1..4
+                generatedBoard[it.x, it.y] shouldBe field
+            }
         }
         test("clones well") {
             val board = makeBoard(0 y 0 to 1)
@@ -58,6 +59,7 @@ class BoardTest: FunSpec({
         }
     }
     context("Board calculates diffs") {
+        // TODO
         //val board = makeBoard(0 y 0 to "r", 2 y 0 to "r")
         //test("empty for itself") {
         //    board.diff(board).shouldBeEmpty()
@@ -99,6 +101,6 @@ class BoardTest: FunSpec({
 infix fun Int.y(other: Int) = Coordinates(this, other)
 
 fun makeBoard(vararg list: Pair<Coordinates, Int>) =
-    Board(List(PluginConstants.BOARD_SIZE) { MutableList(PluginConstants.BOARD_SIZE) { Field(1) } }).apply {
-        list.forEach { set(it.first, Team.values().getOrNull(it.second)) }
-    }
+        Board(List(PluginConstants.BOARD_SIZE) { MutableList(PluginConstants.BOARD_SIZE) { Field(1) } }).apply {
+            list.forEach { set(it.first, Team.values().getOrNull(it.second)) }
+        }

sdk/src/main/server-api/sc/api/plugins/RectangularBoard.kt

@@ -31,11 +31,13 @@ open class RectangularBoard<FIELD: IField<FIELD>>(
             coordinates.y in gameField.indices &&
             coordinates.x in gameField[coordinates.y].indices
 
-    /** Gibt das Feld an den gegebenen Koordinaten zurück. */
-    protected open operator fun get(x: Int, y: Int) =
+    /** Gibt das Feld an den gegebenen Koordinaten zurück.
+     * Bevorzugt für interne Verwendung, da Fehler roh zurückgegeben werden. */
+    open operator fun get(x: Int, y: Int) =
             gameField[y][x]
 
     /** Gibt das Feld an den gegebenen Koordinaten zurück. */
+    @Throws(IllegalArgumentException::class)
     override operator fun get(key: Coordinates) =
             try {
                 get(key.x, key.y)