Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

자동차경주/제훈/step1 #4

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'eclipse'

group = 'camp.nextstep'
version = '1.0.0'
sourceCompatibility = '1.8'
sourceCompatibility = "11"

repositories {
mavenCentral()
Expand All @@ -17,3 +17,4 @@ dependencies {
test {
useJUnitPlatform()
}
targetCompatibility = JavaVersion.VERSION_11
10 changes: 10 additions & 0 deletions src/main/java/study/racingcar/RacingCarApplication.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package study.racingcar;

import study.racingcar.controller.CarController;

public class RacingCarApplication {

public static void main(String[] args) {
new CarController();
}
}
38 changes: 38 additions & 0 deletions src/main/java/study/racingcar/controller/CarController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package study.racingcar.controller;

import study.racingcar.view.InputView;
import study.racingcar.view.ResultView;

import java.util.ArrayList;
import java.util.List;

import static study.racingcar.model.Car.requestCarsToMove;

public class CarController {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'CarController' 에서 로직을 직접 구현해서 사용하고 있네요!
현재의 구조에서는 Car객체와 CarController가 서로 바뀐듯처럼 보이네요 🤔

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CarController 라는 네이밍은 왜 나온것일까요?
게임기 컨트롤러 처럼 도메인 객체에게 어떠한 일을 하도록 시키는 녀석이 아닐까요?
현재의 구조에서는 Car 객체가 CarController에게 자동차 경주를 하도록 시키는 것으로 보이네요~

Copy link
Collaborator Author

@JoJeHuni JoJeHuni Jul 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MVC 패턴이 컨트롤러 로직 실행 -> 비즈니스 로직 실행 후 결과를 받고 -> 결과 데이터를 모델에 저장 -> 컨트롤러에서 뷰 로직으로 권한을 넘겨준 뒤 뷰는 모델에서 데이터를 참조해 응답하는 것이라는걸 정리해놓고 활용할 때는 반대로 이행하고 있었네요.. 감사합니다!

public CarController() {
raceStart(InputView.getCarNumber(), InputView.getAttemptNumber());
}

public static List<Integer> raceStart(int carNum, int attemptNum) {
List<Integer> startLine = addCar(carNum);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

분명히 Car객체는 존재하는데도 불구하고
출발했을때의 위치, 경주가 끝났을때의 위치를 각각 만들어서 구현하신 이유가 무엇일까요? 🤔

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

테스트 코드에서 raceStart 메서드의 반환값으로 assertEquals 를 사용하려고 만들었던 것 같습니다. 다시 생각해보겠습니다!

List<Integer> finalPositions = new ArrayList<>();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

레이스가 시작하기전에 경주에 참여할 자동차 객체들을 생성하고
반복문을 통해서 자동차에게 앞으로 전진할지 말지를 요청해보는 식으로 만들어보면 어떨까요~?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

raceStart 에서 addCar 메서드를 불러오는 것이 아닌 그 전에 미리 객체들을 생성하고 요청해보자는 조언 감사합니다! 수정하겠습니다!


for (int i = 0; i < attemptNum; i++) {
List<Integer> racingCar = requestCarsToMove(carNum, startLine);
ResultView.printRaceResult(racingCar);
System.out.println("");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

출력은 ResultView에게 위임해보아요~

finalPositions = new ArrayList<>(racingCar);
}
return finalPositions;
}

private static List<Integer> addCar(int carNum) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addCar() 메서드 명만을 봤을때 Car 객체들을 생성해줄 것같은데 Integer들을 생성해주고 있네요 🤔

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Car 객체를 생성해준다는 것을 놓치고 있었네요 바로 수정하겠습니다. 감사합니다!!

List<Integer> positions = new ArrayList<>();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

position을 자동차 객체의 맴버변수로 바꿔서 로직을 만들어보면 어떨까요~?
자동차의 위치는 존재하는데 자동차는 존재하지 않는 이상한 상황이 벌어지고 있네요 😨

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Integer로 받는 것이 아닌 Car 객체의 ArrayList 를 만들어보겠습니다!


for (int i = 0; i < carNum; i++) {
positions.add(i,0);
}

return positions;
}
}
28 changes: 28 additions & 0 deletions src/main/java/study/racingcar/model/Car.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package study.racingcar.model;

import java.util.List;
import java.util.Random;

public class Car {
private static final int MAX_BOUNDARY_OF_RANDOM_NUMBER= 10;
public Car() { }

public static List<Integer> requestCarsToMove(int carNum, List<Integer> positions) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

열심히 만든 Car 객체를 자동차 경주에 참가시켜봅시다 💪

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

한 차례 더 수정을 거치는 중이라 곧 커밋하겠습니다 조언 항상 감사합니다!

for (int i = 0; i < carNum; i++) {
forwardNumber(i, positions);
}
return positions;
}

private static void forwardNumber(int current, List<Integer> positions) {
Random random = new Random();
int forward = random.nextInt(MAX_BOUNDARY_OF_RANDOM_NUMBER); // 0부터 9

if (forward >= 4) {
int currentValue = positions.get(current);
int newValue = currentValue + 1;

positions.set(current, newValue);
}
}
}
24 changes: 24 additions & 0 deletions src/main/java/study/racingcar/view/InputView.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package study.racingcar.view;

