From 164a0528f09d38375234e538a612583196538531 Mon Sep 17 00:00:00 2001 From: Mathieu GROUSSEAU Date: Sat, 18 Jan 2025 09:30:22 +0100 Subject: [PATCH] Change pieces names --- Model/Sources/Model/Board.swift | 4 ++-- Model/Sources/Model/Piece.swift | 2 +- Model/Tests/ModelTests/EmptyBoardTests.swift | 22 +++++++++---------- Model/Tests/ModelTests/FilledBoardTests.swift | 12 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Model/Sources/Model/Board.swift b/Model/Sources/Model/Board.swift index 5455369..98659d2 100644 --- a/Model/Sources/Model/Board.swift +++ b/Model/Sources/Model/Board.swift @@ -39,9 +39,9 @@ public struct Board { for column in grid { for piece in column { switch piece { - case .Player1: + case .PlayerA: a += 1 - case .Player2: + case .PlayerB: b += 1 case nil: break diff --git a/Model/Sources/Model/Piece.swift b/Model/Sources/Model/Piece.swift index 9bb3089..ca13fd2 100644 --- a/Model/Sources/Model/Piece.swift +++ b/Model/Sources/Model/Piece.swift @@ -1,3 +1,3 @@ public enum Piece { - case Player1, Player2 + case PlayerA, PlayerB } diff --git a/Model/Tests/ModelTests/EmptyBoardTests.swift b/Model/Tests/ModelTests/EmptyBoardTests.swift index 573949e..133055b 100644 --- a/Model/Tests/ModelTests/EmptyBoardTests.swift +++ b/Model/Tests/ModelTests/EmptyBoardTests.swift @@ -31,13 +31,13 @@ final class EmptyBoardTests: XCTestCase { } func testSetGet() throws { - board[1, 1] = Piece.Player1; + board[1, 1] = Piece.PlayerA; - XCTAssertEqual(board[1, 1], .Player1) + XCTAssertEqual(board[1, 1], .PlayerA) } func testCounts() throws { - board[1, 2] = .Player2 + board[1, 2] = .PlayerB let counts = board.countPieces() XCTAssertEqual(counts.a, 0) @@ -45,22 +45,22 @@ final class EmptyBoardTests: XCTestCase { } func testInsertTopNoPush() { - XCTAssert(board.insert(piece: .Player1, side: .Top, offset: 2)) - XCTAssertEqual(board[2, 0], .Player1) + XCTAssert(board.insert(piece: .PlayerA, side: .Top, offset: 2)) + XCTAssertEqual(board[2, 0], .PlayerA) } func testInsertBottomNoPush() { - XCTAssert(board.insert(piece: .Player2, side: .Bottom, offset: 2)) - XCTAssertEqual(board[2, board.rows - 1], .Player2) + XCTAssert(board.insert(piece: .PlayerB, side: .Bottom, offset: 2)) + XCTAssertEqual(board[2, board.rows - 1], .PlayerB) } func testInsertLeftNoPush() { - XCTAssert(board.insert(piece: .Player1, side: .Left, offset: 2)) - XCTAssertEqual(board[0, 2], .Player1) + XCTAssert(board.insert(piece: .PlayerA, side: .Left, offset: 2)) + XCTAssertEqual(board[0, 2], .PlayerA) } func testInsertRightNoPush() { - XCTAssert(board.insert(piece: .Player2, side: .Right, offset: 2)) - XCTAssertEqual(board[board.columns - 1, 2], .Player2) + XCTAssert(board.insert(piece: .PlayerB, side: .Right, offset: 2)) + XCTAssertEqual(board[board.columns - 1, 2], .PlayerB) } } diff --git a/Model/Tests/ModelTests/FilledBoardTests.swift b/Model/Tests/ModelTests/FilledBoardTests.swift index 8c475f0..f4b7426 100644 --- a/Model/Tests/ModelTests/FilledBoardTests.swift +++ b/Model/Tests/ModelTests/FilledBoardTests.swift @@ -15,9 +15,9 @@ final class FilledBoardTests: XCTestCase { for row in 0..