정규식 및 테스트 파일 수정

Author: kimihiqq

src/main/java/me/kimihiqq/Application.java

@@ -1,8 +1,11 @@
 package me.kimihiqq;
 
+import me.kimihiqq.model.History;
+
 public class Application {
     public static void main(String[] args) {
         Console console = new Console();
-        new Calculator(console, console).run();
+        History history = new History();
+        new Calculator(console, console, history).run();
     }
 }

src/main/java/me/kimihiqq/Calculator.java

@@ -13,7 +13,7 @@ public class Calculator implements Runnable {
 
     private final Input scanner;
     private final Output printer;
-    private final History history = new History();
+    private final History history;
 
     public void run() {
 
@@ -81,7 +81,6 @@ public void calculate() {
                 .append(terms.get(0))
                 .toString();
         history.add(result);
-
     }
 
     public void list() {

src/main/java/me/kimihiqq/Pretreatment.java

@@ -12,7 +12,7 @@ public static List<String> parseFormula(String formula) {
     }
 
     public static boolean validateFormula(String formula) {
-        if (!formula.matches("^(\\d\\s[+\\-*/]\\s)+\\d$")) {
+        if (!formula.matches("^(-*\\d\\s[+\\-*/]\\s)+\\d$")) {
             System.out.println("Invalid formula!");
             return false;
         }

src/test/java/me/kimihiqq/CalculatorTest.java

@@ -2,6 +2,7 @@
 
 import me.kimihiqq.io.Input;
 import me.kimihiqq.io.Output;
+import me.kimihiqq.model.History;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import static org.mockito.Mockito.*;
@@ -10,25 +11,27 @@ public class CalculatorTest {
 
     @Test
     public void testCalculate() {
+        History history = new History();
         Input mockInput = Mockito.mock(Input.class);
         Output mockOutput = Mockito.mock(Output.class);
 
         when(mockInput.nextLine()).thenReturn("1 + 2 * 3");
 
-        Calculator calculator = new Calculator(mockInput, mockOutput);
+        Calculator calculator = new Calculator(mockInput, mockOutput, history);
         calculator.calculate();
 
         verify(mockOutput).println("7");
     }
 
     @Test
     public void testList() {
+        History history = new History();
         Input mockInput = Mockito.mock(Input.class);
         Output mockOutput = Mockito.mock(Output.class);
 
         when(mockInput.nextLine()).thenReturn("5 + 6", "4 * 2");
 
-        Calculator calculator = new Calculator(mockInput, mockOutput);
+        Calculator calculator = new Calculator(mockInput, mockOutput, history);
         calculator.calculate();
         calculator.calculate();