import java.util.Scanner;

public class InputView {
public static int getCarNumber() {
Scanner scanner = new Scanner(System.in);

System.out.println("자동차 대수는 몇 대 인가요?");
int carNum = scanner.nextInt();

return carNum;
}

public static int getAttemptNumber() {
Scanner scanner = new Scanner(System.in);

System.out.println("시도할 횟수는 몇 회인가요?");
int attemptNum = scanner.nextInt();
System.out.println();

return attemptNum;
}
}
14 changes: 14 additions & 0 deletions src/main/java/study/racingcar/view/ResultView.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package study.racingcar.view;

import java.util.List;

public class ResultView {
public static void printRaceResult(List<Integer> positions) {
for (int pos : positions) {
for (int k = 0; k < pos; k++) {
System.out.print("ㅡ");
}
System.out.println();
}
}
}
36 changes: 36 additions & 0 deletions src/main/java/study/stringcalculator/StringCalculator.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package study.stringcalculator;

import java.util.List;

public class StringCalculator {

private StringCalculator() { }
public static int calculate(String text) {
List<String> values = StringParser.parse(text);
int number = Integer.parseInt(values.get(0));

for (int i = 1; i < values.size(); i += 2) {

int operand = Integer.parseInt(values.get(i + 1));
String operator = values.get(i);

number = getNumber(number, operand, operator);
}

return number;
}

private static int getNumber(int number, int operand, String operator) {
if ("+".equals(operator)) return number + operand;
if ("-".equals(operator)) return number - operand;
if ("*".equals(operator)) return number * operand;
if ("/".equals(operator)) {
if (operand == 0) {
throw new IllegalArgumentException();
}
return number / operand;
}

throw new IllegalArgumentException("잘못된 연산자 입니다.");
}
}
14 changes: 14 additions & 0 deletions src/main/java/study/stringcalculator/StringParser.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package study.stringcalculator;

import java.util.List;

public class StringParser {

private StringParser() { }

static List<String> parse(String input) {
return List.of(input.split(" "));
// 알아둘 것. ArrayList로 만들면 가변 + null값 허용
// List.of 메서드로 만들면 불변 + null값은 허용 X
}
}
13 changes: 0 additions & 13 deletions src/test/java/study/StringTest.java

This file was deleted.

84 changes: 84 additions & 0 deletions src/test/java/study/exam/SetTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
package study.exam;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.ValueSource;

import java.util.HashSet;
import java.util.Set;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;

public class SetTest {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

저번 요구사항을 반영해서 구체적인 테스트로 바꿔주셨군요 👍

private Set<Integer> numbers;

@BeforeEach
@DisplayName("HashSet에 값을 추가한다.")
void setUp() {
numbers = new HashSet<>();
numbers.add(1);
numbers.add(1);
numbers.add(2);
numbers.add(3);
}

@Test
@DisplayName("집합의 크기를 확인할 수 있다.")
void setSize() {
int result = numbers.size();
assertEquals(result, 3); // Set은 중복을 허용하지 않는다.
}

@Test
@DisplayName("집합에 값이 포함되어있는지 비교할 수 있다.")
void compareContains() {
numbers = new HashSet<>();

numbers.add(1);
numbers.add(1);
numbers.add(2);
numbers.add(3);

assertThat(numbers.contains(1)).isTrue();
assertThat(numbers.contains(2)).isTrue();
assertThat(numbers.contains(3)).isTrue();
}

@ParameterizedTest
@ValueSource(ints = {1, 2, 3})
@DisplayName("ValueSource를 사용해 입력 받은 숫자가 각각 numbers에 포함되는지 확인한다.")
void compareContains(int value) {
numbers = new HashSet<>();

numbers.add(1);
numbers.add(1);
numbers.add(2);
numbers.add(3);

assertThat(numbers.contains(value)).isTrue();
}

@ParameterizedTest
@CsvSource({
"1, true",
"2, true",
"3, true",
"4, false",
"5, false"
})
@DisplayName("CsvSource로 true 값만 비교하는 것이 아닌 false 값도 비교할 수 있다.")
void compareContains(int value, boolean expected) {
numbers = new HashSet<>();

numbers.add(1);
numbers.add(1);
numbers.add(2);
numbers.add(3);

assertThat(numbers.contains(value)).isEqualTo(expected);
}
}
47 changes: 47 additions & 0 deletions src/test/java/study/exam/StringTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package study.exam;

