refactor(Players, WhitePlayer, BlackPlayer): stone -> point로 명칭 변경, 최…

…근 플레이어를 구하는 책임 이동

domain/src/main/kotlin/domain/player/BlackPlayer.kt

@@ -8,7 +8,11 @@ import domain.state.PlayingState
 import domain.stone.StoneColor
 
 class BlackPlayer(state: PlayerState = PlayingState(), rule: OmokRule) : Player(state, rule) {
- override fun putStone(stone: Point, otherStones: Points): Player = BlackPlayer(state.add(stone, otherStones, rule), rule)
+ override fun putPoint(point: Point, otherPoints: Points): Player = BlackPlayer(state.add(point, otherPoints, rule), rule)
+ override fun getLatestPlayer(player: Player): Player {
+ if(player.getPointSize() == getPointSize()) return this
+ return player
+ }
 
- override fun getStoneColor(): StoneColor = StoneColor.BLACK
+ override fun getColor(): StoneColor = StoneColor.BLACK
 }

domain/src/main/kotlin/domain/player/Player.kt

@@ -14,13 +14,15 @@ abstract class Player(protected val state: PlayerState, val rule: OmokRule) {
 
  fun isPlaced(stone: Point): Boolean = state.hasStone(stone)
 
- fun getLastStone(): Point? = state.getLastStone()
+ fun getLastPoint(): Point? = state.getLastStone()
 
  fun getPointSize(): Int = state.getAllPoints().getAll().size
 
  fun getAllPoints(): Points = state.getAllPoints()
 
- abstract fun getStoneColor(): StoneColor
+ abstract fun getLatestPlayer(player: Player): Player
 
- abstract fun putStone(stone: Point, otherStones: Points): Player
+ abstract fun getColor(): StoneColor
+
+ abstract fun putPoint(point: Point, otherPoints: Points): Player
 }

domain/src/main/kotlin/domain/player/Players.kt

