fix(plugin): FieldConverter for Teams

Author: xeruf

plugin/src/main/kotlin/sc/plugin2023/util/FieldConverter.kt

@@ -16,8 +16,8 @@ class FieldConverter: Converter {
         writer.setValue(obj.penguin?.name ?: obj.fish.toString())
     }
 
-    override fun unmarshal(reader: HierarchicalStreamReader, context: UnmarshallingContext): Any? =
+    override fun unmarshal(reader: HierarchicalStreamReader, context: UnmarshallingContext): Field =
             reader.value?.let { value ->
-                value.toIntOrNull()?.let { Field(it) } ?: Team.valueOf(value)
+                value.toIntOrNull()?.let { Field(it) } ?: Field(penguin = Team.valueOf(value))
             } ?: Field()
 }

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

@@ -26,6 +26,7 @@ class BoardTest: FunSpec({
 
             generatedBoard.getPenguins() shouldHaveSize 0
             generatedBoard[1 y 1] = Team.ONE
+            generatedBoard[1 y 1] shouldBe Field(penguin = Team.ONE)
             generatedBoard.getPenguins() shouldHaveSize 1
 
             arrayOf(-1 y 1, -2 y 0, -1 y 3, -1 y 0).forAll {
@@ -93,7 +94,10 @@ class BoardTest: FunSpec({
             testXStream.toXML(Board()) shouldHaveLineCount 82
         }
         test("Board with content") {
-            testXStream.toXML(makeBoard(0 y 0 to 1)) shouldContainOnlyOnce "<field>TWO</field>"
+            val fieldTwo = "<field>TWO</field>"
+            testXStream.fromXML(fieldTwo) shouldBe Field(penguin = Team.TWO)
+            testXStream.fromXML("<board><list>$fieldTwo</list>") shouldBe Board(listOf(mutableListOf(Field(penguin = Team.TWO))))
+            testXStream.toXML(makeBoard(0 y 0 to 1)) shouldContainOnlyOnce fieldTwo
         }
     }
 })

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

@@ -14,12 +14,13 @@ import sc.plugin2023.util.PluginConstants
 class GameStateTest: FunSpec({
     context("XML Serialization") {
         test("empty state") {
-            GameState(Board(listOf(mutableListOf(Field())))) shouldSerializeTo """
+            GameState(Board(listOf(mutableListOf(Field(), Field(penguin = Team.TWO))))) shouldSerializeTo """
                 <state turn="0">
                   <startTeam>ONE</startTeam>
                   <board>
                     <list>
                       <field>0</field>
+                      <field>TWO</field>
                     </list>
                   </board>
                   <fishes>