[2단계 - 자동차 경주 리팩터링] 저문(유정훈) 미션 제출합니다.

src/main/java/racing/domain/Car.java

@@ -3,6 +3,7 @@
 public class Car {
 
     private static final int INITIAL_VALUE = 0;
+    private static final int MOVABLE_VALUE = 4;
 
     private final Name name;
     private Position position;
@@ -12,8 +13,8 @@ public Car(String name) {
         this.position = new Position(INITIAL_VALUE);
     }
 
-    public void move(boolean isMovable) {
-        if (isMovable) {
+    public void move(NumberGenerator numberGenerator) {
+        if (numberGenerator.generate() >= MOVABLE_VALUE) {
             this.position = position.increase();
         }
     }

src/main/java/racing/domain/CarGroup.java

@@ -19,9 +19,9 @@ public CarGroup(String[] names){
         this.cars = setUp(names);
     }
 
-    public void race(boolean isMovable) {
+    public void race(NumberGenerator numberGenerator) {
         for (Car car : cars) {
-            car.move(isMovable);
+            car.move(numberGenerator);
         }
     }
 

src/main/java/racing/domain/NumberGenerator.java

@@ -0,0 +1,6 @@
+package racing.domain;
+
+public interface NumberGenerator {
+
+    int generate();
+}

src/main/java/racing/domain/RacingGame.java

@@ -17,7 +17,7 @@ public RacingGame(CarGroup group, RandomNumberGenerator randomNumberGenerator) {
 
     //TODO: 테스트
     public void race() {
-        carGroup.race(isMovable());
+        carGroup.race(numberGenerator);
     }
 
     public RacingResult produceRacingResult() {
@@ -28,8 +28,4 @@ public RacingResult produceRacingResult() {
 
         return new RacingResult(history);
     }
-
-    private boolean isMovable() {
-        return (numberGenerator.generate() >= MOVABLE_CONDITION);
-    }
 }

src/main/java/racing/domain/RandomNumberGenerator.java

@@ -1,7 +1,8 @@
 package racing.domain;
 
-public class RandomNumberGenerator {
+public class RandomNumberGenerator implements NumberGenerator {
 
+    @Override
     public int generate(){
         return (int)(Math.random() * 10);
     }

src/test/java/racing/domain/CarTest.java

@@ -26,27 +26,30 @@ void createCarWhenLengthOfCarNameIsValidate(String input) {
         assertDoesNotThrow(() -> new Car(input));
     }
 
-    @DisplayName("자동차의 move메소드는 true값을 인자로 받으면 전진한다.")
+    @DisplayName("자동차의 move메소드는 전진하는 경우 위치가 1만큼 증가한다.")
     @Test
     void moveWhenRandomNumberIsOverThree() {
         //given
         Car car = new Car("123");
+        NumberGenerator numberGenerator = new MovableNumberGenerator();
+
         //when
-        car.move(true);
+        car.move(numberGenerator);
         System.out.println(car.getPosition().getPosition());
 
         //then
         assertThat(car.getPosition()).isEqualTo(new Position(1));
     }
 
-    @DisplayName("자동차의 move메소드는 false값을 인자로 받는 경우 전진하지 않는다.")
+    @DisplayName("자동차의 move메소드는 전전하지 않는 경우 위치가 유지된다.")
     @Test
     void moveWhenRandomNumberIsUnderThree() {
         //given
         Car car = new Car("123");
+        NumberGenerator numberGenerator = new NonMovableNumberGenerator();
 
         //when
-        car.move(false);
+        car.move(numberGenerator);
 
         //then
         assertThat(car.getPosition()).isEqualTo(new Position(0));

src/test/java/racing/domain/MovableNumberGenerator.java

@@ -0,0 +1,9 @@
+package racing.domain;
+
+public class MovableNumberGenerator implements NumberGenerator {
+
+    @Override
+    public int generate() {
+        return 4;
+    }
+}

src/test/java/racing/domain/NonMovableNumberGenerator.java

@@ -0,0 +1,9 @@
+package racing.domain;
+
+public class NonMovableNumberGenerator implements NumberGenerator {
+
+    @Override
+    public int generate() {
+        return 0;
+    }
+}