diff --git a/Model/Sources/Model/TicTacToeRules.swift b/Model/Sources/Model/TicTacToeRules.swift index c3b3b63..1cd002b 100644 --- a/Model/Sources/Model/TicTacToeRules.swift +++ b/Model/Sources/Model/TicTacToeRules.swift @@ -20,56 +20,56 @@ public struct TicTacToeRules: Rules { self.piecesToAlign = piecesToAlign } - public func isGameOver(board: Board) -> (result: Bool, winner: Token) { - // Vérification générale avec le nombre de pièces à aligner - let maxRow = board.rowNb - let maxCol = board.columnNb + public func isGameOver(board: Board) -> (result: Bool, winner: Token) { + // Vérification générale avec le nombre de pièces à aligner + let maxRow = board.rowNb + let maxCol = board.columnNb - // Vérification horizontale - for row in 0.. [Move] { diff --git a/Model/Tests/ModelTests/Connect4Rules/IsGameOverTest.swift b/Model/Tests/ModelTests/Connect4Rules/IsGameOverTest.swift index 0b3b00b..018d98c 100644 --- a/Model/Tests/ModelTests/Connect4Rules/IsGameOverTest.swift +++ b/Model/Tests/ModelTests/Connect4Rules/IsGameOverTest.swift @@ -21,22 +21,33 @@ final class IsGameOverTest: XCTestCase { XCTAssertTrue(rules.isGameOver(board: board).result) XCTAssertEqual(rules.isGameOver(board: board).winner, Token.red) } - /*func testFullGridWithoutWin() { - // A REVOIR - let rules = Connect4Rules(piecesToAlign: 4) - var board = Board() + func testFullGridWithoutWin() { + let rules = TicTacToeRules(piecesToAlign: 3) + var board = Board(rowsNb: 3, columnsNb: 3) - // Remplir une grille complète sans qu'il y ait de victoire - for row in 0..