@@ -9,26 +9,26 @@ class Players(private val latestPlayer: Player, private val players: List<Player
  val isFoul: Boolean
  get() = players.any { it.isFoul }
  val curPlayerColor: StoneColor
- get() = players.first { it != latestPlayer }.getStoneColor()
+ get() = players.first { it != latestPlayer }.getColor()
 
  init {
  require(players.size == PLAYER_SIZE) { INVALID_PLAYERS_SIZE_ERROR_MESSAGE }
  }
 
  private fun nextPlayer(): Player = players.first { it != latestPlayer }
 
- fun putStone(point: Point): Players {
+ fun putPoint(point: Point): Players {
  if (players.any { it.isPlaced(point) }) return this
 
- val otherStones = latestPlayer.getAllPoints()
- val nextLatestPlayer = nextPlayer().putStone(point, otherStones)
- val newPlayers = players.filter { it.getStoneColor() != nextLatestPlayer.getStoneColor() } + nextLatestPlayer
+ val otherPoints = latestPlayer.getAllPoints()
+ val nextLatestPlayer = nextPlayer().putPoint(point, otherPoints)
+ val newPlayers = players.filter { it.getColor() != nextLatestPlayer.getColor() } + nextLatestPlayer
  return Players(nextLatestPlayer, newPlayers)
  }
 
 // fun getWinner(): Player? = players.find { !it.isFoul && !it.isPlaying }
 
- fun getLastPoint(): Point? = latestPlayer.getLastStone()
+ fun getLastPoint(): Point? = latestPlayer.getLastPoint()
 
  fun toList(): List<Player> = players.toList()
 

domain/src/main/kotlin/domain/player/WhitePlayer.kt

@@ -8,7 +8,10 @@ import domain.state.PlayingState
 import domain.stone.StoneColor
 
 class WhitePlayer(state: PlayerState = PlayingState(), rule: OmokRule) : Player(state, rule) {
- override fun putStone(stone: Point, otherStones: Points): Player = WhitePlayer(state.add(stone, otherStones, rule), rule)
-
- override fun getStoneColor(): StoneColor = StoneColor.WHITE
+ override fun putPoint(point: Point, otherPoints: Points): Player = WhitePlayer(state.add(point, otherPoints, rule), rule)
+ override fun getLatestPlayer(player: Player): Player {
+ if(player.getPointSize() == getPointSize()) return player
+ return this
+ }
+ override fun getColor(): StoneColor = StoneColor.WHITE
 }

domain/src/test/kotlin/player/BlackPlayerTest.kt

@@ -39,21 +39,21 @@ class BlackPlayerTest {
  @Test
  fun `마지막 놓은 돌을 반환한다`() {
  val player = BlackPlayer(Point(1, 1))
- assertThat(player.getLastStone()).isEqualTo(Point(1, 1))
+ assertThat(player.getLastPoint()).isEqualTo(Point(1, 1))
  }
 
  @Test
  fun `새롭게 오목알을 두었을 때, 룰을 어기지 않았다면 파울이 아니다`() {
  val player = BlackPlayer(Point(1, 1))
- val expected = player.putStone(Point(1, 2), otherStones).isFoul
+ val expected = player.putPoint(Point(1, 2), otherStones).isFoul
 
  assertThat(expected).isFalse
  }
 
  @Test
  fun `새롭게 오목알을 두었을 때, 룰을 어기면 파울이다`() {
  val player = BlackPlayer(Point(1, 1), Point(1, 3), Point(1, 4), Point(1, 5), Point(1, 6))
- val expected = player.putStone(Point(1, 2), otherStones).isFoul
+ val expected = player.putPoint(Point(1, 2), otherStones).isFoul
 
  assertThat(expected).isTrue
  }

domain/src/test/kotlin/player/PlayersTest.kt

@@ -28,7 +28,7 @@ class PlayersTest {
  fun `첫 턴은 흑이며, 현재 턴의 플레이어가 오목알을 성공적으로 놓으면 턴이 백으로 바뀐다`() {
  val players =
  Players(BlackPlayer(rule = blackRenjuRule), WhitePlayer(rule = whiteRenjuRule))
- val actual = players.putStone(Point(1, 1))
+ val actual = players.putPoint(Point(1, 1))
  val expected = Players(
  BlackPlayer(rule = blackRenjuRule, Point(1, 1)),
  WhitePlayer(rule = whiteRenjuRule)
@@ -43,7 +43,7 @@ class PlayersTest {
  BlackPlayer(rule = blackRenjuRule, Point(2, 1)),
  WhitePlayer(rule = whiteRenjuRule)
  )
- val actual = players.putStone(Point(1, 1))
+ val actual = players.putPoint(Point(1, 1))
  val expected = Players(
  BlackPlayer(rule = blackRenjuRule, Point(2, 1)),
  WhitePlayer(rule = whiteRenjuRule, Point(1, 1))
@@ -83,7 +83,7 @@ class PlayersTest {
  val players = Players(
  BlackPlayer(rule = blackRenjuRule),
  WhitePlayer(rule = whiteRenjuRule)
- ).putStone(Point(1, 1)).putStone(Point(2, 2))
+ ).putPoint(Point(1, 1)).putPoint(Point(2, 2))
  val actual = players.getLastPoint()
 
  assertThat(actual).isEqualTo(Point(2, 2))
@@ -111,6 +111,7 @@ class PlayersTest {
  assertThat(actual).isNotSameAs(players)
  }
 
+ private fun Players(blackPlayer: BlackPlayer, whitePlayer: WhitePlayer) = Players(blackPlayer, listOf(blackPlayer, whitePlayer))
  private fun BlackPlayer(rule: BlackRenjuRule, vararg points: Point) =
  BlackPlayer(PlayingState(Points(points.toList())), rule)
  private fun WhitePlayer(rule: WhiteRenjuRule, vararg points: Point) = WhitePlayer(PlayingState(Points(points.toList())), rule)

domain/src/test/kotlin/player/WhitePlayerTest.kt

@@ -47,13 +47,13 @@ class WhitePlayerTest {
  @Test
  fun `마지막 놓은 돌을 반환한다`() {
  val player: Player = WhitePlayer(Point(1, 1))
- assertThat(player.getLastStone()).isEqualTo(Point(1, 1))
+ assertThat(player.getLastPoint()).isEqualTo(Point(1, 1))
  }
 
  @Test
  fun `벡돌 플레이어는 돌의 색상이 흰색이다`() {
  val player: Player = WhitePlayer(rule = rule)
- assertThat(player.getStoneColor()).isEqualTo(StoneColor.WHITE)
+ assertThat(player.getColor()).isEqualTo(StoneColor.WHITE)
  }
 
  private fun WhitePlayer(point: Point) = WhitePlayer(PlayingState(Points(point)), rule)