[둘리] 2단계 자동차 경주 제출합니다.

src/main/kotlin/controller/RaceGame.kt

@@ -1,14 +1,16 @@
 package controller
+
 import model.Cars
 import util.CarsHelper
-import util.Validator
 import view.InputView
 import view.OutputView
 
 class RaceGame(private val outputView: OutputView, private val inputView: InputView) {
 
  fun run() {
+ outputView.outputCarNames()
  val cars = executeInputCarNames()
+ outputView.outputTryNumber()
  val tryNumber = executeInputTryNumber()
  outputView.outputResults()
  repeat(tryNumber) {
@@ -20,44 +22,11 @@ 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()
  }
 
- private fun executeInputTryNumber(): Int {
- var result: Int?
- do {
- outputView.outputTryNumber()
- result = getInputTryNumber(inputView.inputTryNumber())
- } while (result == null)
- return result
- }
-
- private fun getInputTryNumber(number: String): Int? {
- return runCatching {
- Validator().checkTryNumber(number)
- number.toInt()
- }.onFailure {
- outputView.outputErrorMessage(it.message ?: "에러가 발생했습니다.")
- }.getOrNull()
- }
-
- private fun executeInputCarNames(): Cars {
- var result: Cars?
- do {
- outputView.outputCarNames()
- result = getInputCarNames(inputView.inputCarNames())
- } while (result == null)
- return result
- }
-
- private fun getInputCarNames(cars: String): Cars? {
- return runCatching {
- Validator().checkNames(cars)
- Cars(cars)
- }.onFailure {
- outputView.outputErrorMessage(it.message ?: "에러가 발생했습니다.")
- }.getOrNull()
- }
+ private fun executeInputTryNumber(): Int = inputView.inputTryNumber().toInt()
+ private fun executeInputCarNames(): Cars = Cars(inputView.inputCarNames())
 }

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

@@ -2,12 +2,9 @@ package util
 
 import model.Cars
 
-class CarsHelper {
- companion object {
- fun findWinners(cars: Cars): List<String> {
- val carInfos = cars.getCarInfos()
- val equalCars = carInfos.groupBy({ it.position }, { it.name })
- return equalCars[equalCars.keys.max()]?.toList() ?: listOf()
- }
+object CarsHelper {
+ fun findWinners(cars: Cars): List<String> {
+ val equalCars = cars.cars.groupBy({ it.position }, { it.name })
+ return equalCars[equalCars.keys.max()]?.toList() ?: listOf()
  }
 }

src/main/kotlin/util/Validator.kt

@@ -1,5 +1,7 @@
 package util
 
+import view.OutputView
+
 class Validator {
 
  fun checkNames(names: String?) {
@@ -18,34 +20,35 @@ class Validator {
 
  fun checkTryNumber(name: String?) {
  checkTryNumberNull(name)
- checkTryNumberIsRight(name)
+ checkTryNumberIsRight(name ?: "")
  }
 
  private fun checkNameNull(name: String?) {
- require(name != null) { Constants.INPUT_NAME_NULL_ERROR_MESSAGE }
+ require(name != null) { OutputView().outputErrorMessage(Constants.INPUT_NAME_NULL_ERROR_MESSAGE) }
  }
 
  private fun checkNameSize(name: String) {
- require(name.length < 5) { Constants.INPUT_NAME_SIZE_ERROR_MESSAGE }
+ require(name.length < 5) { OutputView().outputErrorMessage(Constants.INPUT_NAME_SIZE_ERROR_MESSAGE) }
  }
 
  private fun checkNameEmpty(name: String) {
- require(name != "") { Constants.INPUT_NAME_NULL_ERROR_MESSAGE }
+ require(name != "") { OutputView().outputErrorMessage(Constants.INPUT_NAME_NULL_ERROR_MESSAGE) }
  }
 
  private fun checkNameRight(name: String) {
- require(name.contains("^[a-zA-Z가-힣]*$".toRegex())) { Constants.INPUT_NAME_RIGHT_ERROR_MESSAGE }
+ require(name.contains("^[a-zA-Z가-힣]*$".toRegex())) { OutputView().outputErrorMessage(Constants.INPUT_NAME_RIGHT_ERROR_MESSAGE) }
  }
 
  private fun checkTryNumberNull(number: String?) {
- require(number != null) { Constants.INPUT_TRY_NUMBER_NULL_ERROR_MESSAGE }
+ require(number != null) { OutputView().outputErrorMessage(Constants.INPUT_TRY_NUMBER_NULL_ERROR_MESSAGE) }
  }
 
- private fun checkTryNumberIsRight(number: String?) {
- try {
- number!!.toInt()
- } catch (e: NumberFormatException) {
- throw IllegalArgumentException(Constants.INPUT_TRY_NUMBER_RIGHT_ERROR_MESSAGE)
+ private fun checkTryNumberIsRight(number: String) {
+ require(
+ number.isNotEmpty() && number.chars().allMatch { Character.isDigit(it) }) {
+ OutputView().outputErrorMessage(
+ Constants.INPUT_TRY_NUMBER_RIGHT_ERROR_MESSAGE
+ )
  }
  }
 }

src/main/kotlin/view/InputView.kt

@@ -1,11 +1,25 @@
 package view
 
+import util.Validator
+
 class InputView {
  fun inputCarNames(): String {
- return readLine() ?: ""
+ val input = readlnOrNull()
+ runCatching {
+ Validator().checkNames(input)
+ }.onFailure {
+ return inputCarNames()
+ }.getOrNull()
+ return input ?: inputCarNames()
  }
 
  fun inputTryNumber(): String {
- return readLine() ?: ""
+ val input = readlnOrNull()
+ runCatching {
+ Validator().checkTryNumber(input)
+ }.onFailure {
+ return inputTryNumber()
+ }.getOrNull()
+ return input ?: inputTryNumber()
  }
 }

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])
  }
  }