TDDed the Chess\Variant\Chess960\K class

chesslablab · Jan 20, 2025 · a6818ed · a6818ed
1 parent 6404c73
commit a6818ed
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 11 deletions.
diff --git a/src/Variant/Chess960/K.php b/src/Variant/Chess960/K.php
@@ -6,4 +6,23 @@
 
 class K extends ClassicalK
 {
+    /**
+     * Returns the piece's moves.
+     * 
+     * Unlike in classical chess, in Chess960 there are positions where the
+     * king can be moved to the same square where it is located in order to
+     * castle. Castling is thus possible by double-clicking on the square
+     * where the king is currently located.
+     *
+     * @return array
+     */
+    public function moveSqs(): array
+    {
+        $sqs = [
+            ...$this->moveSqs(),
+            ...[$this->sq],
+        ];
+
+        return array_filter(array_unique($sqs));
+    }
 }
diff --git a/tests/unit/Variant/Chess960/BoardTest.php b/tests/unit/Variant/Chess960/BoardTest.php
@@ -803,17 +803,12 @@ public function play_RNQNBBKR_castle_short()
      */
     public function play_lan_RNQNBBKR_castle_short()
     {
-        $startPos = ['R', 'N', 'Q', 'N', 'B', 'B', 'K', 'R'];
-
-        $board = new Board($startPos);
-
-        $board->playLan('w', 'g2g3');
-        $board->playLan('b', 'g7g6');
-        $board->playLan('w', 'f1g2');
-        $board->playLan('b', 'f8g7');
-        $board->playLan('w', 'g1g1');
+        $expectedLegal = [
+            'f1',
+            'g1',
+        ];
 
-        $expected = [
+        $expectedArray = [
             7 => [ 'r', 'n', 'q', 'n', 'b', '.', 'k', 'r' ],
             6 => [ 'p', 'p', 'p', 'p', 'p', 'p', 'b', 'p' ],
             5 => [ '.', '.', '.', '.', '.', '.', 'p', '.' ],
@@ -824,6 +819,19 @@ public function play_lan_RNQNBBKR_castle_short()
             0 => [ 'R', 'N', 'Q', 'N', 'B', 'R', 'K', '.' ],
         ];
 
-        $this->assertSame($expected, $board->toArray());
+        $startPos = ['R', 'N', 'Q', 'N', 'B', 'B', 'K', 'R'];
+
+        $board = new Board($startPos);
+
+        $board->playLan('w', 'g2g3');
+        $board->playLan('b', 'g7g6');
+        $board->playLan('w', 'f1g2');
+        $board->playLan('b', 'f8g7');
+
+        $this->assertSame($expectedLegal, $board->legal('g1'));
+
+        $board->playLan('w', 'g1g1');
+
+        $this->assertSame($expectedArray, $board->toArray());
     }
 }