conflict 해결 및 전략 패턴 적용 (#4)

* conflict ㅎㅐ결

* RandomMovingStrategy 작성

* stragegy 패턴 적용

* 포맷팅

src/main/java/step4_winner/CarRacingRunner.java

@@ -2,6 +2,8 @@
 
 import step4_winner.domain.Car;
 import step4_winner.domain.Race;
+import step4_winner.strategy.MovingStrategy;
+import step4_winner.strategy.RandomMovingStrategy;
 import step4_winner.view.InputView;
 import step4_winner.view.ResultView;
 
@@ -12,6 +14,7 @@
 public class CarRacingRunner {
     private final InputView inputView;
     private final ResultView resultView;
+    private final MovingStrategy movingStrategy;
     private final Race race;
     private final int tries;
 
@@ -20,6 +23,7 @@ public CarRacingRunner(InputView inputView, ResultView resultView) {
         this.resultView = resultView;
         this.race = prepareRace();
         this.tries = prepareTries();
+        this.movingStrategy = new RandomMovingStrategy();
     }
 
     private Race prepareRace() {
@@ -37,7 +41,7 @@ private int prepareTries() {
     public void runRaces() {
         resultView.printResultHeader();
         for (int i = 0; i < tries; i++) {
-            race.runRace();
+            race.runRace(movingStrategy);
             resultView.displayRaceResult(race.getCars());
         }
         resultView.printFinalWinner(race.getCars());

src/main/java/step4_winner/domain/Car.java

@@ -1,12 +1,12 @@
 package step4_winner.domain;
 
 import lombok.Getter;
+import step4_winner.strategy.MovingStrategy;
 
 @Getter
 public class Car {
     private static final int MAX_NAME_LENGTH = 5;
     private static final int MIN_DISTANCE = 1;
-    private static final int MOVE_THRESHOLD = 4;
 
     private int distance = MIN_DISTANCE;
     private final String name;
@@ -17,7 +17,7 @@ public Car(String inputName) {
         this.name = inputName;
     }
 
-    public void move(int randomValue) {
-        if (randomValue >= MOVE_THRESHOLD) distance++;
+    public void move(MovingStrategy movingStrategy) {
+        if (movingStrategy.isMove()) distance++;
     }
 }

src/main/java/step4_winner/domain/Race.java

@@ -2,21 +2,21 @@
 
 
 import lombok.Getter;
+import step4_winner.strategy.MovingStrategy;
 
 import java.util.List;
-import java.util.Random;
 
+@Getter
 public class Race {
-    private final Random random = new Random();
-    @Getter private final List<Car> cars;
+    private final List<Car> cars;
 
     public Race(List<Car> cars) {
         if (cars.isEmpty())
             throw new IllegalArgumentException("0이상이어야 함");
         this.cars = cars;
     }
 
-    public void runRace() {
-        cars.forEach(car -> car.move(random.nextInt(10)));
+    public void runRace(MovingStrategy movingStrategy) {
+        cars.forEach(car -> car.move(movingStrategy));
     }
 }

src/main/java/step4_winner/strategy/MovingStrategy.java

@@ -0,0 +1,5 @@
+package step4_winner.strategy;
+
+public interface MovingStrategy {
+    boolean isMove();
+}

src/main/java/step4_winner/strategy/RandomMovingStrategy.java

@@ -0,0 +1,15 @@
+package step4_winner.strategy;
+
+import java.util.Random;
+
+public class RandomMovingStrategy implements MovingStrategy {
+
+    private final Random random = new Random();
+    private static final int RANDOM_RANGE = 10;
+    private static final int MOVE_THRESHOLD = 4;
+
+    @Override
+    public boolean isMove() {
+        return random.nextInt(RANDOM_RANGE) > MOVE_THRESHOLD;
+    }
+}

src/test/java/step4_winner/domain/CarTest.java

@@ -3,7 +3,8 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 
 class CarTest {
 
@@ -22,12 +23,12 @@ void CarMoveTest() {
         assertThat(car.getName()).isEqualTo("test1");
 
         // WHEN : 안움직임
-        car.move(3);
+        car.move(() -> false);
         // THEN
         assertThat(car.getDistance()).isEqualTo(1);
 
         // WHEN : 움직임
-        car.move(4);
+        car.move(() -> true);
         // THEN
         assertThat(car.getDistance()).isGreaterThan(1);
     }

src/test/java/step4_winner/domain/RaceTest.java

@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import step4_winner.strategy.RandomMovingStrategy;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,7 +47,7 @@ public void RaceRoundTest() {
         Race race = new Race(cars);
 
         // WHEN
-        race.runRace();
+        race.runRace(new RandomMovingStrategy());
 
         // then
         boolean anyCarMoved = cars.stream().anyMatch(car -> car.getDistance() > 1);