fix(plugin): correct Piece comparison

Now only the individual blocks' coordinations and color are compared while identity
transformations get ignored

Author: anarchuser

plugin/src/shared/sc/plugin2021/Move.kt

@@ -8,6 +8,8 @@ sealed class Move(val color: Color): IMove {
 
 class SetMove(val piece: Piece): Move(piece.color) {
     override fun toString(): String = piece.toString()
+    override fun equals(other: Any?): Boolean = piece == other
+    override fun hashCode(): Int = piece.hashCode()
 }
 
 class PassMove(color: Color): Move(color) {

plugin/src/shared/sc/plugin2021/Piece.kt

@@ -37,13 +37,13 @@ class Piece(@XStreamAsAttribute val color: Color = Color.BLUE,
     override fun toString(): String =
             "$color Piece $kind:${rotation.value}${if (isFlipped) " (flipped)" else ""} [${position.x},${position.y}]"
 
-    override fun equals(other: Any?): Boolean {
-        return other is Piece &&
-                other.color == color &&
-                other.kind == kind &&
-                other.rotation == rotation &&
-                other.isFlipped == isFlipped &&
-                other.position == position
+    override fun equals(other: Any?): Boolean = when(other) {
+        is SetMove -> this == other.piece
+        is Piece -> {
+            this.color == other.color &&
+            this.coordinates == other.coordinates
+        }
+        else -> false
     }
 
     override fun hashCode(): Int {

plugin/src/shared/sc/plugin2021/util/SetHelpers.kt

@@ -1,9 +1,10 @@
 package sc.plugin2021.util
 
-import sc.plugin2021.Coordinates
-import sc.plugin2021.FieldContent
-import sc.plugin2021.Rotation
-import sc.plugin2021.Vector
+import sc.plugin2021.*
+
+/**
+ * A Collection of methods callable on specific Sets or functions that take Sets as input.
+ */
 
 /** Rotates the given shape based on the given rotation. */
 fun Set<Coordinates>.rotate(rotation: Rotation): Set<Coordinates> = when(rotation) {

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

@@ -0,0 +1,28 @@
+package sc.plugin2021
+
+import io.kotlintest.matchers.types.shouldNotBeSameInstanceAs
+import io.kotlintest.shouldBe
+import io.kotlintest.shouldNotBe
+import io.kotlintest.specs.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()
+    }
+    "Piece comparison" {
+        Rotation.values().map {
+            SetMove(Piece(kind = PieceShape.TETRO_O, rotation = it, isFlipped = true, position = Coordinates(7, 12)))
+            SetMove(Piece(kind = PieceShape.TETRO_O, rotation = it, isFlipped = false, position = Coordinates(7, 12)))
+        }.toSet().size shouldBe 1
+    }
+    "SetMove comparison" {
+        Rotation.values().map {
+            SetMove(Piece(kind = PieceShape.TETRO_O, rotation = it, isFlipped = true, position = Coordinates(7, 12)))
+            SetMove(Piece(kind = PieceShape.TETRO_O, rotation = it, isFlipped = false, position = Coordinates(7, 12)))
+        }.toSet().size shouldBe 1
+    }
+})

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

@@ -166,4 +166,5 @@ class PieceTest: StringSpec({
             converted shouldBe it
         }
     }
+
 })