fix(plugin25): GameState equality and xml tests through Board.equals

Author: xeruf

plugin2025/src/main/kotlin/sc/plugin2025/Board.kt

@@ -5,7 +5,7 @@ import com.thoughtworks.xstream.annotations.XStreamImplicit
 import sc.api.plugins.IBoard
 
 @XStreamAlias("board")
-data class Board(
+class Board(
     @XStreamImplicit(itemFieldName = "field")
     private val track: Array<out Field> = generateTrack().toTypedArray(),
 ): IBoard {
@@ -36,6 +36,15 @@ data class Board(
 
     override fun clone(): Board = this
 
+    override fun equals(other: Any?): Boolean {
+        if(this === other) return true
+        if(other !is Board) return false
+        return track.contentEquals(other.track)
+    }
+    
+    override fun hashCode(): Int =
+        track.contentHashCode()
+    
     companion object {
 
         private fun shuffledFields(vararg fields: Field) = fields.asList().shuffled()

plugin2025/src/main/kotlin/sc/plugin2025/Hare.kt

@@ -15,7 +15,6 @@ data class Hare(
     @XStreamAsAttribute var salads: Int = HuIConstants.INITIAL_SALADS,
     @XStreamAsAttribute var carrots: Int = HuIConstants.INITIAL_CARROTS,
     @XStreamAsAttribute var lastAction: HuIAction? = null,
-    @XStreamImplicit(itemFieldName = "card")
     private val cards: ArrayList<Card> = arrayListOf(),
 ): PublicCloneable<Hare> {
     fun getCards(): List<Card> = cards
@@ -44,5 +43,5 @@ data class Hare(
             null
         }
 
-    override fun clone(): Hare = copy(cards = ArrayList(cards))
+    override fun clone(): Hare = copy(cards = ArrayList(getCards()))
 }

plugin2025/src/test/kotlin/sc/plugin2025/GameStateTest.kt

@@ -2,6 +2,7 @@ package sc.plugin2025
 
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.matchers.*
+import sc.api.plugins.Team
 import sc.helpers.shouldSerializeTo
 
 class GameStateTest: WordSpec({
@@ -13,31 +14,70 @@ class GameStateTest: WordSpec({
             clone.currentPlayer.addCard(Card.EAT_SALAD)
             state.currentPlayer.getCards().size shouldBe 0
         }
+        val state = GameState(
+            Board(arrayOf(Field.START, Field.MARKET, Field.CARROTS, Field.SALAD, Field.HARE, Field.GOAL)),
+            lastMove = Advance(5, Card.EAT_SALAD),
+            turn = 1,
+            players = listOf(
+                Hare(Team.TWO, cards = arrayListOf(Card.SWAP_CARROTS), lastAction = Advance(5)),
+                Hare(Team.ONE, position = 3, lastAction = Card.EAT_SALAD)
+            )
+        )
+        "behave properly" {
+            state.currentTeam shouldBe Team.ONE
+            state.currentField shouldBe Field.SALAD
+            state.currentPlayer.team shouldBe Team.ONE
+            state.currentPlayer.lastAction shouldBe Card.EAT_SALAD
+            state.mayEatSalad() shouldBe true
+            state.currentPlayer.lastAction = EatSalad
+            state.mayEatSalad() shouldBe false
+        }
         "produce nice XML" {
-            GameState(
-                Board(arrayOf(Field.START, Field.MARKET, Field.CARROTS, Field.HARE, Field.GOAL)),
-                lastMove = Advance(5, Card.EAT_SALAD)
-            ).apply {
-                players.forEachIndexed { index, hare ->
-                    hare.addCard(Card.values()[index])
-                    hare.lastAction = if(index == 0) Card.EAT_SALAD else Advance(index)
-                }
-            } shouldSerializeTo """
-              <state startTeam="ONE" turn="0">
+            Hare(Team.TWO, lastAction = EatSalad) shouldSerializeTo """
+              <player team="TWO" position="0" salads="5" carrots="68">
+                <lastAction class="eatsalad"/>
+                <cards/>
+              </player>
+            """.trimIndent()
+            Hare(Team.TWO, cards = arrayListOf(Card.HURRY_AHEAD)) shouldSerializeTo """
+              <player team="TWO" position="0" salads="5" carrots="68">
+                <cards>
+                  <card>HURRY_AHEAD</card>
+                </cards>
+              </player>
+            """.trimIndent()
+            
+            Advance(5, Card.EAT_SALAD) shouldSerializeTo """
+              <advance distance="5">
+                <card>EAT_SALAD</card>
+              </advance>
+            """.trimIndent()
+            
+            Board(arrayOf(Field.START)) shouldSerializeTo """
+                <board>
+                  <field>START</field>
+                </board>
+            """.trimIndent()
+            
+            state shouldSerializeTo """
+              <state startTeam="TWO" turn="1">
                 <board>
                   <field>START</field>
                   <field>MARKET</field>
                   <field>CARROTS</field>
+                  <field>SALAD</field>
                   <field>HARE</field>
                   <field>GOAL</field>
                 </board>
-                <player team="ONE" position="0" salads="5" carrots="68">
-                  <lastAction class="card">EAT_SALAD</lastAction>
-                  <card>FALL_BACK</card>
-                </player>
                 <player team="TWO" position="0" salads="5" carrots="68">
-                  <lastAction class="advance" distance="1"/>
-                  <card>HURRY_AHEAD</card>
+                  <lastAction class="advance" distance="5"/>
+                  <cards>
+                    <card>SWAP_CARROTS</card>
+                  </cards>
+                </player>
+                <player team="ONE" position="3" salads="5" carrots="68">
+                  <lastAction class="card">EAT_SALAD</lastAction>
+                  <cards/>
                 </player>
                 <lastMove class="advance" distance="5">
                   <card>EAT_SALAD</card>