refactor: MoveParameters -> MoveOptions 변경

seongbeenkim · seongbeenkim · commit 361883e265bc · 2021-09-04T04:16:05.000+09:00
diff --git a/src/main/java/chess/domain/ChessGame.java b/src/main/java/chess/domain/ChessGame.java
@@ -2,7 +2,7 @@
 
 import chess.domain.board.Board;
 import chess.domain.board.Status;
-import chess.domain.command.MoveParameters;
+import chess.domain.command.MoveOptions;
 
 public class ChessGame {
 
@@ -13,8 +13,8 @@ public class ChessGame {
     public ChessGame() {
     }
 
-    public void move(final MoveParameters moveParameters) {
-        board.move(moveParameters, isWhiteTurn);
+    public void move(final MoveOptions moveOptions) {
+        board.move(moveOptions, isWhiteTurn);
         isWhiteTurn = !isWhiteTurn;
 
         if (board.isEnd()) {
diff --git a/src/main/java/chess/domain/board/Board.java b/src/main/java/chess/domain/board/Board.java
@@ -1,6 +1,6 @@
 package chess.domain.board;
 
-import chess.domain.command.MoveParameters;
+import chess.domain.command.MoveOptions;
 import chess.domain.piece.Color;
 import chess.domain.piece.Piece;
 import chess.domain.player.Player;
@@ -17,11 +17,11 @@ public Board() {
         this.black = new Player(Color.BLACK);
     }
 
-    public void move(final MoveParameters moveParameters, final boolean isWhiteTurn) {
+    public void move(final MoveOptions moveOptions, final boolean isWhiteTurn) {
         Player player = currentPlayer(isWhiteTurn);
         Player enemy = currentPlayer(!isWhiteTurn);
-        Position source = moveParameters.getSource();
-        Position target = moveParameters.getTarget();
+        Position source = moveOptions.getSource();
+        Position target = moveOptions.getTarget();
 
         validateSourceOwner(enemy, source);
         validateSamePosition(source, target);
diff --git a/src/main/java/chess/domain/command/MoveOptions.java b/src/main/java/chess/domain/command/MoveOptions.java
@@ -4,19 +4,19 @@
 
 import java.util.List;
 
-public class MoveParameters {
+public class MoveOptions {
 
     private static final int SOURCE_INDEX = 0;
     private static final int TARGET_INDEX = 1;
 
     private final Position source;
     private final Position target;
 
-    public MoveParameters(final List<String> parameters) {
-        this(Position.of(parameters.get(SOURCE_INDEX)), Position.of(parameters.get(TARGET_INDEX)));
+    public MoveOptions(final List<String> options) {
+        this(Position.of(options.get(SOURCE_INDEX)), Position.of(options.get(TARGET_INDEX)));
     }
 
-    public MoveParameters(final Position source, final Position target) {
+    public MoveOptions(final Position source, final Position target) {
         this.source = source;
         this.target = target;
     }
diff --git a/src/test/java/chess/domain/board/BoardTest.java b/src/test/java/chess/domain/board/BoardTest.java
@@ -1,6 +1,6 @@
 package chess.domain.board;
 
-import chess.domain.command.MoveParameters;
+import chess.domain.command.MoveOptions;
 import chess.domain.player.Position;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -34,11 +34,11 @@ void move_source_position_empty() {
         Board board = new Board();
         Position source = Position.of("b3");
         Position target = Position.of("b4");
-        MoveParameters moveParameters = new MoveParameters(source, target);
+        MoveOptions moveOptions = new MoveOptions(source, target);
 
         //when, then
         assertThatIllegalArgumentException()
-                .isThrownBy(() -> board.move(moveParameters, true))
+                .isThrownBy(() -> board.move(moveOptions, true))
                 .withMessage("해당 위치에 기물이 존재하지 않습니다.");
     }
 
@@ -50,11 +50,11 @@ void move_source_not_owner(String sourcePosition, String targetPosition, boolean
         Board board = new Board();
         Position source = Position.of(sourcePosition);
         Position target = Position.of(targetPosition);
-        MoveParameters moveParameters = new MoveParameters(source, target);
+        MoveOptions moveOptions = new MoveOptions(source, target);
 
         //when, then
         assertThatIllegalArgumentException()
-                .isThrownBy(() -> board.move(moveParameters, isWhiteTurn))
+                .isThrownBy(() -> board.move(moveOptions, isWhiteTurn))
                 .withMessage("자신의 기물만 움직일 수 있습니다.");
     }
 
@@ -66,11 +66,11 @@ void move_source_and_target_same_color(String sourcePosition, String targetPosit
         Board board = new Board();
         Position source = Position.of(sourcePosition);
         Position target = Position.of(targetPosition);
-        MoveParameters moveParameters = new MoveParameters(source, target);
+        MoveOptions moveOptions = new MoveOptions(source, target);
 
         //when, then
         assertThatIllegalArgumentException()
-                .isThrownBy(() -> board.move(moveParameters, isWhiteTurn))
+                .isThrownBy(() -> board.move(moveOptions, isWhiteTurn))
                 .withMessage("같은 색상의 기물은 공격할 수 없습니다.");
     }
 
@@ -82,11 +82,11 @@ void move_source_and_target_same(String sourcePosition, String targetPosition, b
         Board board = new Board();
         Position source = Position.of(sourcePosition);
         Position target = Position.of(targetPosition);
-        MoveParameters moveParameters = new MoveParameters(source, target);
+        MoveOptions moveOptions = new MoveOptions(source, target);
 
         //when, then
         assertThatIllegalArgumentException()
-                .isThrownBy(() -> board.move(moveParameters, isWhiteTurn))
+                .isThrownBy(() -> board.move(moveOptions, isWhiteTurn))
                 .withMessage("출발 위치와 도착 위치가 같을 수 없습니다.");
     }
 
@@ -98,11 +98,11 @@ void move_invalid_paths(String sourcePosition, String targetPosition, boolean is
         Board board = new Board();
         Position source = Position.of(sourcePosition);
         Position target = Position.of(targetPosition);
-        MoveParameters moveParameters = new MoveParameters(source, target);
+        MoveOptions moveOptions = new MoveOptions(source, target);
 
         //when, then
         assertThatIllegalArgumentException()
-                .isThrownBy(() -> board.move(moveParameters, isWhiteTurn))
+                .isThrownBy(() -> board.move(moveOptions, isWhiteTurn))
                 .withMessage("기물을 통과하여 이동할 수 없습니다.");
     }
 
@@ -112,11 +112,11 @@ void move_invalid_paths(String sourcePosition, String targetPosition, boolean is
     void move_king_invalid_target(String source, String target) {
         //given
         Board board = setBoardToAttackKing();
-        MoveParameters moveParameters = new MoveParameters(Position.of(source), Position.of(target));
+        MoveOptions moveOptions = new MoveOptions(Position.of(source), Position.of(target));
 
         //when, then
         assertThatIllegalArgumentException()
-                .isThrownBy(() -> board.move(moveParameters, true))
+                .isThrownBy(() -> board.move(moveOptions, true))
                 .withMessage("킹은 상대방이 공격 가능한 위치로 이동할 수 없습니다.");
     }
 
@@ -136,20 +136,20 @@ void get_status() {
 
     private Board setBoardToGetStatus() {
         Board board = new Board();
-        board.move(new MoveParameters(Position.of("e7"), Position.of("e5")), false);
-        board.move(new MoveParameters(Position.of("e5"), Position.of("e4")), false);
-        board.move(new MoveParameters(Position.of("e4"), Position.of("e3")), false);
-        board.move(new MoveParameters(Position.of("d2"), Position.of("e3")), true);
+        board.move(new MoveOptions(Position.of("e7"), Position.of("e5")), false);
+        board.move(new MoveOptions(Position.of("e5"), Position.of("e4")), false);
+        board.move(new MoveOptions(Position.of("e4"), Position.of("e3")), false);
+        board.move(new MoveOptions(Position.of("d2"), Position.of("e3")), true);
         return board;
     }
 
     private Board setBoardToAttackKing() {
         Board board = new Board();
-        board.move(new MoveParameters(Position.of("e2"), Position.of("e4")), true);
-        board.move(new MoveParameters(Position.of("d2"), Position.of("d4")), true);
-        board.move(new MoveParameters(Position.of("e1"), Position.of("e2")), true);
-        board.move(new MoveParameters(Position.of("c7"), Position.of("c5")), false);
-        board.move(new MoveParameters(Position.of("d8"), Position.of("a5")), false);
+        board.move(new MoveOptions(Position.of("e2"), Position.of("e4")), true);
+        board.move(new MoveOptions(Position.of("d2"), Position.of("d4")), true);
+        board.move(new MoveOptions(Position.of("e1"), Position.of("e2")), true);
+        board.move(new MoveOptions(Position.of("c7"), Position.of("c5")), false);
+        board.move(new MoveOptions(Position.of("d8"), Position.of("a5")), false);
         return board;
     }
 }
diff --git a/src/test/java/chess/domain/command/MoveOptionsTest.java b/src/test/java/chess/domain/command/MoveOptionsTest.java
@@ -0,0 +1,45 @@
+package chess.domain.command;
+
+import chess.domain.board.File;
+import chess.domain.board.Rank;
+import chess.domain.player.Position;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class MoveOptionsTest {
+
+    @Test
+    @DisplayName("시작 위치를 반환한다.")
+    void getSource() {
+        //given
+        List<String> options = Arrays.asList("a1", "b2");
+        MoveOptions moveOptions = new MoveOptions(options);
+
+        //when
+        Position source = moveOptions.getSource();
+
+        //then
+        assertThat(source.getFile()).isEqualTo(File.A);
+        assertThat(source.getRank()).isEqualTo(Rank.R1);
+    }
+
+    @Test
+    @DisplayName("도착 위치를 반환한다.")
+    void getTarget() {
+        //given
+        List<String> options = Arrays.asList("a1", "b2");
+        MoveOptions moveOptions = new MoveOptions(options);
+
+        //when
+        Position target = moveOptions.getTarget();
+
+        //then
+        assertThat(target.getFile()).isEqualTo(File.B);
+        assertThat(target.getRank()).isEqualTo(Rank.R2);
+    }
+}
