[디디] 레이싱게임 리뷰요청 드립니다.

src/main/java/racinggame/controller/Main.java

@@ -9,12 +9,12 @@ public static void main(String... args) {
         Names names = new Names(InputView.inputName());
         Repeat repeat = new Repeat(InputView.inputRepeat());
         Cars cars = new Cars(names);
-        RacingGame racingGame = new RacingGame();
+        RacingGame racingGame = new RacingGame(cars);
         int maxPosition = 0;
 
         OutputView.printResultFormat();
         for (int i = 0; i < repeat.getRepeat(); i++) {
-            maxPosition = racingGame.moveCars(cars, maxPosition);
+            maxPosition = racingGame.moveCars(new RandomGenerator());
             OutputView.printCarsLog(cars);
         }
         Winners winners = cars.makeWinners(maxPosition);

src/main/java/racinggame/domain/Car.java

@@ -1,8 +1,8 @@
 package racinggame.domain;
 
 public class Car {
-    private static final int FORWARD_NUMBER = 4;
-    private static final int START_POSITION = 0;
+    private static int FORWARD_NUMBER = 4;
+    private static int START_POSITION = 0;
     private final String name;
     private int position;
 
@@ -15,7 +15,8 @@ public Car(String name, int position) {
         this.position = position;
     }
 
-    public boolean move(int random) {
+    public boolean move(Strategy strategy) {
+        int random = strategy.generateRandom();
         if (random >= FORWARD_NUMBER) {
             position++;
             return true;

src/main/java/racinggame/domain/Cars.java

@@ -11,6 +11,10 @@ public Cars(Names names) {
         cars = names.makeCars();
     }
 
+    public Cars(List<Car> cars){
+        this.cars = cars;
+    }
+
     public Winners makeWinners(int maxPosition) {
         List<Car> winners = new ArrayList<>();
 

src/main/java/racinggame/domain/MoveGenerator.java

@@ -0,0 +1,7 @@
+package racinggame.domain;
+
+public class MoveGenerator implements Strategy {
+    public int generateRandom() {
+        return 5;
+    }
+}

src/main/java/racinggame/domain/RacingGame.java

@@ -1,19 +1,17 @@
 package racinggame.domain;
 
-import java.util.Random;
-
-public class RacingGame implements Strategy {
+public class RacingGame {
     public static final int NUMBER_BOUND = 10;
+    private Cars cars;
 
-    public static int generateRandom() {
-        Random rand = new Random();
-        rand.setSeed(System.nanoTime());
-        return rand.nextInt(NUMBER_BOUND);
+    public RacingGame(Cars cars) {
+        this.cars = cars;
     }
 
-    public int moveCars(Cars cars, int maxPosition) {
+    public int moveCars(Strategy randomGenerator) {
+        int maxPosition = 0;
         for (Car car : cars) {
-            if (car.move(generateRandom())) {
+            if (car.move(randomGenerator)) {
                 maxPosition = car.getMaxPosition(maxPosition);
             }
         }

src/main/java/racinggame/domain/RandomGenerator.java

@@ -0,0 +1,14 @@
+package racinggame.domain;
+
+import java.util.Random;
+
+import static racinggame.domain.RacingGame.NUMBER_BOUND;
+
+public class RandomGenerator implements Strategy {
+
+    public int generateRandom() {
+        Random rand = new Random();
+        rand.setSeed(System.nanoTime());
+        return rand.nextInt(NUMBER_BOUND);
+    }
+}

src/main/java/racinggame/domain/StopGenerator.java

@@ -0,0 +1,7 @@
+package racinggame.domain;
+
+public class StopGenerator implements Strategy {
+    public int generateRandom() {
+        return 0;
+    }
+}

src/main/java/racinggame/domain/Strategy.java

@@ -1,5 +1,5 @@
 package racinggame.domain;
 
 public interface Strategy {
-    int moveCars(Cars cars, int maxPosition);
+    int generateRandom();
 }

src/test/java/CarTest.java

@@ -1,9 +1,11 @@
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import racinggame.domain.Car;
+import racinggame.domain.MoveGenerator;
+import racinggame.domain.StopGenerator;
 
 public class CarTest {
     Car car;
@@ -14,34 +16,23 @@ public class CarTest {
     @BeforeEach
     void initCar() {
         car = new Car("moveTest");
-        pobiCar = new Car("pobi");
-        crongCar = new Car("crong");
-        honuxCar = new Car("honux");
-
-        pobiCar.move(4);
-
-        crongCar.move(7);
-        crongCar.move(7);
-
-        honuxCar.move(1);
-        honuxCar.move(2);
-        honuxCar.move(3);
-        honuxCar.move(4);
-        honuxCar.move(5);
-        honuxCar.move(6);
-        honuxCar.move(7);
+        pobiCar = new Car("pobi", 4);
+        crongCar = new Car("crong", 3);
+        honuxCar = new Car("honux", 7);
+    }
 
+    @Test
+    void 이동_테스트(){
+        Assertions.assertThat(car.move(new MoveGenerator())).isTrue();
     }
 
-    @ParameterizedTest
-    @CsvSource(value = {"0,false", "3,false", "4,true", "9,true"})
-    void moveTest(int random, boolean expected) {
-        boolean actual = car.move(random);
-        Assertions.assertThat(actual).isEqualTo(expected);
+    @Test
+    void 정지_테스트(){
+        Assertions.assertThat(car.move(new StopGenerator())).isFalse();
     }
 
     @ParameterizedTest
-    @CsvSource(value = {"1,true,false,false", "2,false,true,false", "4,false," +
+    @CsvSource(value = {"4,true,false,false", "3,false,true,false", "7,false," +
             "false,true"})
     void samePositionTest(int random, boolean expected1, boolean expected2,
                           boolean expected3) {

src/test/java/RacingGameTest.java

@@ -1,5 +1,4 @@
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import racinggame.domain.*;
 
@@ -8,69 +7,31 @@
 
 public class RacingGameTest {
     private static final List<Car> carList = new ArrayList<>();
-    private static final int WINNER_POSITION = 3;
-    private final String NAMES = "pobi,crong,honux";
-    private Names names = new Names(NAMES);
+    private static Cars cars;
+    private static RacingGame racingGame;
 
-    void initList() {
+    static {
         carList.clear();
-        carList.add(new Car("pobi", 0));
-        carList.add(new Car("kim", 0));
-        carList.add(new Car("park", 0));
-
-        carList.get(0).move(4);
-        carList.get(0).move(4);
-        carList.get(0).move(4);
-
-        carList.get(1).move(4);
-        carList.get(1).move(4);
-        carList.get(1).move(4);
-
-        carList.get(2).move(4);
-        carList.get(2).move(2);
-        carList.get(2).move(1);
-    }
-
-    @Test
-    void moveCarsOnlyTrueTest() {
-        int maxPosition = 0;
-        Cars cars = new Cars(names);
-        Strategy racingGame = new MoveCarsOnlyTrue();
-
-        for (int i = 1; i <= 10; i++) {
-            Assertions.assertThat(racingGame.moveCars(cars, maxPosition)).isEqualTo(i);
-        }
+        carList.add(new Car("pobi", 4));
+        carList.add(new Car("crong", 7));
+        carList.add(new Car("honux", 3));
+        cars = new Cars(carList);
+        racingGame = new RacingGame(cars);
     }
 
     @Test
-    void moveCarsOnlyFalseTest() {
-        int maxPosition = 0;
-        Cars cars = new Cars(names);
-        Strategy racingGame = new MoveCarsOnlyFalse();
-
-        for (int i = 1; i <= 10; i++) {
-            Assertions.assertThat(racingGame.moveCars(cars, maxPosition)).isEqualTo(0);
-        }
-    }
+    void Cars_이동_테스트() {
+        racingGame.moveCars(new MoveGenerator());
+        Winners winners = cars.makeWinners(8);
 
-
-    @RepeatedTest(value = 50)
-    void 랜덤_테스트() {
-        int result = RacingGame.generateRandom();
-
-        Assertions.assertThat(result).isBetween(0, 9);
+        Assertions.assertThat(winners.getWinners()).containsExactly("crong");
     }
 
     @Test
-    void 우승자_확인_테스트() {
-        initList();
-        boolean chkWinner = carList.get(0).isSamePosition(WINNER_POSITION);
-        Assertions.assertThat(chkWinner).isEqualTo(true);
-
-        chkWinner = carList.get(1).isSamePosition(WINNER_POSITION);
-        Assertions.assertThat(chkWinner).isEqualTo(true);
+    void Cars_정지_테스트() {
+        racingGame.moveCars(new StopGenerator());
+        Winners winners = cars.makeWinners(7);
 
-        chkWinner = carList.get(2).isSamePosition(WINNER_POSITION);
-        Assertions.assertThat(chkWinner).isEqualTo(false);
+        Assertions.assertThat(winners.getWinners()).containsExactly("crong");
     }
 }

src/test/java/WinnersTest.java

@@ -6,28 +6,29 @@
 import racinggame.domain.Names;
 import racinggame.domain.Winners;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class WinnersTest {
-    private final Names names = new Names("pobi,crong,honux");
-    private Cars cars = new Cars(names);
+    private Cars cars;
     private Winners winners;
-    private String winnerName = "honux";
+    private String winnerName = "crong";
 
     @BeforeEach
-    void initCarsPosition() {
-        int i = 0;
-        for (Car car : cars) {
-            car.move(6);
-            car.move(i);
-            i += 3;
-        }
+    void initList() {
+        List<Car> carList = new ArrayList<>();
+        carList.add(new Car("pobi", 4));
+        carList.add(new Car("crong", 7));
+        carList.add(new Car("honux", 3));
+        cars = new Cars(carList);
     }
 
     @Test
     void makeWinnersTest() {
-        winners = cars.makeWinners(2);
+        winners = cars.makeWinners(7);
         List<String> winnerNames = winners.getWinners();
         Assertions.assertThat(winnerNames.contains(winnerName)).isTrue();
+        Assertions.assertThat(winnerNames.contains("pobi")).isFalse();
+        Assertions.assertThat(winnerNames.contains("honux")).isFalse();
     }
 }