자동차경주/제훈/step1

src/main/java/study/racingcar/controller/CarController.java

@@ -1,12 +1,38 @@
 package study.racingcar.controller;
 
-import static study.racingcar.model.Car.raceStart;
-import static study.racingcar.view.InputView.getAttemptNumber;
-import static study.racingcar.view.InputView.getCarNumber;
+import study.racingcar.view.InputView;
+import study.racingcar.view.ResultView;
 
-public class CarController {
+import java.util.ArrayList;
+import java.util.List;
+
+import static study.racingcar.model.Car.requestCarsToMove;
 
+public class CarController {
     public CarController() {
-        raceStart(getCarNumber(), getAttemptNumber());
+        raceStart(InputView.getCarNumber(), InputView.getAttemptNumber());
+    }
+
+    public static List<Integer> raceStart(int carNum, int attemptNum) {
+        List<Integer> startLine = addCar(carNum);
+        List<Integer> finalPositions = new ArrayList<>();
+
+        for (int i = 0; i < attemptNum; i++) {
+            List<Integer> racingCar = requestCarsToMove(carNum, startLine);
+            ResultView.printRaceResult(racingCar);
+            System.out.println("");
+            finalPositions = new ArrayList<>(racingCar);
+        }
+        return finalPositions;
+    }
+
+    private static List<Integer> addCar(int carNum) {
+        List<Integer> positions = new ArrayList<>();
+
+        for (int i = 0; i < carNum; i++) {
+            positions.add(i,0);
+        }
+
+        return positions;
     }
 }

src/main/java/study/racingcar/model/Car.java

@@ -1,48 +1,24 @@
 package study.racingcar.model;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import static study.racingcar.view.ResultView.printRaceResult;
-
 public class Car {
-
     private static final int MAX_BOUNDARY_OF_RANDOM_NUMBER= 10;
-    public Car(int carNum, List<Integer> positions) {
-        addCar(carNum, positions);
-    }
-
-    public static void raceStart(int carNum, int attemptNum) {
-        List<Integer> positions = new ArrayList<>();
-
-        Car car = new Car(carNum, positions);
-
-        car.addCar(carNum, positions);
-
-        for (int i = 0; i < attemptNum; i++) {
-            car.requestCarsToMove(carNum, positions);
-            printRaceResult(positions);
-        }
-    }
-
-    private static void addCar(int carNum, List<Integer> positions) {
-        for (int i = 0; i < carNum; i++) {
-            positions.add(i,0);
-        }
-    }
+    public Car() { }
 
-    public static void requestCarsToMove(int carNum, List<Integer> positions) {
+    public static List<Integer> requestCarsToMove(int carNum, List<Integer> positions) {
         for (int i = 0; i < carNum; i++) {
             forwardNumber(i, positions);
         }
+        return positions;
     }
 
     private static void forwardNumber(int current, List<Integer> positions) {
         Random random = new Random();
         int forward = random.nextInt(MAX_BOUNDARY_OF_RANDOM_NUMBER); // 0부터 9
 
-        if (forward >= 4) { // 전진하는 조건
+        if (forward >= 4) {
             int currentValue = positions.get(current);
             int newValue = currentValue + 1;
 

src/main/java/study/racingcar/view/ResultView.java

@@ -1,8 +1,6 @@
 package study.racingcar.view;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Random;
 
 public class ResultView {
     public static void printRaceResult(List<Integer> positions) {

src/test/java/study/racingcar/CarTest.java

@@ -1,44 +1,46 @@
 package study.racingcar;
 
 import org.junit.jupiter.api.Test;
-import study.racingcar.model.Car;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static study.racingcar.controller.CarController.raceStart;
+import static study.racingcar.model.Car.requestCarsToMove;
 
 public class CarTest {
 
-    private static final int POSITIONS_INDEX = 0;
+    private static final int MAX_BOUNDARY_OF_RANDOM_CAR_NUMBER = 5;
+    private static final int MAX_BOUNDARY_OF_RANDOM_ATTEMPT_NUMBER = 3;
     @Test
-    public void 자동차_대수와_시도_횟수를_1로_정해준_뒤_이동_로직을_확인한다() {
-        int carNum = 1;
-        int attemptNum = 1;
-        List<Integer> positions = new ArrayList<>();
-
-        Car car = new Car(carNum, positions);
-        car.raceStart(carNum, attemptNum);
-
-        int carPosition = 0;
+    public void 자동차_이동_로직을_확인한다() {
+        // given
+        Random random = new Random();
+        int carNum = random.nextInt(MAX_BOUNDARY_OF_RANDOM_CAR_NUMBER + 1); // 1 ~ 5
+        int attemptNum = random.nextInt(MAX_BOUNDARY_OF_RANDOM_ATTEMPT_NUMBER + 3); // 3 ~ 5
 
-        for (int i = 0; i < positions.size(); i++) {
-            carPosition = positions.get(i);
-        }
+        // when
+        List<Integer> finalPositions = raceStart(carNum, attemptNum);
 
-        assertEquals(carPosition >= 0 && carPosition <= 1, true);
+        // then
+        assertEquals(carNum, finalPositions.size());
     }
 
     @Test
-    public void 자동차_대수를_1대로_정해준_뒤_전진_로직을_확인한다() {
-        int carNum = 1;
+    public void 자동차_전진_로직을_확인한다() {
+        // given
+        Random random = new Random();
+        int carNum = random.nextInt(MAX_BOUNDARY_OF_RANDOM_CAR_NUMBER + 1); // 1 ~ 5
         List<Integer> positions = new ArrayList<>();
 
-        Car car = new Car(carNum, positions);
-        car.requestCarsToMove(carNum, positions);
-
-        int carPosition = positions.get(POSITIONS_INDEX);
+        // when
+        List<Integer> checkForward = requestCarsToMove(carNum, positions);
 
-        assertEquals(carPosition == 0 || carPosition == 1, true);
+        // then
+        for (int i = 0 ; i < carNum; i++) {
+            assertEquals(checkForward.get(i) == 0 || checkForward.get(i) == 1, true);
+        }
     }
 }