From 502ca479df8f45ef317f590f2c4a2fd8728cdf02 Mon Sep 17 00:00:00 2001
From: kim nan seul <154604350+seulnan@users.noreply.github.com>
Date: Tue, 4 Feb 2025 21:29:31 +0900
Subject: [PATCH 1/4] [DOCS](README): add planned feature list

Added a list of features to be implemented in README.md.
This serves as a roadmap for the upcoming development tasks.
---
 README.md | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bd90ef0..1dd243d 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,34 @@
-# java-calculator-precourse
\ No newline at end of file
+# java-calculator-precourse
+
+## 기능 요구 사항
+
+---
+
+입력한 문자열에서 숫자를 추출하여 더하는 계산기를 구현한다.
+
+- 쉼표(,) 또는 콜론(:)을 구분자로 가지는 문자열을 전달하는 경우 구분자를 기준으로 분리한 각 숫자의 합을 반환한다.
+    - 예: "" => 0, "1,2" => 3, "1,2,3" => 6, "1,2:3" => 6
+- 앞의 기본 구분자(쉼표, 콜론) 외에 커스텀 구분자를 지정할 수 있다. 커스텀 구분자는 문자열 앞부분의 "//"와 "\n" 사이에 위치하는 문자를 커스텀 구분자로 사용한다.
+    - 예를 들어 "//;\n1;2;3"과 같이 값을 입력할 경우 커스텀 구분자는 세미콜론(;)이며, 결과 값은 6이 반환되어야 한다.
+- 사용자가 잘못된 값을 입력할 경우 `IllegalArgumentException`을 발생시킨 후 애플리케이션은 종료되어야 한다.
+
+## 프로그래밍 요구사항
+
+---
+
+### Java
+
+- JDK 21 버전에서 실행 가능해야 한다.
+- 프로그램 실행의 시작점은 `Application`의 `main()` 이다.
+- `build.gradle` 파일은 변경할 수 없으며, **제공된 라이브러리 이외의 외부 라이브러리는 사용하지 않는다.**
+- 프로그램 종료 시 `System.exit()`를 호출하지 않는다.
+- 프로그래밍 요구 사항에서 달리 명시하지 않는 한 파일, 패키지 등의 이름을 바꾸거나 이동하지 않는다.
+- 자바 코드 컨벤션을 지키면서 프로그래밍한다.
+    - 기본적으로 Java Style Guide(https://github.com/woowacourse/woowacourse-docs/tree/main/styleguide/java)를 원칙으로 한다.
+
+### 라이브러리
+
+### Java
+
+- `camp.nextstep.edu.missionutils`에서 제공하는 `Console` API를 사용하여 구현해야 한다.
+    - 사용자가 입력하는 값은 `camp.nextstep.edu.missionutils.Console`의 `readLine()`을 활용한다.
\ No newline at end of file

From 64d3c5f4eddfd032a59291abeb98b847696472cb Mon Sep 17 00:00:00 2001
From: kim nan seul <154604350+seulnan@users.noreply.github.com>
Date: Wed, 5 Feb 2025 14:30:28 +0900
Subject: [PATCH 2/4] feat(basic-delimiter-calculator): implement sum
 calculation with default delimiters

Implemented sum calculation using split and Java Streams.

- Supported default delimiters (comma, colon)
- Empty input returns 0
- Unit tests added to verify expected behavior.
---
 src/main/java/calculator/Application.java     |  7 ++++--
 .../controller/CalculatorController.java      | 13 ++++++++++
 .../java/calculator/model/Calculator.java     | 15 +++++++++++
 src/main/java/calculator/view/InputView.java  | 12 +++++++++
 src/main/java/calculator/view/OutputView.java |  7 ++++++
 .../java/calculator/BasicCalculatorTest.java  | 25 +++++++++++++++++++
 6 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/calculator/controller/CalculatorController.java
 create mode 100644 src/main/java/calculator/model/Calculator.java
 create mode 100644 src/main/java/calculator/view/InputView.java
 create mode 100644 src/main/java/calculator/view/OutputView.java
 create mode 100644 src/test/java/calculator/BasicCalculatorTest.java

diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java
index 573580f..55e1957 100644
--- a/src/main/java/calculator/Application.java
+++ b/src/main/java/calculator/Application.java
@@ -1,7 +1,10 @@
 package calculator;
 
+import calculator.controller.CalculatorController;
+
 public class Application {
     public static void main(String[] args) {
-        // TODO: 프로그램 구현
+        CalculatorController controller = new CalculatorController();
+        controller.startCalculator();
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/calculator/controller/CalculatorController.java b/src/main/java/calculator/controller/CalculatorController.java
new file mode 100644
index 0000000..c7d764f
--- /dev/null
+++ b/src/main/java/calculator/controller/CalculatorController.java
@@ -0,0 +1,13 @@
+package calculator.controller;
+
+import calculator.model.Calculator;
+import calculator.view.InputView;
+import calculator.view.OutputView;
+
+public class CalculatorController {
+    public void startCalculator() {
+        String input = InputView.getInput();
+        int result = Calculator.processSum(input);
+        OutputView.printResult(result);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/calculator/model/Calculator.java b/src/main/java/calculator/model/Calculator.java
new file mode 100644
index 0000000..d873785
--- /dev/null
+++ b/src/main/java/calculator/model/Calculator.java
@@ -0,0 +1,15 @@
+package calculator.model;
+
+import java.util.Arrays;
+
+public class Calculator {
+    public static int processSum(String input) {
+        if (input == null || input.trim().isEmpty()) {
+            return 0;
+        }
+
+        return Arrays.stream(input.split("[,|:]"))
+                .mapToInt(Integer::parseInt)
+                .sum();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/calculator/view/InputView.java b/src/main/java/calculator/view/InputView.java
new file mode 100644
index 0000000..45c2496
--- /dev/null
+++ b/src/main/java/calculator/view/InputView.java
@@ -0,0 +1,12 @@
+package calculator.view;
+
+import camp.nextstep.edu.missionutils.Console;
+
+public class InputView {
+    public static String getInput() {
+        System.out.println("문자열을 입력하세요:");
+        String userInputValue = Console.readLine();
+
+        return userInputValue;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/calculator/view/OutputView.java b/src/main/java/calculator/view/OutputView.java
new file mode 100644
index 0000000..f71ec70
--- /dev/null
+++ b/src/main/java/calculator/view/OutputView.java
@@ -0,0 +1,7 @@
+package calculator.view;
+
+public class OutputView {
+    public static void printResult(int result) {
+        System.out.println("결과: " + result);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/calculator/BasicCalculatorTest.java b/src/test/java/calculator/BasicCalculatorTest.java
new file mode 100644
index 0000000..ca34a5c
--- /dev/null
+++ b/src/test/java/calculator/BasicCalculatorTest.java
@@ -0,0 +1,25 @@
+package calculator;
+
+import calculator.model.Calculator;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class BasicCalculatorTest {  // ✅ 더 명확한 이름으로 변경
+
+    @Test
+    void 빈문자열_테스트() {
+        assertThat(Calculator.processSum("")).isEqualTo(0);
+    }
+
+    @Test
+    void 기본_구분자_테스트() {
+        assertThat(Calculator.processSum("1,2:3")).isEqualTo(6);
+    }
+
+    @Test
+    void 하나의_숫자만_입력() {
+        assertThat(Calculator.processSum("5")).isEqualTo(5);
+    }
+
+}

From 4c041824bebe8a19b71f6b8502d8bbb58d72c661 Mon Sep 17 00:00:00 2001
From: kim nan seul <154604350+seulnan@users.noreply.github.com>
Date: Fri, 7 Feb 2025 17:04:13 +0900
Subject: [PATCH 3/4] feat(custom-delimiter-calculator): implement sum
 calculation with default and custom delimiters

- Supported default delimiters (comma, colon)
- Added support for custom delimiters (e.g., `//;\n1;2;3`)
- Unit tests added to verify expected behavior
---
 .../java/calculator/model/Calculator.java     | 24 ++++++++++++++++---
 src/main/java/calculator/view/InputView.java  |  2 +-
 src/test/java/calculator/ApplicationTest.java | 14 +++++------
 .../java/calculator/CustomCalculatorTest.java | 23 ++++++++++++++++++
 4 files changed, 52 insertions(+), 11 deletions(-)
 create mode 100644 src/test/java/calculator/CustomCalculatorTest.java

diff --git a/src/main/java/calculator/model/Calculator.java b/src/main/java/calculator/model/Calculator.java
index d873785..46689ac 100644
--- a/src/main/java/calculator/model/Calculator.java
+++ b/src/main/java/calculator/model/Calculator.java
@@ -1,14 +1,32 @@
 package calculator.model;
 
 import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 public class Calculator {
-    public static int processSum(String input) {
-        if (input == null || input.trim().isEmpty()) {
+    public static int processSum(String numbers) {
+        if (numbers == null || numbers.trim().isEmpty()) {
             return 0;
         }
 
-        return Arrays.stream(input.split("[,|:]"))
+        List<String> delimiters = Arrays.asList(",", ":");
+
+        Matcher matcher = Pattern.compile("^//(.)\\\\n(.*)").matcher(numbers);
+
+        if (matcher.find()) {
+            String customDelimiter = Pattern.quote(matcher.group(1));
+            delimiters = Arrays.asList(customDelimiter, ",", ":");
+            numbers = matcher.group(2);
+        }
+
+        String delimiterRegex = String.join("|", delimiters);
+
+        return Arrays.stream(numbers.split(delimiterRegex))
+                .map(String::trim)
+                .filter(num -> !num.isEmpty())
                 .mapToInt(Integer::parseInt)
                 .sum();
     }
diff --git a/src/main/java/calculator/view/InputView.java b/src/main/java/calculator/view/InputView.java
index 45c2496..6e4dd1a 100644
--- a/src/main/java/calculator/view/InputView.java
+++ b/src/main/java/calculator/view/InputView.java
@@ -4,7 +4,7 @@
 
 public class InputView {
     public static String getInput() {
-        System.out.println("문자열을 입력하세요:");
+        System.out.print("문자열을 입력하세요:");
         String userInputValue = Console.readLine();
 
         return userInputValue;
diff --git a/src/test/java/calculator/ApplicationTest.java b/src/test/java/calculator/ApplicationTest.java
index 93771fb..d05bee3 100644
--- a/src/test/java/calculator/ApplicationTest.java
+++ b/src/test/java/calculator/ApplicationTest.java
@@ -16,13 +16,13 @@ class ApplicationTest extends NsTest {
         });
     }
 
-    @Test
-    void 예외_테스트() {
-        assertSimpleTest(() ->
-            assertThatThrownBy(() -> runException("-1,2,3"))
-                .isInstanceOf(IllegalArgumentException.class)
-        );
-    }
+//    @Test
+//    void 예외_테스트() {
+//        assertSimpleTest(() ->
+//            assertThatThrownBy(() -> runException("-1,2,3"))
+//                .isInstanceOf(IllegalArgumentException.class)
+//        );
+//    }
 
     @Override
     public void runMain() {
diff --git a/src/test/java/calculator/CustomCalculatorTest.java b/src/test/java/calculator/CustomCalculatorTest.java
new file mode 100644
index 0000000..a9d4b26
--- /dev/null
+++ b/src/test/java/calculator/CustomCalculatorTest.java
@@ -0,0 +1,23 @@
+package calculator;
+
+import calculator.model.Calculator;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CustomCalculatorTest {
+    @Test
+    void 기본_구분자_테스트() {
+        assertThat(Calculator.processSum("1,2:3")).isEqualTo(6);
+    }
+
+    @Test
+    void 커스텀_구분자_테스트() {
+        assertThat(Calculator.processSum("//;\\n1;2;3")).isEqualTo(6);
+    }
+
+    @Test
+    void 기본_구분자_혼합사용_테스트() {
+        assertThat(Calculator.processSum("//;\\n1;2,3:4")).isEqualTo(10);
+    }
+}

From 687dc06e9459231476d92a6e90ad6dd4aaa9eaa7 Mon Sep 17 00:00:00 2001
From: kim nan seul <154604350+seulnan@users.noreply.github.com>
Date: Fri, 7 Feb 2025 23:19:30 +0900
Subject: [PATCH 4/4] feat(string-calculator): add exception handling for
 invalid inputs

- Implemented exception handling for negative numbers and invalid input formats
- Throws `IllegalArgumentException` when an invalid input is encountered
- Ensured proper application termination upon encountering an exception
- Verified functionality using provided integration test code
---
 .../controller/CalculatorController.java      | 11 ++++++++---
 .../java/calculator/model/Calculator.java     | 19 +++++++++++++++++--
 src/main/java/calculator/view/InputView.java  |  2 +-
 src/main/java/calculator/view/OutputView.java |  5 ++++-
 src/test/java/calculator/ApplicationTest.java | 14 +++++++-------
 5 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/main/java/calculator/controller/CalculatorController.java b/src/main/java/calculator/controller/CalculatorController.java
index c7d764f..774b91b 100644
--- a/src/main/java/calculator/controller/CalculatorController.java
+++ b/src/main/java/calculator/controller/CalculatorController.java
@@ -6,8 +6,13 @@
 
 public class CalculatorController {
     public void startCalculator() {
-        String input = InputView.getInput();
-        int result = Calculator.processSum(input);
-        OutputView.printResult(result);
+        try {
+            String input = InputView.getInput();
+            int result = Calculator.processSum(input);
+            OutputView.printResult(result);
+        } catch (IllegalArgumentException e) {
+            OutputView.printError(e.getMessage());
+            throw e;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/calculator/model/Calculator.java b/src/main/java/calculator/model/Calculator.java
index 46689ac..0d3e0e8 100644
--- a/src/main/java/calculator/model/Calculator.java
+++ b/src/main/java/calculator/model/Calculator.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 public class Calculator {
     public static int processSum(String numbers) {
@@ -22,12 +21,28 @@ public static int processSum(String numbers) {
             numbers = matcher.group(2);
         }
 
+        if (numbers.trim().isEmpty()) {
+            throw new IllegalArgumentException("커스텀 구분자 이후 숫자가 없습니다.");
+        }
+
         String delimiterRegex = String.join("|", delimiters);
 
         return Arrays.stream(numbers.split(delimiterRegex))
                 .map(String::trim)
                 .filter(num -> !num.isEmpty())
-                .mapToInt(Integer::parseInt)
+                .mapToInt(Calculator::parseValidation)
                 .sum();
     }
+
+    private static int parseValidation(String num) {
+        try {
+            int value = Integer.parseInt(num);
+            if (value < 0) {
+                throw new IllegalArgumentException("음수는 입력할 수 없습니다: " + num);
+            }
+            return value;
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("잘못된 숫자 입력: " + num);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/calculator/view/InputView.java b/src/main/java/calculator/view/InputView.java
index 6e4dd1a..8732a9a 100644
--- a/src/main/java/calculator/view/InputView.java
+++ b/src/main/java/calculator/view/InputView.java
@@ -4,7 +4,7 @@
 
 public class InputView {
     public static String getInput() {
-        System.out.print("문자열을 입력하세요:");
+        System.out.print("문자열을 입력하세요 :");
         String userInputValue = Console.readLine();
 
         return userInputValue;
diff --git a/src/main/java/calculator/view/OutputView.java b/src/main/java/calculator/view/OutputView.java
index f71ec70..f76f596 100644
--- a/src/main/java/calculator/view/OutputView.java
+++ b/src/main/java/calculator/view/OutputView.java
@@ -2,6 +2,9 @@
 
 public class OutputView {
     public static void printResult(int result) {
-        System.out.println("결과: " + result);
+        System.out.println("결과 : " + result);
+    }
+    public static void printError(String message) {
+        System.out.println("오류 발생 : " + message);
     }
 }
\ No newline at end of file
diff --git a/src/test/java/calculator/ApplicationTest.java b/src/test/java/calculator/ApplicationTest.java
index d05bee3..93771fb 100644
--- a/src/test/java/calculator/ApplicationTest.java
+++ b/src/test/java/calculator/ApplicationTest.java
@@ -16,13 +16,13 @@ class ApplicationTest extends NsTest {
         });
     }
 
-//    @Test
-//    void 예외_테스트() {
-//        assertSimpleTest(() ->
-//            assertThatThrownBy(() -> runException("-1,2,3"))
-//                .isInstanceOf(IllegalArgumentException.class)
-//        );
-//    }
+    @Test
+    void 예외_테스트() {
+        assertSimpleTest(() ->
+            assertThatThrownBy(() -> runException("-1,2,3"))
+                .isInstanceOf(IllegalArgumentException.class)
+        );
+    }
 
     @Override
     public void runMain() {