Skip to content

Change - javajigi 패키지 추가 #21

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.

Sign up for GitHub

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

Merged
limwoobin merged 1 commit into from
Apr 23, 2021
Merged

Change - javajigi 패키지 추가 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 0 additions & 68 deletions src/main/java/racingcar/Car.java
View file
Open in desktop

This file was deleted.

85 changes: 0 additions & 85 deletions src/main/java/racingcar/CarList.java
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/main/java/racingcar/Game.java
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions src/main/java/racingcar/RacingCarApplication.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/racingcar/domain/Car.java → src/main/java/racingcar/my/domain/Car.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package racingcar.domain;
package racingcar.my.domain;

public class Car {
public static final String MOVE_SYMBOL = "-";
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/racingcar/domain/CarList.java → ...ain/java/racingcar/my/domain/CarList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package racingcar.domain;
package racingcar.my.domain;

import racingcar.view.GameStringUtils;
import racingcar.my.view.GameStringUtils;

import java.util.ArrayList;
import java.util.List;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/racingcar/view/Game.java → src/main/java/racingcar/my/view/Game.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package racingcar.view;
package racingcar.my.view;

import racingcar.domain.Car;
import racingcar.domain.CarList;
import racingcar.my.domain.Car;
import racingcar.my.domain.CarList;

public class Game {
private final int numberOfTry;
Expand Down
2 changes: 1 addition & 1 deletion .../java/racingcar/view/GameStringUtils.java → ...va/racingcar/my/view/GameStringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package racingcar.view;
package racingcar.my.view;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions .../racingcar/view/RacingCarApplication.java → ...cingcar/my/view/RacingCarApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package racingcar.view;
package racingcar.my.view;

import racingcar.domain.CarList;
import racingcar.my.domain.CarList;

import java.util.Scanner;

Expand Down
6 changes: 3 additions & 3 deletions src/test/java/racingcar/GameTest.java → src/test/java/racingcar/my/GameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package racingcar;
package racingcar.my;

import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import racingcar.domain.Car;
import racingcar.domain.CarList;
import racingcar.my.domain.Car;
import racingcar.my.domain.CarList;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down
9 changes: 3 additions & 6 deletions src/test/java/racingcar/RacingCarTest.java → ...test/java/racingcar/my/RacingCarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
package racingcar;
package racingcar.my;


import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
<<<<<<< HEAD
import racingcar.domain.Car;
import racingcar.domain.CarList;
=======
>>>>>>> 82daf95e334f681edcbee3ff77da61c98afa343b
import racingcar.my.domain.Car;
import racingcar.my.domain.CarList;

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