javajigi · Oct 19, 2018 · Oct 19, 2018 · javajigi · Oct 19, 2018
diff --git a/src/main/java/coordinate/Point.java b/src/main/java/coordinate/Point.java
@@ -3,18 +3,21 @@
 import java.util.Objects;
 
 public class Point {
-    private int x;
-    private int y;
-
-    public Point(int x, int y) throws IllegalArgumentException {
-        if (x < 0 || x > 24 || y < 0 || y > 24)
-            throw new IllegalArgumentException("x와 y값은 0초과 24미만 값이어야 합니다.");
-        this.x = x;
-        this.y = y;
+    private PointNumber x;
+    private PointNumber y;
+
+//    public Point(PointNumber x, PointNumber y) {
+//        this.x = x;
+//        this.y = y;
+//    }
+
+    public Point(int x, int y) {
+        this.x = new PointNumber(x);
+        this.y = new PointNumber(y);
     }
 
     public double calculatorLength(Point point) {
-        return Math.sqrt(Math.pow(this.x - point.x, 2) + Math.pow(this.y - point.y, 2));
+        return Math.sqrt(Math.pow(this.x.getNumber() - point.x.getNumber(), 2) + Math.pow(this.y.getNumber() - point.y.getNumber(), 2));
     }
 
     public Boolean matchX(Point point) {
@@ -26,7 +29,7 @@ public Boolean matchY(Point point) {
     }
 
     public Boolean matchDot(int x, int y) {
-        return this.x * 3 == x && this.y == y;
+        return this.x.getNumber() * 3 == x && this.y.getNumber() == y;
     }
 
     @Override

diff --git a/src/main/java/coordinate/PointNumber.java b/src/main/java/coordinate/PointNumber.java
@@ -0,0 +1,15 @@
+package coordinate;
+
+public class PointNumber {
+    private int number;
+
+    public PointNumber(int number) throws IllegalArgumentException {
+        if (number < 0 || number > 24)
+            throw new IllegalArgumentException("입력 좌표값은 0초과 24미만 값이어야 합니다.");
+        this.number = number;
+    }
+
+    public int getNumber() {
+        return number;
+    }
+}
diff --git a/src/main/java/coordinate/figure/Rectangle.java b/src/main/java/coordinate/figure/Rectangle.java
@@ -7,6 +7,7 @@
 public class Rectangle extends Figure {
     public Rectangle(List<Point> points) {
         super(points);
+        checkRectangle();
     }
 
     void checkRectangle() throws IllegalArgumentException {

diff --git a/src/test/java/lotto/LottoGameTest.java b/src/test/java/lotto/LottoGameTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import java.util.StringTokenizer;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class LottoGameTest {