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

Author: mmm307955

src/main/java/Car.java

@@ -2,17 +2,16 @@ public class Car {
 
   private final String carName;
   private int position = 0;
-  private final RandomMove randomMove;
-
-  public Car(String name, RandomMove randomMove,int position) {
+  private final RandomMovable randomMovable;
 
+  public Car(String name, RandomMovable randomMovable, int position) {
     this.carName = name;
-    this.randomMove = randomMove;
+    this.randomMovable = randomMovable;
     this.position = position;
   }
 
-  public void move(Movable movable) {
-    if (randomMove.canMove()) {
+  public void move() {
+    if (randomMovable.canMove()) {
       position++;
     }
   }

src/main/java/Movable.java

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

src/main/java/RandomMovable.java

@@ -0,0 +1,18 @@
+import java.util.concurrent.ThreadLocalRandom;
+
+public class RandomMovable implements Movable {
+
+    private final int moveThreshold;
+    private final int randomBound;
+
+    //생성자에서 전진 조건을 설정
+    public RandomMovable(int moveThreshold, int randomBound) {
+        this.moveThreshold = moveThreshold;
+        this.randomBound = randomBound;
+    }
+
+    @Override
+    public boolean canMove() {
+        return (ThreadLocalRandom.current().nextInt(randomBound)) >= moveThreshold;
+    }
+}

src/main/java/RandomMove.java

@@ -3,10 +3,10 @@
 
 public class Winners {
 
-  public static List<String> findWinnersNames(List<Car> cars) {
-    return cars.stream()
-        .filter(car -> car.getPosition() >= 5)
-        .map(Car::getCarName)
-        .collect(Collectors.toList());
-  }
+    public static List<String> findWinnersNames(List<Car> cars) {
+        return cars.stream()
+                .filter(car -> car.getPosition() >= 5)
+                .map(Car::getCarName)
+                .collect(Collectors.toList());
+    }
 }

src/main/java/Winners.java

@@ -1,20 +1,21 @@
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class WinnersTest {
 
-  @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);
+    @Test
+    @DisplayName("우승자(들) 이름을 반환한다")
+    void returnWinnerNames() {
+        Car normalCar = new Car("Car A", new RandomMovable(4, 10), 5);
+        Car electricCar = new Car("Car B", new RandomMovable(5, 10), 4);
+        Car truck = new Car("Car C", new RandomMovable(6, 10), 2);
+        Car mini = new Car("Car D", new RandomMovable(3, 10), 5);
 
-    List<Car> cars = List.of(normalCar, electricCar, truck, mini);
-    assertThat(Winners.findWinnersNames(cars)).containsExactlyInAnyOrder("Car A", "Car D");
-  }
+        List<Car> cars = List.of(normalCar, electricCar, truck, mini);
+        assertThat(Winners.findWinnersNames(cars)).containsExactlyInAnyOrder("Car A", "Car D");
+    }
 }