Fix tests build

Author: KevinTCoughlin

TicTacToeTests/TicTacToeTests.swift

@@ -10,6 +10,20 @@ import Testing
 
 @Suite
 final class GameLogicTests {
+    
+    private func makeMoves(_ logic: GameLogic, moves: [(Int, Int)]) {
+        moves.forEach { (row, col) in
+            _ = logic.makeMove(row: row, col: col)
+        }
+    }
+    
+    private func expectWin(for player: GameLogic.Player, logic: GameLogic, message: Comment) {
+        #expect(logic.gameState == .won(player), message)
+    }
+    
+    private func expectDraw(logic: GameLogic, message: Comment) {
+        #expect(logic.gameState == .draw, message)
+    }
 
     @Test("Initial Game State Test")
     func testInitialGameState() {
@@ -18,42 +32,85 @@ final class GameLogicTests {
         #expect(logic.currentPlayer == .x, "Expected the first player to be X")
     }
 
-    @Test("Move Updates State", arguments: [(0, 0), (1, 1)])
-    func testMakeMoveUpdatesState(row: Int, col: Int) {
+    @Test("Turn Switching Test")
+    func testTurnSwitching() {
         let logic = GameLogic(boardSize: 3)
-        let moveResult = logic.makeMove(row: row, col: col)
-        #expect(moveResult == true, "Expected move to be successful")
-        #expect(logic.currentPlayer == .o, "Expected current player to switch to O after X's move")
+        
+        _ = logic.makeMove(row: 0, col: 0)
+        #expect(logic.currentPlayer == .o, "Expected turn to switch to O after X's move")
+        
+        _ = logic.makeMove(row: 1, col: 1)
+        #expect(logic.currentPlayer == .x, "Expected turn to switch back to X after O's move")
     }
 
-    @Test("Win Condition Test", arguments: [
-        [(0, 0), (1, 0), (0, 1), (1, 1), (0, 2)],
-        [(2, 0), (1, 1), (2, 1), (1, 2), (2, 2)]
-    ])
-    func testWinCondition(moves: [(Int, Int)]) {
+    @Test("Invalid Move on Taken Position")
+    func testInvalidMoveOnTakenPosition() {
         let logic = GameLogic(boardSize: 3)
 
-        moves.enumerated().forEach { index, move in
-            let (row, col) = move
-            _ = logic.makeMove(row: row, col: col)
-            if index == moves.count - 1 {  // Last move for the win
-                #expect(logic.gameState == .won(.x), "Expected X to win on final move")
-            }
-        }
+        _ = logic.makeMove(row: 0, col: 0)
+        let invalidMove = logic.makeMove(row: 0, col: 0)
+        #expect(invalidMove == false, "Expected move on taken position to be invalid")
     }
 
-    @Test("Draw Condition Test")
-    func testDrawCondition() {
+    @Test("Win Condition Test for Player X", arguments: [
+        ([(0, 0), (1, 0), (0, 1), (1, 1), (0, 2)], GameLogic.GameState.won(.x)),
+        ([(2, 0), (1, 1), (2, 1), (1, 2), (2, 2)], GameLogic.GameState.won(.x))
+    ])
+    func testWinCondition(moves: [(Int, Int)], expectedState: GameLogic.GameState) {
         let logic = GameLogic(boardSize: 3)
+        makeMoves(logic, moves: moves)
+        #expect(logic.gameState == expectedState, "Expected \(expectedState) for the given move sequence")
+    }
+
+    @Test("Draw Condition Test on 3x3 Board", arguments: [
+        ([(0, 0), (0, 1), (0, 2), (1, 1), (1, 0), (2, 0), (1, 2), (2, 2), (2, 1)], GameLogic.GameState.draw)
+    ])
+    func testDrawConditionOn3x3Board(moves: [(Int, Int)], expectedState: GameLogic.GameState) {
+        let logic = GameLogic(boardSize: 3)
+        makeMoves(logic, moves: moves)
+        #expect(logic.gameState == expectedState, "Expected \(expectedState) on a 3x3 board filled without a win")
+    }
+
+    @Test("No Move After Game Ends", arguments: [
+        ([(0, 0), (1, 0), (0, 1), (1, 1), (0, 2)], false)
+    ])
+    func testNoMoveAfterGameEnds(moves: [(Int, Int)], moveAfterEndExpected: Bool) {
+        let logic = GameLogic(boardSize: 3)
+        makeMoves(logic, moves: moves)
 
-        let moves = [(0, 0), (0, 1), (0, 2),
-                     (1, 1), (1, 0), (2, 0),
-                     (1, 2), (2, 2), (2, 1)]
-        
-        moves.forEach { (row, col) in
-            _ = logic.makeMove(row: row, col: col)
-        }
-        
-        #expect(logic.gameState == .draw, "Expected game to end in a draw")
+        let moveAfterWin = logic.makeMove(row: 2, col: 2)
+        #expect(moveAfterWin == moveAfterEndExpected, "Expected no moves allowed after game ends")
+    }
+
+    @Test("Win Condition on 4x4 Board", arguments: [
+        ([(0, 0), (1, 1), (0, 1), (1, 2), (0, 2), (1, 0), (0, 3)], GameLogic.GameState.won(.x))
+    ])
+    func testWinConditionOnFourByFourBoard(moves: [(Int, Int)], expectedState: GameLogic.GameState) {
+        let logic = GameLogic(boardSize: 4)
+        makeMoves(logic, moves: moves)
+        #expect(logic.gameState == expectedState, "Expected \(expectedState) with a winning line on a 4x4 board")
+    }
+
+    @Test("Draw Condition on 4x4 Board", arguments: [
+        ([
+            (0, 0), (0, 1), (0, 2), (0, 3),
+            (1, 1), (1, 0), (1, 3), (1, 2),
+            (2, 2), (2, 3), (2, 1), (2, 0),
+            (3, 3), (3, 2), (3, 0), (3, 1)
+        ], GameLogic.GameState.draw)
+    ])
+    func testDrawConditionOnFourByFourBoard(moves: [(Int, Int)], expectedState: GameLogic.GameState) {
+        let logic = GameLogic(boardSize: 4)
+        makeMoves(logic, moves: moves)
+        #expect(logic.gameState == expectedState, "Expected \(expectedState) on a 4x4 board filled without a win")
+    }
+
+    @Test("Smallest Possible Board - 1x1", arguments: [
+        ([(0, 0)], GameLogic.GameState.won(.x))
+    ])
+    func testSmallestPossibleBoard(moves: [(Int, Int)], expectedState: GameLogic.GameState) {
+        let logic = GameLogic(boardSize: 1)
+        makeMoves(logic, moves: moves)
+        #expect(logic.gameState == expectedState, "Expected \(expectedState) immediately on a 1x1 board")
     }
 }