Feat : 삼각형 기능 구현 및 테스트 진행

this-is-spear · this-is-spear · commit f0c939e9a2b8 · 2022-07-18T22:00:33.000+09:00
diff --git a/src/main/java/coordinate/domain/CoordinatesCalculator.java b/src/main/java/coordinate/domain/CoordinatesCalculator.java
@@ -12,6 +12,11 @@ public CoordinatesCalculator(String expression) {
             return;
         }
 
+        if (expression.split(REGEX).length == 3) {
+            shapes = new Triangle(expression);
+            return;
+        }
+
         if (expression.split(REGEX).length == 4) {
             shapes = new Rectangle(expression);
             return;
diff --git a/src/main/java/coordinate/domain/Rectangle.java b/src/main/java/coordinate/domain/Rectangle.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static java.lang.Math.abs;
 
diff --git a/src/main/java/coordinate/domain/Triangle.java b/src/main/java/coordinate/domain/Triangle.java
@@ -0,0 +1,57 @@
+package coordinate.domain;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static java.lang.Math.abs;
+import static java.lang.Math.sqrt;
+
+public class Triangle implements Shapes {
+    public static final String REGEX = "-";
+    private final List<Coordinate> coordinates;
+
+
+    public Triangle(String expression) {
+
+        if (!expression.contains(REGEX)) {
+            throw new IllegalArgumentException("식이 틀렸습니다.");
+        }
+
+        if (expression.split(REGEX).length != 3) {
+            throw new IllegalArgumentException("좌표는 세 개만 들어가야 합니다.");
+        }
+
+        List<Coordinate> coordinateList = Arrays.asList(
+            new Coordinate(expression.split(REGEX)[0]),
+            new Coordinate(expression.split(REGEX)[1]),
+            new Coordinate(expression.split(REGEX)[2])
+        );
+
+        this.coordinates = coordinateList;
+    }
+
+    @Override
+    public double getResult() {
+        return getArea(this.coordinates);
+    }
+
+    private double getArea(List<Coordinate> coordinates) {
+        double a = getDistance(coordinates.get(0), coordinates.get(1));
+        double b = getDistance(coordinates.get(1), coordinates.get(2));
+        double c = getDistance(coordinates.get(2), coordinates.get(0));
+        double s = (a + b + c) / 2;
+        return sqrt(s * (s - a) * (s - b) * (s - c));
+    }
+
+    @Override
+    public List<Coordinate> findCoordinates() {
+        return new ArrayList<>(this.coordinates);
+    }
+
+    private double getDistance(Coordinate coordinate, Coordinate otherCoordinate) {
+        return sqrt(
+            abs((coordinate.getX() - otherCoordinate.getX()) * (coordinate.getX() - otherCoordinate.getX())
+                + (coordinate.getY() - otherCoordinate.getY()) * (coordinate.getY() - otherCoordinate.getY())));
+    }
+}
diff --git a/src/test/java/coordinate/domain/CoordinatesCalculatorTest.java b/src/test/java/coordinate/domain/CoordinatesCalculatorTest.java
@@ -2,16 +2,16 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.offset;
 
 class CoordinatesCalculatorTest {
 
     @ParameterizedTest
-    @ValueSource(strings = {"(10,10)-(14,15)", "(10,10)-(22,10)-(22,18)-(10,18)"})
+    @ValueSource(strings = {"(10,10)-(14,15)", "(10,10)-(22,10)-(22,18)-(10,18)", "(10,10)-(14,15)-(20,8)"})
     @DisplayName("입력을 받습니다.")
     void test1(String 식) {
         Assertions.assertDoesNotThrow(
@@ -20,7 +20,7 @@ void test1(String 식) {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"(10,10)-(14,15)", "(10,10)-(22,10)-(22,18)-(10,18)"})
+    @ValueSource(strings = {"(10,10)-(14,15)", "(10,10)-(22,10)-(22,18)-(10,18)", "(10,10)-(14,15)-(20,8)"})
     @DisplayName("입력이 선 인지 직사각형인지 판단합니다.")
     void test2(String 식) {
         CoordinatesCalculator calculator = new CoordinatesCalculator(식);
@@ -32,10 +32,14 @@ void test2(String 식) {
         if (식.equals("(10,10)-(22,10)-(22,18)-(10,18)")) {
             assertThat(calculator.getShapes()).isInstanceOf(Rectangle.class);
         }
+
+        if (식.equals("(10,10)-(14,15)-(20,8)")) {
+            assertThat(calculator.getShapes()).isInstanceOf(Triangle.class);
+        }
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"(10,10)-(10,15)", "(10,10)-(22,10)-(22,18)-(10,18)"})
+    @ValueSource(strings = {"(10,10)-(10,15)", "(10,10)-(22,10)-(22,18)-(10,18)", "(10,10)-(14,15)-(20,8)"})
     @DisplayName("답을 출력합니다.")
     void test3(String 식) {
         CoordinatesCalculator calculator = new CoordinatesCalculator(식);
@@ -47,10 +51,14 @@ void test3(String 식) {
         if (식.equals("(10,10)-(22,10)-(22,18)-(10,18)")) {
             assertThat(calculator.getResult()).isEqualTo(96.0);
         }
+
+        if (식.equals("(10,10)-(14,15)-(20,8)")) {
+            assertThat(calculator.getResult()).isEqualTo(29.0, offset(0.0009));
+        }
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"(10,10)-(10,15)", "(10,10)-(22,10)-(22,18)-(10,18)"})
+    @ValueSource(strings = {"(10,10)-(10,15)", "(10,10)-(22,10)-(22,18)-(10,18)", "(10,10)-(14,15)-(20,8)"})
     @DisplayName("좌표를 출력합니다.")
     void test4(String 식) {
         CoordinatesCalculator calculator = new CoordinatesCalculator(식);
@@ -62,5 +70,9 @@ void test4(String 식) {
         if (식.equals("(10,10)-(22,10)-(22,18)-(10,18)")) {
             assertThat(calculator.findCoordinates()).hasSize(4);
         }
+
+        if (식.equals("(10,10)-(14,15)-(20,8)")) {
+            assertThat(calculator.findCoordinates()).hasSize(3);
+        }
     }
 }
diff --git a/src/test/java/coordinate/domain/TriangleTest.java b/src/test/java/coordinate/domain/TriangleTest.java
@@ -0,0 +1,56 @@
+package coordinate.domain;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+class TriangleTest {
+
+    @Test
+    @DisplayName("삼각형을 그릴 수 있습니다.")
+    void test() {
+        String 식 = "(10,10)-(14,15)-(20,8)";
+        assertDoesNotThrow(
+            () -> new Triangle(식)
+        );
+    }
+
+    @Test
+    @DisplayName("식이 틀리면 예외가 발생합니다.")
+    void test1() {
+        String 식 = "(10,10)(14,15)-(20,8)";
+        assertThatThrownBy(
+            () -> new Triangle(식)
+        ).isInstanceOf(IllegalArgumentException.class);
+    }
+
+
+    @ParameterizedTest
+    @ValueSource(strings = {"(14,15)-(20,8)", "(14,15)-(20,8)-(20,15)-(14,8)"})
+    @DisplayName("좌표가 세개 이외의 값이 들어오면 예외가 발생합니다.")
+    void test2(String 식) {
+        assertThatThrownBy(
+            () -> new Triangle(식)
+        ).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    @DisplayName("답인 삼각형의 넓이를 출력합니다.")
+    void test3() {
+        String 식 = "(10,10)-(14,15)-(20,8)";
+        Triangle 삼각형 = new Triangle(식);
+        assertThat(삼각형.getResult()).isEqualTo(29.0, offset(0.00099));
+    }
+
+    @Test
+    @DisplayName("좌표를 그리기 위해 좌표들을 출력합니다.")
+    void test4() {
+        String 식 = "(10,10)-(14,15)-(20,8)";
+        Triangle 삼각형 = new Triangle(식);
+        assertThat(삼각형.findCoordinates()).hasSize(3);
+    }
+}
