refactor(CarsInfo): CarsInfo 삭제, Cars/Car 클래스만 사용

src/main/kotlin/controller/RaceGame.kt

@@ -20,7 +20,7 @@ class RaceGame(private val outputView: OutputView, private val inputView: InputV
  private fun tryMove(cars: Cars) {
  repeat(cars.getCarSize()) {
  cars.move(it)
- outputView.outputResult(cars.getCarInfo(it))
+ outputView.outputResult(cars.getCar(it))
  }
  outputView.outputNextLine()
  }

src/main/kotlin/model/Car.kt

@@ -2,16 +2,19 @@ package model
 
 import util.Validator
 
-class Car(private val name: String, private var position: Int = 0) {
+class Car(private val _name: String, private var _position: Int = 0) {
+
+ val name: String
+ get() = _name
+ val position: Int
+ get() = _position
 
  init {
- Validator().checkName(name)
+ Validator().checkName(_name)
  }
 
- fun getInfo(): CarInfo = CarInfo(name, position)
-
  fun move(condition: Int) {
- if (condition >= MOVING_POINT) position++
+ if (condition >= MOVING_POINT) _position++
  }
 
  companion object {

src/main/kotlin/model/Cars.kt

@@ -2,20 +2,15 @@ package model
 
 import generator.RandomGenerator
 
-class Cars(private val cars: List<Car>) {
- constructor(input: String) : this(input.split(",").mapIndexed { _, name -> Car(name.trim()) })
+class Cars(private val _cars: List<Car>) {
+ val cars: List<Car>
+ get() = _cars
 
- fun getCarInfos(): List<CarInfo> {
- val carInfos = mutableListOf<CarInfo>()
- repeat(cars.size) {
- carInfos.add(cars[it].getInfo())
- }
- return carInfos
- }
+ constructor(input: String) : this(input.split(",").mapIndexed { _, name -> Car(name.trim()) })
 
- fun getCarInfo(index: Int): CarInfo = cars[index].getInfo()
- fun getCarSize(): Int = cars.size
+ fun getCar(index: Int): Car = _cars[index]
+ fun getCarSize(): Int = _cars.size
  fun move(index: Int) {
- cars[index].move(RandomGenerator().getRandomNumber())
+ _cars[index].move(RandomGenerator().getRandomNumber())
  }
 }

src/main/kotlin/util/CarsHelper.kt

@@ -4,8 +4,7 @@ import model.Cars
 
 object CarsHelper {
  fun findWinners(cars: Cars): List<String> {
- val carInfos = cars.getCarInfos()
- val equalCars = carInfos.groupBy({ it.position }, { it.name })
+ val equalCars = cars.cars.groupBy({ it.position }, { it.name })
  return equalCars[equalCars.keys.max()]?.toList() ?: listOf()
  }
 }

src/main/kotlin/view/OutputView.kt

@@ -1,6 +1,6 @@
 package view
 
-import model.CarInfo
+import model.Car
 import util.Constants
 
 class OutputView {
@@ -26,9 +26,9 @@ class OutputView {
  println(error)
  }
 
- fun outputResult(info: CarInfo) {
- print(info.name + " : ")
- repeat(info.position) {
+ fun outputResult(car: Car) {
+ print(car.name + " : ")
+ repeat(car.position) {
  print("-")
  }
  println()

src/test/kotlin/CarTest.kt

@@ -6,10 +6,10 @@ import org.junit.jupiter.api.assertThrows
 class CarTest {
 
  @Test
- fun getInfoTest() {
+ fun initTest() {
  val car = Car("dool")
- assertThat(car.getInfo().name).isEqualTo("dool")
- assertThat(car.getInfo().position).isEqualTo(0)
+ assertThat(car.name).isEqualTo("dool")
+ assertThat(car.position).isEqualTo(0)
  }
 
  @Test
@@ -23,13 +23,13 @@ class CarTest {
  fun moveTest() {
  val car = Car("dool")
  car.move(3)
- assertThat(car.getInfo().position).isEqualTo(0)
+ assertThat(car.position).isEqualTo(0)
  }
 
  @Test
  fun dontMoveTest() {
  val car = Car("dool")
  car.move(4)
- assertThat(car.getInfo().position).isEqualTo(1)
+ assertThat(car.position).isEqualTo(1)
  }
 }

src/test/kotlin/CarsTest.kt

@@ -9,7 +9,7 @@ class CarsTest {
  fun mappingCarsTest() {
  val carNames = listOf("pobi", "dool", "woni")
  repeat(cars.getCarSize()) {
- assertThat(cars.getCarInfo(it).name).isEqualTo(carNames[it])
+ assertThat(cars.getCar(it).name).isEqualTo(carNames[it])
  }
  }