[라빈] 온보딩 - 학습 테스트, 단위 테스트

src/main/java/calculator/Input.java

@@ -3,14 +3,14 @@
 import java.util.Scanner;
 
 public class Input {
-    private Validator validator = new Validator();
+    private ValidityInspector validityInspector = new ValidityInspector();
     private Scanner scanner = new Scanner(System.in);
 
     private String inputString() {
         System.out.print("계산식을 입력하시오: ");
         String inputLine = scanner.nextLine();
         try {
-            validator.isValidInput(inputLine);
+            validityInspector.isValidInput(inputLine);
         } catch (IllegalArgumentException e) {
             System.out.println(e.getMessage());
             return inputString();
@@ -22,7 +22,7 @@ public String[] splitString() {
         String input = inputString();
         String[] splitInput = input.split(" ");
         try {
-            validator.isValidSplitedInput(splitInput);
+            validityInspector.isValidSplitedInput(splitInput);
         } catch (IllegalArgumentException e) {
             System.out.println(e.getMessage());
             return splitString();

src/main/java/calculator/Operator.java

@@ -0,0 +1,15 @@
+package calculator;
+
+public enum Operator {
+    Plus("+"), Minus("-"), Multiplication("*"), Division("/");
+
+    private String symbol;
+
+    Operator(String symbol) {
+        this.symbol = symbol;
+    }
+
+    public String getValue() {
+        return this.symbol;
+    }
+}

src/main/java/calculator/Validator.java → src/main/java/calculator/ValidityInspector.java

@@ -1,15 +1,17 @@
 package calculator;
 
 import java.util.ArrayList;
+import java.util.List;
 
-public class Validator {
-    private static final ArrayList<String> operators = new ArrayList<>();
+public class ValidityInspector {
+    private List<String> operators;
 
-    public Validator() {
-        operators.add("+");
-        operators.add("-");
-        operators.add("*");
-        operators.add("/");
+    ValidityInspector() {
+        operators = new ArrayList<>();
+        operators.add(Operator.Plus.getValue());
+        operators.add(Operator.Minus.getValue());
+        operators.add(Operator.Multiplication.getValue());
+        operators.add(Operator.Division.getValue());
     }
 
     public void isValidInput(String input) {

src/test/java/calculator/CalculatorTest.java

@@ -10,12 +10,12 @@
 
 public class CalculatorTest {
     private Calculator calculator;
-    private Validator validator;
+    private ValidityInspector validityInspector;
 
     @BeforeEach
     public void setUp() {
         calculator = new Calculator();
-        validator = new Validator();
+        validityInspector = new ValidityInspector();
     }
 
     static Stream<String> notValidInputStrings() {
@@ -30,7 +30,7 @@ static Stream<String> notValidSplitedStrings() {
     @MethodSource("notValidInputStrings")
     public void isValidInputTest(String notValidInputString) {
         Assertions.assertThatThrownBy(() -> {
-            validator.isValidInput(notValidInputString);
+            validityInspector.isValidInput(notValidInputString);
         }).isInstanceOf(IllegalArgumentException.class)
                 .hasMessageContaining("Null or Blank or Empty exception.");
     }
@@ -40,7 +40,7 @@ public void isValidInputTest(String notValidInputString) {
     public void isValidSplitedInputTest(String notValidSplitedStrings) {
         String[] splitData = notValidSplitedStrings.split(" ");
         Assertions.assertThatThrownBy(() -> {
-            validator.isValidSplitedInput(splitData);
+            validityInspector.isValidSplitedInput(splitData);
         }).isInstanceOf(IllegalArgumentException.class);
     }