[2단계 - 자동차 경주 리팩터링] - 윤생(이윤성) 미션 제출합니다.

__tests__/Car.test.js

@@ -1,6 +1,6 @@
 /* eslint-disable max-lines-per-function */
 /* eslint-disable no-undef */
-import Car from '../src/Car';
+import Car from '../src/domain/Car';
 
 describe('Car Test', () => {
   test.each([
@@ -11,6 +11,6 @@ describe('Car Test', () => {
     for (let i = 0; i < go; i++) {
       car.move(true);
     }
-    expect(car.getPosition() === position).toBe(expected);
+    expect(car.position === position).toBe(expected);
   });
 });

__tests__/GameManager.test.js

@@ -1,55 +1,21 @@
 /* eslint-disable max-lines-per-function */
 /* eslint-disable no-undef */
-// const Car = require('../src/Car');
-import GameManager from '../src/GameManager';
-import RandomGenerator from '../src/utils/RandomGenerator';
 
-const mockRandom = (number) => {
-  RandomGenerator.pickRandomNumber = jest.fn();
-  RandomGenerator.pickRandomNumber.mockReturnValueOnce(number);
-};
-
-const mockRandoms = (numbers) => {
-  RandomGenerator.pickRandomNumber = jest.fn();
-  numbers.reduce((acc, number) => {
-    return acc.mockReturnValueOnce(number);
-  }, RandomGenerator.pickRandomNumber);
-};
+import GameManager from '../src/domain/GameManager';
 
 describe('GameManager Test', () => {
-  test('Random mock Test', () => {
-    mockRandom(10);
-    expect(RandomGenerator.pickRandomNumber()).toBe(10);
-  });
+  test('차 이름 입력이 유효하지 않으면 에러를 던지는 지 테스트', () => {
+    const gameMananger = new GameManager();
+    const badNamesInput = 'abcdef,bad guy,nononono';
 
-  test.each([
-    [9, true],
-    [4, true],
-    [3, false],
-    [0, false],
-  ])('isFoward Test Random value : %i', (number, expected) => {
-    mockRandom(number);
-    const gameManager = new GameManager();
-    expect(gameManager.isForward()).toEqual(expected);
+    expect(() => gameMananger.checkCarNames(badNamesInput)).toThrow();
   });
 
-  test.each([
-    [['yun', 'park', 'kim'], [9, 0, 1, 8, 1, 2, 7, 5, 6], ['yun']],
-    [
-      ['choi', 'ann', 'lee', 'gabi'],
-      [0, 0, 5, 5, 0, 0, 9, 9],
-      ['lee', 'gabi'],
-    ],
-    [
-      ['aa', 'bb'],
-      [0, 0, 5, 5, 0, 0, 9, 9],
-      ['aa', 'bb'],
-    ],
-  ])('judgeWinners Test (%#)', (carNames, moves, winners) => {
-    const gameManager = new GameManager();
-    const cars = gameManager.generateCars(carNames);
-    mockRandoms(moves);
-    gameManager.moveCars(cars);
-    expect(gameManager.judgeWinners([...cars])).toEqual(winners);
-  });
+  test.each([0, -1, NaN])(
+    '시도 횟수 입력이 유효하지 않으면 에러를 던지는 지 테스트',
+    (input) => {
+      const gameMananger = new GameManager();
+      expect(() => gameMananger.checkTryCount(input)).toThrow();
+    }
+  );
 });

__tests__/Validation.test.js

@@ -4,12 +4,20 @@ import Validation from '../src/utils/Validation.js';
 
 describe('Validation Test', () => {
   test.each([
-    [['yunseong', 'gabriel'], false],
-    [['aa', 'bb', 'cc'], true],
-    [['aa', 'bb', ''], false],
-    // [['aa', 'bb', '윤생이😁😁'], true], => 고민할 부분(서로게이트 쌍)
-  ])('이름 유효성 검사(%s: %s)', (names, expected) => {
-    expect(Validation.isValidCarNames(names)).toBe(expected);
+    'ys,pobi,crong',
+    'gabi,hoho',
+    'jason,poco',
+    '윤생😁😁😁,𩷶𩷶𩷶𩷶',
+  ])('올바른 차이름 입력 시 true를 반환한다.', (carNames) => {
+    expect(Validation.isValidCarNames(carNames.split(','))).toBeTruthy();
+  });
+
+  test.each([
+    'gabriel,yunseong',
+    '이윤성입니다,윤생',
+    '우아한 배달이,치킨과피자',
+  ])('잘못된 차이름 입력 시 false를 반환한다.', (carNames) => {
+    expect(Validation.isValidCarNames(carNames.split(','))).toBeFalsy();
   });
 
   test.each([

__tests__/calcWordCount.test.js

@@ -0,0 +1,12 @@
+import calcWordCount from '../src/utils/calcWordCount';
+
+/* eslint-disable no-undef */
+describe('calcWordCount', () => {
+  test.each([
+    ['test', 4],
+    ['yunsang', 7],
+    ['윤생😁', 3],
+  ])('문자열이 들어오면 그 문자열의 글자 수를 반환한다.', (text, expected) => {
+    expect(calcWordCount(text)).toBe(expected);
+  });
+});

src/Car.js → src/domain/Car.js

@@ -1,5 +1,3 @@
-import OutputView from './OutputView.js';
-
 class Car {
   #name;
   #position = 0;
@@ -8,11 +6,11 @@ class Car {
     this.#name = name;
   }
 
-  getName() {
+  get name() {
     return this.#name;
   }
 
-  getPosition() {
+  get position() {
     return this.#position;
   }
 
@@ -25,10 +23,6 @@ class Car {
       this.move();
     }
   }
-
-  print() {
-    OutputView.printCar(this.#name, this.#position);
-  }
 }
 
 export default Car;

src/GameManager.js → src/domain/GameManager.js

@@ -1,10 +1,10 @@
-import Console from './utils/Console.js';
-import Validation from './utils/Validation.js';
+import Console from '../utils/Console.js';
+import Validation from '../utils/Validation.js';
 import Car from './Car.js';
-import RandomGenerator from './utils/RandomGenerator.js';
-import OutputView from './OutputView.js';
-import InputView from './InputView.js';
-import constants from './utils/constants.js';
+import RandomGenerator from '../utils/RandomGenerator.js';
+import OutputView from '../view/OutputView.js';
+import InputView from '../view/InputView.js';
+import constants from '../utils/constants.js';
 
 class GameManager {
   #cars = [];
@@ -21,25 +21,24 @@ class GameManager {
 
   printCars(cars) {
     cars.forEach((car) => {
-      car.print();
+      OutputView.printCar(car.name, car.position);
     });
     OutputView.printEmptyLine();
   }
 
   tryMoveCars(tryCount, cars) {
-    OutputView.printResult();
     for (let i = 0; i < tryCount; i++) {
       this.moveCars(cars);
       this.printCars(cars);
     }
   }
 
   judgeWinners(cars) {
-    cars.sort((a, b) => b.getPosition() - a.getPosition());
-    const max = cars[0].getPosition();
+    cars.sort((a, b) => b.position - a.position);
+    const max = cars[0].position;
     const winners = cars
-      .filter((car) => car.getPosition() === max)
-      .map((car) => car.getName());
+      .filter((car) => car.position === max)
+      .map((car) => car.name);
     return winners;
   }
 
@@ -84,6 +83,7 @@ class GameManager {
   async play() {
     await this.handleCarNames();
     const tryCount = await this.handleTryCount();
+    OutputView.printResult();
     this.tryMoveCars(tryCount, this.#cars);
     const winners = this.judgeWinners([...this.#cars]);
     OutputView.printWinners(winners);

src/index.js

@@ -1,4 +1,4 @@
-import GameManager from './GameManager.js';
+import GameManager from './domain/GameManager.js';
 
 const gameManger = new GameManager();
 gameManger.play();

src/utils/RandomGenerator.js

@@ -1,4 +1,5 @@
-import constants from './constants';
+import constants from './constants.js';
+
 const RandomGenerator = {
   pickRandomNumber() {
     return Math.floor(Math.random() * constants.RANDOM_RANGE);

src/utils/Validation.js

@@ -1,16 +1,22 @@
-import constants from './constants';
+import calcWordCount from './calcWordCount.js';
+import constants from './constants.js';
 
 const Validation = {
   isValidCarNames(carNames) {
-    return carNames.every(
-      (name) =>
-        name.length >= constants.MIN_CAR_NAME_LENGTH &&
-        name.length <= constants.MAX_CAR_NAME_LENGTH
+    return carNames.every((carName) =>
+      this.isValidCarNameLength(calcWordCount(carName))
     );
   },
 
   isValidTryCount(tryCount) {
     return Number.isInteger(tryCount) && tryCount >= constants.MIN_TRY_COUNT;
   },
+
+  isValidCarNameLength(carNameLength) {
+    return (
+      carNameLength >= constants.MIN_CAR_NAME_LENGTH &&
+      carNameLength <= constants.MAX_CAR_NAME_LENGTH
+    );
+  },
 };
 export default Validation;

src/utils/calcWordCount.js

@@ -0,0 +1,8 @@
+export default function calcWordCount(text) {
+  let count = 0;
+  // eslint-disable-next-line no-unused-vars
+  for (const char of text) {
+    count += 1;
+  }
+  return count;
+}

src/InputView.js → src/view/InputView.js

@@ -1,4 +1,4 @@
-import Console from './utils/Console.js';
+import Console from '../utils/Console.js';
 
 const InputView = {
   async readCarNames() {

src/OutputView.js → src/view/OutputView.js

@@ -1,5 +1,5 @@
-import Console from './utils/Console.js';
-import constants from './utils/constants.js';
+import Console from '../utils/Console.js';
+import constants from '../utils/constants.js';
 
 const OutputView = {
   printEmptyLine() {