import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

public class StringTest {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

좋습니다~ 💪

@Test
@DisplayName("abc에서 b를 d로 대체했을 때 같은지 테스트하는 코드")
void replace() {
String actual = "abc".replace("b", "d");
assertThat(actual).isEqualTo("adc");
}
// 요구사항 1
@Test
@DisplayName("특정 문자열로 분리하는 테스트 코드")
public void split() {
String[] values = "1,2".split(",");
assertThat(values).containsExactly("1", "2");
values = "1".split(",");
assertThat(values).contains("1");
}
@Test
@DisplayName("특정 문자열까지 읽어서 비교하는 테스트 코드")
public void subString() {
String input = "(1,2)";
String result = input.substring(1, input.length() - 1); //문자열 인덱스 1부터 input의 길이 - 1 즉 2까지.
assertThat(result).isEqualTo("1,2");
}
@Test
@DisplayName("String의 특정 위치의 문자 가져오기")
public void getIndexValue() {
String values = "abc";
assertEquals('a', values.charAt(0));
}

@Test
@DisplayName("위치 값을 벗어났을 때의 예외")
public void stringIndexOutOfBoundsException() {
String values = "abc";
assertThrows(StringIndexOutOfBoundsException.class, () -> values.charAt(-1));
assertThrows(StringIndexOutOfBoundsException.class, () -> values.charAt(3));
}
}
46 changes: 46 additions & 0 deletions src/test/java/study/racingcar/CarTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package study.racingcar;

import org.junit.jupiter.api.Test;

import java.util.ArrayList;
import java.util.List;
import java.util.Random;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static study.racingcar.controller.CarController.raceStart;
import static study.racingcar.model.Car.requestCarsToMove;

public class CarTest {

private static final int MAX_BOUNDARY_OF_RANDOM_CAR_NUMBER = 5;
private static final int MAX_BOUNDARY_OF_RANDOM_ATTEMPT_NUMBER = 3;
@Test
public void 자동차_이동_로직을_확인한다() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

테스트가 아직 제대로 작성되지 않았네요!
저번에 리뷰에서 말한것이지만 테스트를 작성했을때 어려웠다면
책임을 나누고 객체들 간의 관계를 정하는 작업을 더 해야한다는 신호가 아닐까요~?

조금씩 좋아지고 있습니다 👍

// given
Random random = new Random();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

여기서도 자동차 로직을 테스트 하는데 자동차는 없고 자동차의 위치가 둥둥 떠다니고 있네요 😅

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

바로 수정해보겠습니다!

int carNum = random.nextInt(MAX_BOUNDARY_OF_RANDOM_CAR_NUMBER + 1); // 1 ~ 5
int attemptNum = random.nextInt(MAX_BOUNDARY_OF_RANDOM_ATTEMPT_NUMBER + 3); // 3 ~ 5

// when
List<Integer> finalPositions = raceStart(carNum, attemptNum);

// then
assertEquals(carNum, finalPositions.size());
}

@Test
public void 자동차_전진_로직을_확인한다() {
// given
Random random = new Random();
int carNum = random.nextInt(MAX_BOUNDARY_OF_RANDOM_CAR_NUMBER + 1); // 1 ~ 5
List<Integer> positions = new ArrayList<>();

// when
List<Integer> checkForward = requestCarsToMove(carNum, positions);

// then
for (int i = 0 ; i < carNum; i++) {
assertEquals(checkForward.get(i) == 0 || checkForward.get(i) == 1, true);
}
}
}
Loading