[2단계 - 자동차 경주 리팩토링] 연로그(권시연) 미션 제출합니다.

README.md

@@ -27,14 +27,19 @@
     - 공동 우승은 ,로 구분해 출력  
       (ex: 오찌, 연로그가 최종 우승했습니다.)
 
-## 기능 요구사항
+## step1 요구사항
 - 주어진 횟수 동안 n대의 자동차는 전진 또는 멈출 수 있다.
 - 각 자동차에 이름을 부여할 수 있다. 전진하는 자동차를 출력할 때 자동차 이름을 같이 출력한다.
 - 자동차 이름은 쉼표(,)를 기준으로 구분하며 이름은 5자 이하만 가능하다.
 - 사용자는 몇 번의 이동을 할 것인지를 입력할 수 있어야 한다.
 - 전진하는 조건은 0에서 9 사이에서 random 값을 구한 후 random 값이 4 이상일 경우 전진하고, 3 이하의 값이면 멈춘다.
 - 자동차 경주 게임을 완료한 후 누가 우승했는지를 알려준다. 우승자는 한 명 이상일 수 있다.
 
+## step2 요구사항
+- MVC 패턴 기반으로 리팩토링
+  - domain 패키지의 객체는 view 패키지 객체에 의존하지 않는다.
+- 테스트 가능/불가능 부분을 분리해 테스트 가능 부분에 대해서만 단위 테스트
+
 ## 출력 예제
 ```
 경주할 자동차 이름을 입력하세요(이름은 쉼표(,)를 기준으로 구분).

src/main/java/racingcar/Application.java

@@ -1,10 +1,13 @@
 package racingcar;
 
 import racingcar.controller.RacingController;
+import racingcar.domain.strategy.MoveStrategy;
+import racingcar.domain.strategy.RandomMoveStrategy;
 
 public class Application {
     public static void main(String[] args) {
         RacingController racingController = new RacingController();
-        racingController.start();
+        MoveStrategy moveStrategy = new RandomMoveStrategy();
+        racingController.start(moveStrategy);
     }
 }

src/main/java/racingcar/controller/RacingController.java

@@ -1,45 +1,47 @@
 package racingcar.controller;
 
-import racingcar.model.Cars;
-import racingcar.model.TryCount;
+import racingcar.domain.Cars;
+import racingcar.domain.TryCount;
+import racingcar.domain.strategy.MoveStrategy;
 import racingcar.view.InputView;
 import racingcar.view.OutputView;
 
 public class RacingController {
-    private Cars cars;
-    private TryCount tryCount;
+    public void start(MoveStrategy moveStrategy) {
+        Cars cars = inputCars();
+        TryCount tryCount = inputTryCount();
+        race(cars, tryCount, moveStrategy);
+        printRaceResult(cars);
+    }
 
-    public void start() {
+    private Cars inputCars() {
         try {
-            cars = new Cars(InputView.inputCarNames());
-            inputTryCount();
-            race();
-            terminate();
+            return new Cars(InputView.inputCarNames());
         } catch (IllegalArgumentException e) {
             OutputView.printException(e);
-            start();
+            return inputCars();
         }
     }
 
-    private void inputTryCount() {
+    private TryCount inputTryCount() {
         try {
-            tryCount = new TryCount(InputView.inputTryCount());
+            return new TryCount(InputView.inputTryCount());
         } catch (IllegalArgumentException e) {
             OutputView.printException(e);
-            inputTryCount();
+            return inputTryCount();
         }
     }
 
-    private void race() {
+    private void race(Cars cars, TryCount tryCount, MoveStrategy moveStrategy) {
         int nowTryCnt = 0;
         OutputView.printStartMessage();
         while (tryCount.isNotSame(nowTryCnt++)) {
-            cars.moveAll();
+            cars.moveAll(moveStrategy);
             OutputView.printCarsStatus(cars.getCars());
         }
     }
 
-    private void terminate() {
+    private void printRaceResult(Cars cars) {
         OutputView.printCarsStatus(cars.getCars());
         OutputView.printWinners(cars.getWinners());
     }

src/main/java/racingcar/model/Car.java → src/main/java/racingcar/domain/Car.java

@@ -1,9 +1,8 @@
-package racingcar.model;
+package racingcar.domain;
 
-public class Car {
-    private static final int MOVING_DISTANCE = 1;
-    private static final int STANDARD_VALUE = 4;
+import racingcar.domain.strategy.MoveStrategy;
 
+public class Car {
     private final Name name;
     private final Position position;
 
@@ -12,10 +11,8 @@ public Car(String nameString) {
         this.position = new Position();
     }
 
-    public void goOrStop(int random) {
-        if (random >= STANDARD_VALUE) {
-            position.move(MOVING_DISTANCE);
-        }
+    public void go(MoveStrategy strategy) {
+        position.move(strategy.move());
     }
 
     public String getName() {
@@ -26,4 +23,11 @@ public int getPosition() {
         return this.position.toInt();
     }
 
+    @Override
+    public String toString() {
+        return "Car{" +
+                "name=" + name +
+                ", position=" + position +
+                '}';
+    }
 }

src/main/java/racingcar/model/Cars.java → src/main/java/racingcar/domain/Cars.java

@@ -1,18 +1,18 @@
-package racingcar.model;
+package racingcar.domain;
 
 import static racingcar.util.StringUtils.splitByDelimiter;
 import static racingcar.util.StringUtils.stripStringArray;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import racingcar.domain.strategy.MoveStrategy;
 import racingcar.message.ErrorMessages;
-import racingcar.util.RandomGenerator;
+import racingcar.util.RandomUtils;
 
 public class Cars {
     private static final String DELIMITER = ",";
-    private static final int MIN = 0;
-    private static final int MAX = 9;
+
 
     private final List<Car> cars = new ArrayList<>();
 
@@ -24,9 +24,9 @@ public Cars(String carNames) {
         }
     }
 
-    public void moveAll() {
+    public void moveAll(MoveStrategy strategy) {
         for (Car car : cars) {
-            car.goOrStop(RandomGenerator.generateNumber(MIN, MAX + 1));
+            car.go(strategy);
         }
     }
 
@@ -45,4 +45,11 @@ private void validateDuplicatedName(String[] carNames) {
             throw new IllegalArgumentException(ErrorMessages.DUPLICATED_NAME);
         }
     }
+
+    @Override
+    public String toString() {
+        return "Cars{" +
+                "cars=" + cars +
+                '}';
+    }
 }

src/main/java/racingcar/model/Name.java → src/main/java/racingcar/domain/Name.java

@@ -1,4 +1,4 @@
-package racingcar.model;
+package racingcar.domain;
 
 import java.util.Objects;
 import racingcar.message.ErrorMessages;
@@ -13,11 +13,6 @@ public Name(String name) {
         this.name = name;
     }
 
-    @Override
-    public String toString() {
-        return this.name;
-    }
-
     private void validate(String name) {
         validateNotEmpty(name);
         validateLength(name);
@@ -51,4 +46,9 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return Objects.hash(name);
     }
+
+    @Override
+    public String toString() {
+        return this.name;
+    }
 }

src/main/java/racingcar/model/Position.java → src/main/java/racingcar/domain/Position.java

@@ -1,4 +1,4 @@
-package racingcar.model;
+package racingcar.domain;
 
 public class Position {
     private static final int INITIAL_POSITION = 0;
@@ -17,4 +17,10 @@ public int toInt() {
         return this.position;
     }
 
+    @Override
+    public String toString() {
+        return "Position{" +
+                "position=" + position +
+                '}';
+    }
 }

src/main/java/racingcar/model/TryCount.java → src/main/java/racingcar/domain/TryCount.java

@@ -1,21 +1,41 @@
-package racingcar.model;
+package racingcar.domain;
 
-import static racingcar.message.ErrorMessages.*;
+import static racingcar.message.ErrorMessages.TRY_CNT_NOT_NUMBER;
+import static racingcar.message.ErrorMessages.TRY_CNT_NOT_VALID_NUMBER;
 
 import java.util.Objects;
 
 public class TryCount {
+    private static final int TRY_MAX_CNT = 1000;
     private final int tryCount;
 
     public TryCount(String countString) {
+        validateStringIsNumber(countString);
+        isValidNumber(countString);
         this.tryCount = convertStringToInt(countString);
-        validatePositive(tryCount);
     }
 
     public boolean isNotSame(int tryCount) {
         return this.tryCount != tryCount;
     }
 
+    private void validateStringIsNumber(String input) {
+        if (!input.matches("[0-9]")) {
+            throw new IllegalArgumentException(TRY_CNT_NOT_NUMBER);
+        }
+    }
+
+    private void isValidNumber(String input) {
+        long count = Long.parseLong(input);
+        if (count < 0 || count > TRY_MAX_CNT) {
+            throw new IllegalArgumentException(TRY_CNT_NOT_VALID_NUMBER);
+        }
+    }
+
+    private int convertStringToInt(String string) {
+        return Integer.parseInt(string);
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
@@ -33,17 +53,10 @@ public int hashCode() {
         return Objects.hash(tryCount);
     }
 
-    private int convertStringToInt(String string) {
-        try {
-            return Integer.parseInt(string);
-        } catch (NumberFormatException e) {
-            throw new IllegalArgumentException(TRY_CNT_NOT_NUMBER);
-        }
-    }
-
-    private void validatePositive(int count) {
-        if (count < 0) {
-            throw new IllegalArgumentException(TRY_CNT_NOT_NATURAL_NUMBER);
-        }
+    @Override
+    public String toString() {
+        return "TryCount{" +
+                "tryCount=" + tryCount +
+                '}';
     }
 }

src/main/java/racingcar/model/Winners.java → src/main/java/racingcar/domain/Winners.java

@@ -1,4 +1,4 @@
-package racingcar.model;
+package racingcar.domain;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -7,20 +7,14 @@ public class Winners {
     private static final int MIN_POSITION = 0;
 
     private final List<Car> winners;
-    private final int maxPosition;
 
     public Winners(List<Car> cars) {
-        maxPosition = getMaxPosition(cars);
+        int maxPosition = getMaxPosition(cars);
         winners = cars.stream()
                 .filter(car -> car.getPosition() == maxPosition)
                 .collect(Collectors.toList());
     }
 
-
-    public int getMaxPosition() {
-        return maxPosition;
-    }
-
     public List<String> getNames() {
         return winners.stream()
                 .map(Car::getName)
@@ -34,4 +28,10 @@ private int getMaxPosition(List<Car> cars) {
                 .orElse(MIN_POSITION);
     }
 
+    @Override
+    public String toString() {
+        return "Winners{" +
+                "winners=" + winners +
+                '}';
+    }
 }

src/main/java/racingcar/domain/strategy/FixMoveStrategy.java

@@ -0,0 +1,20 @@
+package racingcar.domain.strategy;
+
+public class FixMoveStrategy implements MoveStrategy {
+    private static final int MOVING_DISTANCE = 1;
+    private static final int STANDARD_VALUE = 4;
+
+    private final int distance;
+
+    public FixMoveStrategy(int distance) {
+        this.distance = distance;
+    }
+
+    @Override
+    public int move() {
+        if (distance >= STANDARD_VALUE) {
+            return MOVING_DISTANCE;
+        }
+        return 0;
+    }
+}

src/main/java/racingcar/domain/strategy/MoveStrategy.java

@@ -0,0 +1,5 @@
+package racingcar.domain.strategy;
+
+public interface MoveStrategy {
+    int move();
+}

src/main/java/racingcar/domain/strategy/RandomMoveStrategy.java

@@ -0,0 +1,19 @@
+package racingcar.domain.strategy;
+
+import racingcar.util.RandomUtils;
+
+public class RandomMoveStrategy implements MoveStrategy {
+    private static final int MOVE_MIN = 0;
+    private static final int MOVE_MAX = 9;
+    private static final int STANDARD_VALUE = 4;
+    private static final int MOVING_DISTANCE = 1;
+
+    @Override
+    public int move() {
+        int random = RandomUtils.generateNumber(MOVE_MIN, MOVE_MAX + 1);
+        if (random >= STANDARD_VALUE) {
+            return MOVING_DISTANCE;
+        }
+        return 0;
+    }
+}

src/main/java/racingcar/message/ErrorMessages.java

@@ -5,5 +5,5 @@ public class ErrorMessages {
     public static final String LONG_NAME = "[ERROR] 너무 긴 이름입니다.";
     public static final String DUPLICATED_NAME = "[ERROR] 중복된 이름이 존재합니다";
     public static final String TRY_CNT_NOT_NUMBER = "[ERROR] 시도할 횟수는 숫자여야 합니다.";
-    public static final String TRY_CNT_NOT_NATURAL_NUMBER = "[ERROR] 시도할 횟수는 0 이상이어야 합니다.";
+    public static final String TRY_CNT_NOT_VALID_NUMBER = "[ERROR] 시도할 횟수는 0 이상 1000 이하여야 합니다.";
 }