리뷰 반영-2단계 자동차경주

Author: mmm307955

src/main/java/Car.java

@@ -1,23 +1,28 @@
 public class Car {
-    private final String carName;
-    private int position = 0;
 
-    public Car(String name){
-        this.carName = name;
-    }
+  private final String carName;
+  private int position = 0;
+  private final RandomMove randomMove;
 
-    public void move(Movable movable){
-        if(movable.canMove()){
-            position++;
-        }
-    }
+  public Car(String name, RandomMove randomMove,int position) {
 
-    public String getCarName(){
-        return carName;
-    }
+    this.carName = name;
+    this.randomMove = randomMove;
+    this.position = position;
+  }
 
-    public int getPosition() {
-        return position;
+  public void move(Movable movable) {
+    if (randomMove.canMove()) {
+      position++;
     }
+  }
+
+  public String getCarName() {
+    return carName;
+  }
+
+  public int getPosition() {
+    return position;
+  }
 
 }

src/main/java/Movable.java

@@ -1,4 +1,6 @@
 //움직일 수 있나? 만 보는 인터페이스
+@FunctionalInterface
 public interface Movable {
-    boolean canMove();
+  boolean canMove();
 }
+

src/main/java/RandomMove.java

@@ -1,12 +1,18 @@
+import java.util.concurrent.ThreadLocalRandom;
+
 public class RandomMove implements Movable {
-    //값의 의미나 목적을 코드에서 명확하게 알리고 가독성을 위한 상수 사용
-    //4는 전진 조건, 10은 랜덤 범위를 의미. 추후 변경 시 상수만 수정하면 됨
-    private static final int MOVE_THRESHOLD = 4;
-    private static final int RANDOM_BOUND = 10;
-
-    @Override
-    public boolean canMove(){
-        //nextInt(10)은 0~9까지의 랜덤한 값을 반환. 그 값이 4보다 크거나 같으면 true 반환
-        return (int)(Math.random() * RANDOM_BOUND) >= MOVE_THRESHOLD;
-    }
-}
+
+  private final int moveThreshold;
+  private final int randomBound;
+
+  //생성자에서 전진 조건을 설정
+  public RandomMove(int moveThreshold, int randomBound) {
+    this.moveThreshold = moveThreshold;
+    this.randomBound = randomBound;
+  }
+
+  @Override
+  public boolean canMove() {
+    return (ThreadLocalRandom.current().nextInt(randomBound)) >= moveThreshold;
+  }
+}

src/main/java/Winners.java

@@ -1,14 +1,12 @@
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class Winners {
-    public static List<String> findWinnersNames(List<Car> cars){
-        List<String> winners = new ArrayList<>();
-        for(int i = 0; i < cars.size(); i++){
-            if(cars.get(i).getPosition() >= 5){
-                winners.add(cars.get(i).getCarName());
-            }
-        }
-        return winners;
-    }
+
+  public static List<String> findWinnersNames(List<Car> cars) {
+    return cars.stream()
+        .filter(car -> car.getPosition() >= 5)
+        .map(Car::getCarName)
+        .collect(Collectors.toList());
+  }
 }

src/test/java/WinnersTest.java

@@ -1,30 +1,20 @@
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
 
 public class WinnersTest {
-    @Test
-    @DisplayName("우승자(들) 이름을 반환한다")
-    void returnWinnerNames(){
-        Car carA = new Car("Car A");
-        Car carB = new Car("Car B");
-        Car carC = new Car("Car C");
-
-        for(int i = 0; i < 5; i++){
-            carA.move(()->true);
-        }
 
-        for(int i = 0; i < 4; i++){
-            carB.move(()->true);
-        }
-        for(int i = 0; i < 5; i++){
-            carC.move(()->true);
-        }
+  @Test
+  @DisplayName("우승자(들) 이름을 반환한다")
+  void returnWinnerNames() {
+    Car normalCar = new Car("Car A",new RandomMove(4,10),5);
+    Car electricCar = new Car("Car B",new RandomMove(5,10),4);
+    Car truck = new Car("Car C",new RandomMove(6,10),2);
+    Car mini = new Car("Car D",new RandomMove(3,10),5);
 
-        List<Car> cars = List.of(carA, carB, carC);
-        assertThat(Winners.findWinnersNames(cars)).containsExactlyInAnyOrder("Car A","Car C");
-    }
+    List<Car> cars = List.of(normalCar, electricCar, truck, mini);
+    assertThat(Winners.findWinnersNames(cars)).containsExactlyInAnyOrder("Car A", "Car D");
+  }
 }