From e4116d1919111a6ea0874c65a0fd8771a327861c Mon Sep 17 00:00:00 2001 From: dong279 Date: Sat, 21 Mar 2026 19:17:43 +0900 Subject: [PATCH 01/27] =?UTF-8?q?=EB=8D=A7=EC=85=88=ED=95=A0=20=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=EC=97=B4=20=EC=9E=85=EB=A0=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/Application.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java index 573580f..58b15fc 100644 --- a/src/main/java/calculator/Application.java +++ b/src/main/java/calculator/Application.java @@ -1,7 +1,10 @@ package calculator; +import camp.nextstep.edu.missionutils.Console; + public class Application { public static void main(String[] args) { - // TODO: 프로그램 구현 + System.out.println("덧셈할 문자열을 입력해 주세요"); + String input = Console.readLine(); } } From 979ee54cde856e0f61388e8b1cad4bfbeeb4ea51 Mon Sep 17 00:00:00 2001 From: dong279 Date: Sat, 21 Mar 2026 19:25:09 +0900 Subject: [PATCH 02/27] =?UTF-8?q?=EB=B9=88=EB=AC=B8=EC=9E=90=EC=97=B4=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=20=EC=8B=9C=200=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/Application.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java index 58b15fc..f5c649b 100644 --- a/src/main/java/calculator/Application.java +++ b/src/main/java/calculator/Application.java @@ -7,4 +7,10 @@ public static void main(String[] args) { System.out.println("덧셈할 문자열을 입력해 주세요"); String input = Console.readLine(); } + + private static int calculate(String input) { + if (input == null || input.isEmpty()) { + return 0; + } + } } From 99b169123492ffd0a4827eba4bf1bd5f1c288215 Mon Sep 17 00:00:00 2001 From: dong279 Date: Sat, 21 Mar 2026 19:42:00 +0900 Subject: [PATCH 03/27] =?UTF-8?q?=EC=BB=A4=EC=8A=A4=ED=85=80=20=EA=B5=AC?= =?UTF-8?q?=EB=B6=84=EC=9E=90=EB=A1=9C=20=EB=AC=B8=EC=9E=90=EC=97=B4?= =?UTF-8?q?=EC=9D=84=20=EB=B6=84=EB=A6=AC=20=ED=95=98=EA=B3=A0=20=EA=B0=81?= =?UTF-8?q?=20=EC=88=AB=EC=9E=90=EB=A5=BC=20=ED=95=A9=EC=82=B0=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/Application.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java index f5c649b..436e423 100644 --- a/src/main/java/calculator/Application.java +++ b/src/main/java/calculator/Application.java @@ -12,5 +12,20 @@ private static int calculate(String input) { if (input == null || input.isEmpty()) { return 0; } + + String delimiter = "[,:]"; + String numberPart = input; + + int sum = 0; + for (String token : numberPart.split(delimiter)) { + int num; + try{ + num = Integer.parseInt(token.trim()); + }catch (NumberFormatException e){ + throw new IllegalArgumentException("숫자가 아닌 값: " + token); + } + sum += num; + } + return sum; } } From 98e4aa54083b5224e5ba92d6796325814ecc68fb Mon Sep 17 00:00:00 2001 From: dong279 Date: Sat, 21 Mar 2026 19:46:29 +0900 Subject: [PATCH 04/27] =?UTF-8?q?=EC=9D=8C=EC=88=98=20=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=20=EC=8B=9C=20=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/Application.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java index 436e423..7a27460 100644 --- a/src/main/java/calculator/Application.java +++ b/src/main/java/calculator/Application.java @@ -24,6 +24,9 @@ private static int calculate(String input) { }catch (NumberFormatException e){ throw new IllegalArgumentException("숫자가 아닌 값: " + token); } + if (num < 0) { + throw new IllegalArgumentException("음수는 사용 불가: " + num); + } sum += num; } return sum; From f96061178008b98461530af7be4889a4f5754bf6 Mon Sep 17 00:00:00 2001 From: dong279 Date: Sat, 21 Mar 2026 19:57:29 +0900 Subject: [PATCH 05/27] =?UTF-8?q?'//'=EC=99=80'|n'=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=EC=9D=98=20=EB=AC=B8=EC=9E=90=EB=A5=BC=20=EC=BB=A4=EC=8A=A4?= =?UTF-8?q?=ED=85=80=20=EA=B5=AC=EB=B6=84=EC=9E=90=EB=A1=9C=20=EC=B6=94?= =?UTF-8?q?=EC=B6=9C=ED=95=98=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20=EC=99=84=EB=A3=8C.=20+=20Pattern.quote()=EB=A1=9C?= =?UTF-8?q?=20=ED=8A=B9=EC=88=98=EB=AC=B8=EC=9E=90=EB=8F=84=20=EA=B5=AC?= =?UTF-8?q?=EB=B6=84=EC=9E=90=EB=A1=9C=20=EC=82=AC=EC=9A=A9=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=98=EA=B2=8C=20=EC=B2=98=EB=A6=AC=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/Application.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java index 7a27460..1be6b9d 100644 --- a/src/main/java/calculator/Application.java +++ b/src/main/java/calculator/Application.java @@ -4,7 +4,7 @@ public class Application { public static void main(String[] args) { - System.out.println("덧셈할 문자열을 입력해 주세요"); + System.out.println("덧셈할 문자열을 입력해 주세요."); String input = Console.readLine(); } @@ -16,6 +16,16 @@ private static int calculate(String input) { String delimiter = "[,:]"; String numberPart = input; + if(input.startsWith("//")) { + int idx = input.indexOf("\\n"); + if (idx < 0) { + throw new IllegalArgumentException("잘못된 커스텀 구분자 형식입니다."); + } + String custom = input.substring(2,idx); + delimiter = "[,:]|" + java.util.regex.Pattern.quote(custom); + numberPart = input.substring(idx+2); + } + int sum = 0; for (String token : numberPart.split(delimiter)) { int num; From 6a24e8a169d49c8932ce8dceed36c037fb042420 Mon Sep 17 00:00:00 2001 From: dong279 Date: Sat, 21 Mar 2026 19:58:44 +0900 Subject: [PATCH 06/27] =?UTF-8?q?=EA=B2=B0=EA=B3=BC=EB=AC=BC=20=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/Application.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java index 1be6b9d..b745e97 100644 --- a/src/main/java/calculator/Application.java +++ b/src/main/java/calculator/Application.java @@ -6,6 +6,9 @@ public class Application { public static void main(String[] args) { System.out.println("덧셈할 문자열을 입력해 주세요."); String input = Console.readLine(); + + int result = calculate(input); + System.out.println("결과: " + result); } private static int calculate(String input) { From e8e4c2117fba6a5c521828d79c781b1b873c9294 Mon Sep 17 00:00:00 2001 From: dong279 Date: Sat, 21 Mar 2026 20:01:52 +0900 Subject: [PATCH 07/27] =?UTF-8?q?=EA=B2=B0=EA=B3=BC=EB=AC=BC=20=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/Application.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java index b745e97..1bdf55a 100644 --- a/src/main/java/calculator/Application.java +++ b/src/main/java/calculator/Application.java @@ -8,7 +8,7 @@ public static void main(String[] args) { String input = Console.readLine(); int result = calculate(input); - System.out.println("결과: " + result); + System.out.println("결과 : " + result); } private static int calculate(String input) { From 5c1261aacb8ffb51f7fbd8804596d420704d5d56 Mon Sep 17 00:00:00 2001 From: dong279 Date: Mon, 23 Mar 2026 21:30:18 +0900 Subject: [PATCH 08/27] =?UTF-8?q?readme=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 69 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 299a2d2..bd8943d 100644 --- a/README.md +++ b/README.md @@ -11,29 +11,27 @@ ### **진행 방식** -- 미션은 **과제 진행 요구 사항**, **기능 요구 사항**, **프로그래밍 요구 사항** 세 가지로 구성되어 있다. +- 미션은 **과제 진행 요구 사항**, **기능 요구 사항**, **프로그래밍 요구 사항** 세 가지로 구성되어 있다. - 세 개의 요구 사항을 만족하기 위해 노력한다. 특히 기능을 구현하기 전에 기능 목록을 만들고, 기능 단위로 커밋 하는 방식으로 진행한다. - **기능 요구 사항에 기재되지 않은 내용은 스스로 판단하여 구현한다.** ### **미션 제출 방법** - 미션 구현을 완료한 후 GitHub을 통해 제출해야 한다. - - GitHub을 활용한 제출 방법은 [프리코스 과제 제출](https://github.com/woowacourse/woowacourse-docs/tree/master/precourse) 문서를 참고해 제출한다. + - GitHub을 활용한 제출 방법은 [프리코스 과제 제출](https://github.com/woowacourse/woowacourse-docs/tree/master/precourse) 문서를 참고해 제출한다. ### **과제 제출 전 체크 리스트** -- 기능을 올바르게 구현했더라도 **요구 사항에 명시된 출력 형식을 따르지 않으면 0점**을 받게 된다. +- 기능을 올바르게 구현했더라도 **요구 사항에 명시된 출력 형식을 따르지 않으면 0점**을 받게 된다. - 기능 구현을 완료한 후 아래 가이드에 따라 모든 테스트가 성공적으로 실행되는지 확인한다. - **테스트가 실패하면 점수가 0점**이 되므로 제출하기 전에 반드시 확인한다. ### **테스트 실행 가이드** -- 터미널에서 `java -version`을 실행하여 Java 버전이 21인지 확인한다. Eclipse 또는 IntelliJ IDEA와 같은 IDE에서 Java 21로 실행되는지 확인한다. -- 터미널에서 Mac 또는 Linux 사용자의 경우 `./gradlew clean test` 명령을 실행하고, Windows 사용자의 경우 `gradlew.bat clean test` 또는 `.\gradlew.bat clean test` 명령을 실행할 때 모든 테스트가 아래와 같이 통과하는지 확인한다. - +- 터미널에서 `java -version`을 실행하여 Java 버전이 21인지 확인한다. Eclipse 또는 IntelliJ IDEA와 같은 IDE에서 Java 21로 실행되는지 확인한다. +- 터미널에서 Mac 또는 Linux 사용자의 경우 `./gradlew clean test` 명령을 실행하고, Windows 사용자의 경우 `gradlew.bat clean test` 또는 `.\gradlew.bat clean test` 명령을 실행할 때 모든 테스트가 아래와 같이 통과하는지 확인한다. ``` BUILD SUCCESSFUL in 0s - ``` --- @@ -41,9 +39,9 @@ BUILD SUCCESSFUL in 0s # **문자열 덧셈 계산기** ## **과제 진행 요구 사항** -- **기능을 구현하기 전 `README.md`에 구현할 기능 목록을 정리**해 추가한다. -- Git의 커밋 단위는 앞 단계에서 `README.md`에 정리한 기능 목록 단위로 추가한다. - - [AngularJS Git Commit Message Conventions](https://gist.github.com/stephenparish/9941e89d80e2bc58a153)을 참고해 커밋 메시지를 작성한다. +- **기능을 구현하기 전 `README.md`에 구현할 기능 목록을 정리**해 추가한다. +- Git의 커밋 단위는 앞 단계에서 `README.md`에 정리한 기능 목록 단위로 추가한다. + - [AngularJS Git Commit Message Conventions](https://gist.github.com/stephenparish/9941e89d80e2bc58a153)을 참고해 커밋 메시지를 작성한다. - 자세한 과제 진행 방법은 프리코스 진행 가이드 문서를 참고한다. ## **기능 요구 사항** @@ -51,10 +49,10 @@ BUILD SUCCESSFUL in 0s 입력한 문자열에서 숫자를 추출하여 더하는 계산기를 구현한다. - 쉼표(,) 또는 콜론(:)을 구분자로 가지는 문자열을 전달하는 경우 구분자를 기준으로 분리한 각 숫자의 합을 반환한다. - - 예: "" => 0, "1,2" => 3, "1,2,3" => 6, "1,2:3" => 6 + - 예: "" => 0, "1,2" => 3, "1,2,3" => 6, "1,2:3" => 6 - 앞의 기본 구분자(쉼표, 콜론) 외에 커스텀 구분자를 지정할 수 있다. 커스텀 구분자는 문자열 앞부분의 "//"와 "\n" 사이에 위치하는 문자를 커스텀 구분자로 사용한다. - - 예를 들어 "//;\n1;2;3"과 같이 값을 입력할 경우 커스텀 구분자는 세미콜론(;)이며, 결과 값은 6이 반환되어야 한다. -- 사용자가 잘못된 값을 입력할 경우 `IllegalArgumentException`을 발생시킨 후 애플리케이션은 종료되어야 한다. + - 예를 들어 "//;\n1;2;3"과 같이 값을 입력할 경우 커스텀 구분자는 세미콜론(;)이며, 결과 값은 6이 반환되어야 한다. +- 사용자가 잘못된 값을 입력할 경우 `IllegalArgumentException`을 발생시킨 후 애플리케이션은 종료되어야 한다. ### **입출력 요구 사항** @@ -65,12 +63,57 @@ BUILD SUCCESSFUL in 0s ### **출력** - 덧셈 결과 +``` +결과 : 6 +``` +### **실행 결과 예시** ``` +덧셈할 문자열을 입력해 주세요. +1,2:3 결과 : 6 +``` + +## **프로그래밍 요구 사항** +- JDK 21 버전에서 실행 가능해야 한다. +- 프로그램 실행의 시작점은 `Application`의 `main()`이다. +- `build.gradle` 파일은 변경할 수 없으며, **제공된 라이브러리 이외의 외부 라이브러리는 사용하지 않는다.** +- 프로그램 종료 시 `System.exit()`를 호출하지 않는다. +- 프로그래밍 요구 사항에서 달리 명시하지 않는 한 파일, 패키지 등의 이름을 바꾸거나 이동하지 않는다. +- 자바 코드 컨벤션을 지키면서 프로그래밍한다. + - 기본적으로 [Java Style Guide](https://github.com/woowacourse/woowacourse-docs/blob/main/styleguide/java)를 원칙으로 한다. + +### **라이브러리** + +- `camp.nextstep.edu.missionutils`에서 제공하는 `Console` API를 사용하여 구현해야 한다. + - 사용자가 입력하는 값은 `camp.nextstep.edu.missionutils.Console`의 `readLine()`을 활용한다. + +--- + +## **기능 목록** + +### 입력 +- [x] 덧셈할 문자열 입력 받기 + +### 계산 +- [x] 빈 문자열 입력 시 0 반환 +- [x] 쉼표(,), 콜론(:) 기본 구분자로 숫자 분리 후 합산 +- [x] 커스텀 구분자(`//[구분자]\n`) 파싱 후 합산 + +### 예외 처리 +- [x] 음수 입력 시 IllegalArgumentException 발생 +- [x] 숫자가 아닌 값 입력 시 IllegalArgumentException 발생 +- [x] 잘못된 커스텀 구분자 형식 입력 시 IllegalArgumentException 발생 + +### 출력 +- [x] `결과 : {합계}` 형식으로 결과 출력 ``` +README.md 전체 교체 후: +``` +git add . +git commit -m "docs: README 기능 목록 작성" ### **실행 결과 예시** ``` From 1da11a75d84979cae7894b3ed863c5a0f2a2a566 Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 24 Mar 2026 17:25:08 +0900 Subject: [PATCH 09/27] =?UTF-8?q?mvc=20=ED=8C=A8=ED=84=B4=EC=9D=84=20?= =?UTF-8?q?=EB=8F=84=EC=9E=85=ED=95=98=EC=97=AC=20=ED=8F=B4=EB=8D=94?= =?UTF-8?q?=EC=99=80=20=ED=8C=8C=EC=9D=BC=20=EA=B5=AC=EC=A1=B0=EB=A5=BC=20?= =?UTF-8?q?=EA=B0=9C=ED=8E=B8=20=ED=96=88=EC=8A=B5=EB=8B=88=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/Application.java | 42 +------------------ .../java/controller/CalculatorController.java | 4 ++ src/main/java/model/StringCalculator.java | 4 ++ src/main/java/model/StringParser.java | 4 ++ src/main/java/model/Validator.java | 4 ++ src/main/java/view/InputView.java | 4 ++ src/main/java/view/OutputView.java | 4 ++ 7 files changed, 26 insertions(+), 40 deletions(-) create mode 100644 src/main/java/controller/CalculatorController.java create mode 100644 src/main/java/model/StringCalculator.java create mode 100644 src/main/java/model/StringParser.java create mode 100644 src/main/java/model/Validator.java create mode 100644 src/main/java/view/InputView.java create mode 100644 src/main/java/view/OutputView.java diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java index 1bdf55a..40e6a9b 100644 --- a/src/main/java/calculator/Application.java +++ b/src/main/java/calculator/Application.java @@ -1,47 +1,9 @@ package calculator; import camp.nextstep.edu.missionutils.Console; +import controller.CalculatorController; public class Application { - public static void main(String[] args) { - System.out.println("덧셈할 문자열을 입력해 주세요."); - String input = Console.readLine(); - int result = calculate(input); - System.out.println("결과 : " + result); - } - private static int calculate(String input) { - if (input == null || input.isEmpty()) { - return 0; - } - - String delimiter = "[,:]"; - String numberPart = input; - - if(input.startsWith("//")) { - int idx = input.indexOf("\\n"); - if (idx < 0) { - throw new IllegalArgumentException("잘못된 커스텀 구분자 형식입니다."); - } - String custom = input.substring(2,idx); - delimiter = "[,:]|" + java.util.regex.Pattern.quote(custom); - numberPart = input.substring(idx+2); - } - - int sum = 0; - for (String token : numberPart.split(delimiter)) { - int num; - try{ - num = Integer.parseInt(token.trim()); - }catch (NumberFormatException e){ - throw new IllegalArgumentException("숫자가 아닌 값: " + token); - } - if (num < 0) { - throw new IllegalArgumentException("음수는 사용 불가: " + num); - } - sum += num; - } - return sum; - } -} +} \ No newline at end of file diff --git a/src/main/java/controller/CalculatorController.java b/src/main/java/controller/CalculatorController.java new file mode 100644 index 0000000..f5b6fc7 --- /dev/null +++ b/src/main/java/controller/CalculatorController.java @@ -0,0 +1,4 @@ +package controller; + +public class CalculatorController { +} diff --git a/src/main/java/model/StringCalculator.java b/src/main/java/model/StringCalculator.java new file mode 100644 index 0000000..d6102ab --- /dev/null +++ b/src/main/java/model/StringCalculator.java @@ -0,0 +1,4 @@ +package model; + +public class StringCalculator { +} diff --git a/src/main/java/model/StringParser.java b/src/main/java/model/StringParser.java new file mode 100644 index 0000000..9967332 --- /dev/null +++ b/src/main/java/model/StringParser.java @@ -0,0 +1,4 @@ +package model; + +public class StringParser { +} diff --git a/src/main/java/model/Validator.java b/src/main/java/model/Validator.java new file mode 100644 index 0000000..e57d661 --- /dev/null +++ b/src/main/java/model/Validator.java @@ -0,0 +1,4 @@ +package model; + +public class Validator { +} diff --git a/src/main/java/view/InputView.java b/src/main/java/view/InputView.java new file mode 100644 index 0000000..ae2791f --- /dev/null +++ b/src/main/java/view/InputView.java @@ -0,0 +1,4 @@ +package view; + +public class InputView { +} diff --git a/src/main/java/view/OutputView.java b/src/main/java/view/OutputView.java new file mode 100644 index 0000000..d8f9743 --- /dev/null +++ b/src/main/java/view/OutputView.java @@ -0,0 +1,4 @@ +package view; + +public class OutputView { +} From fb1f65db3c028fdd2f93c1a123cdd3243767a1f5 Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 24 Mar 2026 17:50:22 +0900 Subject: [PATCH 10/27] =?UTF-8?q?=EA=B8=B0=EC=A1=B4=20=ED=8F=B0=EB=8D=94?= =?UTF-8?q?=20=EA=B5=AC=EC=A1=B0=EC=97=90=EC=84=9C=20calculator=EC=9D=98?= =?UTF-8?q?=20mvc=20=ED=8C=A8=ED=84=B4=EC=9D=84=20=EB=AA=85=EC=8B=9C?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=B4=20model,=20controller,?= =?UTF-8?q?=20view=20=ED=8F=B4=EB=8D=94=EB=A5=BC=20calculator=20=ED=8F=B4?= =?UTF-8?q?=EB=8D=94=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20=EC=8B=9C=EC=BC=B0?= =?UTF-8?q?=EC=8A=B5=EB=8B=88=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/Application.java | 12 +++++++++--- .../controller/CalculatorController.java | 2 +- .../{ => calculator}/model/StringCalculator.java | 2 +- .../java/{ => calculator}/model/StringParser.java | 2 +- src/main/java/{ => calculator}/model/Validator.java | 2 +- src/main/java/{ => calculator}/view/InputView.java | 2 +- src/main/java/{ => calculator}/view/OutputView.java | 2 +- 7 files changed, 15 insertions(+), 9 deletions(-) rename src/main/java/{ => calculator}/controller/CalculatorController.java (55%) rename src/main/java/{ => calculator}/model/StringCalculator.java (57%) rename src/main/java/{ => calculator}/model/StringParser.java (54%) rename src/main/java/{ => calculator}/model/Validator.java (51%) rename src/main/java/{ => calculator}/view/InputView.java (52%) rename src/main/java/{ => calculator}/view/OutputView.java (53%) diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java index 40e6a9b..d89ddc0 100644 --- a/src/main/java/calculator/Application.java +++ b/src/main/java/calculator/Application.java @@ -1,9 +1,15 @@ package calculator; import camp.nextstep.edu.missionutils.Console; -import controller.CalculatorController; +import calculator.controller.CalculatorController; public class Application { - - + public static void main(String[] args) { + try { + CalculatorController controller = new CalculatorController(); + controller.run(); + } finally { + Console.close(); + } + } } \ No newline at end of file diff --git a/src/main/java/controller/CalculatorController.java b/src/main/java/calculator/controller/CalculatorController.java similarity index 55% rename from src/main/java/controller/CalculatorController.java rename to src/main/java/calculator/controller/CalculatorController.java index f5b6fc7..f284487 100644 --- a/src/main/java/controller/CalculatorController.java +++ b/src/main/java/calculator/controller/CalculatorController.java @@ -1,4 +1,4 @@ -package controller; +package calculator.controller; public class CalculatorController { } diff --git a/src/main/java/model/StringCalculator.java b/src/main/java/calculator/model/StringCalculator.java similarity index 57% rename from src/main/java/model/StringCalculator.java rename to src/main/java/calculator/model/StringCalculator.java index d6102ab..f711594 100644 --- a/src/main/java/model/StringCalculator.java +++ b/src/main/java/calculator/model/StringCalculator.java @@ -1,4 +1,4 @@ -package model; +package calculator.model; public class StringCalculator { } diff --git a/src/main/java/model/StringParser.java b/src/main/java/calculator/model/StringParser.java similarity index 54% rename from src/main/java/model/StringParser.java rename to src/main/java/calculator/model/StringParser.java index 9967332..03bcb35 100644 --- a/src/main/java/model/StringParser.java +++ b/src/main/java/calculator/model/StringParser.java @@ -1,4 +1,4 @@ -package model; +package calculator.model; public class StringParser { } diff --git a/src/main/java/model/Validator.java b/src/main/java/calculator/model/Validator.java similarity index 51% rename from src/main/java/model/Validator.java rename to src/main/java/calculator/model/Validator.java index e57d661..e5440ad 100644 --- a/src/main/java/model/Validator.java +++ b/src/main/java/calculator/model/Validator.java @@ -1,4 +1,4 @@ -package model; +package calculator.model; public class Validator { } diff --git a/src/main/java/view/InputView.java b/src/main/java/calculator/view/InputView.java similarity index 52% rename from src/main/java/view/InputView.java rename to src/main/java/calculator/view/InputView.java index ae2791f..75f4ceb 100644 --- a/src/main/java/view/InputView.java +++ b/src/main/java/calculator/view/InputView.java @@ -1,4 +1,4 @@ -package view; +package calculator.view; public class InputView { } diff --git a/src/main/java/view/OutputView.java b/src/main/java/calculator/view/OutputView.java similarity index 53% rename from src/main/java/view/OutputView.java rename to src/main/java/calculator/view/OutputView.java index d8f9743..4a2a4b0 100644 --- a/src/main/java/view/OutputView.java +++ b/src/main/java/calculator/view/OutputView.java @@ -1,4 +1,4 @@ -package view; +package calculator.view; public class OutputView { } From f0a82c11c429abe3ac1b2a0513bdb82673b069c5 Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 24 Mar 2026 17:54:23 +0900 Subject: [PATCH 11/27] =?UTF-8?q?feat:=20InputView,=20OutputView=20view=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=EB=A1=9C=20=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=EA=B3=BC=20=EC=B6=9C=EB=A0=A5=EC=9D=84=20=20=EB=B6=84=EB=A6=AC?= =?UTF-8?q?=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/view/InputView.java | 6 ++++++ src/main/java/calculator/view/OutputView.java | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/main/java/calculator/view/InputView.java b/src/main/java/calculator/view/InputView.java index 75f4ceb..0bfa867 100644 --- a/src/main/java/calculator/view/InputView.java +++ b/src/main/java/calculator/view/InputView.java @@ -1,4 +1,10 @@ package calculator.view; +import camp.nextstep.edu.missionutils.Console; + public class InputView { + public static String read() { + System.out.println("덧셈할 문자열을 입력해 주세요."); + return Console.readLine(); + } } diff --git a/src/main/java/calculator/view/OutputView.java b/src/main/java/calculator/view/OutputView.java index 4a2a4b0..9101ec5 100644 --- a/src/main/java/calculator/view/OutputView.java +++ b/src/main/java/calculator/view/OutputView.java @@ -1,4 +1,7 @@ package calculator.view; public class OutputView { + public static void printResult(int result) { + System.out.println("결과 : " + result); + } } From dc695900531e1f9aef05fe87655b60b1ef37251a Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 24 Mar 2026 22:27:59 +0900 Subject: [PATCH 12/27] =?UTF-8?q?feat:=20Validator=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EC=83=9D=EC=84=B1=EC=9C=BC=EB=A1=9C=20=EC=BB=A4?= =?UTF-8?q?=EC=8A=A4=ED=85=80=20=EA=B5=AC=EB=B6=84=EC=9E=90=20=EB=B0=8F=20?= =?UTF-8?q?=EC=9D=8C=EC=88=98=20=EA=B2=80=EC=A6=9D=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calculator/controller/CalculatorController.java | 9 +++++++++ src/main/java/calculator/model/Validator.java | 12 +++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/calculator/controller/CalculatorController.java b/src/main/java/calculator/controller/CalculatorController.java index f284487..bb8e47f 100644 --- a/src/main/java/calculator/controller/CalculatorController.java +++ b/src/main/java/calculator/controller/CalculatorController.java @@ -1,4 +1,13 @@ package calculator.controller; +import calculator.model.StringCalculator; +import calculator.view.InputView; +import calculator.view.OutputView; + public class CalculatorController { + public void run(){ + String input = InputView.read(); + int result = StringCalculator.calculate(input); + OutputView.printResult(result); + } } diff --git a/src/main/java/calculator/model/Validator.java b/src/main/java/calculator/model/Validator.java index e5440ad..2f0ea83 100644 --- a/src/main/java/calculator/model/Validator.java +++ b/src/main/java/calculator/model/Validator.java @@ -1,4 +1,14 @@ package calculator.model; public class Validator { -} + public static void validateCustomDelimiterFormat(int newlineIndex){ + if(newlineIndex < 0){ + throw new IllegalArgumentException("잘못된 커스텀 구분자 형식입니다."); + } + } + public static void validateNotNegative(int number){ + if(number < 0){ + throw new IllegalArgumentException("음수는 입력할 수 없습니다."); + } + } +} \ No newline at end of file From d40a7ebc9df5f380cb175763d26a82a3cfc7f89d Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 24 Mar 2026 22:36:21 +0900 Subject: [PATCH 13/27] =?UTF-8?q?feat:=20StringParser=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=EB=A5=BC=20=EC=83=9D=EC=84=B1=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=EC=9E=90=20=ED=8C=8C=EC=8B=B1=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/calculator/model/StringParser.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/main/java/calculator/model/StringParser.java b/src/main/java/calculator/model/StringParser.java index 03bcb35..8b67275 100644 --- a/src/main/java/calculator/model/StringParser.java +++ b/src/main/java/calculator/model/StringParser.java @@ -1,4 +1,32 @@ package calculator.model; +import java.util.regex.Pattern; + public class StringParser { + + private static final String DEFAULT_DELIMITER = "[,:]"; + private static final String CUSTOM_PREFIX = "//"; + private static final String CUSTOM_SUFFIX = "\\n"; + + public static String[] parse(String input) { + if (hasCustomDelimiter(input)){ + return parseWithCustomDelimiter(input); + } + return input.split(DEFAULT_DELIMITER); + } + + private static boolean hasCustomDelimiter(String input) { + return input.startsWith(CUSTOM_PREFIX); + } + + private static String[] parseWithCustomDelimiter(String input) { + int newlineIndex = input.indexOf(CUSTOM_SUFFIX); + Validator.validateCustomDelimiterFormat(newlineIndex); + + String custom = input.substring(2, newlineIndex); + String delimiter = DEFAULT_DELIMITER +"|" + Pattern.quote(custom); + String numberPart = input.substring(newlineIndex + 2); + + return numberPart.split(delimiter); + } } From 50ebce160f2f2f4fdeafdafc863f879e20d0187f Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 24 Mar 2026 22:43:11 +0900 Subject: [PATCH 14/27] =?UTF-8?q?feat:=20StringCalculator=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=EB=A5=BC=20=EC=83=9D=EC=84=B1=ED=95=98?= =?UTF-8?q?=EC=97=AC=20=EC=88=AB=EC=9E=90=20=ED=95=A9=EC=82=B0=20=EA=B3=84?= =?UTF-8?q?=EC=82=B0=20=EB=A1=9C=EC=A7=81=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calculator/model/StringCalculator.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/main/java/calculator/model/StringCalculator.java b/src/main/java/calculator/model/StringCalculator.java index f711594..37cf7bb 100644 --- a/src/main/java/calculator/model/StringCalculator.java +++ b/src/main/java/calculator/model/StringCalculator.java @@ -1,4 +1,29 @@ package calculator.model; public class StringCalculator { + + public static int calculate(String input) { + if (input == null || input.isEmpty()) { + return 0; + } + String[] tokens = StringParser.parse(input); + return sum(tokens); + } + private static int sum(String[] tokens) { + int total = 0; + for (String token : tokens) { + int number = parseNumber(token); + Validator.validateNotNegative(number); + total += number; + } + return total; + } + + private static int parseNumber(String token) { + try{ + return Integer.parseInt(token.trim()); + } catch (NumberFormatException e) { + throw new IllegalArgumentException("숫자가 아닌 값이 포함되어 있습니다." + token); + } + } } From 7a51054fe3b1fe085898b116e9bdf80c5df4bcbe Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 24 Mar 2026 22:47:25 +0900 Subject: [PATCH 15/27] =?UTF-8?q?Validator=20validateNotNegative=EC=9D=98?= =?UTF-8?q?=20=EC=98=88=EC=99=B8=20=EB=AC=B8=EC=9E=90=20=EB=92=A4=20'.'->'?= =?UTF-8?q?:'=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/model/Validator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/calculator/model/Validator.java b/src/main/java/calculator/model/Validator.java index 2f0ea83..63a685a 100644 --- a/src/main/java/calculator/model/Validator.java +++ b/src/main/java/calculator/model/Validator.java @@ -8,7 +8,7 @@ public static void validateCustomDelimiterFormat(int newlineIndex){ } public static void validateNotNegative(int number){ if(number < 0){ - throw new IllegalArgumentException("음수는 입력할 수 없습니다."); + throw new IllegalArgumentException("음수는 입력할 수 없습니다: " + number); } } } \ No newline at end of file From 06f62a27a55484a3eb794cc5e668a2b2e3cc654b Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 12 May 2026 19:21:55 +0900 Subject: [PATCH 16/27] =?UTF-8?q?-=20StringCalulator=EB=A5=BC=20static=20?= =?UTF-8?q?=EC=A7=81=EC=A0=91=20=ED=98=B8=EC=B6=9C=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=9E=90=20=EC=A3=BC=EC=9E=85(DI)=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20-=20Controller=EA=B0=80=20=EA=B5=AC?= =?UTF-8?q?=EC=B2=B4=20=EA=B5=AC=ED=98=84=EC=9D=B4=20=EC=95=84=EB=8B=8C=20?= =?UTF-8?q?=EC=A3=BC=EC=9E=85=EB=90=9C=20=EC=9D=B8=EC=8A=A4=ED=84=B4?= =?UTF-8?q?=EC=8A=A4=EC=97=90=20=EC=9D=98=EC=A1=B4=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95=ED=95=A8=20DI=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=EC=9C=BC=EB=A1=9C=20=EB=8B=A8=EC=9C=84=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9A=A9=EC=9D=B4=EC=84=B1=20=EB=B0=8F=20?= =?UTF-8?q?=EC=9C=A0=EC=97=B0=EC=84=B1=20=ED=99=95=EB=B3=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/Application.java | 3 ++- .../java/calculator/controller/CalculatorController.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java index d89ddc0..a55a138 100644 --- a/src/main/java/calculator/Application.java +++ b/src/main/java/calculator/Application.java @@ -2,11 +2,12 @@ import camp.nextstep.edu.missionutils.Console; import calculator.controller.CalculatorController; +import calculator.model.StringCalculator; public class Application { public static void main(String[] args) { try { - CalculatorController controller = new CalculatorController(); + CalculatorController controller = new CalculatorController(new StringCalculator()); controller.run(); } finally { Console.close(); diff --git a/src/main/java/calculator/controller/CalculatorController.java b/src/main/java/calculator/controller/CalculatorController.java index bb8e47f..cb15daf 100644 --- a/src/main/java/calculator/controller/CalculatorController.java +++ b/src/main/java/calculator/controller/CalculatorController.java @@ -5,6 +5,13 @@ import calculator.view.OutputView; public class CalculatorController { + + private final StringCalculator calculator; + + public CalculatorController(StringCalculator calculator) { + this.calculator = calculator; + } + public void run(){ String input = InputView.read(); int result = StringCalculator.calculate(input); From 93e0ec855d5065ab312f09062d9e00d67442e713 Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 12 May 2026 19:37:50 +0900 Subject: [PATCH 17/27] =?UTF-8?q?-=20=EB=AC=B8=EC=9E=90=EC=97=B4=20?= =?UTF-8?q?=ED=86=A0=ED=81=B0=EC=9D=84=20=EB=B0=9B=EC=95=84=20=EC=A0=95?= =?UTF-8?q?=EC=88=98=EB=A1=9C=20=EB=B3=80=ED=99=98=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EC=B1=85=EC=9E=84=EC=9D=84=20PostiveNumber=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=ED=95=A8=20-=20=EC=9D=8C=EC=88=98=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=20=EC=8B=9C=20IllegalArgumentException?= =?UTF-8?q?=EC=9D=B4=20=EB=B0=9C=EC=83=9D=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=9E=90=EC=B2=B4=20=EA=B2=80=EC=A6=9D=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?-=20=EA=B0=9D=EC=B2=B4=20=EC=83=9D=EC=84=B1=20=EC=8B=9C?= =?UTF-8?q?=EC=A0=90=EC=97=90=EC=84=9C=20=EC=9C=A0=ED=9A=A8=EC=84=B1?= =?UTF-8?q?=EC=9D=84=20=EB=B3=B4=EC=9E=A5=ED=95=98=EC=97=AC=20=EB=B6=88?= =?UTF-8?q?=EB=B3=80=EC=8B=9D=20=EC=84=B1=EB=A6=BD=20-=20=EA=B8=B0?= =?UTF-8?q?=EC=A1=B4=20Validator.validateNotNegative()=20=EC=9D=98?= =?UTF-8?q?=EC=A1=B4=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/calculator/model/PositiveNumber.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/main/java/calculator/model/PositiveNumber.java diff --git a/src/main/java/calculator/model/PositiveNumber.java b/src/main/java/calculator/model/PositiveNumber.java new file mode 100644 index 0000000..07778b0 --- /dev/null +++ b/src/main/java/calculator/model/PositiveNumber.java @@ -0,0 +1,26 @@ +package calculator.model; + +public class PositiveNumber { + private final int value; + + public PositiveNumber(String token) { + this.value = parse(token); + } + + private int parse(String token) { + int number; + try{ + number = Integer.parseInt(token.trim()); + } catch (NumberFormatException e) { + throw new IllegalArgumentException("숫자가 아닌 값입니다."+token); + } + if (number < 0) { + throw new IllegalArgumentException("음수는 입력할 수 없습니다." + number); + } + return number; + } + public int getValue() { + return value; + } + +} From b4283ad912f256ba4970c9a3a09fa2eb99f68989 Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 12 May 2026 20:31:17 +0900 Subject: [PATCH 18/27] =?UTF-8?q?-=20String[]=20=EB=8C=80=EC=8B=A0=20List=EB=A5=BC=20=EA=B0=90=EC=8B=B8=EB=8A=94=20?= =?UTF-8?q?=EC=9D=BC=EA=B8=89=20=EC=BB=AC=EB=A0=89=EC=85=98=20=EB=8F=84?= =?UTF-8?q?=EC=9E=85=20-=20=ED=95=A9=EC=82=B0=20=EC=B1=85=EC=9E=84(sum)?= =?UTF-8?q?=EC=9D=84=20Numbers=20=EB=82=B4=EB=B6=80=EB=A1=9C=20=EC=BA=A1?= =?UTF-8?q?=EC=8A=90=ED=99=94=20-=20empty()=20=ED=8C=A9=ED=86=A0=EB=A6=AC?= =?UTF-8?q?=20=EB=A9=94=EC=84=9C=EB=93=9C=EB=A1=9C=20=EB=B9=88=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=20=EC=BC=80=EC=9D=B4=EC=8A=A4=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?-=20Primitive=20Obsession=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20?= =?UTF-8?q?=EC=88=AB=EC=9E=90=20=EB=AA=A9=EB=A1=9D=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=EC=9D=98=20=EC=9D=91=EC=A7=91=EB=8F=84=20?= =?UTF-8?q?=ED=96=A5=EC=83=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/model/Numbers.java | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/main/java/calculator/model/Numbers.java diff --git a/src/main/java/calculator/model/Numbers.java b/src/main/java/calculator/model/Numbers.java new file mode 100644 index 0000000..74b115e --- /dev/null +++ b/src/main/java/calculator/model/Numbers.java @@ -0,0 +1,23 @@ +package calculator.model; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +public class Numbers { + private final List values; + + public Numbers(List values) { + this.values = List.copyOf(values); + } + + public static Numbers empty() { + return new Numbers(Collections.emptyList()); + } + + public int sum(){ + return values.stream() + .mapToInt(PositiveNumber::getValue) + .sum(); + } +} From 4bc81ab2948f81d650eb4c0c2ba5da1ae04106f9 Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 12 May 2026 20:37:58 +0900 Subject: [PATCH 19/27] =?UTF-8?q?-=20,=EB=B0=8F:=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=EC=9E=90=20=ED=8C=8C=EC=8B=B1=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=EC=9D=84=20=EB=B3=84=EB=8F=84=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=EB=A1=9C=20=EB=B6=84=EB=A6=AC=20-=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8/=EC=BB=A4=EC=8A=A4=ED=85=80=20=ED=8C=8C=EC=8B=B1?= =?UTF-8?q?=EC=9D=B4=20StringParser=EC=97=90=20=ED=98=BC=EC=9E=AC=ED=95=98?= =?UTF-8?q?=EB=8D=98=20SRP=20=EC=9C=84=EB=B0=98=20=ED=95=B4=EC=86=8C=20-?= =?UTF-8?q?=20=ED=8C=8C=EC=8B=B1=20=EA=B2=B0=EA=B3=BC=EB=A5=BC=20String[]?= =?UTF-8?q?=20=EB=8C=80=EC=8B=A0=20Numbers=EB=A1=9C=20=EB=B0=98=ED=99=98?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/parser/DefaultDelimiterParser.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/main/java/calculator/model/parser/DefaultDelimiterParser.java diff --git a/src/main/java/calculator/model/parser/DefaultDelimiterParser.java b/src/main/java/calculator/model/parser/DefaultDelimiterParser.java new file mode 100644 index 0000000..a5e4448 --- /dev/null +++ b/src/main/java/calculator/model/parser/DefaultDelimiterParser.java @@ -0,0 +1,19 @@ +package calculator.model.parser; + +import calculator.model.Numbers; +import calculator.model.PositiveNumber; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +public class DefaultDelimiterParser { + private static final String DELIMITER = "[,:]"; + + public Numbers parse(String input) { + List list = Arrays.stream(input.split(DELIMITER)) + .map(PositiveNumber::new) + .collect(Collectors.toList()); + return new Numbers(list); + } +} From 94cada386c09995f08440fd7206cdb50b6690606 Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 12 May 2026 20:45:38 +0900 Subject: [PATCH 20/27] =?UTF-8?q?-=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=EC=9E=90=20=ED=8C=8C=EC=8B=B1=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=EC=9D=84=20=EB=B3=84=EB=8F=84=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=EB=A1=9C=20=EB=B6=84=EB=A6=AC=20(SRP)=20-=20newlineIn?= =?UTF-8?q?dex=20=E2=86=92=20suffixIndex=EB=A1=9C=20=EB=B3=80=EC=88=98?= =?UTF-8?q?=EB=AA=85=20=EB=B3=80=EA=B2=BD=ED=95=98=EC=97=AC=20=EC=9D=98?= =?UTF-8?q?=EB=8F=84=20=EB=AA=85=ED=99=95=ED=99=94=20-=20=EB=A7=A4?= =?UTF-8?q?=EC=A7=81=20=EB=84=98=EB=B2=84=202=EB=A5=BC=20PREFIX.length(),?= =?UTF-8?q?=20SUFFIX.length()=20=EC=83=81=EC=88=98=EB=A1=9C=20=EB=8C=80?= =?UTF-8?q?=EC=B2=B4=20-=20=EC=BB=A4=EC=8A=A4=ED=85=80=20=EA=B5=AC?= =?UTF-8?q?=EB=B6=84=EC=9E=90=20=ED=98=95=EC=8B=9D=20=EA=B2=80=EC=A6=9D?= =?UTF-8?q?=EC=9D=84=20Validator=20=EB=8C=80=EC=8B=A0=20=EB=82=B4=EB=B6=80?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=B2=98=EB=A6=AC=20-=20Pattern.quote()?= =?UTF-8?q?=EB=A1=9C=20=EC=A0=95=EA=B7=9C=EC=8B=9D=20=ED=8A=B9=EC=88=98?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9D=B4=EC=8A=88=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/parser/CustomDelimiterParser.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/main/java/calculator/model/parser/CustomDelimiterParser.java diff --git a/src/main/java/calculator/model/parser/CustomDelimiterParser.java b/src/main/java/calculator/model/parser/CustomDelimiterParser.java new file mode 100644 index 0000000..dba504b --- /dev/null +++ b/src/main/java/calculator/model/parser/CustomDelimiterParser.java @@ -0,0 +1,29 @@ +package calculator.model.parser; + +import calculator.model.Numbers; +import calculator.model.PositiveNumber; + +import java.util.Arrays; +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + +public class CustomDelimiterParser { + private static final String PREFIX = "//"; // 상수명 의미 명확화 + private static final String SUFFIX = "\\n"; // 상수명 의미 명확화 + + public Numbers parse(String input){ + int suffixIndex = input.indexOf(SUFFIX); // newlineIndex → suffixIndex + if (suffixIndex < 0){ // Validator 대신 내부 검증 + throw new IllegalArgumentException("잘못된 커스텀 구분자 형식입니다."); + } + String custom = input.substring(PREFIX.length(), suffixIndex); + String numberPart = input.substring(suffixIndex + SUFFIX.length()); + String regex = "[,:]|" + Pattern.quote(custom); + + List list = Arrays.stream(numberPart.split(regex)) + .map(PositiveNumber::new) + .collect(Collectors.toList()); + return new Numbers(list); + } +} From c1bd3f3769efea0afe256915c4c7d8cccad1e012 Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 12 May 2026 21:03:11 +0900 Subject: [PATCH 21/27] =?UTF-8?q?-=20null/empty=20=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=EB=A5=BC=20Calculator=EC=97=90=EC=84=9C=20Pa?= =?UTF-8?q?rser=20=EB=8B=A8=EA=B3=84=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20-=20s?= =?UTF-8?q?upports()=20=EA=B8=B0=EB=B0=98=EC=9C=BC=EB=A1=9C=20CustomDelimi?= =?UTF-8?q?terParser,=20DefaultDelimiterParser=20=EC=84=A0=ED=83=9D=20-=20?= =?UTF-8?q?=EB=B9=88=20=EC=9E=85=EB=A0=A5=20=EC=8B=9C=20Numbers.empty()=20?= =?UTF-8?q?=EB=B0=98=ED=99=98=EC=9C=BC=EB=A1=9C=200=20=ED=95=A9=EC=82=B0?= =?UTF-8?q?=20=EB=B3=B4=EC=9E=A5=20-=20if=20=EC=A1=B0=EA=B1=B4=20=EB=B6=84?= =?UTF-8?q?=EA=B8=B0=20=EA=B5=AC=EC=A1=B0=EB=A5=BC=20=EA=B0=9C=EC=84=A0?= =?UTF-8?q?=ED=95=98=EC=97=AC=20OCP=20=EC=9C=84=EB=B0=98=20=ED=95=B4?= =?UTF-8?q?=EC=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/parser/CustomDelimiterParser.java | 4 ++++ .../model/parser/ExpressionParser.java | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 src/main/java/calculator/model/parser/ExpressionParser.java diff --git a/src/main/java/calculator/model/parser/CustomDelimiterParser.java b/src/main/java/calculator/model/parser/CustomDelimiterParser.java index dba504b..1fa3b6a 100644 --- a/src/main/java/calculator/model/parser/CustomDelimiterParser.java +++ b/src/main/java/calculator/model/parser/CustomDelimiterParser.java @@ -12,6 +12,10 @@ public class CustomDelimiterParser { private static final String PREFIX = "//"; // 상수명 의미 명확화 private static final String SUFFIX = "\\n"; // 상수명 의미 명확화 + public boolean supports(String input){ + return input.startsWith(PREFIX); + } + public Numbers parse(String input){ int suffixIndex = input.indexOf(SUFFIX); // newlineIndex → suffixIndex if (suffixIndex < 0){ // Validator 대신 내부 검증 diff --git a/src/main/java/calculator/model/parser/ExpressionParser.java b/src/main/java/calculator/model/parser/ExpressionParser.java new file mode 100644 index 0000000..fbec53b --- /dev/null +++ b/src/main/java/calculator/model/parser/ExpressionParser.java @@ -0,0 +1,18 @@ +package calculator.model.parser; + +import calculator.model.Numbers; + +public class ExpressionParser { + private final CustomDelimiterParser customParser = new CustomDelimiterParser(); + private final DefaultDelimiterParser defaultParser = new DefaultDelimiterParser(); + + public Numbers parse(String input) { + if (input == null || input.isEmpty()){ + return Numbers.empty(); + } + if (customParser.supports(input)){ + return customParser.parse(input); + } + return defaultParser.parse(input); + } +} From 18614040b1bb2347a3d42b57149964cc3b049f4d Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 12 May 2026 21:09:01 +0900 Subject: [PATCH 22/27] =?UTF-8?q?-=20static=20=EB=A9=94=EC=84=9C=EB=93=9C?= =?UTF-8?q?=EB=A5=BC=20=EC=9D=B8=EC=8A=A4=ED=84=B4=EC=8A=A4=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=EB=A1=9C=20=EC=A0=84=ED=99=98=20(OOP=20?= =?UTF-8?q?=EC=A4=80=EC=88=98)=20-=20null/empty=20=EA=B2=80=EC=A6=9D?= =?UTF-8?q?=EC=9D=84=20ExpressionParser=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20-?= =?UTF-8?q?=20StringParser=20=EA=B5=AC=EC=B2=B4=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EC=A7=81=EC=A0=91=20=EC=B0=B8=EC=A1=B0=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=20(DIP=20=EC=9C=84=EB=B0=98=20=ED=95=B4=EC=86=8C)=20-?= =?UTF-8?q?=20sum(),=20parseNumber()=20=EC=A0=9C=EA=B1=B0=20-=20=EC=B1=85?= =?UTF-8?q?=EC=9E=84=EC=9D=84=20Numbers,=20PositiveNumber=EB=A1=9C=20?= =?UTF-8?q?=EC=9C=84=EC=9E=84=20-=20calculate()=EA=B0=80=20=EC=88=9C?= =?UTF-8?q?=EC=88=98=ED=95=98=EA=B2=8C=20=ED=95=A9=EC=82=B0=20=ED=9D=90?= =?UTF-8?q?=EB=A6=84=EB=A7=8C=20=EC=A1=B0=EC=9C=A8=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EB=8B=A8=EC=88=9C=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calculator/model/StringCalculator.java | 29 ++++--------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/src/main/java/calculator/model/StringCalculator.java b/src/main/java/calculator/model/StringCalculator.java index 37cf7bb..63b638e 100644 --- a/src/main/java/calculator/model/StringCalculator.java +++ b/src/main/java/calculator/model/StringCalculator.java @@ -1,29 +1,12 @@ package calculator.model; -public class StringCalculator { +import calculator.model.parser.ExpressionParser; - public static int calculate(String input) { - if (input == null || input.isEmpty()) { - return 0; - } - String[] tokens = StringParser.parse(input); - return sum(tokens); - } - private static int sum(String[] tokens) { - int total = 0; - for (String token : tokens) { - int number = parseNumber(token); - Validator.validateNotNegative(number); - total += number; - } - return total; - } +public class StringCalculator { + private final ExpressionParser parser = new ExpressionParser(); - private static int parseNumber(String token) { - try{ - return Integer.parseInt(token.trim()); - } catch (NumberFormatException e) { - throw new IllegalArgumentException("숫자가 아닌 값이 포함되어 있습니다." + token); - } + public int calculate(String input) { + Numbers numbers = parser.parse(input); + return numbers.sum(); } } From 984b5de1de3f0c662808656a676bffdd945b3784 Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 12 May 2026 21:10:41 +0900 Subject: [PATCH 23/27] =?UTF-8?q?-=20StringCalculator=EB=A5=BC=20static=20?= =?UTF-8?q?=EC=A7=81=EC=A0=91=20=ED=98=B8=EC=B6=9C=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=9E=90=20=EC=A3=BC=EC=9E=85(DI)=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20-=20Controller=EA=B0=80=20?= =?UTF-8?q?=EA=B5=AC=EC=B2=B4=20=EA=B5=AC=ED=98=84=EC=9D=B4=20=EC=95=84?= =?UTF-8?q?=EB=8B=8C=20=EC=A3=BC=EC=9E=85=EB=90=9C=20=EC=9D=B8=EC=8A=A4?= =?UTF-8?q?=ED=84=B4=EC=8A=A4=EC=97=90=20=EC=9D=98=EC=A1=B4=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20-=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=98=88=EC=99=B8(IllegalArgumentExceptio?= =?UTF-8?q?n)=EB=8A=94=20=EB=8F=84=EB=A9=94=EC=9D=B8=EC=97=90=EC=84=9C=20t?= =?UTF-8?q?hrow,=20Controller=EB=A1=9C=20=EC=A0=84=ED=8C=8C=20-=20DI=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=EC=9C=BC=EB=A1=9C=20=EB=8B=A8=EC=9C=84=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9A=A9=EC=9D=B4=EC=84=B1=20?= =?UTF-8?q?=EB=B0=8F=20=EC=9C=A0=EC=97=B0=EC=84=B1=20=ED=99=95=EB=B3=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/controller/CalculatorController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/calculator/controller/CalculatorController.java b/src/main/java/calculator/controller/CalculatorController.java index cb15daf..0b387c0 100644 --- a/src/main/java/calculator/controller/CalculatorController.java +++ b/src/main/java/calculator/controller/CalculatorController.java @@ -5,7 +5,6 @@ import calculator.view.OutputView; public class CalculatorController { - private final StringCalculator calculator; public CalculatorController(StringCalculator calculator) { @@ -14,7 +13,7 @@ public CalculatorController(StringCalculator calculator) { public void run(){ String input = InputView.read(); - int result = StringCalculator.calculate(input); + int result = calculator.calculate(input); // 도메인 예외는 여기서 위로 전파 OutputView.printResult(result); } } From 46768f0866cb608272e4eedaa1206092f304094a Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 12 May 2026 21:11:56 +0900 Subject: [PATCH 24/27] =?UTF-8?q?-=20POSIX=20=ED=91=9C=EC=A4=80=EC=97=90?= =?UTF-8?q?=20=EB=94=B0=EB=9D=BC=20=ED=8C=8C=EC=9D=BC=20=EB=81=9D=20?= =?UTF-8?q?=EA=B0=9C=ED=96=89=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/model/Validator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/calculator/model/Validator.java b/src/main/java/calculator/model/Validator.java index 63a685a..21d693f 100644 --- a/src/main/java/calculator/model/Validator.java +++ b/src/main/java/calculator/model/Validator.java @@ -11,4 +11,4 @@ public static void validateNotNegative(int number){ throw new IllegalArgumentException("음수는 입력할 수 없습니다: " + number); } } -} \ No newline at end of file +} From b38a2b85f7101bea1e25acb765ead7a60f272dda Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 12 May 2026 21:12:22 +0900 Subject: [PATCH 25/27] =?UTF-8?q?-=20POSIX=20=ED=91=9C=EC=A4=80=EC=97=90?= =?UTF-8?q?=20=EB=94=B0=EB=9D=BC=20=ED=8C=8C=EC=9D=BC=20=EB=81=9D=20?= =?UTF-8?q?=EA=B0=9C=ED=96=89=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/calculator/Application.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/calculator/Application.java b/src/main/java/calculator/Application.java index a55a138..245dd34 100644 --- a/src/main/java/calculator/Application.java +++ b/src/main/java/calculator/Application.java @@ -13,4 +13,4 @@ public static void main(String[] args) { Console.close(); } } -} \ No newline at end of file +} From 111c4b23afc24d48fc0b6024e3335d83ec4dd81c Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 12 May 2026 21:13:22 +0900 Subject: [PATCH 26/27] =?UTF-8?q?-=20StringParser=20=EC=97=AD=ED=95=A0?= =?UTF-8?q?=EC=9D=84=20DefaultDelimiterParser,=20CustomDelimiterParser,=20?= =?UTF-8?q?ExpressionParser=EB=A1=9C=20=EB=B6=84=EB=A6=AC=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20-=20Validator=20=EA=B2=80=EC=A6=9D=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=EC=9D=84=20PositiveNumber,=20CustomDelimiterParser?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EC=A0=84=20=EC=99=84=EB=A3=8C=20-=20?= =?UTF-8?q?=EC=97=AD=ED=95=A0=EC=9D=B4=20=EC=9D=B4=EC=A0=84=EB=90=9C=20?= =?UTF-8?q?=EB=91=90=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/calculator/model/StringParser.java | 32 ------------------- src/main/java/calculator/model/Validator.java | 14 -------- 2 files changed, 46 deletions(-) delete mode 100644 src/main/java/calculator/model/StringParser.java delete mode 100644 src/main/java/calculator/model/Validator.java diff --git a/src/main/java/calculator/model/StringParser.java b/src/main/java/calculator/model/StringParser.java deleted file mode 100644 index 8b67275..0000000 --- a/src/main/java/calculator/model/StringParser.java +++ /dev/null @@ -1,32 +0,0 @@ -package calculator.model; - -import java.util.regex.Pattern; - -public class StringParser { - - private static final String DEFAULT_DELIMITER = "[,:]"; - private static final String CUSTOM_PREFIX = "//"; - private static final String CUSTOM_SUFFIX = "\\n"; - - public static String[] parse(String input) { - if (hasCustomDelimiter(input)){ - return parseWithCustomDelimiter(input); - } - return input.split(DEFAULT_DELIMITER); - } - - private static boolean hasCustomDelimiter(String input) { - return input.startsWith(CUSTOM_PREFIX); - } - - private static String[] parseWithCustomDelimiter(String input) { - int newlineIndex = input.indexOf(CUSTOM_SUFFIX); - Validator.validateCustomDelimiterFormat(newlineIndex); - - String custom = input.substring(2, newlineIndex); - String delimiter = DEFAULT_DELIMITER +"|" + Pattern.quote(custom); - String numberPart = input.substring(newlineIndex + 2); - - return numberPart.split(delimiter); - } -} diff --git a/src/main/java/calculator/model/Validator.java b/src/main/java/calculator/model/Validator.java deleted file mode 100644 index 21d693f..0000000 --- a/src/main/java/calculator/model/Validator.java +++ /dev/null @@ -1,14 +0,0 @@ -package calculator.model; - -public class Validator { - public static void validateCustomDelimiterFormat(int newlineIndex){ - if(newlineIndex < 0){ - throw new IllegalArgumentException("잘못된 커스텀 구분자 형식입니다."); - } - } - public static void validateNotNegative(int number){ - if(number < 0){ - throw new IllegalArgumentException("음수는 입력할 수 없습니다: " + number); - } - } -} From 5e03a5d84f1a6a551d2ccd9369b5456c54d3ff43 Mon Sep 17 00:00:00 2001 From: dong279 Date: Tue, 12 May 2026 21:26:54 +0900 Subject: [PATCH 27/27] =?UTF-8?q?-=20PositiveNumberTest:=20=EB=B3=80?= =?UTF-8?q?=ED=99=98,=20=EC=9D=8C=EC=88=98/=EB=B9=84=EC=88=AB=EC=9E=90=20?= =?UTF-8?q?=EC=98=88=EC=99=B8=20=EA=B2=80=EC=A6=9D=20-=20NumbersTest:=20?= =?UTF-8?q?=ED=95=A9=EC=82=B0,=20=EB=B9=88=20=EC=BB=AC=EB=A0=89=EC=85=98?= =?UTF-8?q?=20=EA=B2=80=EC=A6=9D=20-=20DefaultDelimiterParserTest:=20?= =?UTF-8?q?=EC=89=BC=ED=91=9C/=EC=BD=9C=EB=A1=A0/=ED=98=BC=ED=95=A9=20?= =?UTF-8?q?=ED=8C=8C=EC=8B=B1=20=EA=B2=80=EC=A6=9D=20-=20CustomDelimiterPa?= =?UTF-8?q?rserTest:=20=EC=BB=A4=EC=8A=A4=ED=85=80=20=EA=B5=AC=EB=B6=84?= =?UTF-8?q?=EC=9E=90/=ED=8A=B9=EC=88=98=EB=AC=B8=EC=9E=90/=EC=98=88?= =?UTF-8?q?=EC=99=B8=20=EA=B2=80=EC=A6=9D=20-=20ExpressionParserTest:=20nu?= =?UTF-8?q?ll/=EB=B9=88=EA=B0=92/=ED=8C=8C=EC=84=9C=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=20=EA=B2=80=EC=A6=9D=20-=20StringCalculatorTest:=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=20=EA=B3=84=EC=82=B0=20=ED=9D=90=EB=A6=84=20=EA=B2=80?= =?UTF-8?q?=EC=A6=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/calculator/ApplicationTest.java | 71 ++++++++++++++++++- .../java/calculator/model/NumbersTest.java | 29 ++++++++ .../calculator/model/PositiveNumberTest.java | 40 +++++++++++ .../model/StringCalculatorTest.java | 58 +++++++++++++++ .../parser/CustomDelimiterParserTest.java | 55 ++++++++++++++ .../parser/DefaultDelimiterParserTest.java | 46 ++++++++++++ .../model/parser/ExpressionParserTest.java | 46 ++++++++++++ 7 files changed, 343 insertions(+), 2 deletions(-) create mode 100644 src/test/java/calculator/model/NumbersTest.java create mode 100644 src/test/java/calculator/model/PositiveNumberTest.java create mode 100644 src/test/java/calculator/model/StringCalculatorTest.java create mode 100644 src/test/java/calculator/model/parser/CustomDelimiterParserTest.java create mode 100644 src/test/java/calculator/model/parser/DefaultDelimiterParserTest.java create mode 100644 src/test/java/calculator/model/parser/ExpressionParserTest.java diff --git a/src/test/java/calculator/ApplicationTest.java b/src/test/java/calculator/ApplicationTest.java index 93771fb..514dd12 100644 --- a/src/test/java/calculator/ApplicationTest.java +++ b/src/test/java/calculator/ApplicationTest.java @@ -1,6 +1,7 @@ package calculator; import camp.nextstep.edu.missionutils.test.NsTest; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import static camp.nextstep.edu.missionutils.test.Assertions.assertSimpleTest; @@ -8,22 +9,88 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; class ApplicationTest extends NsTest { + + @Test + @DisplayName("쉼표 구분자로 숫자를 더한다") + void 쉼표_구분자() { + assertSimpleTest(() -> { + run("1,2"); + assertThat(output()).contains("결과 : 3"); + }); + } + @Test + @DisplayName("콜론 구분자로 숫자를 더한다") + void 콜론_구분자() { + assertSimpleTest(() -> { + run("1:2:3"); + assertThat(output()).contains("결과 : 6"); + }); + } + + @Test + @DisplayName("쉼표와 콜론을 혼합하여 숫자를 더한다") + void 쉼표_콜론_혼합_구분자() { + assertSimpleTest(() -> { + run("1,2:3"); + assertThat(output()).contains("결과 : 6"); + }); + } + + @Test + @DisplayName("커스텀 구분자로 숫자를 더한다") void 커스텀_구분자_사용() { assertSimpleTest(() -> { - run("//;\\n1"); + run("//;\\n1;2;3"); + assertThat(output()).contains("결과 : 6"); + }); + } + + @Test + @DisplayName("커스텀 구분자와 기본 구분자를 혼합하여 숫자를 더한다") + void 커스텀_구분자_기본_구분자_혼합() { + assertSimpleTest(() -> { + run("//;\\n1;2,3"); + assertThat(output()).contains("결과 : 6"); + }); + } + + @Test + @DisplayName("숫자가 하나일 때 그 숫자를 반환한다") + void 숫자_하나() { + assertSimpleTest(() -> { + run("1"); assertThat(output()).contains("결과 : 1"); }); } @Test - void 예외_테스트() { + @DisplayName("음수 입력 시 IllegalArgumentException이 발생한다") + void 음수_입력_예외() { assertSimpleTest(() -> assertThatThrownBy(() -> runException("-1,2,3")) .isInstanceOf(IllegalArgumentException.class) ); } + @Test + @DisplayName("숫자가 아닌 값 입력 시 IllegalArgumentException이 발생한다") + void 숫자가_아닌_값_예외() { + assertSimpleTest(() -> + assertThatThrownBy(() -> runException("a,b,c")) + .isInstanceOf(IllegalArgumentException.class) + ); + } + + @Test + @DisplayName("잘못된 커스텀 구분자 형식 입력 시 IllegalArgumentException이 발생한다") + void 잘못된_커스텀_구분자_형식_예외() { + assertSimpleTest(() -> + assertThatThrownBy(() -> runException("//;1;2;3")) + .isInstanceOf(IllegalArgumentException.class) + ); + } + @Override public void runMain() { Application.main(new String[]{}); diff --git a/src/test/java/calculator/model/NumbersTest.java b/src/test/java/calculator/model/NumbersTest.java new file mode 100644 index 0000000..78d190d --- /dev/null +++ b/src/test/java/calculator/model/NumbersTest.java @@ -0,0 +1,29 @@ +package calculator.model; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +class NumbersTest { + + @Test + @DisplayName("숫자 목록의 합산을 반환한다") + void 숫자_합산() { + Numbers numbers = new Numbers(List.of( + new PositiveNumber("1"), + new PositiveNumber("2"), + new PositiveNumber("3") + )); + assertThat(numbers.sum()).isEqualTo(6); + } + + @Test + @DisplayName("빈 숫자 목록의 합산은 0이다") + void 빈_숫자_합산() { + Numbers numbers = Numbers.empty(); + assertThat(numbers.sum()).isEqualTo(0); + } +} diff --git a/src/test/java/calculator/model/PositiveNumberTest.java b/src/test/java/calculator/model/PositiveNumberTest.java new file mode 100644 index 0000000..d0a4150 --- /dev/null +++ b/src/test/java/calculator/model/PositiveNumberTest.java @@ -0,0 +1,40 @@ +package calculator.model; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class PositiveNumberTest { + + @Test + @DisplayName("문자열을 양수로 변환한다") + void 문자열을_양수로_변환() { + PositiveNumber number = new PositiveNumber("3"); + assertThat(number.getValue()).isEqualTo(3); + } + + @Test + @DisplayName("공백이 포함된 문자열도 변환한다") + void 공백_포함_문자열_변환() { + PositiveNumber number = new PositiveNumber(" 3 "); + assertThat(number.getValue()).isEqualTo(3); + } + + @Test + @DisplayName("음수 입력 시 IllegalArgumentException이 발생한다") + void 음수_입력_예외() { + assertThatThrownBy(() -> new PositiveNumber("-1")) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("음수는 입력할 수 없습니다"); + } + + @Test + @DisplayName("숫자가 아닌 값 입력 시 IllegalArgumentException이 발생한다") + void 숫자가_아닌_값_예외() { + assertThatThrownBy(() -> new PositiveNumber("abc")) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("숫자가 아닌 값입니다"); + } +} diff --git a/src/test/java/calculator/model/StringCalculatorTest.java b/src/test/java/calculator/model/StringCalculatorTest.java new file mode 100644 index 0000000..5b10a13 --- /dev/null +++ b/src/test/java/calculator/model/StringCalculatorTest.java @@ -0,0 +1,58 @@ +package calculator.model; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class StringCalculatorTest { + + private StringCalculator calculator; + + @BeforeEach + void setUp() { + calculator = new StringCalculator(); + } + + @Test + @DisplayName("빈 문자열 입력 시 0을 반환한다") + void 빈_문자열_입력() { + assertThat(calculator.calculate("")).isEqualTo(0); + } + + @Test + @DisplayName("쉼표 구분자로 합산한다") + void 쉼표_구분자_합산() { + assertThat(calculator.calculate("1,2,3")).isEqualTo(6); + } + + @Test + @DisplayName("콜론 구분자로 합산한다") + void 콜론_구분자_합산() { + assertThat(calculator.calculate("1:2:3")).isEqualTo(6); + } + + @Test + @DisplayName("커스텀 구분자로 합산한다") + void 커스텀_구분자_합산() { + assertThat(calculator.calculate("//;\\n1;2;3")).isEqualTo(6); + } + + @Test + @DisplayName("음수 입력 시 IllegalArgumentException이 발생한다") + void 음수_입력_예외() { + assertThatThrownBy(() -> calculator.calculate("-1,2,3")) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("음수는 입력할 수 없습니다"); + } + + @Test + @DisplayName("숫자가 아닌 값 입력 시 IllegalArgumentException이 발생한다") + void 숫자가_아닌_값_예외() { + assertThatThrownBy(() -> calculator.calculate("a,b,c")) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("숫자가 아닌 값입니다"); + } +} diff --git a/src/test/java/calculator/model/parser/CustomDelimiterParserTest.java b/src/test/java/calculator/model/parser/CustomDelimiterParserTest.java new file mode 100644 index 0000000..c10c58c --- /dev/null +++ b/src/test/java/calculator/model/parser/CustomDelimiterParserTest.java @@ -0,0 +1,55 @@ +package calculator.model.parser; + +import calculator.model.Numbers; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class CustomDelimiterParserTest { + + private CustomDelimiterParser parser; + + @BeforeEach + void setUp() { + parser = new CustomDelimiterParser(); + } + + @Test + @DisplayName("세미콜론 커스텀 구분자로 파싱한다") + void 세미콜론_커스텀_구분자() { + Numbers numbers = parser.parse("//;\\n1;2;3"); + assertThat(numbers.sum()).isEqualTo(6); + } + + @Test + @DisplayName("커스텀 구분자와 기본 구분자를 혼합하여 파싱한다") + void 커스텀_기본_구분자_혼합() { + Numbers numbers = parser.parse("//;\\n1;2,3"); + assertThat(numbers.sum()).isEqualTo(6); + } + + @Test + @DisplayName("정규식 특수문자를 커스텀 구분자로 사용할 수 있다") + void 특수문자_커스텀_구분자() { + Numbers numbers = parser.parse("//.\\n1.2.3"); + assertThat(numbers.sum()).isEqualTo(6); + } + + @Test + @DisplayName("커스텀 구분자 형식이 올바른지 확인한다") + void 커스텀_구분자_supports() { + assertThat(parser.supports("//;\\n1;2;3")).isTrue(); + assertThat(parser.supports("1,2,3")).isFalse(); + } + + @Test + @DisplayName("잘못된 커스텀 구분자 형식 시 IllegalArgumentException이 발생한다") + void 잘못된_형식_예외() { + assertThatThrownBy(() -> parser.parse("//;1;2;3")) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("잘못된 커스텀 구분자 형식"); + } +} diff --git a/src/test/java/calculator/model/parser/DefaultDelimiterParserTest.java b/src/test/java/calculator/model/parser/DefaultDelimiterParserTest.java new file mode 100644 index 0000000..65c58cc --- /dev/null +++ b/src/test/java/calculator/model/parser/DefaultDelimiterParserTest.java @@ -0,0 +1,46 @@ +package calculator.model.parser; + +import calculator.model.Numbers; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +class DefaultDelimiterParserTest { + + private DefaultDelimiterParser parser; + + @BeforeEach + void setUp() { + parser = new DefaultDelimiterParser(); + } + + @Test + @DisplayName("쉼표 구분자로 파싱한다") + void 쉼표_구분자_파싱() { + Numbers numbers = parser.parse("1,2,3"); + assertThat(numbers.sum()).isEqualTo(6); + } + + @Test + @DisplayName("콜론 구분자로 파싱한다") + void 콜론_구분자_파싱() { + Numbers numbers = parser.parse("1:2:3"); + assertThat(numbers.sum()).isEqualTo(6); + } + + @Test + @DisplayName("쉼표와 콜론 혼합 구분자로 파싱한다") + void 혼합_구분자_파싱() { + Numbers numbers = parser.parse("1,2:3"); + assertThat(numbers.sum()).isEqualTo(6); + } + + @Test + @DisplayName("숫자가 하나일 때 그 숫자를 반환한다") + void 숫자_하나_파싱() { + Numbers numbers = parser.parse("5"); + assertThat(numbers.sum()).isEqualTo(5); + } +} diff --git a/src/test/java/calculator/model/parser/ExpressionParserTest.java b/src/test/java/calculator/model/parser/ExpressionParserTest.java new file mode 100644 index 0000000..76e0171 --- /dev/null +++ b/src/test/java/calculator/model/parser/ExpressionParserTest.java @@ -0,0 +1,46 @@ +package calculator.model.parser; + +import calculator.model.Numbers; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +class ExpressionParserTest { + + private ExpressionParser parser; + + @BeforeEach + void setUp() { + parser = new ExpressionParser(); + } + + @Test + @DisplayName("null 입력 시 0을 반환한다") + void null_입력() { + Numbers numbers = parser.parse(null); + assertThat(numbers.sum()).isEqualTo(0); + } + + @Test + @DisplayName("빈 문자열 입력 시 0을 반환한다") + void 빈_문자열_입력() { + Numbers numbers = parser.parse(""); + assertThat(numbers.sum()).isEqualTo(0); + } + + @Test + @DisplayName("기본 구분자 입력 시 DefaultDelimiterParser를 사용한다") + void 기본_구분자_사용() { + Numbers numbers = parser.parse("1,2,3"); + assertThat(numbers.sum()).isEqualTo(6); + } + + @Test + @DisplayName("커스텀 구분자 입력 시 CustomDelimiterParser를 사용한다") + void 커스텀_구분자_사용() { + Numbers numbers = parser.parse("//;\\n1;2;3"); + assertThat(numbers.sum()).isEqualTo(6); + } +}