From f0424ce2ddab8118a0fa518e302636ccf1aea6ae Mon Sep 17 00:00:00 2001 From: hongxeob Date: Thu, 8 Jun 2023 00:14:48 +0900 Subject: [PATCH 01/77] =?UTF-8?q?chore=20:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 40 ++++ build.gradle | 19 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 234 +++++++++++++++++++++++ gradlew.bat | 89 +++++++++ settings.gradle | 2 + src/main/java/com/programmers/Main.java | 7 + 8 files changed, 396 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/programmers/Main.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..efcd97cd6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +.DS_Store +.gradle +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..d34c89625 --- /dev/null +++ b/build.gradle @@ -0,0 +1,19 @@ +plugins { + id 'java' +} + +group 'com.programmers' +version '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..41d9927a4d4fb3f96a785543079b8df6723c946b GIT binary patch literal 59821 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..41dfb8790 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..1b6c78733 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..bcf30bf6c --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'java-calculator' + diff --git a/src/main/java/com/programmers/Main.java b/src/main/java/com/programmers/Main.java new file mode 100644 index 000000000..c7adf0100 --- /dev/null +++ b/src/main/java/com/programmers/Main.java @@ -0,0 +1,7 @@ +package com.programmers; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file From 76d8a1875f755ab94b90075c9d3c37f723944aa3 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Thu, 8 Jun 2023 00:19:26 +0900 Subject: [PATCH 02/77] =?UTF-8?q?chore=20:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=84=B8=ED=8C=85=20(=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20=EC=84=A4=EC=A0=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/com/programmers/CalculatorTests.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/test/java/com/programmers/CalculatorTests.java diff --git a/src/test/java/com/programmers/CalculatorTests.java b/src/test/java/com/programmers/CalculatorTests.java new file mode 100644 index 000000000..6099a3d72 --- /dev/null +++ b/src/test/java/com/programmers/CalculatorTests.java @@ -0,0 +1,4 @@ +package com.programmers; + +public class CalculatorTests { +} From 89fe19941cf88337394c78ad7d2163e39e1fe30e Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 13:47:53 +0900 Subject: [PATCH 03/77] =?UTF-8?q?chore=20:=20AssertJ=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index d34c89625..e2161327a 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,9 @@ repositories { dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' + + testImplementation 'org.assertj:assertj-core:3.22.0' + } test { From 0996a5fa8b2e47419fe05fbf14b6693f3ff31180 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 13:56:03 +0900 Subject: [PATCH 04/77] =?UTF-8?q?feat=20:=20Operators=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EA=B5=AC=ED=98=84=20(=EC=97=B0=EC=82=B0=EC=9E=90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvalidOperatorInputException.java | 8 ++++ .../java/com/programmers/util/Operators.java | 39 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 src/main/java/com/programmers/error/exception/InvalidOperatorInputException.java create mode 100644 src/main/java/com/programmers/util/Operators.java diff --git a/src/main/java/com/programmers/error/exception/InvalidOperatorInputException.java b/src/main/java/com/programmers/error/exception/InvalidOperatorInputException.java new file mode 100644 index 000000000..585488bdd --- /dev/null +++ b/src/main/java/com/programmers/error/exception/InvalidOperatorInputException.java @@ -0,0 +1,8 @@ +package com.programmers.error.exception; + +public class InvalidOperatorInputException extends RuntimeException { + public InvalidOperatorInputException(String msg) { + super(msg); + + } +} diff --git a/src/main/java/com/programmers/util/Operators.java b/src/main/java/com/programmers/util/Operators.java new file mode 100644 index 000000000..37373bda2 --- /dev/null +++ b/src/main/java/com/programmers/util/Operators.java @@ -0,0 +1,39 @@ +package com.programmers.util; + +import com.programmers.error.exception.InvalidOperatorInputException; + +import java.util.Arrays; +import java.util.function.BiFunction; + +public enum Operators { + + PLUS("+", (num1, num2) -> num1 + num2), + SUBTRACTION("-", (num1, num2) -> num1 - num2), + MULTIPLY("*", (num1, num2) -> num1 * num2), + DIVISION("/", (num1, num2) -> num1 / num2); + + private final String symbol; + private final BiFunction function; + + Operators(String operator, BiFunction function) { + this.symbol = operator; + this.function = function; + } + + public static Operators getOperator(String inputOperator) { + return Arrays.stream(values()) + .filter(operator -> operator.symbol.equals(inputOperator)) + .findFirst() + .orElseThrow(() -> new InvalidOperatorInputException("잘못된 수식입니다. +, -, *, / 연산만 가능합니다.")); + } + + + public static long calculate(String operator, long num1, long num2) { + return getOperator(operator).function.apply(num1, num2); + } + + public static boolean isOperator(String unCheckedOperator) { + return Arrays.stream(Operators.values()) + .anyMatch(operators -> operators.symbol.equals(unCheckedOperator)); + } +} From ecf45dc37a84c9f378ed0da7db6bc118ddcfd58c Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 13:56:51 +0900 Subject: [PATCH 05/77] =?UTF-8?q?feat=20:=20Priority=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EA=B5=AC=ED=98=84=20(=EC=9A=B0=EC=84=A0=20?= =?UTF-8?q?=EC=88=9C=EC=9C=84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/programmers/util/Priority.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/main/java/com/programmers/util/Priority.java diff --git a/src/main/java/com/programmers/util/Priority.java b/src/main/java/com/programmers/util/Priority.java new file mode 100644 index 000000000..3fa433b14 --- /dev/null +++ b/src/main/java/com/programmers/util/Priority.java @@ -0,0 +1,26 @@ +package com.programmers.util; + +import com.programmers.error.exception.InvalidOperatorInputException; + +import java.util.Arrays; + +public enum Priority { + HIGH(2, new String[]{"/", "*"}), LOW(1, new String[]{"+", "-"}); + + private final int priority; + private final String[] operators; + + Priority(int priority, String[] operators) { + this.priority = priority; + this.operators = operators; + } + + public static int getPriority(String operator) { + return Arrays.stream(Priority.values()) + .filter(symbol -> Arrays.asList(symbol.operators).contains(operator)) + .findFirst() + .orElseThrow(() -> new InvalidOperatorInputException("잘못된 수식입니다. +, -, *, / 연산만 가능합니다.")) + .priority; + } +} + From f99c00994757ca4813503b0dfffb5665c948945a Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 14:13:35 +0900 Subject: [PATCH 06/77] =?UTF-8?q?feat=20:=20PostfixConverter=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EA=B5=AC=ED=98=84(=ED=9B=84=EC=9C=84=20?= =?UTF-8?q?=ED=91=9C=EA=B8=B0=EC=8B=9D=20=EB=B3=80=ED=99=98=EA=B8=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/util/PostfixConverter.java | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 src/main/java/com/programmers/util/PostfixConverter.java diff --git a/src/main/java/com/programmers/util/PostfixConverter.java b/src/main/java/com/programmers/util/PostfixConverter.java new file mode 100644 index 000000000..ac443069c --- /dev/null +++ b/src/main/java/com/programmers/util/PostfixConverter.java @@ -0,0 +1,82 @@ +package com.programmers.util; + +import java.util.ArrayList; +import java.util.List; +import java.util.Stack; + +public class PostfixConverter { + private static final String SEPARATOR = " "; + + public static List convert(String formula) { + List postfix = new ArrayList<>(); + String[] splitFormula = formula.split(SEPARATOR); + Stack stack = new Stack<>(); + checkEmptyFormula(splitFormula); + + for (int i = 0; i < splitFormula.length; i++) { + String eachFormula = splitFormula[i]; + + if (isOperatorCheck(i)) { + putOperator(eachFormula, postfix, stack); + } else { + putOperand(eachFormula, postfix); + } + } + while (!stack.isEmpty()) { + postfix.add(stack.pop()); + } + return postfix; + } + + private static void putOperator(String operator, List postfix, Stack stack) { + if (!Operators.isOperator(operator)) + throw new IllegalArgumentException("잘못된 수식입니다. +, -, *, / 연산만 가능합니다."); + + if (stack.isEmpty() || Priority.getPriority(stack.peek()) < Priority.getPriority(operator)) { + stack.push(operator); + return; + } + + while (!stack.isEmpty() && Priority.getPriority(stack.peek()) >= Priority.getPriority(operator)) { + postfix.add(stack.pop()); + } + + stack.push(operator); + } + + private static void putOperand(String operand, List postfix) throws IllegalArgumentException { + if (!isNumber(operand)) { + throw new IllegalArgumentException("number는 숫자가 아닙니다."); + } + + postfix.add(operand); + } + + private static boolean isNumber(String operand) { + boolean isNumber; + try { + convertStringToLong(operand); + isNumber = true; + } catch (NumberFormatException e) { + isNumber = false; + } + return isNumber; + } + + private static void convertStringToLong(String operand) { + Long.parseLong(operand); + } + + + private static boolean isOperatorCheck(int i) { + return (i + 1) % 2 == 0; + } + + private static void checkEmptyFormula(String[] splitFormula) throws IllegalArgumentException { + if (isEmptyFormula(splitFormula)) throw new IllegalArgumentException("비어있는 수식입니다."); + } + + private static boolean isEmptyFormula(String[] splitFormula) { + return splitFormula != null && splitFormula.length == 0; + } +} From e6731658e302e7750843230b270fe870befc07bb Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 14:16:21 +0900 Subject: [PATCH 07/77] =?UTF-8?q?feat=20:=20StringUtil=20=EC=9C=A0?= =?UTF-8?q?=ED=8B=B8=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?(=EB=AC=B8=EC=9E=90=EC=97=B4=20=ED=8C=8C=EC=8B=B1,=EC=B2=B4?= =?UTF-8?q?=ED=82=B9=20=EA=B4=80=EB=A0=A8=20=ED=81=B4=EB=9E=98=EC=8A=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/util/PostfixConverter.java | 20 ++----------------- .../java/com/programmers/util/StringUtil.java | 16 +++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/programmers/util/StringUtil.java diff --git a/src/main/java/com/programmers/util/PostfixConverter.java b/src/main/java/com/programmers/util/PostfixConverter.java index ac443069c..0969bd2d0 100644 --- a/src/main/java/com/programmers/util/PostfixConverter.java +++ b/src/main/java/com/programmers/util/PostfixConverter.java @@ -45,28 +45,12 @@ private static void putOperator(String operator, List postfix, Stack postfix) throws IllegalArgumentException { - if (!isNumber(operand)) { - throw new IllegalArgumentException("number는 숫자가 아닙니다."); + if (!StringUtil.isNumber(operand)) { + throw new IllegalArgumentException("피연산자가 숫자가 아닙니다."); } - postfix.add(operand); } - private static boolean isNumber(String operand) { - boolean isNumber; - try { - convertStringToLong(operand); - isNumber = true; - } catch (NumberFormatException e) { - isNumber = false; - } - return isNumber; - } - - private static void convertStringToLong(String operand) { - Long.parseLong(operand); - } - private static boolean isOperatorCheck(int i) { return (i + 1) % 2 == 0; diff --git a/src/main/java/com/programmers/util/StringUtil.java b/src/main/java/com/programmers/util/StringUtil.java new file mode 100644 index 000000000..ca8ddb7bb --- /dev/null +++ b/src/main/java/com/programmers/util/StringUtil.java @@ -0,0 +1,16 @@ +package com.programmers.util; + +public class StringUtil { + public static boolean isNumber(String unCheckedNumber) { + try { + convertStringToLong(unCheckedNumber); + return true; + } catch (NumberFormatException e) { + return false; + } + } + + public static long convertStringToLong(String unCheckedNumOrOperator) { + return Long.parseLong(unCheckedNumOrOperator); + } +} From 6a65c0d76cd4306afdaaf7db178ec1c9ea6ee165 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 14:19:38 +0900 Subject: [PATCH 08/77] =?UTF-8?q?test=20:=20PostfixConverter=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/programmers/PostfixConverterTest.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 src/test/java/com/programmers/PostfixConverterTest.java diff --git a/src/test/java/com/programmers/PostfixConverterTest.java b/src/test/java/com/programmers/PostfixConverterTest.java new file mode 100644 index 000000000..db71db90b --- /dev/null +++ b/src/test/java/com/programmers/PostfixConverterTest.java @@ -0,0 +1,36 @@ +package com.programmers; + +import com.programmers.util.PostfixConverter; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +public class PostfixConverterTest { + + @Test + @DisplayName("후위 표기식 변환 성공 테스트") + void postfixFormulaConversionSuccessful() throws Exception { + //given + String formula1 = "1 + 2 * 3"; + String formula2 = "3 + 5 / 1 + 2 / 2"; + //when + List postfixFormula1 = PostfixConverter.convert(formula1); + List postfixFormula2 = PostfixConverter.convert(formula2); + //then + assertThat(postfixFormula1).containsExactly("1", "2", "3", "*", "+"); + assertThat(postfixFormula2).containsExactly("3", "5", "1", "/", "+", "2", "2", "/", "+"); + } + + @Test + @DisplayName("후위 표기식 변환 실패 테스트") + void postfixFormulaConversionFailed() throws Exception { + String formula = "1 + 2 * 3 + a "; + + Assertions.assertThrows(IllegalArgumentException.class, () -> PostfixConverter.convert(formula)); + } +} + From 34abe3aecf49edc88e87ff7387203f8f5cc89675 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 14:26:00 +0900 Subject: [PATCH 09/77] =?UTF-8?q?feat=20:=20CalculationRepository=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4/=EC=9D=B8=ED=84=B0=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=8A=A4=20=EB=B0=8F=20CalculationResult=20=EA=B0=9D?= =?UTF-8?q?=EC=B2=B4=20=EA=B5=AC=ED=98=84=20(=EA=B3=84=EC=82=B0=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EC=A0=80=EC=9E=A5=20=EB=B0=8F=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/model/CalculationResult.java | 16 +++++++++++++ .../repository/CalculationRepository.java | 12 ++++++++++ .../InMemoryCalculationRepository.java | 24 +++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 src/main/java/com/programmers/model/CalculationResult.java create mode 100644 src/main/java/com/programmers/repository/CalculationRepository.java create mode 100644 src/main/java/com/programmers/repository/InMemoryCalculationRepository.java diff --git a/src/main/java/com/programmers/model/CalculationResult.java b/src/main/java/com/programmers/model/CalculationResult.java new file mode 100644 index 000000000..1da2483e4 --- /dev/null +++ b/src/main/java/com/programmers/model/CalculationResult.java @@ -0,0 +1,16 @@ +package com.programmers.model; + +public class CalculationResult { + private String formula; + private long result; + + public CalculationResult(String formula, long result) { + this.formula = formula; + this.result = result; + } + + @Override + public String toString() { + return formula + " = " + result; + } +} diff --git a/src/main/java/com/programmers/repository/CalculationRepository.java b/src/main/java/com/programmers/repository/CalculationRepository.java new file mode 100644 index 000000000..05a6e85f6 --- /dev/null +++ b/src/main/java/com/programmers/repository/CalculationRepository.java @@ -0,0 +1,12 @@ +package com.programmers.repository; + +import com.programmers.model.CalculationResult; + +import java.util.List; + +public interface CalculationRepository { + void save(CalculationResult result); + + List findAll(); + +} diff --git a/src/main/java/com/programmers/repository/InMemoryCalculationRepository.java b/src/main/java/com/programmers/repository/InMemoryCalculationRepository.java new file mode 100644 index 000000000..f70a4d549 --- /dev/null +++ b/src/main/java/com/programmers/repository/InMemoryCalculationRepository.java @@ -0,0 +1,24 @@ +package com.programmers.repository; + +import com.programmers.model.CalculationResult; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class InMemoryCalculationRepository implements CalculationRepository { + private static final Map repository = new HashMap<>(); + private static long id = 0L; + + @Override + public void save(CalculationResult result) { + repository.put(++id, result); + } + + @Override + public List findAll() { + return new ArrayList<>(repository.values()); + } + +} From 1bbf8163e82f0fffe88e54522ec12f0ae4633edb Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 15:03:33 +0900 Subject: [PATCH 10/77] =?UTF-8?q?test=20:=20CalculationRepository=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InMemoryCalculationRepositoryTest.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/test/java/com/programmers/repository/InMemoryCalculationRepositoryTest.java diff --git a/src/test/java/com/programmers/repository/InMemoryCalculationRepositoryTest.java b/src/test/java/com/programmers/repository/InMemoryCalculationRepositoryTest.java new file mode 100644 index 000000000..6c661b3c1 --- /dev/null +++ b/src/test/java/com/programmers/repository/InMemoryCalculationRepositoryTest.java @@ -0,0 +1,31 @@ +package com.programmers.repository; + +import com.programmers.model.CalculationResult; +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 InMemoryCalculationRepositoryTest { + CalculationRepository repository = new InMemoryCalculationRepository(); + + @Test + @DisplayName("계산이력 저장 테스트") + void 계산이력저장() throws Exception { + //given + CalculationResult result1 = new CalculationResult("1 + 2 * 3 ", 7); + CalculationResult result2 = new CalculationResult("2 + 4 * 3 - 5 * 2 ", 4); + //when + repository.save(result1); + repository.save(result2); + //then + List record = repository.findAll(); + System.out.println(record.get(0)); + assertThat(record.size()).isEqualTo(2); + assertThat(record).contains(result1, result2); + assertThat(record.get(0)).isEqualTo(result1); + assertThat(record.get(1)).isEqualTo(result2); + } +} \ No newline at end of file From dc3d04a934a5ff0f31b70056eaff16bc66adcfcd Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 15:56:57 +0900 Subject: [PATCH 11/77] =?UTF-8?q?feat=20:=20Input,Output=20=EC=9D=B8?= =?UTF-8?q?=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=20/=20Console=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EA=B5=AC=ED=98=84=20(=EC=9E=85=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=20=EA=B8=B0=EB=8A=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/programmers/view/Console.java | 42 +++++++++++++++++++ src/main/java/com/programmers/view/Input.java | 7 ++++ .../java/com/programmers/view/Output.java | 14 +++++++ 3 files changed, 63 insertions(+) create mode 100644 src/main/java/com/programmers/view/Console.java create mode 100644 src/main/java/com/programmers/view/Input.java create mode 100644 src/main/java/com/programmers/view/Output.java diff --git a/src/main/java/com/programmers/view/Console.java b/src/main/java/com/programmers/view/Console.java new file mode 100644 index 000000000..791e91ff0 --- /dev/null +++ b/src/main/java/com/programmers/view/Console.java @@ -0,0 +1,42 @@ +package com.programmers.view; + +import com.programmers.model.CalculationResult; + +import java.util.List; +import java.util.Scanner; + +public class Console implements Input, Output { + private final Scanner scanner = new Scanner(System.in); + + @Override + public String inputMenu() { + System.out.println("1. 조회"); + System.out.println("2. 계산"); + System.out.print("선택 : "); + return scanner.nextLine().trim(); + } + + @Override + public String inputFormula() { + return scanner.nextLine().trim(); + } + + + @Override + public void printRecord(List record) { + record.forEach(System.out::println); + System.out.println(); + } + + @Override + public void printError(String errorMsg) { + System.out.println(errorMsg); + System.out.println(); + } + + @Override + public void printResult(long result) { + System.out.println(result); + System.out.println(); + } +} diff --git a/src/main/java/com/programmers/view/Input.java b/src/main/java/com/programmers/view/Input.java new file mode 100644 index 000000000..969c5b8d1 --- /dev/null +++ b/src/main/java/com/programmers/view/Input.java @@ -0,0 +1,7 @@ +package com.programmers.view; + +public interface Input { + String inputMenu(); + + String inputFormula(); +} diff --git a/src/main/java/com/programmers/view/Output.java b/src/main/java/com/programmers/view/Output.java new file mode 100644 index 000000000..81d093354 --- /dev/null +++ b/src/main/java/com/programmers/view/Output.java @@ -0,0 +1,14 @@ +package com.programmers.view; + +import com.programmers.model.CalculationResult; + +import java.util.List; + +public interface Output { + void printRecord(List record); + + void printError(String errorMsg); + + void printResult(long result); + +} From d39771431b3b1c1c66b653c93e02a4bb1b667e50 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:02:12 +0900 Subject: [PATCH 12/77] =?UTF-8?q?feat=20:=20Calculator=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EA=B5=AC=ED=98=84=20(=EA=B3=84=EC=82=B0?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/programmers/model/Calculator.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/main/java/com/programmers/model/Calculator.java diff --git a/src/main/java/com/programmers/model/Calculator.java b/src/main/java/com/programmers/model/Calculator.java new file mode 100644 index 000000000..15c511c3d --- /dev/null +++ b/src/main/java/com/programmers/model/Calculator.java @@ -0,0 +1,37 @@ +package com.programmers.model; + +import com.programmers.util.Operators; +import com.programmers.util.PostfixConverter; +import com.programmers.util.StringUtil; + +import java.util.List; +import java.util.Stack; + +public class Calculator { + + private final String formula; + + public Calculator(String formula) { + this.formula = formula; + } + + public long calculate(String formula) throws IllegalArgumentException, ArithmeticException { + List postfix = PostfixConverter.convert(formula); + return calculatePostfixFormula(postfix); + } + + private long calculatePostfixFormula(List formula) { + Stack stack = new Stack<>(); + for (String numOrOperator : formula) { + if (StringUtil.isNumber(numOrOperator)) { + stack.push(StringUtil.convertStringToLong(numOrOperator)); + } else { + Long num2 = stack.pop(); + Long num1 = stack.pop(); + stack.push(Operators.calculate(numOrOperator, num1, num2)); + } + } + return stack.pop(); + } + +} From 218160eb610af08f882f656f4ef6844430a3aa48 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:02:42 +0900 Subject: [PATCH 13/77] =?UTF-8?q?chore=20:=20=EB=A7=A4=EA=B0=9C=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=ED=99=94=EB=90=9C=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=B4=20JUnit=20Jupiter=20Par?= =?UTF-8?q?ams=205.8.1=20=EC=A2=85=EC=86=8D=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index e2161327a..496fdba25 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,7 @@ repositories { dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1' testImplementation 'org.assertj:assertj-core:3.22.0' From 3f6a6dd44618b7797ad5ec2861f1a8606778d06d Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:03:11 +0900 Subject: [PATCH 14/77] =?UTF-8?q?test=20:=20Calculator=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/programmers/CalculatorTests.java | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/src/test/java/com/programmers/CalculatorTests.java b/src/test/java/com/programmers/CalculatorTests.java index 6099a3d72..23018e897 100644 --- a/src/test/java/com/programmers/CalculatorTests.java +++ b/src/test/java/com/programmers/CalculatorTests.java @@ -1,4 +1,97 @@ package com.programmers; +import com.programmers.model.Calculator; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +import static org.assertj.core.api.Assertions.assertThat; + public class CalculatorTests { + + @Test + @DisplayName("덧셈 테스트") + void addTest() throws Exception { + //given + Calculator calculator = new Calculator("1 + 1"); + Calculator calculator2 = new Calculator("2 + 2"); + //when + long result = calculator.calculate("1 + 1"); + long result2 = calculator2.calculate("2 + 2"); + + //then + assertThat(result).isEqualTo(2); + assertThat(result2).isEqualTo(4); + } + + @Test + @DisplayName("뺄셈 테스트") + void subtractTest() throws Exception { + //given + Calculator calculator = new Calculator("1 - 1"); + //when + long result = calculator.calculate("1 - 1"); + //then + assertThat(result).isEqualTo(0); + } + + @Test + @DisplayName("곱하기 테스트") + void multiplyTest() throws Exception { + //given + Calculator calculator = new Calculator("2 * 2 * 3"); + //when + long result = calculator.calculate("2 * 2 * 3"); + //then + assertThat(result).isEqualTo(12); + } + + @Test + @DisplayName("나누기 테스트") + void divideTest() throws Exception { + //given + Calculator calculator = new Calculator("6 / 2 / 3"); + //when + long result = calculator.calculate("6 / 2 / 3"); + //then + assertThat(result).isEqualTo(1); + } + + + @Test + @DisplayName("우선 순위 테스트") + void priorityTest() throws Exception { + //given + Calculator calculator = new Calculator("2 + 2 * 3 / 3"); + + //when + long result = calculator.calculate("2 + 2 * 3 / 3"); + + //then + assertThat(result).isEqualTo(4); + } + + + @ParameterizedTest + @ValueSource(strings = {"2 / 0 ", "1 + 3 * 10 / 0", "2 - 3 + 2 / 0 * 5"}) + @DisplayName("0으로 나눌시 예외 발생 테스트") + void divideZeroTest(String formula) throws Exception { + Calculator calculator = new Calculator(formula); + + Assertions.assertThrows(ArithmeticException.class, () -> calculator.calculate(formula)); + } + + @ParameterizedTest + @ValueSource(strings = {"", "1 + a", "2 2", "1 + +", "a B C d"}) + @DisplayName("숫자,연산외 다른 문자 입력시 예외") + void wrongFormulaTest(String formula) throws Exception { + Calculator calculator = new Calculator(formula); + + Assertions.assertThrows(IllegalArgumentException.class, () -> calculator.calculate(formula)); + + + } + } From f8bcb0b7bc7fe47e14b0f1d0e5fed84d794b5d9e Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:10:01 +0900 Subject: [PATCH 15/77] =?UTF-8?q?feat=20:=20ErrorMsg=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EA=B5=AC=ED=98=84=20(=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EA=B4=80=EB=A6=AC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/error/ErrorMsg.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/main/java/com/programmers/error/ErrorMsg.java diff --git a/src/main/java/com/programmers/error/ErrorMsg.java b/src/main/java/com/programmers/error/ErrorMsg.java new file mode 100644 index 000000000..415ca18d1 --- /dev/null +++ b/src/main/java/com/programmers/error/ErrorMsg.java @@ -0,0 +1,12 @@ +package com.programmers.error; + +public final class ErrorMsg { + private ErrorMsg() { + } + + public static String INVALID_MENU_SELECTION = "메뉴를 잘못 선택하셨습니다. 메뉴는 1,2만 가능합니다."; + public static String ENTER_ZERO_FOR_DIVISION = "0으로는 나눌 수 없습니다. 0이 아닌 다른 숫자를 사용해 주세요."; + public static String INVALID_OPERATOR_INPUT = "잘못된 수식입니다. +, -, *, / 연산만 가능합니다."; + public static String NO_CALCULATION_RECORDS = "계산 기록이 없습니다. 먼저 계산 결과를 얻은 후 사용하세요."; + public static String OPERAND_IS_NOT_A_NUMBER = "피연산자가 숫자가 아닙니다. 숫자를 입력해 주세요."; +} From e2c5d08c2908aad5d93268296b68b9bd02b3b349 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:13:36 +0900 Subject: [PATCH 16/77] =?UTF-8?q?fix=20:=20putOperand()=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EC=98=88=EC=99=B8=20=EC=9C=A0=ED=98=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/util/PostfixConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/programmers/util/PostfixConverter.java b/src/main/java/com/programmers/util/PostfixConverter.java index 0969bd2d0..9a51dc5b4 100644 --- a/src/main/java/com/programmers/util/PostfixConverter.java +++ b/src/main/java/com/programmers/util/PostfixConverter.java @@ -44,9 +44,9 @@ private static void putOperator(String operator, List postfix, Stack postfix) throws IllegalArgumentException { + private static void putOperand(String operand, List postfix) throws NumberFormatException { if (!StringUtil.isNumber(operand)) { - throw new IllegalArgumentException("피연산자가 숫자가 아닙니다."); + throw new NumberFormatException("피연산자가 숫자가 아닙니다."); } postfix.add(operand); } From e11a95959f262f8a174bcd28cd8817dde42beecb Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:16:38 +0900 Subject: [PATCH 17/77] =?UTF-8?q?feat:=20CalculatorRunner=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EA=B5=AC=ED=98=84=20(=EA=B3=84=EC=82=B0?= =?UTF-8?q?=EA=B8=B0=20=EA=B5=AC=EB=8F=99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/model/CalculatorRunner.java | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 src/main/java/com/programmers/model/CalculatorRunner.java diff --git a/src/main/java/com/programmers/model/CalculatorRunner.java b/src/main/java/com/programmers/model/CalculatorRunner.java new file mode 100644 index 000000000..19c3a126a --- /dev/null +++ b/src/main/java/com/programmers/model/CalculatorRunner.java @@ -0,0 +1,90 @@ +package com.programmers.model; + +import com.programmers.error.ErrorMsg; +import com.programmers.repository.CalculationRepository; +import com.programmers.view.Input; +import com.programmers.view.Output; + +import java.util.List; + +public class CalculatorRunner { + private final CalculationRepository repository; + private final Input input; + private final Output output; + private static final String VIEW = "1", CALCULATION = "2"; + + public CalculatorRunner(CalculationRepository repository, Input input, Output output) { + this.repository = repository; + this.input = input; + this.output = output; + } + + public void run() { + while (true) { + switch (inputMenu()) { + case VIEW: + findAllCalculationHistory(); + break; + case CALCULATION: + calculatorProcessStart(); + break; + default: + wrongMenuSelection(); + } + } + } + + private void findAllCalculationHistory() { + List calculationRecord = repository.findAll(); + recordCommandExecution(calculationRecord); + } + + private void calculatorProcessStart() { + String formula = getFormula(); + saveAndPrintResult(formula); + } + + private void saveAndPrintResult(String formula) { + try { + long result = sendToCalculator(formula); + repository.save(new CalculationResult(formula, result)); + output.printResult(result); + } catch (NumberFormatException e) { + output.printError(ErrorMsg.OPERAND_IS_NOT_A_NUMBER); + } catch (IllegalArgumentException e) { + output.printError(ErrorMsg.INVALID_OPERATOR_INPUT); + } catch (ArithmeticException e) { + output.printError(ErrorMsg.ENTER_ZERO_FOR_DIVISION); + } + } + + private long sendToCalculator(String formula) { + Calculator calculator = new Calculator(formula); + return calculator.calculate(formula); + } + + private String getFormula() { + return input.inputFormula(); + } + + private String inputMenu() { + return input.inputMenu(); + } + + private void wrongMenuSelection() { + output.printError(ErrorMsg.INVALID_MENU_SELECTION); + } + + private void recordCommandExecution(List calculationRecord) { + if (isEmptyRecord(calculationRecord)) { + output.printError(ErrorMsg.NO_CALCULATION_RECORDS); + return; + } + output.printRecord(calculationRecord); + } + + private boolean isEmptyRecord(List record) { + return record != null && record.size() == 0; + } +} + From e7276a6ec610958cb8216579ff4c13804cc60d28 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:22:18 +0900 Subject: [PATCH 18/77] =?UTF-8?q?refactor=20:=20CalculatorRunner=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=9D=B4=EB=A6=84=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/{CalculatorRunner.java => CalculatorManager.java} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename src/main/java/com/programmers/model/{CalculatorRunner.java => CalculatorManager.java} (95%) diff --git a/src/main/java/com/programmers/model/CalculatorRunner.java b/src/main/java/com/programmers/model/CalculatorManager.java similarity index 95% rename from src/main/java/com/programmers/model/CalculatorRunner.java rename to src/main/java/com/programmers/model/CalculatorManager.java index 19c3a126a..7d030e6e0 100644 --- a/src/main/java/com/programmers/model/CalculatorRunner.java +++ b/src/main/java/com/programmers/model/CalculatorManager.java @@ -7,13 +7,13 @@ import java.util.List; -public class CalculatorRunner { +public class CalculatorManager { private final CalculationRepository repository; private final Input input; private final Output output; private static final String VIEW = "1", CALCULATION = "2"; - public CalculatorRunner(CalculationRepository repository, Input input, Output output) { + public CalculatorManager(CalculationRepository repository, Input input, Output output) { this.repository = repository; this.input = input; this.output = output; @@ -87,4 +87,3 @@ private boolean isEmptyRecord(List record) { return record != null && record.size() == 0; } } - From d8688d71d97370b14380e632b932d605bc85af04 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:24:03 +0900 Subject: [PATCH 19/77] =?UTF-8?q?refactor=20:=20CalculatorTest=20=EC=98=A4?= =?UTF-8?q?=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/{CalculatorTests.java => CalculatorTest.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/test/java/com/programmers/{CalculatorTests.java => CalculatorTest.java} (98%) diff --git a/src/test/java/com/programmers/CalculatorTests.java b/src/test/java/com/programmers/CalculatorTest.java similarity index 98% rename from src/test/java/com/programmers/CalculatorTests.java rename to src/test/java/com/programmers/CalculatorTest.java index 23018e897..932de1088 100644 --- a/src/test/java/com/programmers/CalculatorTests.java +++ b/src/test/java/com/programmers/CalculatorTest.java @@ -9,7 +9,7 @@ import static org.assertj.core.api.Assertions.assertThat; -public class CalculatorTests { +public class CalculatorTest { @Test @DisplayName("덧셈 테스트") From c4189ed40f8943646b31440a0c3b99a0682af6bd Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:28:58 +0900 Subject: [PATCH 20/77] =?UTF-8?q?feat=20:=20Main=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=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/com/programmers/Main.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/programmers/Main.java b/src/main/java/com/programmers/Main.java index c7adf0100..215a4d62a 100644 --- a/src/main/java/com/programmers/Main.java +++ b/src/main/java/com/programmers/Main.java @@ -1,7 +1,15 @@ package com.programmers; +import com.programmers.model.CalculatorManager; +import com.programmers.repository.CalculationRepository; +import com.programmers.repository.InMemoryCalculationRepository; +import com.programmers.view.Console; + public class Main { public static void main(String[] args) { - System.out.println("Hello world!"); + CalculationRepository repository = new InMemoryCalculationRepository(); + Console console = new Console(); + CalculatorManager calculatorManager = new CalculatorManager(repository, console, console); + calculatorManager.run(); } } \ No newline at end of file From 5e9d621310433a5875a3fa06564d0e0816c76c4d Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:30:18 +0900 Subject: [PATCH 21/77] =?UTF-8?q?fix=20:=20getOperator()=20=EC=98=88?= =?UTF-8?q?=EC=99=B8=20=EC=9C=A0=ED=98=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/util/Operators.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/programmers/util/Operators.java b/src/main/java/com/programmers/util/Operators.java index 37373bda2..6ba4f37c7 100644 --- a/src/main/java/com/programmers/util/Operators.java +++ b/src/main/java/com/programmers/util/Operators.java @@ -1,7 +1,5 @@ package com.programmers.util; -import com.programmers.error.exception.InvalidOperatorInputException; - import java.util.Arrays; import java.util.function.BiFunction; @@ -24,7 +22,7 @@ public static Operators getOperator(String inputOperator) { return Arrays.stream(values()) .filter(operator -> operator.symbol.equals(inputOperator)) .findFirst() - .orElseThrow(() -> new InvalidOperatorInputException("잘못된 수식입니다. +, -, *, / 연산만 가능합니다.")); + .orElseThrow(() -> new IllegalArgumentException("잘못된 수식입니다. +, -, *, / 연산만 가능합니다.")); } From e8db59a063a4c903aef5aebce4f66652d29d30a0 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:31:06 +0900 Subject: [PATCH 22/77] =?UTF-8?q?fix=20:=20getPriority()=20=EC=98=88?= =?UTF-8?q?=EC=99=B8=20=EC=9C=A0=ED=98=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/util/Priority.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/programmers/util/Priority.java b/src/main/java/com/programmers/util/Priority.java index 3fa433b14..0a84108af 100644 --- a/src/main/java/com/programmers/util/Priority.java +++ b/src/main/java/com/programmers/util/Priority.java @@ -19,7 +19,7 @@ public static int getPriority(String operator) { return Arrays.stream(Priority.values()) .filter(symbol -> Arrays.asList(symbol.operators).contains(operator)) .findFirst() - .orElseThrow(() -> new InvalidOperatorInputException("잘못된 수식입니다. +, -, *, / 연산만 가능합니다.")) + .orElseThrow(() -> new IllegalArgumentException("잘못된 수식입니다. +, -, *, / 연산만 가능합니다.")) .priority; } } From 0caa0d2728a8cb126d1b11f0be8645b758e08172 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:32:00 +0900 Subject: [PATCH 23/77] =?UTF-8?q?chore=20:=20=EC=BB=A4=EC=8A=A4=ED=85=80?= =?UTF-8?q?=20=EC=98=88=EC=99=B8=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EB=B0=8F?= =?UTF-8?q?=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 --- .../error/exception/InvalidOperatorInputException.java | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 src/main/java/com/programmers/error/exception/InvalidOperatorInputException.java diff --git a/src/main/java/com/programmers/error/exception/InvalidOperatorInputException.java b/src/main/java/com/programmers/error/exception/InvalidOperatorInputException.java deleted file mode 100644 index 585488bdd..000000000 --- a/src/main/java/com/programmers/error/exception/InvalidOperatorInputException.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.programmers.error.exception; - -public class InvalidOperatorInputException extends RuntimeException { - public InvalidOperatorInputException(String msg) { - super(msg); - - } -} From 63acaf65b12c15a29896e766a930f9bba731c472 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 16:39:03 +0900 Subject: [PATCH 24/77] =?UTF-8?q?refactor=20:=20=EB=AF=B8=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20import=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/util/Priority.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/programmers/util/Priority.java b/src/main/java/com/programmers/util/Priority.java index 0a84108af..1b2acdb85 100644 --- a/src/main/java/com/programmers/util/Priority.java +++ b/src/main/java/com/programmers/util/Priority.java @@ -1,7 +1,5 @@ package com.programmers.util; -import com.programmers.error.exception.InvalidOperatorInputException; - import java.util.Arrays; public enum Priority { From 0cbd01a1a8e1b8e830bdc651a12638d50e0fc1fc Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 19:48:15 +0900 Subject: [PATCH 25/77] =?UTF-8?q?refactor=20:=20pintError()=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/view/Output.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/programmers/view/Output.java b/src/main/java/com/programmers/view/Output.java index 81d093354..0751afc49 100644 --- a/src/main/java/com/programmers/view/Output.java +++ b/src/main/java/com/programmers/view/Output.java @@ -7,7 +7,7 @@ public interface Output { void printRecord(List record); - void printError(String errorMsg); + void printMessage(String errorMsg); void printResult(long result); From 88239e6a52edfee68a32b283e335548737f0d7f7 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Mon, 12 Jun 2023 19:48:51 +0900 Subject: [PATCH 26/77] =?UTF-8?q?feat=20:=20=ED=94=84=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EB=9E=A8=20=EC=A2=85=EB=A3=8C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/model/CalculatorManager.java | 20 +++++++++++++------ .../java/com/programmers/view/Console.java | 5 +++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/programmers/model/CalculatorManager.java b/src/main/java/com/programmers/model/CalculatorManager.java index 7d030e6e0..ca3bc6b39 100644 --- a/src/main/java/com/programmers/model/CalculatorManager.java +++ b/src/main/java/com/programmers/model/CalculatorManager.java @@ -11,7 +11,8 @@ public class CalculatorManager { private final CalculationRepository repository; private final Input input; private final Output output; - private static final String VIEW = "1", CALCULATION = "2"; + private static final String VIEW = "1", CALCULATION = "2", EXIT = "3"; + public CalculatorManager(CalculationRepository repository, Input input, Output output) { this.repository = repository; @@ -28,6 +29,8 @@ public void run() { case CALCULATION: calculatorProcessStart(); break; + case EXIT: + exitProgram(); default: wrongMenuSelection(); } @@ -50,11 +53,11 @@ private void saveAndPrintResult(String formula) { repository.save(new CalculationResult(formula, result)); output.printResult(result); } catch (NumberFormatException e) { - output.printError(ErrorMsg.OPERAND_IS_NOT_A_NUMBER); + output.printMessage(ErrorMsg.OPERAND_IS_NOT_A_NUMBER); } catch (IllegalArgumentException e) { - output.printError(ErrorMsg.INVALID_OPERATOR_INPUT); + output.printMessage(ErrorMsg.INVALID_OPERATOR_INPUT); } catch (ArithmeticException e) { - output.printError(ErrorMsg.ENTER_ZERO_FOR_DIVISION); + output.printMessage(ErrorMsg.ENTER_ZERO_FOR_DIVISION); } } @@ -72,12 +75,12 @@ private String inputMenu() { } private void wrongMenuSelection() { - output.printError(ErrorMsg.INVALID_MENU_SELECTION); + output.printMessage(ErrorMsg.INVALID_MENU_SELECTION); } private void recordCommandExecution(List calculationRecord) { if (isEmptyRecord(calculationRecord)) { - output.printError(ErrorMsg.NO_CALCULATION_RECORDS); + output.printMessage(ErrorMsg.NO_CALCULATION_RECORDS); return; } output.printRecord(calculationRecord); @@ -86,4 +89,9 @@ private void recordCommandExecution(List calculationRecord) { private boolean isEmptyRecord(List record) { return record != null && record.size() == 0; } + + private void exitProgram() { + output.printMessage("프로그램을 종료합니다."); + System.exit(0); + } } diff --git a/src/main/java/com/programmers/view/Console.java b/src/main/java/com/programmers/view/Console.java index 791e91ff0..6b3961e5b 100644 --- a/src/main/java/com/programmers/view/Console.java +++ b/src/main/java/com/programmers/view/Console.java @@ -12,6 +12,7 @@ public class Console implements Input, Output { public String inputMenu() { System.out.println("1. 조회"); System.out.println("2. 계산"); + System.out.println("3. 종료"); System.out.print("선택 : "); return scanner.nextLine().trim(); } @@ -29,8 +30,8 @@ public void printRecord(List record) { } @Override - public void printError(String errorMsg) { - System.out.println(errorMsg); + public void printMessage(String message) { + System.out.println(message); System.out.println(); } From eef98d0c685aa2db412afcf73ebdcdecdc43e74c Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 16:06:41 +0900 Subject: [PATCH 27/77] =?UTF-8?q?style=20:=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EB=A9=94=EC=84=B8=EC=A7=80=20=EC=A0=95=EB=A6=AC=20=EB=B0=8F=20?= =?UTF-8?q?=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/model/Calculator.java | 2 +- src/main/java/com/programmers/util/PostfixConverter.java | 8 ++++---- src/main/java/com/programmers/util/Priority.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/programmers/model/Calculator.java b/src/main/java/com/programmers/model/Calculator.java index 15c511c3d..b5a2fcdcf 100644 --- a/src/main/java/com/programmers/model/Calculator.java +++ b/src/main/java/com/programmers/model/Calculator.java @@ -15,7 +15,7 @@ public Calculator(String formula) { this.formula = formula; } - public long calculate(String formula) throws IllegalArgumentException, ArithmeticException { + public long calculate(String formula) { List postfix = PostfixConverter.convert(formula); return calculatePostfixFormula(postfix); } diff --git a/src/main/java/com/programmers/util/PostfixConverter.java b/src/main/java/com/programmers/util/PostfixConverter.java index 9a51dc5b4..54d713bc9 100644 --- a/src/main/java/com/programmers/util/PostfixConverter.java +++ b/src/main/java/com/programmers/util/PostfixConverter.java @@ -30,7 +30,7 @@ public static List convert(String formula) { private static void putOperator(String operator, List postfix, Stack stack) { if (!Operators.isOperator(operator)) - throw new IllegalArgumentException("잘못된 수식입니다. +, -, *, / 연산만 가능합니다."); + throw new IllegalArgumentException(); if (stack.isEmpty() || Priority.getPriority(stack.peek()) < Priority.getPriority(operator)) { stack.push(operator); @@ -44,9 +44,9 @@ private static void putOperator(String operator, List postfix, Stack postfix) throws NumberFormatException { + private static void putOperand(String operand, List postfix) { if (!StringUtil.isNumber(operand)) { - throw new NumberFormatException("피연산자가 숫자가 아닙니다."); + throw new NumberFormatException(); } postfix.add(operand); } @@ -57,7 +57,7 @@ private static boolean isOperatorCheck(int i) { } private static void checkEmptyFormula(String[] splitFormula) throws IllegalArgumentException { - if (isEmptyFormula(splitFormula)) throw new IllegalArgumentException("비어있는 수식입니다."); + if (isEmptyFormula(splitFormula)) throw new IllegalArgumentException(); } private static boolean isEmptyFormula(String[] splitFormula) { diff --git a/src/main/java/com/programmers/util/Priority.java b/src/main/java/com/programmers/util/Priority.java index 1b2acdb85..34f854896 100644 --- a/src/main/java/com/programmers/util/Priority.java +++ b/src/main/java/com/programmers/util/Priority.java @@ -17,7 +17,7 @@ public static int getPriority(String operator) { return Arrays.stream(Priority.values()) .filter(symbol -> Arrays.asList(symbol.operators).contains(operator)) .findFirst() - .orElseThrow(() -> new IllegalArgumentException("잘못된 수식입니다. +, -, *, / 연산만 가능합니다.")) + .orElseThrow(IllegalArgumentException::new) .priority; } } From 6379fd42083c8249571e03c1aea8f4036603b405 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 16:06:55 +0900 Subject: [PATCH 28/77] =?UTF-8?q?style=20:=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EB=A9=94=EC=84=B8=EC=A7=80=20=EC=A0=95=EB=A6=AC=20=EB=B0=8F=20?= =?UTF-8?q?=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/util/Operators.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/programmers/util/Operators.java b/src/main/java/com/programmers/util/Operators.java index 6ba4f37c7..41af62bcc 100644 --- a/src/main/java/com/programmers/util/Operators.java +++ b/src/main/java/com/programmers/util/Operators.java @@ -22,7 +22,7 @@ public static Operators getOperator(String inputOperator) { return Arrays.stream(values()) .filter(operator -> operator.symbol.equals(inputOperator)) .findFirst() - .orElseThrow(() -> new IllegalArgumentException("잘못된 수식입니다. +, -, *, / 연산만 가능합니다.")); + .orElseThrow(IllegalArgumentException::new); } From d8400a7a46976a021c055e4d2343c4694c2245eb Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 16:27:18 +0900 Subject: [PATCH 29/77] =?UTF-8?q?refactor=20:=20CalculatorManager=20?= =?UTF-8?q?=EC=9D=B8=EC=9E=90=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/Main.java | 2 +- .../programmers/model/CalculatorManager.java | 32 +++++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/programmers/Main.java b/src/main/java/com/programmers/Main.java index 215a4d62a..2bb351543 100644 --- a/src/main/java/com/programmers/Main.java +++ b/src/main/java/com/programmers/Main.java @@ -9,7 +9,7 @@ public class Main { public static void main(String[] args) { CalculationRepository repository = new InMemoryCalculationRepository(); Console console = new Console(); - CalculatorManager calculatorManager = new CalculatorManager(repository, console, console); + CalculatorManager calculatorManager = new CalculatorManager(repository, console); calculatorManager.run(); } } \ No newline at end of file diff --git a/src/main/java/com/programmers/model/CalculatorManager.java b/src/main/java/com/programmers/model/CalculatorManager.java index ca3bc6b39..a5cc6a51c 100644 --- a/src/main/java/com/programmers/model/CalculatorManager.java +++ b/src/main/java/com/programmers/model/CalculatorManager.java @@ -2,22 +2,20 @@ import com.programmers.error.ErrorMsg; import com.programmers.repository.CalculationRepository; -import com.programmers.view.Input; -import com.programmers.view.Output; +import com.programmers.view.Console; import java.util.List; public class CalculatorManager { private final CalculationRepository repository; - private final Input input; - private final Output output; + private final Console console; private static final String VIEW = "1", CALCULATION = "2", EXIT = "3"; - public CalculatorManager(CalculationRepository repository, Input input, Output output) { + public CalculatorManager(CalculationRepository repository, Console console) { this.repository = repository; - this.input = input; - this.output = output; + this.console = console; + } public void run() { @@ -51,13 +49,13 @@ private void saveAndPrintResult(String formula) { try { long result = sendToCalculator(formula); repository.save(new CalculationResult(formula, result)); - output.printResult(result); + console.printResult(result); } catch (NumberFormatException e) { - output.printMessage(ErrorMsg.OPERAND_IS_NOT_A_NUMBER); + console.printMessage(ErrorMsg.OPERAND_IS_NOT_A_NUMBER); } catch (IllegalArgumentException e) { - output.printMessage(ErrorMsg.INVALID_OPERATOR_INPUT); + console.printMessage(ErrorMsg.INVALID_OPERATOR_INPUT); } catch (ArithmeticException e) { - output.printMessage(ErrorMsg.ENTER_ZERO_FOR_DIVISION); + console.printMessage(ErrorMsg.ENTER_ZERO_FOR_DIVISION); } } @@ -67,23 +65,23 @@ private long sendToCalculator(String formula) { } private String getFormula() { - return input.inputFormula(); + return console.inputFormula(); } private String inputMenu() { - return input.inputMenu(); + return console.inputMenu(); } private void wrongMenuSelection() { - output.printMessage(ErrorMsg.INVALID_MENU_SELECTION); + console.printMessage(ErrorMsg.INVALID_MENU_SELECTION); } private void recordCommandExecution(List calculationRecord) { if (isEmptyRecord(calculationRecord)) { - output.printMessage(ErrorMsg.NO_CALCULATION_RECORDS); + console.printMessage(ErrorMsg.NO_CALCULATION_RECORDS); return; } - output.printRecord(calculationRecord); + console.printRecord(calculationRecord); } private boolean isEmptyRecord(List record) { @@ -91,7 +89,7 @@ private boolean isEmptyRecord(List record) { } private void exitProgram() { - output.printMessage("프로그램을 종료합니다."); + console.printMessage("프로그램을 종료합니다."); System.exit(0); } } From 5a2f9f234315174eee3d54ae158a5b9afb725efa Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 16:31:14 +0900 Subject: [PATCH 30/77] =?UTF-8?q?refactor=20:=20isOperatorCheck=20?= =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=9D=B8=EC=9E=90=EB=AA=85,=20?= =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=EB=AA=85=20=EB=AA=85=EC=8B=9C?= =?UTF-8?q?=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/programmers/util/PostfixConverter.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/programmers/util/PostfixConverter.java b/src/main/java/com/programmers/util/PostfixConverter.java index 54d713bc9..498292555 100644 --- a/src/main/java/com/programmers/util/PostfixConverter.java +++ b/src/main/java/com/programmers/util/PostfixConverter.java @@ -13,10 +13,10 @@ public static List convert(String formula) { Stack stack = new Stack<>(); checkEmptyFormula(splitFormula); - for (int i = 0; i < splitFormula.length; i++) { - String eachFormula = splitFormula[i]; + for (int position = 0; position < splitFormula.length; position++) { + String eachFormula = splitFormula[position]; - if (isOperatorCheck(i)) { + if (isOperatorPositionCheck(position)) { putOperator(eachFormula, postfix, stack); } else { putOperand(eachFormula, postfix); @@ -52,8 +52,8 @@ private static void putOperand(String operand, List postfix) { } - private static boolean isOperatorCheck(int i) { - return (i + 1) % 2 == 0; + private static boolean isOperatorPositionCheck(int position) { + return (position + 1) % 2 == 0; } private static void checkEmptyFormula(String[] splitFormula) throws IllegalArgumentException { From cadabfbc8cfd1f9b1c6e75e59797af845806a585 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 18:41:27 +0900 Subject: [PATCH 31/77] =?UTF-8?q?chore=20:=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?UTF-8?q?=20=EA=B5=AC=EC=A1=B0=20=EC=9E=AC=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/{model => }/Calculator.java | 6 +++--- src/main/java/com/programmers/Main.java | 2 +- .../com/programmers/{model => core}/CalculatorManager.java | 4 +++- src/main/java/com/programmers/{util => core}/Operators.java | 2 +- .../com/programmers/{util => core}/PostfixConverter.java | 4 +++- src/main/java/com/programmers/{util => core}/Priority.java | 2 +- src/test/java/com/programmers/CalculatorTest.java | 1 - src/test/java/com/programmers/PostfixConverterTest.java | 2 +- 8 files changed, 13 insertions(+), 10 deletions(-) rename src/main/java/com/programmers/{model => }/Calculator.java (88%) rename src/main/java/com/programmers/{model => core}/CalculatorManager.java (96%) rename src/main/java/com/programmers/{util => core}/Operators.java (97%) rename src/main/java/com/programmers/{util => core}/PostfixConverter.java (96%) rename src/main/java/com/programmers/{util => core}/Priority.java (95%) diff --git a/src/main/java/com/programmers/model/Calculator.java b/src/main/java/com/programmers/Calculator.java similarity index 88% rename from src/main/java/com/programmers/model/Calculator.java rename to src/main/java/com/programmers/Calculator.java index b5a2fcdcf..ba78f5573 100644 --- a/src/main/java/com/programmers/model/Calculator.java +++ b/src/main/java/com/programmers/Calculator.java @@ -1,7 +1,7 @@ -package com.programmers.model; +package com.programmers; -import com.programmers.util.Operators; -import com.programmers.util.PostfixConverter; +import com.programmers.core.Operators; +import com.programmers.core.PostfixConverter; import com.programmers.util.StringUtil; import java.util.List; diff --git a/src/main/java/com/programmers/Main.java b/src/main/java/com/programmers/Main.java index 2bb351543..441ceffe1 100644 --- a/src/main/java/com/programmers/Main.java +++ b/src/main/java/com/programmers/Main.java @@ -1,6 +1,6 @@ package com.programmers; -import com.programmers.model.CalculatorManager; +import com.programmers.core.CalculatorManager; import com.programmers.repository.CalculationRepository; import com.programmers.repository.InMemoryCalculationRepository; import com.programmers.view.Console; diff --git a/src/main/java/com/programmers/model/CalculatorManager.java b/src/main/java/com/programmers/core/CalculatorManager.java similarity index 96% rename from src/main/java/com/programmers/model/CalculatorManager.java rename to src/main/java/com/programmers/core/CalculatorManager.java index a5cc6a51c..36331ca34 100644 --- a/src/main/java/com/programmers/model/CalculatorManager.java +++ b/src/main/java/com/programmers/core/CalculatorManager.java @@ -1,6 +1,8 @@ -package com.programmers.model; +package com.programmers.core; +import com.programmers.Calculator; import com.programmers.error.ErrorMsg; +import com.programmers.model.CalculationResult; import com.programmers.repository.CalculationRepository; import com.programmers.view.Console; diff --git a/src/main/java/com/programmers/util/Operators.java b/src/main/java/com/programmers/core/Operators.java similarity index 97% rename from src/main/java/com/programmers/util/Operators.java rename to src/main/java/com/programmers/core/Operators.java index 41af62bcc..bed8317ed 100644 --- a/src/main/java/com/programmers/util/Operators.java +++ b/src/main/java/com/programmers/core/Operators.java @@ -1,4 +1,4 @@ -package com.programmers.util; +package com.programmers.core; import java.util.Arrays; import java.util.function.BiFunction; diff --git a/src/main/java/com/programmers/util/PostfixConverter.java b/src/main/java/com/programmers/core/PostfixConverter.java similarity index 96% rename from src/main/java/com/programmers/util/PostfixConverter.java rename to src/main/java/com/programmers/core/PostfixConverter.java index 498292555..f95c8c0bf 100644 --- a/src/main/java/com/programmers/util/PostfixConverter.java +++ b/src/main/java/com/programmers/core/PostfixConverter.java @@ -1,4 +1,6 @@ -package com.programmers.util; +package com.programmers.core; + +import com.programmers.util.StringUtil; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/programmers/util/Priority.java b/src/main/java/com/programmers/core/Priority.java similarity index 95% rename from src/main/java/com/programmers/util/Priority.java rename to src/main/java/com/programmers/core/Priority.java index 34f854896..f79b4032e 100644 --- a/src/main/java/com/programmers/util/Priority.java +++ b/src/main/java/com/programmers/core/Priority.java @@ -1,4 +1,4 @@ -package com.programmers.util; +package com.programmers.core; import java.util.Arrays; diff --git a/src/test/java/com/programmers/CalculatorTest.java b/src/test/java/com/programmers/CalculatorTest.java index 932de1088..1a22f73a4 100644 --- a/src/test/java/com/programmers/CalculatorTest.java +++ b/src/test/java/com/programmers/CalculatorTest.java @@ -1,6 +1,5 @@ package com.programmers; -import com.programmers.model.Calculator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/programmers/PostfixConverterTest.java b/src/test/java/com/programmers/PostfixConverterTest.java index db71db90b..14ee3917f 100644 --- a/src/test/java/com/programmers/PostfixConverterTest.java +++ b/src/test/java/com/programmers/PostfixConverterTest.java @@ -1,6 +1,6 @@ package com.programmers; -import com.programmers.util.PostfixConverter; +import com.programmers.core.PostfixConverter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; From 8f9583d6c6dbac4cbf34d94dbbc14feeead07241 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 18:55:49 +0900 Subject: [PATCH 32/77] =?UTF-8?q?refactor=20:=20PostfixConverter=EC=9D=98?= =?UTF-8?q?=20=EC=9D=BC=EB=B6=80=20=EB=A9=94=EC=84=9C=EB=93=9C=EB=A5=BC=20?= =?UTF-8?q?PostfixConverterHelper=20=EA=B0=9D=EC=B2=B4=EB=A1=9C=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/core/PostfixConverter.java | 80 +++++++++---------- .../core/PostfixConverterHelper.java | 43 ++++++++++ 2 files changed, 82 insertions(+), 41 deletions(-) create mode 100644 src/main/java/com/programmers/core/PostfixConverterHelper.java diff --git a/src/main/java/com/programmers/core/PostfixConverter.java b/src/main/java/com/programmers/core/PostfixConverter.java index f95c8c0bf..88b0284da 100644 --- a/src/main/java/com/programmers/core/PostfixConverter.java +++ b/src/main/java/com/programmers/core/PostfixConverter.java @@ -1,7 +1,5 @@ package com.programmers.core; -import com.programmers.util.StringUtil; - import java.util.ArrayList; import java.util.List; import java.util.Stack; @@ -13,15 +11,15 @@ public static List convert(String formula) { List postfix = new ArrayList<>(); String[] splitFormula = formula.split(SEPARATOR); Stack stack = new Stack<>(); - checkEmptyFormula(splitFormula); + PostfixConverterHelper.checkEmptyFormula(splitFormula); for (int position = 0; position < splitFormula.length; position++) { String eachFormula = splitFormula[position]; - if (isOperatorPositionCheck(position)) { - putOperator(eachFormula, postfix, stack); + if (PostfixConverterHelper.isOperatorPositionCheck(position)) { + PostfixConverterHelper.putOperator(eachFormula, postfix, stack); } else { - putOperand(eachFormula, postfix); + PostfixConverterHelper.putOperand(eachFormula, postfix); } } while (!stack.isEmpty()) { @@ -30,39 +28,39 @@ public static List convert(String formula) { return postfix; } - private static void putOperator(String operator, List postfix, Stack stack) { - if (!Operators.isOperator(operator)) - throw new IllegalArgumentException(); - - if (stack.isEmpty() || Priority.getPriority(stack.peek()) < Priority.getPriority(operator)) { - stack.push(operator); - return; - } - - while (!stack.isEmpty() && Priority.getPriority(stack.peek()) >= Priority.getPriority(operator)) { - postfix.add(stack.pop()); - } - - stack.push(operator); - } - - private static void putOperand(String operand, List postfix) { - if (!StringUtil.isNumber(operand)) { - throw new NumberFormatException(); - } - postfix.add(operand); - } - - - private static boolean isOperatorPositionCheck(int position) { - return (position + 1) % 2 == 0; - } - - private static void checkEmptyFormula(String[] splitFormula) throws IllegalArgumentException { - if (isEmptyFormula(splitFormula)) throw new IllegalArgumentException(); - } - - private static boolean isEmptyFormula(String[] splitFormula) { - return splitFormula != null && splitFormula.length == 0; - } +// private static void putOperator(String operator, List postfix, Stack stack) { +// if (!Operators.isOperator(operator)) +// throw new IllegalArgumentException(); +// +// if (stack.isEmpty() || Priority.getPriority(stack.peek()) < Priority.getPriority(operator)) { +// stack.push(operator); +// return; +// } +// +// while (!stack.isEmpty() && Priority.getPriority(stack.peek()) >= Priority.getPriority(operator)) { +// postfix.add(stack.pop()); +// } +// +// stack.push(operator); +// } +// +// private static void putOperand(String operand, List postfix) { +// if (!StringUtil.isNumber(operand)) { +// throw new NumberFormatException(); +// } +// postfix.add(operand); +// } +// +// +// private static boolean isOperatorPositionCheck(int position) { +// return (position + 1) % 2 == 0; +// } +// +// private static void checkEmptyFormula(String[] splitFormula) throws IllegalArgumentException { +// if (isEmptyFormula(splitFormula)) throw new IllegalArgumentException(); +// } +// +// private static boolean isEmptyFormula(String[] splitFormula) { +// return splitFormula != null && splitFormula.length == 0; +// } } diff --git a/src/main/java/com/programmers/core/PostfixConverterHelper.java b/src/main/java/com/programmers/core/PostfixConverterHelper.java new file mode 100644 index 000000000..3be20e884 --- /dev/null +++ b/src/main/java/com/programmers/core/PostfixConverterHelper.java @@ -0,0 +1,43 @@ +package com.programmers.core; + +import com.programmers.util.StringUtil; + +import java.util.List; +import java.util.Stack; + +public class PostfixConverterHelper { + public static void putOperator(String operator, List postfix, Stack stack) { + if (!Operators.isOperator(operator)) throw new IllegalArgumentException(); + + if (stack.isEmpty() || Priority.getPriority(stack.peek()) < Priority.getPriority(operator)) { + stack.push(operator); + return; + } + + while (!stack.isEmpty() && Priority.getPriority(stack.peek()) >= Priority.getPriority(operator)) { + postfix.add(stack.pop()); + } + + stack.push(operator); + } + + public static void putOperand(String operand, List postfix) { + if (!StringUtil.isNumber(operand)) { + throw new NumberFormatException(); + } + postfix.add(operand); + } + + + public static boolean isOperatorPositionCheck(int position) { + return (position + 1) % 2 == 0; + } + + public static void checkEmptyFormula(String[] splitFormula) { + if (isEmptyFormula(splitFormula)) ; + } + + public static boolean isEmptyFormula(String[] splitFormula) { + return splitFormula != null && splitFormula.length == 0; + } +} From 048651effa93a22c576a1b6a481dd334fddf8a9a Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 18:58:04 +0900 Subject: [PATCH 33/77] =?UTF-8?q?style=20:=20PostfixConverter=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=EC=9D=98=20=EC=A3=BC=EC=84=9D=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/core/PostfixConverter.java | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/src/main/java/com/programmers/core/PostfixConverter.java b/src/main/java/com/programmers/core/PostfixConverter.java index 88b0284da..b25d71aba 100644 --- a/src/main/java/com/programmers/core/PostfixConverter.java +++ b/src/main/java/com/programmers/core/PostfixConverter.java @@ -27,40 +27,4 @@ public static List convert(String formula) { } return postfix; } - -// private static void putOperator(String operator, List postfix, Stack stack) { -// if (!Operators.isOperator(operator)) -// throw new IllegalArgumentException(); -// -// if (stack.isEmpty() || Priority.getPriority(stack.peek()) < Priority.getPriority(operator)) { -// stack.push(operator); -// return; -// } -// -// while (!stack.isEmpty() && Priority.getPriority(stack.peek()) >= Priority.getPriority(operator)) { -// postfix.add(stack.pop()); -// } -// -// stack.push(operator); -// } -// -// private static void putOperand(String operand, List postfix) { -// if (!StringUtil.isNumber(operand)) { -// throw new NumberFormatException(); -// } -// postfix.add(operand); -// } -// -// -// private static boolean isOperatorPositionCheck(int position) { -// return (position + 1) % 2 == 0; -// } -// -// private static void checkEmptyFormula(String[] splitFormula) throws IllegalArgumentException { -// if (isEmptyFormula(splitFormula)) throw new IllegalArgumentException(); -// } -// -// private static boolean isEmptyFormula(String[] splitFormula) { -// return splitFormula != null && splitFormula.length == 0; -// } } From 34d68724be4c16aea8dff848148674cee33835bf Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 19:10:59 +0900 Subject: [PATCH 34/77] =?UTF-8?q?refactor=20:=20=EC=9A=B0=EC=84=A0=20?= =?UTF-8?q?=EC=88=9C=EC=9C=84=EB=A5=BC=20=EA=B0=80=EB=A6=AC=EB=8A=94=20?= =?UTF-8?q?=EB=B9=84=EA=B5=90=20=EA=B5=AC=EB=AC=B8=EC=9D=84=20Priority=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EC=97=90=20=EC=9C=84=EC=9E=84,=20op?= =?UTF-8?q?erator=20=EC=9D=B8=EC=9E=90=20->=20operatorStack=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/core/PostfixConverterHelper.java | 15 ++++++++------- src/main/java/com/programmers/core/Priority.java | 5 +++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/programmers/core/PostfixConverterHelper.java b/src/main/java/com/programmers/core/PostfixConverterHelper.java index 3be20e884..c5e09ef83 100644 --- a/src/main/java/com/programmers/core/PostfixConverterHelper.java +++ b/src/main/java/com/programmers/core/PostfixConverterHelper.java @@ -6,19 +6,20 @@ import java.util.Stack; public class PostfixConverterHelper { - public static void putOperator(String operator, List postfix, Stack stack) { - if (!Operators.isOperator(operator)) throw new IllegalArgumentException(); - if (stack.isEmpty() || Priority.getPriority(stack.peek()) < Priority.getPriority(operator)) { - stack.push(operator); + public static void putOperator(String operator, List postfix, Stack operatorStack) { + if (!Operators.isOperator(operator)); + + if (operatorStack.isEmpty() || Priority.isNewOperatorPriorityHigher(operator, operatorStack)) { + operatorStack.push(operator); return; } - while (!stack.isEmpty() && Priority.getPriority(stack.peek()) >= Priority.getPriority(operator)) { - postfix.add(stack.pop()); + while (!operatorStack.isEmpty() && Priority.getPriority(operatorStack.peek()) >= Priority.getPriority(operator)) { + postfix.add(operatorStack.pop()); } - stack.push(operator); + operatorStack.push(operator); } public static void putOperand(String operand, List postfix) { diff --git a/src/main/java/com/programmers/core/Priority.java b/src/main/java/com/programmers/core/Priority.java index f79b4032e..4431a9b8b 100644 --- a/src/main/java/com/programmers/core/Priority.java +++ b/src/main/java/com/programmers/core/Priority.java @@ -1,6 +1,7 @@ package com.programmers.core; import java.util.Arrays; +import java.util.Stack; public enum Priority { HIGH(2, new String[]{"/", "*"}), LOW(1, new String[]{"+", "-"}); @@ -20,5 +21,9 @@ public static int getPriority(String operator) { .orElseThrow(IllegalArgumentException::new) .priority; } + + public static boolean isNewOperatorPriorityHigher(String operator, Stack operatorStack) { + return Priority.getPriority(operatorStack.peek()) < Priority.getPriority(operator); + } } From 1d7a42672cce767ccd55829d25c5f3c970416cd6 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 21:11:52 +0900 Subject: [PATCH 35/77] =?UTF-8?q?style=20:=20=EA=B0=81=EA=B0=81=20?= =?UTF-8?q?=EC=9A=94=EC=86=8C=EB=A5=BC=20=EB=9C=BB=ED=95=98=EB=8A=94=20num?= =?UTF-8?q?OrOperator=EB=A5=BC=20token=EC=9C=BC=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/Calculator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/programmers/Calculator.java b/src/main/java/com/programmers/Calculator.java index ba78f5573..6e6fdd150 100644 --- a/src/main/java/com/programmers/Calculator.java +++ b/src/main/java/com/programmers/Calculator.java @@ -22,13 +22,13 @@ public long calculate(String formula) { private long calculatePostfixFormula(List formula) { Stack stack = new Stack<>(); - for (String numOrOperator : formula) { - if (StringUtil.isNumber(numOrOperator)) { - stack.push(StringUtil.convertStringToLong(numOrOperator)); + for (String token : formula) { + if (StringUtil.isNumber(token)) { + stack.push(StringUtil.convertStringToLong(token)); } else { Long num2 = stack.pop(); Long num1 = stack.pop(); - stack.push(Operators.calculate(numOrOperator, num1, num2)); + stack.push(Operators.calculate(token, num1, num2)); } } return stack.pop(); From 39eb058a793f9b04aebe1e4f1b6316a04a204b24 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 21:19:20 +0900 Subject: [PATCH 36/77] =?UTF-8?q?refactor=20:=20try=20catch=EB=AC=B8=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20=ED=9B=84=20=EC=A0=95=EA=B7=9C=EC=8B=9D=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9,=20=EC=9D=B8=EC=9E=90=EB=AA=85=20=EB=AA=85?= =?UTF-8?q?=ED=99=95=ED=95=98=EA=B2=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/programmers/util/StringUtil.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/programmers/util/StringUtil.java b/src/main/java/com/programmers/util/StringUtil.java index ca8ddb7bb..33faad3f9 100644 --- a/src/main/java/com/programmers/util/StringUtil.java +++ b/src/main/java/com/programmers/util/StringUtil.java @@ -1,16 +1,13 @@ package com.programmers.util; public class StringUtil { - public static boolean isNumber(String unCheckedNumber) { - try { - convertStringToLong(unCheckedNumber); - return true; - } catch (NumberFormatException e) { - return false; - } + private static final String NUMBER_REGEX = "-?\\d+(\\.\\d+)?"; + + public static boolean isNumber(String unCheckedToken) { + return unCheckedToken.matches(NUMBER_REGEX); } - public static long convertStringToLong(String unCheckedNumOrOperator) { - return Long.parseLong(unCheckedNumOrOperator); + public static long convertStringToLong(String token) { + return Long.parseLong(token); } } From a98304195554a3e0038cb2b09f2de1e2ff6a32d9 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 21:39:17 +0900 Subject: [PATCH 37/77] =?UTF-8?q?style=20:=20=EC=9A=B0=EC=84=A0=20?= =?UTF-8?q?=EC=88=9C=EC=9C=84=20=EB=B2=94=EC=9C=84=EB=A5=BC=20=EC=97=AC?= =?UTF-8?q?=EC=9C=A0=EC=9E=88=EA=B2=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/core/Priority.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/programmers/core/Priority.java b/src/main/java/com/programmers/core/Priority.java index 4431a9b8b..348ec5e44 100644 --- a/src/main/java/com/programmers/core/Priority.java +++ b/src/main/java/com/programmers/core/Priority.java @@ -4,7 +4,7 @@ import java.util.Stack; public enum Priority { - HIGH(2, new String[]{"/", "*"}), LOW(1, new String[]{"+", "-"}); + HIGH(10, new String[]{"/", "*"}), LOW(1, new String[]{"+", "-"}); private final int priority; private final String[] operators; From 4177bafb52fe1e449599b4c583411170536ccf4d Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 23:31:18 +0900 Subject: [PATCH 38/77] =?UTF-8?q?refactor=20:=20Writer(Output),=20Reader(I?= =?UTF-8?q?nput)=20=EA=B5=AC=ED=98=84=EC=B2=B4=20=EC=83=9D=EC=84=B1=20?= =?UTF-8?q?=ED=9B=84,=20Console=20=ED=81=B4=EB=9E=98=EC=8A=A4=EC=97=90=20?= =?UTF-8?q?=EC=B6=94=EC=83=81=EC=B2=B4=EC=9D=B8=20Input,Output=20=EC=A3=BC?= =?UTF-8?q?=EC=9E=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/Main.java | 9 +++- .../programmers/core/CalculatorManager.java | 16 +++---- .../java/com/programmers/view/Console.java | 43 +++++++++++-------- src/main/java/com/programmers/view/Input.java | 6 +-- .../java/com/programmers/view/Output.java | 7 +-- 5 files changed, 46 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/programmers/Main.java b/src/main/java/com/programmers/Main.java index 441ceffe1..6ed56744d 100644 --- a/src/main/java/com/programmers/Main.java +++ b/src/main/java/com/programmers/Main.java @@ -4,11 +4,18 @@ import com.programmers.repository.CalculationRepository; import com.programmers.repository.InMemoryCalculationRepository; import com.programmers.view.Console; +import com.programmers.view.Input; +import com.programmers.view.Output; +import com.programmers.view.Reader; +import com.programmers.view.Writer; public class Main { public static void main(String[] args) { CalculationRepository repository = new InMemoryCalculationRepository(); - Console console = new Console(); + Input reader = new Reader(); + Output writer = new Writer(); + Console console = new Console(reader, writer); + CalculatorManager calculatorManager = new CalculatorManager(repository, console); calculatorManager.run(); } diff --git a/src/main/java/com/programmers/core/CalculatorManager.java b/src/main/java/com/programmers/core/CalculatorManager.java index 36331ca34..95139ecf5 100644 --- a/src/main/java/com/programmers/core/CalculatorManager.java +++ b/src/main/java/com/programmers/core/CalculatorManager.java @@ -51,13 +51,13 @@ private void saveAndPrintResult(String formula) { try { long result = sendToCalculator(formula); repository.save(new CalculationResult(formula, result)); - console.printResult(result); + console.print(result); } catch (NumberFormatException e) { - console.printMessage(ErrorMsg.OPERAND_IS_NOT_A_NUMBER); + console.print(ErrorMsg.OPERAND_IS_NOT_A_NUMBER); } catch (IllegalArgumentException e) { - console.printMessage(ErrorMsg.INVALID_OPERATOR_INPUT); + console.print(ErrorMsg.INVALID_OPERATOR_INPUT); } catch (ArithmeticException e) { - console.printMessage(ErrorMsg.ENTER_ZERO_FOR_DIVISION); + console.print(ErrorMsg.ENTER_ZERO_FOR_DIVISION); } } @@ -75,15 +75,15 @@ private String inputMenu() { } private void wrongMenuSelection() { - console.printMessage(ErrorMsg.INVALID_MENU_SELECTION); + console.print(ErrorMsg.INVALID_MENU_SELECTION); } private void recordCommandExecution(List calculationRecord) { if (isEmptyRecord(calculationRecord)) { - console.printMessage(ErrorMsg.NO_CALCULATION_RECORDS); + console.print(ErrorMsg.NO_CALCULATION_RECORDS); return; } - console.printRecord(calculationRecord); + console.printList(calculationRecord); } private boolean isEmptyRecord(List record) { @@ -91,7 +91,7 @@ private boolean isEmptyRecord(List record) { } private void exitProgram() { - console.printMessage("프로그램을 종료합니다."); + console.print("프로그램을 종료합니다."); System.exit(0); } } diff --git a/src/main/java/com/programmers/view/Console.java b/src/main/java/com/programmers/view/Console.java index 6b3961e5b..d6f0aff35 100644 --- a/src/main/java/com/programmers/view/Console.java +++ b/src/main/java/com/programmers/view/Console.java @@ -3,41 +3,46 @@ import com.programmers.model.CalculationResult; import java.util.List; -import java.util.Scanner; -public class Console implements Input, Output { - private final Scanner scanner = new Scanner(System.in); +public class Console { + private final Input input; + private final Output output; + + private static final String VIEW_MESSAGE = "1. 조회"; + private static final String CALCULATION_MESSAGE = "2. 계산"; + private static final String EXITING_MESSAGE = "3. 종료"; + private static final String CHOICE = "선택 : "; + + public Console(Input input, Output output) { + this.input = input; + this.output = output; + } - @Override public String inputMenu() { - System.out.println("1. 조회"); - System.out.println("2. 계산"); - System.out.println("3. 종료"); - System.out.print("선택 : "); - return scanner.nextLine().trim(); + System.out.println(VIEW_MESSAGE); + System.out.println(CALCULATION_MESSAGE); + System.out.println(EXITING_MESSAGE); + System.out.print(CHOICE); + return input.read(); } - @Override public String inputFormula() { - return scanner.nextLine().trim(); + return input.read(); } - - @Override - public void printRecord(List record) { - record.forEach(System.out::println); + public void printList(List record) { System.out.println(); + record.forEach(System.out::println); } - @Override - public void printMessage(String message) { + public void print(String message) { System.out.println(message); System.out.println(); } - @Override - public void printResult(long result) { + public void print(long result) { System.out.println(result); System.out.println(); } } + diff --git a/src/main/java/com/programmers/view/Input.java b/src/main/java/com/programmers/view/Input.java index 969c5b8d1..b1a057140 100644 --- a/src/main/java/com/programmers/view/Input.java +++ b/src/main/java/com/programmers/view/Input.java @@ -1,7 +1,5 @@ package com.programmers.view; public interface Input { - String inputMenu(); - - String inputFormula(); -} + String read(); +} \ No newline at end of file diff --git a/src/main/java/com/programmers/view/Output.java b/src/main/java/com/programmers/view/Output.java index 0751afc49..89f4ab244 100644 --- a/src/main/java/com/programmers/view/Output.java +++ b/src/main/java/com/programmers/view/Output.java @@ -5,10 +5,11 @@ import java.util.List; public interface Output { - void printRecord(List record); - void printMessage(String errorMsg); + void print(String message); - void printResult(long result); + void print(long result); + + void print(List record); } From 9aa97108a1006dde19e624f5f6b99be72f747916 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 23:43:17 +0900 Subject: [PATCH 39/77] =?UTF-8?q?refactor=20:=20=EB=AA=85=EC=8B=9C?= =?UTF-8?q?=EC=A0=81=EC=9D=B8=20calculateTop=20=EB=A9=94=EC=84=9C=EB=93=9C?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/Calculator.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/programmers/Calculator.java b/src/main/java/com/programmers/Calculator.java index 6e6fdd150..06497eecb 100644 --- a/src/main/java/com/programmers/Calculator.java +++ b/src/main/java/com/programmers/Calculator.java @@ -26,12 +26,15 @@ private long calculatePostfixFormula(List formula) { if (StringUtil.isNumber(token)) { stack.push(StringUtil.convertStringToLong(token)); } else { - Long num2 = stack.pop(); - Long num1 = stack.pop(); - stack.push(Operators.calculate(token, num1, num2)); + calculateTop(stack, token); } } return stack.pop(); } + private void calculateTop(Stack stack, String token) { + Long num2 = stack.pop(); + Long num1 = stack.pop(); + stack.push(Operators.calculate(token, num1, num2)); + } } From 1a85706dc86ca0e6981cca4aa43e5b9429bbb5b8 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 23:44:22 +0900 Subject: [PATCH 40/77] =?UTF-8?q?refactor=20:=20=EB=AA=85=EC=8B=9C?= =?UTF-8?q?=EC=A0=81=EC=9D=B8=20isNewOperatorPriorityLower=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/programmers/core/PostfixConverterHelper.java | 2 +- src/main/java/com/programmers/core/Priority.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/programmers/core/PostfixConverterHelper.java b/src/main/java/com/programmers/core/PostfixConverterHelper.java index c5e09ef83..86f5bd6e1 100644 --- a/src/main/java/com/programmers/core/PostfixConverterHelper.java +++ b/src/main/java/com/programmers/core/PostfixConverterHelper.java @@ -15,7 +15,7 @@ public static void putOperator(String operator, List postfix, Stack= Priority.getPriority(operator)) { + while (!operatorStack.isEmpty() && Priority.isNewOperatorPriorityLower(operator, operatorStack)) { postfix.add(operatorStack.pop()); } diff --git a/src/main/java/com/programmers/core/Priority.java b/src/main/java/com/programmers/core/Priority.java index 348ec5e44..1e20a1838 100644 --- a/src/main/java/com/programmers/core/Priority.java +++ b/src/main/java/com/programmers/core/Priority.java @@ -25,5 +25,9 @@ public static int getPriority(String operator) { public static boolean isNewOperatorPriorityHigher(String operator, Stack operatorStack) { return Priority.getPriority(operatorStack.peek()) < Priority.getPriority(operator); } + + public static boolean isNewOperatorPriorityLower(String operator, Stack operatorStack) { + return Priority.getPriority(operatorStack.peek()) >= Priority.getPriority(operator); + } } From a133dfec6a4ddeed8161b4317fa4bb6593a9017e Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 13 Jun 2023 23:49:20 +0900 Subject: [PATCH 41/77] =?UTF-8?q?refactor=20:=20Writer(Output),=20Reader(I?= =?UTF-8?q?nput)=20=EA=B5=AC=ED=98=84=EC=B2=B4=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/programmers/view/Reader.java | 16 ++++++++++++ .../java/com/programmers/view/Writer.java | 26 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 src/main/java/com/programmers/view/Reader.java create mode 100644 src/main/java/com/programmers/view/Writer.java diff --git a/src/main/java/com/programmers/view/Reader.java b/src/main/java/com/programmers/view/Reader.java new file mode 100644 index 000000000..9c2cd276f --- /dev/null +++ b/src/main/java/com/programmers/view/Reader.java @@ -0,0 +1,16 @@ +package com.programmers.view; + +import java.util.Scanner; + +public class Reader implements Input { + private final Scanner scanner; + + public Reader() { + this.scanner = new Scanner(System.in); + } + + @Override + public String read() { + return scanner.nextLine().trim(); + } +} diff --git a/src/main/java/com/programmers/view/Writer.java b/src/main/java/com/programmers/view/Writer.java new file mode 100644 index 000000000..3e1d1fcb9 --- /dev/null +++ b/src/main/java/com/programmers/view/Writer.java @@ -0,0 +1,26 @@ +package com.programmers.view; + +import com.programmers.model.CalculationResult; + +import java.util.List; + +public class Writer implements Output { + + @Override + public void print(String message) { + System.out.println(message); + System.out.println(); + } + + @Override + public void print(long result) { + System.out.println(result); + System.out.println(); + } + + @Override + public void print(List record) { + record.forEach(System.out::println); + System.out.println(); + } +} From 9feb6466b03488d4cde6f542afd273ee3d68ec56 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Wed, 14 Jun 2023 14:03:47 +0900 Subject: [PATCH 42/77] =?UTF-8?q?refactor=20:=20while(true)=20->=20power?= =?UTF-8?q?=EB=A5=BC=20=EB=84=A3=EC=96=B4=EC=A4=8C=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=EC=8D=A8=20=EB=AC=B4=ED=95=9C=EB=A3=A8=ED=94=84=20=EB=B0=A9?= =?UTF-8?q?=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/core/CalculatorManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/programmers/core/CalculatorManager.java b/src/main/java/com/programmers/core/CalculatorManager.java index 95139ecf5..b93f4b08d 100644 --- a/src/main/java/com/programmers/core/CalculatorManager.java +++ b/src/main/java/com/programmers/core/CalculatorManager.java @@ -21,7 +21,9 @@ public CalculatorManager(CalculationRepository repository, Console console) { } public void run() { - while (true) { + boolean power = true; + + while (power) { switch (inputMenu()) { case VIEW: findAllCalculationHistory(); @@ -31,6 +33,7 @@ public void run() { break; case EXIT: exitProgram(); + power = false; default: wrongMenuSelection(); } From ddf36179c295c510a3fee6b962d3a918fcf9cae6 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Wed, 14 Jun 2023 14:06:43 +0900 Subject: [PATCH 43/77] =?UTF-8?q?refactor=20:=20println()=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80,=20=EC=97=90=EB=9F=AC=20=EB=A9=94=EC=84=B8=EC=A7=80?= =?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/com/programmers/error/ErrorMsg.java | 2 +- src/main/java/com/programmers/view/Writer.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/programmers/error/ErrorMsg.java b/src/main/java/com/programmers/error/ErrorMsg.java index 415ca18d1..15ad06146 100644 --- a/src/main/java/com/programmers/error/ErrorMsg.java +++ b/src/main/java/com/programmers/error/ErrorMsg.java @@ -4,7 +4,7 @@ public final class ErrorMsg { private ErrorMsg() { } - public static String INVALID_MENU_SELECTION = "메뉴를 잘못 선택하셨습니다. 메뉴는 1,2만 가능합니다."; + public static String INVALID_MENU_SELECTION = "메뉴를 잘못 선택하셨습니다. 메뉴는 1,2,3만 가능합니다."; public static String ENTER_ZERO_FOR_DIVISION = "0으로는 나눌 수 없습니다. 0이 아닌 다른 숫자를 사용해 주세요."; public static String INVALID_OPERATOR_INPUT = "잘못된 수식입니다. +, -, *, / 연산만 가능합니다."; public static String NO_CALCULATION_RECORDS = "계산 기록이 없습니다. 먼저 계산 결과를 얻은 후 사용하세요."; diff --git a/src/main/java/com/programmers/view/Writer.java b/src/main/java/com/programmers/view/Writer.java index 3e1d1fcb9..f54c709d8 100644 --- a/src/main/java/com/programmers/view/Writer.java +++ b/src/main/java/com/programmers/view/Writer.java @@ -9,17 +9,18 @@ public class Writer implements Output { @Override public void print(String message) { System.out.println(message); - System.out.println(); } @Override public void print(long result) { + System.out.println(); System.out.println(result); System.out.println(); } @Override public void print(List record) { + System.out.println(); record.forEach(System.out::println); System.out.println(); } From a4719039a48fc3ba15032a4e0c9bc69442f6c677 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Wed, 14 Jun 2023 14:09:15 +0900 Subject: [PATCH 44/77] =?UTF-8?q?refactor=20:=20output.print()=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=20=ED=99=9C=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/view/Console.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/programmers/view/Console.java b/src/main/java/com/programmers/view/Console.java index d6f0aff35..b602da897 100644 --- a/src/main/java/com/programmers/view/Console.java +++ b/src/main/java/com/programmers/view/Console.java @@ -19,9 +19,9 @@ public Console(Input input, Output output) { } public String inputMenu() { - System.out.println(VIEW_MESSAGE); - System.out.println(CALCULATION_MESSAGE); - System.out.println(EXITING_MESSAGE); + output.print(VIEW_MESSAGE); + output.print(CALCULATION_MESSAGE); + output.print(EXITING_MESSAGE); System.out.print(CHOICE); return input.read(); } @@ -31,18 +31,15 @@ public String inputFormula() { } public void printList(List record) { - System.out.println(); - record.forEach(System.out::println); + output.print(record); } public void print(String message) { - System.out.println(message); - System.out.println(); + output.print(message); } public void print(long result) { - System.out.println(result); - System.out.println(); + output.print(result); } } From f7036b3a8db846e9398e8984679895f99c5f875c Mon Sep 17 00:00:00 2001 From: hongxeob Date: Wed, 14 Jun 2023 15:36:17 +0900 Subject: [PATCH 45/77] =?UTF-8?q?refactor=20:=20final=EC=9D=84=20=EB=B6=99?= =?UTF-8?q?=EC=97=AC=20=EA=B0=81=20=EB=A9=94=EC=8B=9C=EC=A7=80=EB=A5=BC=20?= =?UTF-8?q?=EC=83=81=EC=88=98=EB=A1=9C=20=EC=84=A0=EC=96=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/error/ErrorMsg.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/programmers/error/ErrorMsg.java b/src/main/java/com/programmers/error/ErrorMsg.java index 15ad06146..22bd7a880 100644 --- a/src/main/java/com/programmers/error/ErrorMsg.java +++ b/src/main/java/com/programmers/error/ErrorMsg.java @@ -4,9 +4,9 @@ public final class ErrorMsg { private ErrorMsg() { } - public static String INVALID_MENU_SELECTION = "메뉴를 잘못 선택하셨습니다. 메뉴는 1,2,3만 가능합니다."; - public static String ENTER_ZERO_FOR_DIVISION = "0으로는 나눌 수 없습니다. 0이 아닌 다른 숫자를 사용해 주세요."; - public static String INVALID_OPERATOR_INPUT = "잘못된 수식입니다. +, -, *, / 연산만 가능합니다."; - public static String NO_CALCULATION_RECORDS = "계산 기록이 없습니다. 먼저 계산 결과를 얻은 후 사용하세요."; - public static String OPERAND_IS_NOT_A_NUMBER = "피연산자가 숫자가 아닙니다. 숫자를 입력해 주세요."; + public final static String INVALID_MENU_SELECTION = "메뉴를 잘못 선택하셨습니다. 메뉴는 1,2,3만 가능합니다."; + public final static String ENTER_ZERO_FOR_DIVISION = "0으로는 나눌 수 없습니다. 0이 아닌 다른 숫자를 사용해 주세요."; + public final static String INVALID_OPERATOR_INPUT = "잘못된 수식입니다. +, -, *, / 연산만 가능합니다."; + public final static String NO_CALCULATION_RECORDS = "계산 기록이 없습니다. 먼저 계산 결과를 얻은 후 사용하세요."; + public final static String OPERAND_IS_NOT_A_NUMBER = "피연산자가 숫자가 아닙니다. 숫자를 입력해 주세요."; } From 871e9e2822a5d2889184af9f65b6fdb732a22fd7 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Wed, 14 Jun 2023 20:33:11 +0900 Subject: [PATCH 46/77] =?UTF-8?q?feat=20:=20Validator=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/PostfixConverterHelper.java | 44 ------------------- .../java/com/programmers/util/Validator.java | 17 +++++++ 2 files changed, 17 insertions(+), 44 deletions(-) delete mode 100644 src/main/java/com/programmers/core/PostfixConverterHelper.java create mode 100644 src/main/java/com/programmers/util/Validator.java diff --git a/src/main/java/com/programmers/core/PostfixConverterHelper.java b/src/main/java/com/programmers/core/PostfixConverterHelper.java deleted file mode 100644 index 86f5bd6e1..000000000 --- a/src/main/java/com/programmers/core/PostfixConverterHelper.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.programmers.core; - -import com.programmers.util.StringUtil; - -import java.util.List; -import java.util.Stack; - -public class PostfixConverterHelper { - - public static void putOperator(String operator, List postfix, Stack operatorStack) { - if (!Operators.isOperator(operator)); - - if (operatorStack.isEmpty() || Priority.isNewOperatorPriorityHigher(operator, operatorStack)) { - operatorStack.push(operator); - return; - } - - while (!operatorStack.isEmpty() && Priority.isNewOperatorPriorityLower(operator, operatorStack)) { - postfix.add(operatorStack.pop()); - } - - operatorStack.push(operator); - } - - public static void putOperand(String operand, List postfix) { - if (!StringUtil.isNumber(operand)) { - throw new NumberFormatException(); - } - postfix.add(operand); - } - - - public static boolean isOperatorPositionCheck(int position) { - return (position + 1) % 2 == 0; - } - - public static void checkEmptyFormula(String[] splitFormula) { - if (isEmptyFormula(splitFormula)) ; - } - - public static boolean isEmptyFormula(String[] splitFormula) { - return splitFormula != null && splitFormula.length == 0; - } -} diff --git a/src/main/java/com/programmers/util/Validator.java b/src/main/java/com/programmers/util/Validator.java new file mode 100644 index 000000000..9d4196132 --- /dev/null +++ b/src/main/java/com/programmers/util/Validator.java @@ -0,0 +1,17 @@ +package com.programmers.util; + +public class Validator { + + public static boolean isOperatorCheck(int position) { + return (position + 1) % 2 == 0; + } + + public static void checkEmpty(String[] splitFormula) { + if (isEmpty(splitFormula)) ; + } + + private static boolean isEmpty(String[] splitFormula) { + return splitFormula != null && splitFormula.length == 0; + } + +} From 632192173d46adb6ad424d33dd0f9d4ff05fcdfe Mon Sep 17 00:00:00 2001 From: hongxeob Date: Wed, 14 Jun 2023 20:40:29 +0900 Subject: [PATCH 47/77] =?UTF-8?q?refactor=20:=20Converter=20=EC=9D=B8?= =?UTF-8?q?=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=EB=A5=BC=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=ED=95=B4=20PostfixConverter=20=EC=BA=A1=EC=8A=90?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/Calculator.java | 6 ++- .../java/com/programmers/core/Converter.java | 7 ++++ .../programmers/core/PostfixConverter.java | 38 ++++++++++++++++--- 3 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/programmers/core/Converter.java diff --git a/src/main/java/com/programmers/Calculator.java b/src/main/java/com/programmers/Calculator.java index 06497eecb..00b1048c5 100644 --- a/src/main/java/com/programmers/Calculator.java +++ b/src/main/java/com/programmers/Calculator.java @@ -1,5 +1,6 @@ package com.programmers; +import com.programmers.core.Converter; import com.programmers.core.Operators; import com.programmers.core.PostfixConverter; import com.programmers.util.StringUtil; @@ -8,15 +9,16 @@ import java.util.Stack; public class Calculator { - + private final Converter converter; private final String formula; public Calculator(String formula) { this.formula = formula; + this.converter = new PostfixConverter(); } public long calculate(String formula) { - List postfix = PostfixConverter.convert(formula); + List postfix = converter.convert(formula); return calculatePostfixFormula(postfix); } diff --git a/src/main/java/com/programmers/core/Converter.java b/src/main/java/com/programmers/core/Converter.java new file mode 100644 index 000000000..3ef1480c0 --- /dev/null +++ b/src/main/java/com/programmers/core/Converter.java @@ -0,0 +1,7 @@ +package com.programmers.core; + +import java.util.List; + +public interface Converter { + List convert(String formula); +} diff --git a/src/main/java/com/programmers/core/PostfixConverter.java b/src/main/java/com/programmers/core/PostfixConverter.java index b25d71aba..26af1118b 100644 --- a/src/main/java/com/programmers/core/PostfixConverter.java +++ b/src/main/java/com/programmers/core/PostfixConverter.java @@ -1,25 +1,29 @@ package com.programmers.core; +import com.programmers.util.StringUtil; +import com.programmers.util.Validator; + import java.util.ArrayList; import java.util.List; import java.util.Stack; -public class PostfixConverter { +public class PostfixConverter implements Converter { private static final String SEPARATOR = " "; - public static List convert(String formula) { + @Override + public List convert(String formula) { List postfix = new ArrayList<>(); String[] splitFormula = formula.split(SEPARATOR); Stack stack = new Stack<>(); - PostfixConverterHelper.checkEmptyFormula(splitFormula); + Validator.checkEmpty(splitFormula); for (int position = 0; position < splitFormula.length; position++) { String eachFormula = splitFormula[position]; - if (PostfixConverterHelper.isOperatorPositionCheck(position)) { - PostfixConverterHelper.putOperator(eachFormula, postfix, stack); + if (Validator.isOperatorCheck(position)) { + putOperator(eachFormula, postfix, stack); } else { - PostfixConverterHelper.putOperand(eachFormula, postfix); + putOperand(eachFormula, postfix); } } while (!stack.isEmpty()) { @@ -27,4 +31,26 @@ public static List convert(String formula) { } return postfix; } + + private void putOperator(String operator, List postfix, Stack operatorStack) { + if (!Operators.isOperator(operator)) ; + + if (operatorStack.isEmpty() || Priority.isNewOperatorPriorityHigher(operator, operatorStack)) { + operatorStack.push(operator); + return; + } + + while (!operatorStack.isEmpty() && Priority.isNewOperatorPriorityLower(operator, operatorStack)) { + postfix.add(operatorStack.pop()); + } + + operatorStack.push(operator); + } + + private void putOperand(String operand, List postfix) { + if (!StringUtil.isNumber(operand)) { + throw new NumberFormatException(); + } + postfix.add(operand); + } } From 8824513cf1f9d54b13b18c95ad748c43dd2dd9fb Mon Sep 17 00:00:00 2001 From: hongxeob Date: Wed, 14 Jun 2023 21:39:15 +0900 Subject: [PATCH 48/77] =?UTF-8?q?refactor=20:=20PostfixConverter=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/programmers/PostfixConverterTest.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/programmers/PostfixConverterTest.java b/src/test/java/com/programmers/PostfixConverterTest.java index 14ee3917f..0037a121e 100644 --- a/src/test/java/com/programmers/PostfixConverterTest.java +++ b/src/test/java/com/programmers/PostfixConverterTest.java @@ -1,5 +1,6 @@ package com.programmers; +import com.programmers.core.Converter; import com.programmers.core.PostfixConverter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -14,12 +15,13 @@ public class PostfixConverterTest { @Test @DisplayName("후위 표기식 변환 성공 테스트") void postfixFormulaConversionSuccessful() throws Exception { + Converter postfixConverter = new PostfixConverter(); //given String formula1 = "1 + 2 * 3"; String formula2 = "3 + 5 / 1 + 2 / 2"; //when - List postfixFormula1 = PostfixConverter.convert(formula1); - List postfixFormula2 = PostfixConverter.convert(formula2); + List postfixFormula1 = postfixConverter.convert(formula1); + List postfixFormula2 = postfixConverter.convert(formula2); //then assertThat(postfixFormula1).containsExactly("1", "2", "3", "*", "+"); assertThat(postfixFormula2).containsExactly("3", "5", "1", "/", "+", "2", "2", "/", "+"); @@ -28,9 +30,11 @@ void postfixFormulaConversionSuccessful() throws Exception { @Test @DisplayName("후위 표기식 변환 실패 테스트") void postfixFormulaConversionFailed() throws Exception { + Converter postfixConverter = new PostfixConverter(); + String formula = "1 + 2 * 3 + a "; - Assertions.assertThrows(IllegalArgumentException.class, () -> PostfixConverter.convert(formula)); + Assertions.assertThrows(IllegalArgumentException.class, () -> postfixConverter.convert(formula)); } } From 84d699d5b099be9c78d7d08a67e4751f92d152d9 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Wed, 14 Jun 2023 22:00:59 +0900 Subject: [PATCH 49/77] =?UTF-8?q?refactor=20:=20AbstractConverter=20?= =?UTF-8?q?=EC=9D=B8=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=EB=A5=BC=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=ED=95=B4=20Calculator=20=EC=BA=A1=EC=8A=90?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/Calculator.java | 11 +++++------ .../com/programmers/model/AbstractCalculator.java | 5 +++++ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/programmers/model/AbstractCalculator.java diff --git a/src/main/java/com/programmers/Calculator.java b/src/main/java/com/programmers/Calculator.java index 00b1048c5..07e995234 100644 --- a/src/main/java/com/programmers/Calculator.java +++ b/src/main/java/com/programmers/Calculator.java @@ -2,21 +2,20 @@ import com.programmers.core.Converter; import com.programmers.core.Operators; -import com.programmers.core.PostfixConverter; +import com.programmers.model.AbstractCalculator; import com.programmers.util.StringUtil; import java.util.List; import java.util.Stack; -public class Calculator { +public class Calculator implements AbstractCalculator { private final Converter converter; - private final String formula; - public Calculator(String formula) { - this.formula = formula; - this.converter = new PostfixConverter(); + public Calculator(Converter converter) { + this.converter = converter; } + @Override public long calculate(String formula) { List postfix = converter.convert(formula); return calculatePostfixFormula(postfix); diff --git a/src/main/java/com/programmers/model/AbstractCalculator.java b/src/main/java/com/programmers/model/AbstractCalculator.java new file mode 100644 index 000000000..74df6d37e --- /dev/null +++ b/src/main/java/com/programmers/model/AbstractCalculator.java @@ -0,0 +1,5 @@ +package com.programmers.model; + +public interface AbstractCalculator { + long calculate(String formula); +} \ No newline at end of file From a39c737a04feff600cc0023dcbb507cadc993a30 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Wed, 14 Jun 2023 22:01:46 +0900 Subject: [PATCH 50/77] =?UTF-8?q?refactor=20:=20AbstractCalculator=20?= =?UTF-8?q?=EC=9D=98=EC=A1=B4=EC=84=B1=20=EC=A3=BC=EC=9E=85=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/Main.java | 7 ++++++- .../java/com/programmers/core/CalculatorManager.java | 9 ++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/programmers/Main.java b/src/main/java/com/programmers/Main.java index 6ed56744d..40bb1c78e 100644 --- a/src/main/java/com/programmers/Main.java +++ b/src/main/java/com/programmers/Main.java @@ -1,6 +1,9 @@ package com.programmers; import com.programmers.core.CalculatorManager; +import com.programmers.core.Converter; +import com.programmers.core.PostfixConverter; +import com.programmers.model.AbstractCalculator; import com.programmers.repository.CalculationRepository; import com.programmers.repository.InMemoryCalculationRepository; import com.programmers.view.Console; @@ -15,8 +18,10 @@ public static void main(String[] args) { Input reader = new Reader(); Output writer = new Writer(); Console console = new Console(reader, writer); + Converter converter = new PostfixConverter(); + AbstractCalculator calculator = new Calculator(converter); - CalculatorManager calculatorManager = new CalculatorManager(repository, console); + CalculatorManager calculatorManager = new CalculatorManager(repository, console, calculator); calculatorManager.run(); } } \ No newline at end of file diff --git a/src/main/java/com/programmers/core/CalculatorManager.java b/src/main/java/com/programmers/core/CalculatorManager.java index b93f4b08d..64da970e6 100644 --- a/src/main/java/com/programmers/core/CalculatorManager.java +++ b/src/main/java/com/programmers/core/CalculatorManager.java @@ -1,7 +1,7 @@ package com.programmers.core; -import com.programmers.Calculator; import com.programmers.error.ErrorMsg; +import com.programmers.model.AbstractCalculator; import com.programmers.model.CalculationResult; import com.programmers.repository.CalculationRepository; import com.programmers.view.Console; @@ -11,12 +11,15 @@ public class CalculatorManager { private final CalculationRepository repository; private final Console console; + private final AbstractCalculator calculator; + private static final String VIEW = "1", CALCULATION = "2", EXIT = "3"; - public CalculatorManager(CalculationRepository repository, Console console) { + public CalculatorManager(CalculationRepository repository, Console console, AbstractCalculator calculator) { this.repository = repository; this.console = console; + this.calculator = calculator; } @@ -65,7 +68,7 @@ private void saveAndPrintResult(String formula) { } private long sendToCalculator(String formula) { - Calculator calculator = new Calculator(formula); + calculator.calculate(formula); return calculator.calculate(formula); } From 07890c26418e17ba000e3ae5bc264a164dfbeec1 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Thu, 15 Jun 2023 17:41:36 +0900 Subject: [PATCH 51/77] =?UTF-8?q?refactor=20:=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=EC=9E=90=EB=A5=BC=20private=EC=9C=BC=EB=A1=9C=20=EC=84=A0?= =?UTF-8?q?=EC=96=B8=ED=95=98=EC=97=AC=20=ED=81=B4=EB=9E=98=EC=8A=A4?= =?UTF-8?q?=EC=9D=98=20=EC=9D=B8=EC=8A=A4=ED=84=B4=EC=8A=A4=ED=99=94=20?= =?UTF-8?q?=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/core/CalculatorManager.java | 13 ++++--- .../com/programmers/error/ErrorMessages.java | 34 +++++++++++++++++++ .../java/com/programmers/error/ErrorMsg.java | 12 ------- 3 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/programmers/error/ErrorMessages.java delete mode 100644 src/main/java/com/programmers/error/ErrorMsg.java diff --git a/src/main/java/com/programmers/core/CalculatorManager.java b/src/main/java/com/programmers/core/CalculatorManager.java index 64da970e6..191b70670 100644 --- a/src/main/java/com/programmers/core/CalculatorManager.java +++ b/src/main/java/com/programmers/core/CalculatorManager.java @@ -1,6 +1,6 @@ package com.programmers.core; -import com.programmers.error.ErrorMsg; +import com.programmers.error.ErrorMessages; import com.programmers.model.AbstractCalculator; import com.programmers.model.CalculationResult; import com.programmers.repository.CalculationRepository; @@ -20,7 +20,6 @@ public CalculatorManager(CalculationRepository repository, Console console, Abst this.repository = repository; this.console = console; this.calculator = calculator; - } public void run() { @@ -59,11 +58,11 @@ private void saveAndPrintResult(String formula) { repository.save(new CalculationResult(formula, result)); console.print(result); } catch (NumberFormatException e) { - console.print(ErrorMsg.OPERAND_IS_NOT_A_NUMBER); + console.print(ErrorMessages.getOperandIsNotANumberMsg()); } catch (IllegalArgumentException e) { - console.print(ErrorMsg.INVALID_OPERATOR_INPUT); + console.print(ErrorMessages.getInvalidOperatorInputMsg()); } catch (ArithmeticException e) { - console.print(ErrorMsg.ENTER_ZERO_FOR_DIVISION); + console.print(ErrorMessages.getEnterZeroForDivisionMsg()); } } @@ -81,12 +80,12 @@ private String inputMenu() { } private void wrongMenuSelection() { - console.print(ErrorMsg.INVALID_MENU_SELECTION); + console.print(ErrorMessages.getInvalidMenuSelectionMsg()); } private void recordCommandExecution(List calculationRecord) { if (isEmptyRecord(calculationRecord)) { - console.print(ErrorMsg.NO_CALCULATION_RECORDS); + console.print(ErrorMessages.getNoCalculationRecordsMsg()); return; } console.printList(calculationRecord); diff --git a/src/main/java/com/programmers/error/ErrorMessages.java b/src/main/java/com/programmers/error/ErrorMessages.java new file mode 100644 index 000000000..3bc512556 --- /dev/null +++ b/src/main/java/com/programmers/error/ErrorMessages.java @@ -0,0 +1,34 @@ +package com.programmers.error; + +public final class ErrorMessages { + + private static final String INVALID_MENU_SELECTION = "메뉴를 잘못 선택하셨습니다. 메뉴는 1,2,3만 가능합니다."; + private static final String ENTER_ZERO_FOR_DIVISION = "0으로는 나눌 수 없습니다. 0이 아닌 다른 숫자를 사용해 주세요."; + private static final String INVALID_OPERATOR_INPUT = "잘못된 수식입니다. +, -, *, / 연산만 가능합니다."; + private static final String NO_CALCULATION_RECORDS = "계산 기록이 없습니다. 먼저 계산 결과를 얻은 후 사용하세요."; + private static final String OPERAND_IS_NOT_A_NUMBER = "피연산자가 숫자가 아닙니다. 숫자를 입력해 주세요."; + + private ErrorMessages() { + throw new RuntimeException("ErrorMsg를 인스턴스화 하지 마세요"); + } + + public static String getInvalidMenuSelectionMsg() { + return INVALID_MENU_SELECTION; + } + + public static String getEnterZeroForDivisionMsg() { + return ENTER_ZERO_FOR_DIVISION; + } + + public static String getInvalidOperatorInputMsg() { + return INVALID_OPERATOR_INPUT; + } + + public static String getNoCalculationRecordsMsg() { + return NO_CALCULATION_RECORDS; + } + + public static String getOperandIsNotANumberMsg() { + return OPERAND_IS_NOT_A_NUMBER; + } +} diff --git a/src/main/java/com/programmers/error/ErrorMsg.java b/src/main/java/com/programmers/error/ErrorMsg.java deleted file mode 100644 index 22bd7a880..000000000 --- a/src/main/java/com/programmers/error/ErrorMsg.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.programmers.error; - -public final class ErrorMsg { - private ErrorMsg() { - } - - public final static String INVALID_MENU_SELECTION = "메뉴를 잘못 선택하셨습니다. 메뉴는 1,2,3만 가능합니다."; - public final static String ENTER_ZERO_FOR_DIVISION = "0으로는 나눌 수 없습니다. 0이 아닌 다른 숫자를 사용해 주세요."; - public final static String INVALID_OPERATOR_INPUT = "잘못된 수식입니다. +, -, *, / 연산만 가능합니다."; - public final static String NO_CALCULATION_RECORDS = "계산 기록이 없습니다. 먼저 계산 결과를 얻은 후 사용하세요."; - public final static String OPERAND_IS_NOT_A_NUMBER = "피연산자가 숫자가 아닙니다. 숫자를 입력해 주세요."; -} From 1eb0f8ca3dc2e652721af3d495082e1e3954a741 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Thu, 15 Jun 2023 20:23:19 +0900 Subject: [PATCH 52/77] =?UTF-8?q?refactor=20:=20=EB=AA=85=ED=99=95?= =?UTF-8?q?=ED=95=9C=20=EB=B3=80=EC=88=98=EB=AA=85=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/Calculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/programmers/Calculator.java b/src/main/java/com/programmers/Calculator.java index 07e995234..b47fb6896 100644 --- a/src/main/java/com/programmers/Calculator.java +++ b/src/main/java/com/programmers/Calculator.java @@ -21,9 +21,9 @@ public long calculate(String formula) { return calculatePostfixFormula(postfix); } - private long calculatePostfixFormula(List formula) { + private long calculatePostfixFormula(List postfix) { Stack stack = new Stack<>(); - for (String token : formula) { + for (String token : postfix) { if (StringUtil.isNumber(token)) { stack.push(StringUtil.convertStringToLong(token)); } else { From bfe384190203ed7b8857e7c8b785e24e28400d48 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Thu, 15 Jun 2023 22:09:06 +0900 Subject: [PATCH 53/77] =?UTF-8?q?style=20:=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EB=A9=94=EC=84=B8=EC=A7=80=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/com/programmers/error/ErrorMessages.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/programmers/error/ErrorMessages.java b/src/main/java/com/programmers/error/ErrorMessages.java index 3bc512556..a4562b560 100644 --- a/src/main/java/com/programmers/error/ErrorMessages.java +++ b/src/main/java/com/programmers/error/ErrorMessages.java @@ -2,7 +2,7 @@ public final class ErrorMessages { - private static final String INVALID_MENU_SELECTION = "메뉴를 잘못 선택하셨습니다. 메뉴는 1,2,3만 가능합니다."; + private static final String INVALID_MENU_SELECTION = "메뉴를 잘못 선택하셨습니다. 메뉴는 1,2,3 중에서 선택 가능합니다."; private static final String ENTER_ZERO_FOR_DIVISION = "0으로는 나눌 수 없습니다. 0이 아닌 다른 숫자를 사용해 주세요."; private static final String INVALID_OPERATOR_INPUT = "잘못된 수식입니다. +, -, *, / 연산만 가능합니다."; private static final String NO_CALCULATION_RECORDS = "계산 기록이 없습니다. 먼저 계산 결과를 얻은 후 사용하세요."; From 60b3fdb4825b023cc9e515eec0e32daf2bfcb941 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Thu, 15 Jun 2023 22:09:37 +0900 Subject: [PATCH 54/77] =?UTF-8?q?refactor=20:=20=EB=B6=88=ED=95=84?= =?UTF-8?q?=EC=9A=94=ED=95=9C=20private=20=EB=A9=94=EC=84=9C=EB=93=9C=20?= =?UTF-8?q?=EA=B0=84=EC=86=8C=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/core/CalculatorManager.java | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/programmers/core/CalculatorManager.java b/src/main/java/com/programmers/core/CalculatorManager.java index 191b70670..aa65e5c78 100644 --- a/src/main/java/com/programmers/core/CalculatorManager.java +++ b/src/main/java/com/programmers/core/CalculatorManager.java @@ -23,7 +23,7 @@ public CalculatorManager(CalculationRepository repository, Console console, Abst } public void run() { - boolean power = true; + Boolean power = true; while (power) { switch (inputMenu()) { @@ -36,6 +36,7 @@ public void run() { case EXIT: exitProgram(); power = false; + break; default: wrongMenuSelection(); } @@ -48,8 +49,7 @@ private void findAllCalculationHistory() { } private void calculatorProcessStart() { - String formula = getFormula(); - saveAndPrintResult(formula); + saveAndPrintResult(console.inputFormula()); } private void saveAndPrintResult(String formula) { @@ -66,37 +66,17 @@ private void saveAndPrintResult(String formula) { } } - private long sendToCalculator(String formula) { - calculator.calculate(formula); - return calculator.calculate(formula); - } - - private String getFormula() { - return console.inputFormula(); - } - - private String inputMenu() { - return console.inputMenu(); - } - private void wrongMenuSelection() { console.print(ErrorMessages.getInvalidMenuSelectionMsg()); } private void recordCommandExecution(List calculationRecord) { - if (isEmptyRecord(calculationRecord)) { + if (calculationRecord.isEmpty()) { console.print(ErrorMessages.getNoCalculationRecordsMsg()); return; } console.printList(calculationRecord); } - private boolean isEmptyRecord(List record) { - return record != null && record.size() == 0; - } - private void exitProgram() { - console.print("프로그램을 종료합니다."); - System.exit(0); - } } From ae953b9ff2e2e9e9590145555740b89c4a6572e1 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 00:02:21 +0900 Subject: [PATCH 55/77] =?UTF-8?q?refactor=20:=20=EB=A6=AC=ED=84=B4=20?= =?UTF-8?q?=ED=83=80=EC=9E=85,=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20ob?= =?UTF-8?q?ject=20=ED=98=95=ED=83=9C=EB=A1=9C=20=EA=B5=90=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/calculator/AbstractCalculator.java | 8 ++++++++ .../{ => core/calculator}/Calculator.java | 15 ++++++++++----- .../{model => core/data}/CalculationResult.java | 6 +++++- .../com/programmers/model/AbstractCalculator.java | 5 ----- .../repository/CalculationRepository.java | 2 +- 5 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/programmers/core/calculator/AbstractCalculator.java rename src/main/java/com/programmers/{ => core/calculator}/Calculator.java (66%) rename src/main/java/com/programmers/{model => core/data}/CalculationResult.java (76%) delete mode 100644 src/main/java/com/programmers/model/AbstractCalculator.java diff --git a/src/main/java/com/programmers/core/calculator/AbstractCalculator.java b/src/main/java/com/programmers/core/calculator/AbstractCalculator.java new file mode 100644 index 000000000..11c962731 --- /dev/null +++ b/src/main/java/com/programmers/core/calculator/AbstractCalculator.java @@ -0,0 +1,8 @@ +package com.programmers.core.calculator; + +import com.programmers.core.data.CalculationRequest; +import com.programmers.core.data.CalculationResult; + +public interface AbstractCalculator { + CalculationResult calculate(CalculationRequest request); +} \ No newline at end of file diff --git a/src/main/java/com/programmers/Calculator.java b/src/main/java/com/programmers/core/calculator/Calculator.java similarity index 66% rename from src/main/java/com/programmers/Calculator.java rename to src/main/java/com/programmers/core/calculator/Calculator.java index b47fb6896..40c4b6d47 100644 --- a/src/main/java/com/programmers/Calculator.java +++ b/src/main/java/com/programmers/core/calculator/Calculator.java @@ -1,8 +1,9 @@ -package com.programmers; +package com.programmers.core.calculator; -import com.programmers.core.Converter; import com.programmers.core.Operators; -import com.programmers.model.AbstractCalculator; +import com.programmers.core.converter.Converter; +import com.programmers.core.data.CalculationRequest; +import com.programmers.core.data.CalculationResult; import com.programmers.util.StringUtil; import java.util.List; @@ -16,9 +17,13 @@ public Calculator(Converter converter) { } @Override - public long calculate(String formula) { + public CalculationResult calculate(CalculationRequest request) { + String formula = request.getFormula(); List postfix = converter.convert(formula); - return calculatePostfixFormula(postfix); + long result = calculatePostfixFormula(postfix); +// request.updateResult(result); +// return request; + return new CalculationResult(formula, result); } private long calculatePostfixFormula(List postfix) { diff --git a/src/main/java/com/programmers/model/CalculationResult.java b/src/main/java/com/programmers/core/data/CalculationResult.java similarity index 76% rename from src/main/java/com/programmers/model/CalculationResult.java rename to src/main/java/com/programmers/core/data/CalculationResult.java index 1da2483e4..9f08b3338 100644 --- a/src/main/java/com/programmers/model/CalculationResult.java +++ b/src/main/java/com/programmers/core/data/CalculationResult.java @@ -1,4 +1,4 @@ -package com.programmers.model; +package com.programmers.core.data; public class CalculationResult { private String formula; @@ -13,4 +13,8 @@ public CalculationResult(String formula, long result) { public String toString() { return formula + " = " + result; } + + public long getResult() { + return result; + } } diff --git a/src/main/java/com/programmers/model/AbstractCalculator.java b/src/main/java/com/programmers/model/AbstractCalculator.java deleted file mode 100644 index 74df6d37e..000000000 --- a/src/main/java/com/programmers/model/AbstractCalculator.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.programmers.model; - -public interface AbstractCalculator { - long calculate(String formula); -} \ No newline at end of file diff --git a/src/main/java/com/programmers/repository/CalculationRepository.java b/src/main/java/com/programmers/repository/CalculationRepository.java index 05a6e85f6..2da57dd86 100644 --- a/src/main/java/com/programmers/repository/CalculationRepository.java +++ b/src/main/java/com/programmers/repository/CalculationRepository.java @@ -1,6 +1,6 @@ package com.programmers.repository; -import com.programmers.model.CalculationResult; +import com.programmers.core.data.CalculationResult; import java.util.List; From b9c4588135aa633bee9096522f4623843c1121a9 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 00:04:34 +0900 Subject: [PATCH 56/77] =?UTF-8?q?chore=20:=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?UTF-8?q?=20=EB=B6=84=EB=A5=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/programmers/core/{ => converter}/Converter.java | 2 +- .../programmers/repository/InMemoryCalculationRepository.java | 2 +- src/main/java/com/programmers/view/Console.java | 4 ++-- src/main/java/com/programmers/view/Output.java | 2 +- src/main/java/com/programmers/view/Writer.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/main/java/com/programmers/core/{ => converter}/Converter.java (71%) diff --git a/src/main/java/com/programmers/core/Converter.java b/src/main/java/com/programmers/core/converter/Converter.java similarity index 71% rename from src/main/java/com/programmers/core/Converter.java rename to src/main/java/com/programmers/core/converter/Converter.java index 3ef1480c0..cecf4f7a7 100644 --- a/src/main/java/com/programmers/core/Converter.java +++ b/src/main/java/com/programmers/core/converter/Converter.java @@ -1,4 +1,4 @@ -package com.programmers.core; +package com.programmers.core.converter; import java.util.List; diff --git a/src/main/java/com/programmers/repository/InMemoryCalculationRepository.java b/src/main/java/com/programmers/repository/InMemoryCalculationRepository.java index f70a4d549..b521c57eb 100644 --- a/src/main/java/com/programmers/repository/InMemoryCalculationRepository.java +++ b/src/main/java/com/programmers/repository/InMemoryCalculationRepository.java @@ -1,6 +1,6 @@ package com.programmers.repository; -import com.programmers.model.CalculationResult; +import com.programmers.core.data.CalculationResult; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/programmers/view/Console.java b/src/main/java/com/programmers/view/Console.java index b602da897..dc0425827 100644 --- a/src/main/java/com/programmers/view/Console.java +++ b/src/main/java/com/programmers/view/Console.java @@ -1,6 +1,6 @@ package com.programmers.view; -import com.programmers.model.CalculationResult; +import com.programmers.core.data.CalculationResult; import java.util.List; @@ -22,7 +22,7 @@ public String inputMenu() { output.print(VIEW_MESSAGE); output.print(CALCULATION_MESSAGE); output.print(EXITING_MESSAGE); - System.out.print(CHOICE); + output.print(CHOICE); return input.read(); } diff --git a/src/main/java/com/programmers/view/Output.java b/src/main/java/com/programmers/view/Output.java index 89f4ab244..115b1620a 100644 --- a/src/main/java/com/programmers/view/Output.java +++ b/src/main/java/com/programmers/view/Output.java @@ -1,6 +1,6 @@ package com.programmers.view; -import com.programmers.model.CalculationResult; +import com.programmers.core.data.CalculationResult; import java.util.List; diff --git a/src/main/java/com/programmers/view/Writer.java b/src/main/java/com/programmers/view/Writer.java index f54c709d8..61fe9dc1f 100644 --- a/src/main/java/com/programmers/view/Writer.java +++ b/src/main/java/com/programmers/view/Writer.java @@ -1,6 +1,6 @@ package com.programmers.view; -import com.programmers.model.CalculationResult; +import com.programmers.core.data.CalculationResult; import java.util.List; From f21b475180c72c00b57af55e23f805efd2f3a7d9 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 00:09:35 +0900 Subject: [PATCH 57/77] =?UTF-8?q?refactor=20:=20=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=20object=20=ED=98=95=ED=83=9C=EB=A1=9C=20?= =?UTF-8?q?=EA=B5=90=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/programmers/core/calculator/Calculator.java | 4 +--- .../java/com/programmers/core/converter/Converter.java | 4 +++- .../core/{ => converter}/PostfixConverter.java | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) rename src/main/java/com/programmers/core/{ => converter}/PostfixConverter.java (85%) diff --git a/src/main/java/com/programmers/core/calculator/Calculator.java b/src/main/java/com/programmers/core/calculator/Calculator.java index 40c4b6d47..2225e328f 100644 --- a/src/main/java/com/programmers/core/calculator/Calculator.java +++ b/src/main/java/com/programmers/core/calculator/Calculator.java @@ -19,10 +19,8 @@ public Calculator(Converter converter) { @Override public CalculationResult calculate(CalculationRequest request) { String formula = request.getFormula(); - List postfix = converter.convert(formula); + List postfix = converter.convert(request); long result = calculatePostfixFormula(postfix); -// request.updateResult(result); -// return request; return new CalculationResult(formula, result); } diff --git a/src/main/java/com/programmers/core/converter/Converter.java b/src/main/java/com/programmers/core/converter/Converter.java index cecf4f7a7..f5b5e02b2 100644 --- a/src/main/java/com/programmers/core/converter/Converter.java +++ b/src/main/java/com/programmers/core/converter/Converter.java @@ -1,7 +1,9 @@ package com.programmers.core.converter; +import com.programmers.core.data.CalculationRequest; + import java.util.List; public interface Converter { - List convert(String formula); + List convert(CalculationRequest formula); } diff --git a/src/main/java/com/programmers/core/PostfixConverter.java b/src/main/java/com/programmers/core/converter/PostfixConverter.java similarity index 85% rename from src/main/java/com/programmers/core/PostfixConverter.java rename to src/main/java/com/programmers/core/converter/PostfixConverter.java index 26af1118b..f8450af04 100644 --- a/src/main/java/com/programmers/core/PostfixConverter.java +++ b/src/main/java/com/programmers/core/converter/PostfixConverter.java @@ -1,5 +1,8 @@ -package com.programmers.core; +package com.programmers.core.converter; +import com.programmers.core.Operators; +import com.programmers.core.Priority; +import com.programmers.core.data.CalculationRequest; import com.programmers.util.StringUtil; import com.programmers.util.Validator; @@ -11,7 +14,8 @@ public class PostfixConverter implements Converter { private static final String SEPARATOR = " "; @Override - public List convert(String formula) { + public List convert(CalculationRequest request) { + String formula = request.getFormula(); List postfix = new ArrayList<>(); String[] splitFormula = formula.split(SEPARATOR); Stack stack = new Stack<>(); From e5d1c83d6cf05dc79aa209dd20b4a0387d0c5c4c Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 00:10:30 +0900 Subject: [PATCH 58/77] =?UTF-8?q?refactor=20:=20CalculatorManager=EC=9D=98?= =?UTF-8?q?=20=EC=97=AD=ED=95=A0=20=EB=B6=84=EB=8B=B4=20(SRP)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/Main.java | 17 ++++- .../programmers/core/CalculatorManager.java | 75 +++++++------------ .../core/data/CalculationRequest.java | 15 ++++ .../manager/CalculationRequestManager.java | 18 +++++ .../core/manager/CalculatorProcessor.java | 36 +++++++++ .../programmers/core/manager/MenuManager.java | 37 +++++++++ .../core/manager/ResultPrinter.java | 15 ++++ 7 files changed, 162 insertions(+), 51 deletions(-) create mode 100644 src/main/java/com/programmers/core/data/CalculationRequest.java create mode 100644 src/main/java/com/programmers/core/manager/CalculationRequestManager.java create mode 100644 src/main/java/com/programmers/core/manager/CalculatorProcessor.java create mode 100644 src/main/java/com/programmers/core/manager/MenuManager.java create mode 100644 src/main/java/com/programmers/core/manager/ResultPrinter.java diff --git a/src/main/java/com/programmers/Main.java b/src/main/java/com/programmers/Main.java index 40bb1c78e..afe3504b4 100644 --- a/src/main/java/com/programmers/Main.java +++ b/src/main/java/com/programmers/Main.java @@ -1,9 +1,14 @@ package com.programmers; import com.programmers.core.CalculatorManager; -import com.programmers.core.Converter; -import com.programmers.core.PostfixConverter; -import com.programmers.model.AbstractCalculator; +import com.programmers.core.calculator.AbstractCalculator; +import com.programmers.core.calculator.Calculator; +import com.programmers.core.converter.Converter; +import com.programmers.core.converter.PostfixConverter; +import com.programmers.core.manager.CalculationRequestManager; +import com.programmers.core.manager.CalculatorProcessor; +import com.programmers.core.manager.MenuManager; +import com.programmers.core.manager.ResultPrinter; import com.programmers.repository.CalculationRepository; import com.programmers.repository.InMemoryCalculationRepository; import com.programmers.view.Console; @@ -21,7 +26,11 @@ public static void main(String[] args) { Converter converter = new PostfixConverter(); AbstractCalculator calculator = new Calculator(converter); - CalculatorManager calculatorManager = new CalculatorManager(repository, console, calculator); + MenuManager menuManager = new MenuManager(console); + CalculationRequestManager requestManager = new CalculationRequestManager(console); + CalculatorProcessor calculatorProcessor = new CalculatorProcessor(calculator, repository, console); + ResultPrinter resultPrinter = new ResultPrinter(console); + CalculatorManager calculatorManager = new CalculatorManager(menuManager, requestManager, calculatorProcessor, resultPrinter, repository); calculatorManager.run(); } } \ No newline at end of file diff --git a/src/main/java/com/programmers/core/CalculatorManager.java b/src/main/java/com/programmers/core/CalculatorManager.java index aa65e5c78..244631744 100644 --- a/src/main/java/com/programmers/core/CalculatorManager.java +++ b/src/main/java/com/programmers/core/CalculatorManager.java @@ -1,82 +1,63 @@ package com.programmers.core; -import com.programmers.error.ErrorMessages; -import com.programmers.model.AbstractCalculator; -import com.programmers.model.CalculationResult; +import com.programmers.core.data.CalculationRequest; +import com.programmers.core.data.CalculationResult; +import com.programmers.core.manager.CalculationRequestManager; +import com.programmers.core.manager.CalculatorProcessor; +import com.programmers.core.manager.MenuManager; +import com.programmers.core.manager.ResultPrinter; import com.programmers.repository.CalculationRepository; -import com.programmers.view.Console; import java.util.List; public class CalculatorManager { + + private final MenuManager menuManager; + private final CalculationRequestManager requestManager; + private final CalculatorProcessor calculatorProcessor; + private final ResultPrinter resultPrinter; private final CalculationRepository repository; - private final Console console; - private final AbstractCalculator calculator; private static final String VIEW = "1", CALCULATION = "2", EXIT = "3"; - - public CalculatorManager(CalculationRepository repository, Console console, AbstractCalculator calculator) { + public CalculatorManager(MenuManager menuManager, CalculationRequestManager requestManager, CalculatorProcessor calculatorProcessor, ResultPrinter resultPrinter, CalculationRepository repository) { + this.menuManager = menuManager; + this.requestManager = requestManager; + this.calculatorProcessor = calculatorProcessor; + this.resultPrinter = resultPrinter; this.repository = repository; - this.console = console; - this.calculator = calculator; } public void run() { Boolean power = true; while (power) { - switch (inputMenu()) { + switch (menuManager.inputMenu()) { case VIEW: - findAllCalculationHistory(); + findRecord(); break; case CALCULATION: - calculatorProcessStart(); + calculatorProcess(); break; case EXIT: - exitProgram(); - power = false; + menuManager.printExitMessage(); break; default: - wrongMenuSelection(); + menuManager.printInvalidMenuSelection(); } } } - private void findAllCalculationHistory() { + private void findRecord() { List calculationRecord = repository.findAll(); - recordCommandExecution(calculationRecord); - } - - private void calculatorProcessStart() { - saveAndPrintResult(console.inputFormula()); + menuManager.printCalculationRecords(calculationRecord); } - private void saveAndPrintResult(String formula) { - try { - long result = sendToCalculator(formula); - repository.save(new CalculationResult(formula, result)); - console.print(result); - } catch (NumberFormatException e) { - console.print(ErrorMessages.getOperandIsNotANumberMsg()); - } catch (IllegalArgumentException e) { - console.print(ErrorMessages.getInvalidOperatorInputMsg()); - } catch (ArithmeticException e) { - console.print(ErrorMessages.getEnterZeroForDivisionMsg()); + private void calculatorProcess() { + CalculationRequest request = requestManager.createCalculationRequest(); + CalculationResult result = calculatorProcessor.performCalculation(request); + if (result != null) { + resultPrinter.printResult(result.getResult()); } } - - private void wrongMenuSelection() { - console.print(ErrorMessages.getInvalidMenuSelectionMsg()); - } - - private void recordCommandExecution(List calculationRecord) { - if (calculationRecord.isEmpty()) { - console.print(ErrorMessages.getNoCalculationRecordsMsg()); - return; - } - console.printList(calculationRecord); - } - - } diff --git a/src/main/java/com/programmers/core/data/CalculationRequest.java b/src/main/java/com/programmers/core/data/CalculationRequest.java new file mode 100644 index 000000000..c1c19edd3 --- /dev/null +++ b/src/main/java/com/programmers/core/data/CalculationRequest.java @@ -0,0 +1,15 @@ +package com.programmers.core.data; + +public class CalculationRequest { + + private final String formula; + + public CalculationRequest(String formula) { + this.formula = formula; + } + + public String getFormula() { + return formula; + } + +} diff --git a/src/main/java/com/programmers/core/manager/CalculationRequestManager.java b/src/main/java/com/programmers/core/manager/CalculationRequestManager.java new file mode 100644 index 000000000..c40a82982 --- /dev/null +++ b/src/main/java/com/programmers/core/manager/CalculationRequestManager.java @@ -0,0 +1,18 @@ +package com.programmers.core.manager; + +import com.programmers.core.data.CalculationRequest; +import com.programmers.view.Console; + +public class CalculationRequestManager { + private final Console console; + + public CalculationRequestManager(Console console) { + this.console = console; + } + + public CalculationRequest createCalculationRequest() { + String formula = console.inputFormula(); + return new CalculationRequest(formula); + } +} + diff --git a/src/main/java/com/programmers/core/manager/CalculatorProcessor.java b/src/main/java/com/programmers/core/manager/CalculatorProcessor.java new file mode 100644 index 000000000..807e94fe1 --- /dev/null +++ b/src/main/java/com/programmers/core/manager/CalculatorProcessor.java @@ -0,0 +1,36 @@ +package com.programmers.core.manager; + +import com.programmers.core.calculator.AbstractCalculator; +import com.programmers.core.data.CalculationRequest; +import com.programmers.core.data.CalculationResult; +import com.programmers.error.ErrorMessages; +import com.programmers.repository.CalculationRepository; +import com.programmers.view.Console; + +public class CalculatorProcessor { + private final AbstractCalculator calculator; + private final CalculationRepository repository; + private final Console console; + + public CalculatorProcessor(AbstractCalculator calculator, CalculationRepository repository, Console console) { + this.calculator = calculator; + this.repository = repository; + this.console = console; + } + + public CalculationResult performCalculation(CalculationRequest request) { + try { + CalculationResult result = calculator.calculate(request); + repository.save(result); + return result; + } catch (NumberFormatException e) { + console.print(ErrorMessages.getOperandIsNotANumberMsg()); + } catch (IllegalArgumentException e) { + console.print(ErrorMessages.getInvalidOperatorInputMsg()); + } catch (ArithmeticException e) { + console.print(ErrorMessages.getEnterZeroForDivisionMsg()); + } + return null; + } +} + diff --git a/src/main/java/com/programmers/core/manager/MenuManager.java b/src/main/java/com/programmers/core/manager/MenuManager.java new file mode 100644 index 000000000..bf1583c45 --- /dev/null +++ b/src/main/java/com/programmers/core/manager/MenuManager.java @@ -0,0 +1,37 @@ +package com.programmers.core.manager; + +import com.programmers.core.data.CalculationResult; +import com.programmers.error.ErrorMessages; +import com.programmers.view.Console; + +import java.util.List; + +public class MenuManager { + + private final Console console; + + public MenuManager(Console console) { + this.console = console; + } + + public String inputMenu() { + return console.inputMenu(); + } + + public void printInvalidMenuSelection() { + console.print(ErrorMessages.getInvalidMenuSelectionMsg()); + } + + public void printExitMessage() { + console.print("프로그램을 종료합니다."); + } + + public void printCalculationRecords(List calculationRecord) { + if (calculationRecord.isEmpty()) { + console.print(ErrorMessages.getNoCalculationRecordsMsg()); + } else { + console.printList(calculationRecord); + } + } +} + diff --git a/src/main/java/com/programmers/core/manager/ResultPrinter.java b/src/main/java/com/programmers/core/manager/ResultPrinter.java new file mode 100644 index 000000000..a7d6a819e --- /dev/null +++ b/src/main/java/com/programmers/core/manager/ResultPrinter.java @@ -0,0 +1,15 @@ +package com.programmers.core.manager; + +import com.programmers.view.Console; + +public class ResultPrinter { + private final Console console; + + public ResultPrinter(Console console) { + this.console = console; + } + + public void printResult(long result) { + console.print(result); + } +} From b1c06c78e28ad3ed20095ea78bbd004240a6439e Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 00:18:15 +0900 Subject: [PATCH 59/77] =?UTF-8?q?refactor=20:=20=EC=98=A4=ED=83=88?= =?UTF-8?q?=EC=9E=90=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=B3=80=EC=88=98?= =?UTF-8?q?=EB=AA=85=20=EC=A7=81=EA=B4=80=EC=A0=81=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/util/Validator.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/programmers/util/Validator.java b/src/main/java/com/programmers/util/Validator.java index 9d4196132..e073f106e 100644 --- a/src/main/java/com/programmers/util/Validator.java +++ b/src/main/java/com/programmers/util/Validator.java @@ -7,11 +7,13 @@ public static boolean isOperatorCheck(int position) { } public static void checkEmpty(String[] splitFormula) { - if (isEmpty(splitFormula)) ; + if (isEmpty(splitFormula)) { + throw new IllegalArgumentException(); + } } - private static boolean isEmpty(String[] splitFormula) { - return splitFormula != null && splitFormula.length == 0; + private static boolean isEmpty(String[] list) { + return list != null && list.length == 0; } } From d9d1de5098f88d34ef58598cedc31a4b50ca7337 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 00:18:43 +0900 Subject: [PATCH 60/77] =?UTF-8?q?style=20:=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/programmers/core/converter/PostfixConverter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/programmers/core/converter/PostfixConverter.java b/src/main/java/com/programmers/core/converter/PostfixConverter.java index f8450af04..aeca42de4 100644 --- a/src/main/java/com/programmers/core/converter/PostfixConverter.java +++ b/src/main/java/com/programmers/core/converter/PostfixConverter.java @@ -16,11 +16,12 @@ public class PostfixConverter implements Converter { @Override public List convert(CalculationRequest request) { String formula = request.getFormula(); - List postfix = new ArrayList<>(); String[] splitFormula = formula.split(SEPARATOR); - Stack stack = new Stack<>(); Validator.checkEmpty(splitFormula); + List postfix = new ArrayList<>(); + Stack stack = new Stack<>(); + for (int position = 0; position < splitFormula.length; position++) { String eachFormula = splitFormula[position]; From fa161857fd60a6b8540814ab9a8fd85f11725d1b Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 00:24:33 +0900 Subject: [PATCH 61/77] =?UTF-8?q?style=20:=20=EA=B0=9C=ED=96=89=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 --- .../java/com/programmers/core/converter/PostfixConverter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/programmers/core/converter/PostfixConverter.java b/src/main/java/com/programmers/core/converter/PostfixConverter.java index aeca42de4..4f821c1ae 100644 --- a/src/main/java/com/programmers/core/converter/PostfixConverter.java +++ b/src/main/java/com/programmers/core/converter/PostfixConverter.java @@ -34,6 +34,7 @@ public List convert(CalculationRequest request) { while (!stack.isEmpty()) { postfix.add(stack.pop()); } + return postfix; } @@ -58,4 +59,4 @@ private void putOperand(String operand, List postfix) { } postfix.add(operand); } -} +} \ No newline at end of file From ae8527962a383aa9850936e3222ff6b29d282210 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 00:29:31 +0900 Subject: [PATCH 62/77] =?UTF-8?q?refactor=20:=20=EC=B6=94=EC=83=81?= =?UTF-8?q?=EC=B2=B4=EC=99=80=20=EA=B5=AC=ED=98=84=EC=B2=B4=EB=A5=BC=20?= =?UTF-8?q?=EC=A2=80=20=EB=8D=94=20=EB=AA=85=ED=99=95=ED=95=9C=20=EB=84=A4?= =?UTF-8?q?=EC=9D=B4=EB=B0=8D=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/programmers/Main.java | 4 +- .../core/calculator/Calculator.java | 42 ++---------------- .../core/calculator/PostfixCalculator.java | 44 +++++++++++++++++++ .../core/manager/CalculatorProcessor.java | 6 +-- 4 files changed, 52 insertions(+), 44 deletions(-) create mode 100644 src/main/java/com/programmers/core/calculator/PostfixCalculator.java diff --git a/src/main/java/com/programmers/Main.java b/src/main/java/com/programmers/Main.java index afe3504b4..1ab73228e 100644 --- a/src/main/java/com/programmers/Main.java +++ b/src/main/java/com/programmers/Main.java @@ -1,8 +1,8 @@ package com.programmers; import com.programmers.core.CalculatorManager; -import com.programmers.core.calculator.AbstractCalculator; import com.programmers.core.calculator.Calculator; +import com.programmers.core.calculator.PostfixCalculator; import com.programmers.core.converter.Converter; import com.programmers.core.converter.PostfixConverter; import com.programmers.core.manager.CalculationRequestManager; @@ -24,7 +24,7 @@ public static void main(String[] args) { Output writer = new Writer(); Console console = new Console(reader, writer); Converter converter = new PostfixConverter(); - AbstractCalculator calculator = new Calculator(converter); + Calculator calculator = new PostfixCalculator(converter); MenuManager menuManager = new MenuManager(console); CalculationRequestManager requestManager = new CalculationRequestManager(console); diff --git a/src/main/java/com/programmers/core/calculator/Calculator.java b/src/main/java/com/programmers/core/calculator/Calculator.java index 2225e328f..e0a301c27 100644 --- a/src/main/java/com/programmers/core/calculator/Calculator.java +++ b/src/main/java/com/programmers/core/calculator/Calculator.java @@ -1,44 +1,8 @@ package com.programmers.core.calculator; -import com.programmers.core.Operators; -import com.programmers.core.converter.Converter; import com.programmers.core.data.CalculationRequest; import com.programmers.core.data.CalculationResult; -import com.programmers.util.StringUtil; -import java.util.List; -import java.util.Stack; - -public class Calculator implements AbstractCalculator { - private final Converter converter; - - public Calculator(Converter converter) { - this.converter = converter; - } - - @Override - public CalculationResult calculate(CalculationRequest request) { - String formula = request.getFormula(); - List postfix = converter.convert(request); - long result = calculatePostfixFormula(postfix); - return new CalculationResult(formula, result); - } - - private long calculatePostfixFormula(List postfix) { - Stack stack = new Stack<>(); - for (String token : postfix) { - if (StringUtil.isNumber(token)) { - stack.push(StringUtil.convertStringToLong(token)); - } else { - calculateTop(stack, token); - } - } - return stack.pop(); - } - - private void calculateTop(Stack stack, String token) { - Long num2 = stack.pop(); - Long num1 = stack.pop(); - stack.push(Operators.calculate(token, num1, num2)); - } -} +public interface Calculator { + CalculationResult calculate(CalculationRequest request); +} \ No newline at end of file diff --git a/src/main/java/com/programmers/core/calculator/PostfixCalculator.java b/src/main/java/com/programmers/core/calculator/PostfixCalculator.java new file mode 100644 index 000000000..c3c0b1ea4 --- /dev/null +++ b/src/main/java/com/programmers/core/calculator/PostfixCalculator.java @@ -0,0 +1,44 @@ +package com.programmers.core.calculator; + +import com.programmers.core.Operators; +import com.programmers.core.converter.Converter; +import com.programmers.core.data.CalculationRequest; +import com.programmers.core.data.CalculationResult; +import com.programmers.util.StringUtil; + +import java.util.List; +import java.util.Stack; + +public class PostfixCalculator implements Calculator { + private final Converter converter; + + public PostfixCalculator(Converter converter) { + this.converter = converter; + } + + @Override + public CalculationResult calculate(CalculationRequest request) { + String formula = request.getFormula(); + List postfix = converter.convert(request); + long result = calculatePostfixFormula(postfix); + return new CalculationResult(formula, result); + } + + private long calculatePostfixFormula(List postfix) { + Stack stack = new Stack<>(); + for (String token : postfix) { + if (StringUtil.isNumber(token)) { + stack.push(StringUtil.convertStringToLong(token)); + } else { + calculateTop(stack, token); + } + } + return stack.pop(); + } + + private void calculateTop(Stack stack, String token) { + Long num2 = stack.pop(); + Long num1 = stack.pop(); + stack.push(Operators.calculate(token, num1, num2)); + } +} diff --git a/src/main/java/com/programmers/core/manager/CalculatorProcessor.java b/src/main/java/com/programmers/core/manager/CalculatorProcessor.java index 807e94fe1..71f5df95a 100644 --- a/src/main/java/com/programmers/core/manager/CalculatorProcessor.java +++ b/src/main/java/com/programmers/core/manager/CalculatorProcessor.java @@ -1,6 +1,6 @@ package com.programmers.core.manager; -import com.programmers.core.calculator.AbstractCalculator; +import com.programmers.core.calculator.Calculator; import com.programmers.core.data.CalculationRequest; import com.programmers.core.data.CalculationResult; import com.programmers.error.ErrorMessages; @@ -8,11 +8,11 @@ import com.programmers.view.Console; public class CalculatorProcessor { - private final AbstractCalculator calculator; + private final Calculator calculator; private final CalculationRepository repository; private final Console console; - public CalculatorProcessor(AbstractCalculator calculator, CalculationRepository repository, Console console) { + public CalculatorProcessor(Calculator calculator, CalculationRepository repository, Console console) { this.calculator = calculator; this.repository = repository; this.console = console; From ce23bdbfe857335d709eeecd14440c20a7612d0f Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 00:31:29 +0900 Subject: [PATCH 63/77] =?UTF-8?q?refactor=20:=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=EC=97=90=20final=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/com/programmers/core/data/CalculationResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/programmers/core/data/CalculationResult.java b/src/main/java/com/programmers/core/data/CalculationResult.java index 9f08b3338..5b75f00b6 100644 --- a/src/main/java/com/programmers/core/data/CalculationResult.java +++ b/src/main/java/com/programmers/core/data/CalculationResult.java @@ -2,7 +2,7 @@ public class CalculationResult { private String formula; - private long result; + private final long result; public CalculationResult(String formula, long result) { this.formula = formula; From e4d798419ef1dd8cd9397ccdfc0e6c8182872104 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 00:49:12 +0900 Subject: [PATCH 64/77] =?UTF-8?q?refactor=20:=20=EC=9C=A0=ED=8B=B8=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EA=B0=80=20=EC=9D=B8=EC=8A=A4?= =?UTF-8?q?=ED=84=B4=EC=8A=A4=ED=99=94=20=EB=90=98=EC=A7=80=20=EB=AA=BB?= =?UTF-8?q?=ED=95=98=EA=B2=8C=20=EC=88=98=EC=A0=95,=20null=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=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/com/programmers/util/StringUtil.java | 10 +++++++++- src/main/java/com/programmers/util/Validator.java | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/programmers/util/StringUtil.java b/src/main/java/com/programmers/util/StringUtil.java index 33faad3f9..c1e01bbe8 100644 --- a/src/main/java/com/programmers/util/StringUtil.java +++ b/src/main/java/com/programmers/util/StringUtil.java @@ -1,9 +1,17 @@ package com.programmers.util; -public class StringUtil { +public final class StringUtil { + private StringUtil() { + throw new AssertionError("StringUtil 클래스는 인스턴스화 할 수 없습니다."); + } + private static final String NUMBER_REGEX = "-?\\d+(\\.\\d+)?"; public static boolean isNumber(String unCheckedToken) { + if (unCheckedToken == null) { + throw new IllegalArgumentException(); + } + return unCheckedToken.matches(NUMBER_REGEX); } diff --git a/src/main/java/com/programmers/util/Validator.java b/src/main/java/com/programmers/util/Validator.java index e073f106e..c4900220a 100644 --- a/src/main/java/com/programmers/util/Validator.java +++ b/src/main/java/com/programmers/util/Validator.java @@ -1,6 +1,9 @@ package com.programmers.util; -public class Validator { +public final class Validator { + private Validator() { + throw new AssertionError("Validator 클래스는 인스턴스화 할 수 없습니다."); + } public static boolean isOperatorCheck(int position) { return (position + 1) % 2 == 0; From c67121b2e80d37badf21201f951c6b3c24160f2e Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 00:51:29 +0900 Subject: [PATCH 65/77] =?UTF-8?q?refactor=20:=20=ED=95=B4=EB=8B=B9=20?= =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=EA=B0=80=20=ED=95=9C=EB=B2=88?= =?UTF-8?q?=EB=A7=8C=20=EC=82=AC=EC=9A=A9=EB=90=98=EB=AF=80=EB=A1=9C=20?= =?UTF-8?q?=EC=B6=94=EC=B6=9C=ED=95=98=EC=A7=80=20=EC=95=8A=EA=B3=A0=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/programmers/core/calculator/PostfixCalculator.java | 3 ++- src/main/java/com/programmers/util/StringUtil.java | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/programmers/core/calculator/PostfixCalculator.java b/src/main/java/com/programmers/core/calculator/PostfixCalculator.java index c3c0b1ea4..26e44cf8d 100644 --- a/src/main/java/com/programmers/core/calculator/PostfixCalculator.java +++ b/src/main/java/com/programmers/core/calculator/PostfixCalculator.java @@ -28,11 +28,12 @@ private long calculatePostfixFormula(List postfix) { Stack stack = new Stack<>(); for (String token : postfix) { if (StringUtil.isNumber(token)) { - stack.push(StringUtil.convertStringToLong(token)); + stack.push(Long.parseLong(token)); } else { calculateTop(stack, token); } } + return stack.pop(); } diff --git a/src/main/java/com/programmers/util/StringUtil.java b/src/main/java/com/programmers/util/StringUtil.java index c1e01bbe8..810b15219 100644 --- a/src/main/java/com/programmers/util/StringUtil.java +++ b/src/main/java/com/programmers/util/StringUtil.java @@ -14,8 +14,4 @@ public static boolean isNumber(String unCheckedToken) { return unCheckedToken.matches(NUMBER_REGEX); } - - public static long convertStringToLong(String token) { - return Long.parseLong(token); - } } From d923d2bb351bb5e82f2c8a473549ec76c6ba5e55 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 12:42:07 +0900 Subject: [PATCH 66/77] =?UTF-8?q?test=20:=20=ED=81=B4=EB=9E=98=EC=8A=A4=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/core/calculator/AbstractCalculator.java | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 src/main/java/com/programmers/core/calculator/AbstractCalculator.java diff --git a/src/main/java/com/programmers/core/calculator/AbstractCalculator.java b/src/main/java/com/programmers/core/calculator/AbstractCalculator.java deleted file mode 100644 index 11c962731..000000000 --- a/src/main/java/com/programmers/core/calculator/AbstractCalculator.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.programmers.core.calculator; - -import com.programmers.core.data.CalculationRequest; -import com.programmers.core.data.CalculationResult; - -public interface AbstractCalculator { - CalculationResult calculate(CalculationRequest request); -} \ No newline at end of file From 191cad9081fd70e66814ce87ae5a7ee354eff428 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 12:44:04 +0900 Subject: [PATCH 67/77] =?UTF-8?q?refactor=20:=20=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=20=EB=AA=85=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/core/converter/Converter.java | 2 +- .../core/data/CalculationResult.java | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/programmers/core/converter/Converter.java b/src/main/java/com/programmers/core/converter/Converter.java index f5b5e02b2..22e177bbb 100644 --- a/src/main/java/com/programmers/core/converter/Converter.java +++ b/src/main/java/com/programmers/core/converter/Converter.java @@ -5,5 +5,5 @@ import java.util.List; public interface Converter { - List convert(CalculationRequest formula); + List convert(CalculationRequest request); } diff --git a/src/main/java/com/programmers/core/data/CalculationResult.java b/src/main/java/com/programmers/core/data/CalculationResult.java index 5b75f00b6..42fc30cc2 100644 --- a/src/main/java/com/programmers/core/data/CalculationResult.java +++ b/src/main/java/com/programmers/core/data/CalculationResult.java @@ -9,12 +9,25 @@ public CalculationResult(String formula, long result) { this.result = result; } + public long getResult() { + return result; + } + @Override public String toString() { return formula + " = " + result; } - public long getResult() { - return result; - } +// @Override +// public boolean equals(Object o) { +// if (this == o) return true; +// if (o == null || getClass() != o.getClass()) return false; +// CalculationResult that = (CalculationResult) o; +// return Objects.equals(formula, that.formula) && result == that.result; +// } +// +// @Override +// public int hashCode() { +// return Objects.hash(formula, result); +// } } From 52032d122c40c90e45d05f63c811581163a6968c Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 13:30:52 +0900 Subject: [PATCH 68/77] =?UTF-8?q?refactor=20:=20null=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=EA=B2=80=EC=82=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/programmers/core/converter/PostfixConverter.java | 2 ++ src/main/java/com/programmers/util/Validator.java | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/src/main/java/com/programmers/core/converter/PostfixConverter.java b/src/main/java/com/programmers/core/converter/PostfixConverter.java index 4f821c1ae..bbc39eee2 100644 --- a/src/main/java/com/programmers/core/converter/PostfixConverter.java +++ b/src/main/java/com/programmers/core/converter/PostfixConverter.java @@ -16,6 +16,8 @@ public class PostfixConverter implements Converter { @Override public List convert(CalculationRequest request) { String formula = request.getFormula(); + Validator.checkNull(formula); + String[] splitFormula = formula.split(SEPARATOR); Validator.checkEmpty(splitFormula); diff --git a/src/main/java/com/programmers/util/Validator.java b/src/main/java/com/programmers/util/Validator.java index c4900220a..a453f1fda 100644 --- a/src/main/java/com/programmers/util/Validator.java +++ b/src/main/java/com/programmers/util/Validator.java @@ -19,4 +19,13 @@ private static boolean isEmpty(String[] list) { return list != null && list.length == 0; } + public static void checkNull(String input) { + if (isNull(input)) { + throw new IllegalArgumentException(); + } + } + + private static boolean isNull(String input) { + return input == null; + } } From 186e74f23dd1311e95d5ced3ad66051f28eac20b Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 13:35:24 +0900 Subject: [PATCH 69/77] =?UTF-8?q?test=20:=20Calculator=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/programmers/CalculatorTest.java | 113 +++++++++++------- 1 file changed, 69 insertions(+), 44 deletions(-) diff --git a/src/test/java/com/programmers/CalculatorTest.java b/src/test/java/com/programmers/CalculatorTest.java index 1a22f73a4..0b8960d60 100644 --- a/src/test/java/com/programmers/CalculatorTest.java +++ b/src/test/java/com/programmers/CalculatorTest.java @@ -1,96 +1,121 @@ package com.programmers; -import org.junit.jupiter.api.Assertions; +import com.programmers.core.calculator.PostfixCalculator; +import com.programmers.core.converter.Converter; +import com.programmers.core.converter.PostfixConverter; +import com.programmers.core.data.CalculationRequest; +import com.programmers.core.data.CalculationResult; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class CalculatorTest { + private PostfixCalculator calculator; + + @BeforeEach + void setUp() { + Converter converter = new PostfixConverter(); + calculator = new PostfixCalculator(converter); + } @Test - @DisplayName("덧셈 테스트") + @DisplayName("더하기 테스트") void addTest() throws Exception { //given - Calculator calculator = new Calculator("1 + 1"); - Calculator calculator2 = new Calculator("2 + 2"); + CalculationRequest request = new CalculationRequest("1 + 2"); + CalculationResult expected = new CalculationResult(request.getFormula(), 3); + //when - long result = calculator.calculate("1 + 1"); - long result2 = calculator2.calculate("2 + 2"); + CalculationResult result = calculator.calculate(request); //then - assertThat(result).isEqualTo(2); - assertThat(result2).isEqualTo(4); + assertThat(result.getResult()).isEqualTo(expected.getResult()); } @Test - @DisplayName("뺄셈 테스트") - void subtractTest() throws Exception { + @DisplayName("빼기 테스트") + void subtractionTest() throws Exception { //given - Calculator calculator = new Calculator("1 - 1"); + CalculationRequest request = new CalculationRequest("1 - 2"); + CalculationResult expected = new CalculationResult(request.getFormula(), -1); + //when - long result = calculator.calculate("1 - 1"); + CalculationResult result = calculator.calculate(request); + //then - assertThat(result).isEqualTo(0); + assertThat(result.getResult()).isEqualTo(expected.getResult()); } + @Test @DisplayName("곱하기 테스트") void multiplyTest() throws Exception { //given - Calculator calculator = new Calculator("2 * 2 * 3"); + CalculationRequest request = new CalculationRequest("2 * 2"); + CalculationResult expected = new CalculationResult(request.getFormula(), 4); + //when - long result = calculator.calculate("2 * 2 * 3"); + CalculationResult result = calculator.calculate(request); + //then - assertThat(result).isEqualTo(12); + assertThat(result.getResult()).isEqualTo(expected.getResult()); } + @Test @DisplayName("나누기 테스트") void divideTest() throws Exception { //given - Calculator calculator = new Calculator("6 / 2 / 3"); + CalculationRequest request = new CalculationRequest("2 / 2"); + CalculationResult expected = new CalculationResult(request.getFormula(), 1); + //when - long result = calculator.calculate("6 / 2 / 3"); + CalculationResult result = calculator.calculate(request); + //then - assertThat(result).isEqualTo(1); + assertThat(result.getResult()).isEqualTo(expected.getResult()); } - @Test - @DisplayName("우선 순위 테스트") - void priorityTest() throws Exception { - //given - Calculator calculator = new Calculator("2 + 2 * 3 / 3"); - - //when - long result = calculator.calculate("2 + 2 * 3 / 3"); + @DisplayName("계산 실패_잘못된 수식") + public void testInvalidFormula() { + CalculationRequest request = new CalculationRequest("3 4 + +"); - //then - assertThat(result).isEqualTo(4); + assertThrows(IllegalArgumentException.class, () -> calculator.calculate(request)); } + @Test + @DisplayName("계산 실패_빈 수식") + void testEmptyFormula() throws Exception { + CalculationRequest request = new CalculationRequest(""); - @ParameterizedTest - @ValueSource(strings = {"2 / 0 ", "1 + 3 * 10 / 0", "2 - 3 + 2 / 0 * 5"}) - @DisplayName("0으로 나눌시 예외 발생 테스트") - void divideZeroTest(String formula) throws Exception { - Calculator calculator = new Calculator(formula); - - Assertions.assertThrows(ArithmeticException.class, () -> calculator.calculate(formula)); + assertThrows(IllegalArgumentException.class, () -> calculator.calculate(request)); } - @ParameterizedTest - @ValueSource(strings = {"", "1 + a", "2 2", "1 + +", "a B C d"}) - @DisplayName("숫자,연산외 다른 문자 입력시 예외") - void wrongFormulaTest(String formula) throws Exception { - Calculator calculator = new Calculator(formula); + @Test + @DisplayName("계산 실패_null값") + void testNullFormula() throws Exception { + CalculationRequest request = new CalculationRequest(null); - Assertions.assertThrows(IllegalArgumentException.class, () -> calculator.calculate(formula)); + assertThrows(IllegalArgumentException.class, () -> calculator.calculate(request)); + } + @Test + @DisplayName("계산 실패_피연산자가 아닌 문자열 입력") + void testInvalidOperand() throws Exception { + CalculationRequest request = new CalculationRequest("3 + a"); + assertThrows(NumberFormatException.class, () -> calculator.calculate(request)); } + @Test + @DisplayName("계산 실패_0으로 나누는 경우") + void testDivideByZero() throws Exception { + CalculationRequest request = new CalculationRequest("3 / 0"); + + assertThrows(ArithmeticException.class, () -> calculator.calculate(request)); + } } From 067aad399e9605da2498954d31cd9a6466bf1602 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 13:43:18 +0900 Subject: [PATCH 70/77] =?UTF-8?q?test=20:=20Validator=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/programmers/util/ValidatorTest.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/test/java/com/programmers/util/ValidatorTest.java diff --git a/src/test/java/com/programmers/util/ValidatorTest.java b/src/test/java/com/programmers/util/ValidatorTest.java new file mode 100644 index 000000000..a5fc5d373 --- /dev/null +++ b/src/test/java/com/programmers/util/ValidatorTest.java @@ -0,0 +1,35 @@ +package com.programmers.util; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertThrows; + +class ValidatorTest { + @Test + @DisplayName("올바른 위치에 연산자 유무 체크") + void testOperatorPositionCheck() throws Exception { + Assertions.assertTrue(Validator.isOperatorCheck(1)); + Assertions.assertTrue(Validator.isOperatorCheck(3)); + + Assertions.assertFalse(Validator.isOperatorCheck(0)); + Assertions.assertFalse(Validator.isOperatorCheck(2)); + } + + @Test + @DisplayName("빈칸 체크") + void testCheckEmpty() throws Exception { + assertThrows(IllegalArgumentException.class, () -> Validator.checkEmpty(new String[0])); + + assertDoesNotThrow(() -> Validator.checkEmpty(new String[]{"1,", "+", "2"})); + } + @Test + @DisplayName("null 체크") + void testCheckNull() throws Exception { + assertThrows(IllegalArgumentException.class, () -> Validator.checkNull(null)); + assertDoesNotThrow(() -> Validator.checkNull("1 + 2")); + + } +} \ No newline at end of file From b860458475eb7d6f077de5797bab7d847faa8dce Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 13:48:37 +0900 Subject: [PATCH 71/77] =?UTF-8?q?test=20:=20StringUtil=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/programmers/util/StringUtilTest.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/test/java/com/programmers/util/StringUtilTest.java diff --git a/src/test/java/com/programmers/util/StringUtilTest.java b/src/test/java/com/programmers/util/StringUtilTest.java new file mode 100644 index 000000000..50c29fb20 --- /dev/null +++ b/src/test/java/com/programmers/util/StringUtilTest.java @@ -0,0 +1,25 @@ +package com.programmers.util; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class StringUtilTest { + @Test + @DisplayName("숫자인지 확인") + void testValidNumber() throws Exception { + assertTrue(StringUtil.isNumber("123")); + assertTrue(StringUtil.isNumber("0")); + } + + @Test + @DisplayName("숫자외 형식") + void testInvalidNumber() throws Exception { + assertFalse(StringUtil.isNumber("asb")); + assertFalse(StringUtil.isNumber("!@#$")); + assertFalse(StringUtil.isNumber("-")); + assertFalse(StringUtil.isNumber(".")); + } +} \ No newline at end of file From 4895bf1cc475a90162316fbfeba4d4ac0e2385de Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 14:02:05 +0900 Subject: [PATCH 72/77] =?UTF-8?q?test=20:=20=EC=A4=91=EB=B3=B5=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InMemoryCalculationRepositoryTest.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/test/java/com/programmers/repository/InMemoryCalculationRepositoryTest.java b/src/test/java/com/programmers/repository/InMemoryCalculationRepositoryTest.java index 6c661b3c1..0b29402ed 100644 --- a/src/test/java/com/programmers/repository/InMemoryCalculationRepositoryTest.java +++ b/src/test/java/com/programmers/repository/InMemoryCalculationRepositoryTest.java @@ -1,6 +1,6 @@ package com.programmers.repository; -import com.programmers.model.CalculationResult; +import com.programmers.core.data.CalculationResult; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -15,17 +15,14 @@ class InMemoryCalculationRepositoryTest { @DisplayName("계산이력 저장 테스트") void 계산이력저장() throws Exception { //given - CalculationResult result1 = new CalculationResult("1 + 2 * 3 ", 7); - CalculationResult result2 = new CalculationResult("2 + 4 * 3 - 5 * 2 ", 4); + CalculationResult[] results = {new CalculationResult("1 + 2 * 3 ", 7), new CalculationResult("2 + 4 * 3 - 5 * 2 ", 4)}; //when - repository.save(result1); - repository.save(result2); + for (CalculationResult result : results) { + repository.save(result); + } //then List record = repository.findAll(); - System.out.println(record.get(0)); - assertThat(record.size()).isEqualTo(2); - assertThat(record).contains(result1, result2); - assertThat(record.get(0)).isEqualTo(result1); - assertThat(record.get(1)).isEqualTo(result2); + assertThat(record.size()).isEqualTo(results.length); + assertThat(record).containsExactlyInAnyOrder(results); } } \ No newline at end of file From 598b1c7f0ad76b88a4bede70805d248366dc3226 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 14:04:09 +0900 Subject: [PATCH 73/77] =?UTF-8?q?test=20:=20null=20=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/com/programmers/util/StringUtilTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/java/com/programmers/util/StringUtilTest.java b/src/test/java/com/programmers/util/StringUtilTest.java index 50c29fb20..f721f34df 100644 --- a/src/test/java/com/programmers/util/StringUtilTest.java +++ b/src/test/java/com/programmers/util/StringUtilTest.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; class StringUtilTest { @@ -22,4 +23,10 @@ void testInvalidNumber() throws Exception { assertFalse(StringUtil.isNumber("-")); assertFalse(StringUtil.isNumber(".")); } + + @Test + @DisplayName("null 형식") + void nullInput() throws Exception { + assertThrows(IllegalArgumentException.class, () -> StringUtil.isNumber(null)); + } } \ No newline at end of file From 3f3369287102483f09af484d6b2b3bb159b4fa9d Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 14:19:30 +0900 Subject: [PATCH 74/77] =?UTF-8?q?test=20:=20Priority=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/programmers/core/PriorityTest.java | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 src/test/java/com/programmers/core/PriorityTest.java diff --git a/src/test/java/com/programmers/core/PriorityTest.java b/src/test/java/com/programmers/core/PriorityTest.java new file mode 100644 index 000000000..f0d552df4 --- /dev/null +++ b/src/test/java/com/programmers/core/PriorityTest.java @@ -0,0 +1,61 @@ +package com.programmers.core; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.util.Stack; + +import static com.programmers.core.Priority.getPriority; +import static com.programmers.core.Priority.isNewOperatorPriorityHigher; +import static com.programmers.core.Priority.isNewOperatorPriorityLower; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class PriorityTest { + @Test + @DisplayName("올바른 수식의 우선순위 확인") + void validOperator() { + assertThat(getPriority("/")).isEqualTo(10); + assertThat(getPriority("*")).isEqualTo(10); + assertThat(getPriority("+")).isEqualTo(1); + assertThat(getPriority("-")).isEqualTo(1); + } + + @Test + @DisplayName("잘못된 수식 입력") + void invalidOperator() { + assertThrows(IllegalArgumentException.class, () -> Priority.getPriority("@")); + assertThrows(IllegalArgumentException.class, () -> Priority.getPriority("abc")); + assertThrows(IllegalArgumentException.class, () -> Priority.getPriority("")); + assertThrows(IllegalArgumentException.class, () -> Priority.getPriority(null)); + } + + @Test + @DisplayName("우선순위가 operator > stack 상위") + void withHigherPriority() { + Stack operatorStack = new Stack<>(); + operatorStack.push("+"); + + assertTrue(isNewOperatorPriorityHigher("/", operatorStack)); + assertTrue(isNewOperatorPriorityHigher("*", operatorStack)); + + assertFalse(isNewOperatorPriorityLower("/", operatorStack)); + assertFalse(isNewOperatorPriorityLower("*", operatorStack)); + } + + + @Test + @DisplayName("우선순위가 operator < stack 상위") + void withLowerPriority() { + Stack operatorStack = new Stack<>(); + operatorStack.push("*"); + + assertTrue(isNewOperatorPriorityLower("-", operatorStack)); + assertTrue(isNewOperatorPriorityLower("+", operatorStack)); + + assertFalse(isNewOperatorPriorityHigher("-", operatorStack)); + assertFalse(isNewOperatorPriorityHigher("+", operatorStack)); + } +} \ No newline at end of file From 5de6ce2148ecd3e429fe01009f2cda564bdd77e9 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 14:32:56 +0900 Subject: [PATCH 75/77] =?UTF-8?q?test=20:=20Converter=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/programmers/PostfixConverterTest.java | 60 ++++++++++++++----- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/src/test/java/com/programmers/PostfixConverterTest.java b/src/test/java/com/programmers/PostfixConverterTest.java index 0037a121e..f181d6f13 100644 --- a/src/test/java/com/programmers/PostfixConverterTest.java +++ b/src/test/java/com/programmers/PostfixConverterTest.java @@ -1,40 +1,68 @@ package com.programmers; -import com.programmers.core.Converter; -import com.programmers.core.PostfixConverter; -import org.junit.jupiter.api.Assertions; +import com.programmers.core.converter.PostfixConverter; +import com.programmers.core.data.CalculationRequest; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class PostfixConverterTest { + private PostfixConverter converter; + + @BeforeEach + void setUp() { + converter = new PostfixConverter(); + } + @Test @DisplayName("후위 표기식 변환 성공 테스트") - void postfixFormulaConversionSuccessful() throws Exception { - Converter postfixConverter = new PostfixConverter(); + void validFormula() { + //given - String formula1 = "1 + 2 * 3"; - String formula2 = "3 + 5 / 1 + 2 / 2"; + CalculationRequest request1 = new CalculationRequest("1 + 1 * 2"); + CalculationRequest request2 = new CalculationRequest("2 * 2 - 2 / 2"); + //when - List postfixFormula1 = postfixConverter.convert(formula1); - List postfixFormula2 = postfixConverter.convert(formula2); + List postfixFormula1 = converter.convert(request1); + List postfixFormula2 = converter.convert(request2); + //then - assertThat(postfixFormula1).containsExactly("1", "2", "3", "*", "+"); - assertThat(postfixFormula2).containsExactly("3", "5", "1", "/", "+", "2", "2", "/", "+"); + assertThat(postfixFormula1).containsExactly("1", "1", "2", "*", "+"); + assertThat(postfixFormula2).containsExactly("2", "2", "*", "2", "2", "/", "-"); } @Test - @DisplayName("후위 표기식 변환 실패 테스트") - void postfixFormulaConversionFailed() throws Exception { - Converter postfixConverter = new PostfixConverter(); + @DisplayName("후위 표기식 변환 실패 테스트_빈 수식") + void emptyFormula() { + CalculationRequest request = new CalculationRequest(""); + assertThrows(IllegalArgumentException.class, () -> converter.convert(request)); + } - String formula = "1 + 2 * 3 + a "; + @Test + @DisplayName("후위 표기식 변환 실패 테스트_null") + void nullFormula() { + CalculationRequest request = new CalculationRequest(null); + assertThrows(IllegalArgumentException.class, () -> converter.convert(request)); + } + + @Test + @DisplayName("후위 표기식 변환 실패 테스트_잘못된 수식") + void invalidFormula() { + CalculationRequest request = new CalculationRequest("1 + a"); + assertThrows(IllegalArgumentException.class, () -> converter.convert(request)); + } - Assertions.assertThrows(IllegalArgumentException.class, () -> postfixConverter.convert(formula)); + @Test + @DisplayName("후위 표기식 변환 실패 테스트_완성되지 않은 식") + void singleFormula() { + CalculationRequest request = new CalculationRequest("+"); + assertThrows(IllegalArgumentException.class, () -> converter.convert(request)); } } From 208dc6b859dad0687423aa37cfe572d2fbe6eb81 Mon Sep 17 00:00:00 2001 From: hongxeob Date: Fri, 16 Jun 2023 14:36:03 +0900 Subject: [PATCH 76/77] =?UTF-8?q?test=20:=20=EA=B0=9C=ED=96=89=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/com/programmers/CalculatorTest.java | 1 + src/test/java/com/programmers/core/PriorityTest.java | 1 + .../repository/InMemoryCalculationRepositoryTest.java | 1 + src/test/java/com/programmers/util/StringUtilTest.java | 1 + src/test/java/com/programmers/util/ValidatorTest.java | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/programmers/CalculatorTest.java b/src/test/java/com/programmers/CalculatorTest.java index 0b8960d60..0dcee3a3c 100644 --- a/src/test/java/com/programmers/CalculatorTest.java +++ b/src/test/java/com/programmers/CalculatorTest.java @@ -13,6 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; public class CalculatorTest { + private PostfixCalculator calculator; @BeforeEach diff --git a/src/test/java/com/programmers/core/PriorityTest.java b/src/test/java/com/programmers/core/PriorityTest.java index f0d552df4..9e394cc66 100644 --- a/src/test/java/com/programmers/core/PriorityTest.java +++ b/src/test/java/com/programmers/core/PriorityTest.java @@ -14,6 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; class PriorityTest { + @Test @DisplayName("올바른 수식의 우선순위 확인") void validOperator() { diff --git a/src/test/java/com/programmers/repository/InMemoryCalculationRepositoryTest.java b/src/test/java/com/programmers/repository/InMemoryCalculationRepositoryTest.java index 0b29402ed..7c965f607 100644 --- a/src/test/java/com/programmers/repository/InMemoryCalculationRepositoryTest.java +++ b/src/test/java/com/programmers/repository/InMemoryCalculationRepositoryTest.java @@ -9,6 +9,7 @@ import static org.assertj.core.api.Assertions.assertThat; class InMemoryCalculationRepositoryTest { + CalculationRepository repository = new InMemoryCalculationRepository(); @Test diff --git a/src/test/java/com/programmers/util/StringUtilTest.java b/src/test/java/com/programmers/util/StringUtilTest.java index f721f34df..c1cd2a765 100644 --- a/src/test/java/com/programmers/util/StringUtilTest.java +++ b/src/test/java/com/programmers/util/StringUtilTest.java @@ -8,6 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; class StringUtilTest { + @Test @DisplayName("숫자인지 확인") void testValidNumber() throws Exception { diff --git a/src/test/java/com/programmers/util/ValidatorTest.java b/src/test/java/com/programmers/util/ValidatorTest.java index a5fc5d373..adbea2d95 100644 --- a/src/test/java/com/programmers/util/ValidatorTest.java +++ b/src/test/java/com/programmers/util/ValidatorTest.java @@ -8,6 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; class ValidatorTest { + @Test @DisplayName("올바른 위치에 연산자 유무 체크") void testOperatorPositionCheck() throws Exception { @@ -30,6 +31,5 @@ void testCheckEmpty() throws Exception { void testCheckNull() throws Exception { assertThrows(IllegalArgumentException.class, () -> Validator.checkNull(null)); assertDoesNotThrow(() -> Validator.checkNull("1 + 2")); - } } \ No newline at end of file From 84c2a120d056bbf8a67507cbf62c3f46df7a434f Mon Sep 17 00:00:00 2001 From: hongxeob Date: Tue, 20 Jun 2023 14:16:15 +0900 Subject: [PATCH 77/77] =?UTF-8?q?refactor=20:=20=EC=A3=BC=EC=84=9D=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programmers/core/data/CalculationResult.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/main/java/com/programmers/core/data/CalculationResult.java b/src/main/java/com/programmers/core/data/CalculationResult.java index 42fc30cc2..8958e6b15 100644 --- a/src/main/java/com/programmers/core/data/CalculationResult.java +++ b/src/main/java/com/programmers/core/data/CalculationResult.java @@ -17,17 +17,4 @@ public long getResult() { public String toString() { return formula + " = " + result; } - -// @Override -// public boolean equals(Object o) { -// if (this == o) return true; -// if (o == null || getClass() != o.getClass()) return false; -// CalculationResult that = (CalculationResult) o; -// return Objects.equals(formula, that.formula) && result == that.result; -// } -// -// @Override -// public int hashCode() { -// return Objects.hash(formula, result); -// } }