refactor: 예외 테스트 코드 작성

Author: Hchanghyeon

src/test/java/org/programmers/java/OperatorTest.java

@@ -1,6 +1,5 @@
 package org.programmers.java;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.programmers.java.calculation.Operator;

src/test/java/org/programmers/java/RepositoryTest.java

@@ -56,7 +56,7 @@ private String formattingFormula(String inputFormula, String result){
         StringBuilder stringBuilder = new StringBuilder();
         return stringBuilder
                 .append(inputFormula)
-                .append("=")
+                .append(" = ")
                 .append(result)
                 .toString();
     }

src/test/java/org/programmers/java/ValidaionTest.java

@@ -4,52 +4,36 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.programmers.java.validator.Validator;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ValidaionTest {
-    FormulaSplitValidator formulaSplitValidator = new FormulaSplitValidator();
-    FormulaCountValidator formulaCountValidator = new FormulaCountValidator();
 
     @ParameterizedTest
-    @DisplayName("연산식 검증: 연산식 분해 검증")
-    @MethodSource("makeFormulaAndList")
-    void formulaSplitValidation(String input, List<String> formula){
-        // when
-        List<String> formulaList = formulaSplitValidator.validate(input);
-
-        // then
-        assertEquals(formula, formulaList);
-    }
-
-    static Stream<Arguments> makeFormulaAndList(){
-        return Stream.of(
-                Arguments.of("10 + 4 / 20 * 3 - 2", Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2")),
-                Arguments.of("5 - 2 * 20 + 3 / 2", Arrays.asList("5","-","2","*","20","+","3","/","2")),
-                Arguments.of("7 * 2 - 3 / 3 + 2", Arrays.asList("7","*","2","-","3","/","3","+","2"))
-        );
+    @DisplayName("연산자 혹은 피연산자가 아닌 것이 들어오면 예외가 발생한다.")
+    @ValueSource(strings = {"10 + 4 / 20 * 3 - ㄱ", "# + 3 - 11", "****"})
+    void formulaSplitValidation(String input){
+        assertThrows(IllegalArgumentException.class, () -> Validator.formulaSplitValidate(input));
     }
 
     @ParameterizedTest
-    @DisplayName("연산식 검증: 연산자와 피연산자의 전체 개수 검증 및 위치 검증")
+    @DisplayName("연산자와 피연산자 수, 리스트 전체 개수, 위치가 맞지 않으면 예외가 발상핸다.")
     @MethodSource("makeFormulaList")
     void checkFormulaValidation(List<String> formulaList){
-        // when
-        Boolean checkedFormulaValidation = formulaCountValidator.validate(formulaList);
-
-        // then
-        assertEquals(checkedFormulaValidation, true);
+        assertThrows(IllegalArgumentException.class, () -> Validator.formulaCountValidate(formulaList));
     }
 
     static Stream<Arguments> makeFormulaList(){
         return Stream.of(
-                Arguments.of(Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-", "2")),
-                Arguments.of(Arrays.asList("5","-","2","*","20","+","3","/","2")),
-                Arguments.of(Arrays.asList("7","*","2","-","3","/","3","+","2"))
+                Arguments.of(Arrays.asList("10", "+", "4", "/", "20", "*", "3", "-")),
+                Arguments.of(Arrays.asList("5","2","*","20","+","3","/","2")),
+                Arguments.of(Arrays.asList("7","*","2","-","3","/","3","+"))
         );
     }
 }