diff --git a/README.md b/README.md index c1c982e55..40a8a8864 100644 --- a/README.md +++ b/README.md @@ -25,13 +25,13 @@ ### 요구사항 - 콘솔로 구현입니다.(스윙으로 구현하시는 분들 계실까봐) - 객체지향적인 코드로 계산기 구현하기 - - [ ] 더하기 - - [ ] 빼기 - - [ ] 곱하기 - - [ ] 나누기 - - [ ] 우선순위(사칙연산) -- [ ] 테스트 코드 구현하기 -- [ ] 계산 이력을 맵으로 데이터 저장기능 만들기 + - [x] 더하기 + - [x] 빼기 + - [x] 곱하기 + - [x] 나누기 + - [x] 우선순위(사칙연산) +- [x] 테스트 코드 구현하기 +- [x] 계산 이력을 맵으로 데이터 저장기능 만들기 - 애플리케이션이 동작하는 동안 데이터베이스 외에 데이터를 저장할 수 있는 방법을 고안해보세요. - (선택) 정규식 사용 diff --git a/calculator/.gitignore b/calculator/.gitignore new file mode 100644 index 000000000..b63da4551 --- /dev/null +++ b/calculator/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/calculator/.idea/.gitignore b/calculator/.idea/.gitignore new file mode 100644 index 000000000..13566b81b --- /dev/null +++ b/calculator/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/calculator/.idea/gradle.xml b/calculator/.idea/gradle.xml new file mode 100644 index 000000000..2a65317ef --- /dev/null +++ b/calculator/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/calculator/.idea/misc.xml b/calculator/.idea/misc.xml new file mode 100644 index 000000000..2c2bc46a6 --- /dev/null +++ b/calculator/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/calculator/.idea/uiDesigner.xml b/calculator/.idea/uiDesigner.xml new file mode 100644 index 000000000..2b63946d5 --- /dev/null +++ b/calculator/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/calculator/.idea/vcs.xml b/calculator/.idea/vcs.xml new file mode 100644 index 000000000..6c0b86358 --- /dev/null +++ b/calculator/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/calculator/build.gradle b/calculator/build.gradle new file mode 100644 index 000000000..44ff87bc5 --- /dev/null +++ b/calculator/build.gradle @@ -0,0 +1,25 @@ +plugins { + id 'java' +} + +group = 'org.example' +version = '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + // lombok + compileOnly 'org.projectlombok:lombok:1.18.28' + annotationProcessor 'org.projectlombok:lombok:1.18.28' + + testImplementation platform('org.junit:junit-bom:5.9.1') + testImplementation 'org.junit.jupiter:junit-jupiter' + // AssertJ + testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2' +} + +test { + useJUnitPlatform() +} diff --git a/calculator/gradle/wrapper/gradle-wrapper.jar b/calculator/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..249e5832f Binary files /dev/null and b/calculator/gradle/wrapper/gradle-wrapper.jar differ diff --git a/calculator/gradle/wrapper/gradle-wrapper.properties b/calculator/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..d405c4453 --- /dev/null +++ b/calculator/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Jun 10 16:03:34 KST 2023 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/calculator/gradlew b/calculator/gradlew new file mode 100755 index 000000000..1b6c78733 --- /dev/null +++ b/calculator/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/calculator/gradlew.bat b/calculator/gradlew.bat new file mode 100644 index 000000000..ac1b06f93 --- /dev/null +++ b/calculator/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/calculator/settings.gradle b/calculator/settings.gradle new file mode 100644 index 000000000..4b53eb355 --- /dev/null +++ b/calculator/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'calculator' + diff --git a/calculator/src/main/java/org/calculator/App.java b/calculator/src/main/java/org/calculator/App.java new file mode 100644 index 000000000..4c7056b47 --- /dev/null +++ b/calculator/src/main/java/org/calculator/App.java @@ -0,0 +1,16 @@ +package org.calculator; + +import org.calculator.engine.CalculateEngine; +import org.calculator.engine.io.Console; +import org.calculator.engine.io.ConsoleImpl; +import org.calculator.repository.CalculateRepository; +import org.calculator.repository.CalculateRepositoryImpl; + +public class App { + public static void main(String[] args) { + CalculateEngine calculateEngine = new CalculateEngine(); + CalculateRepository calculateRepository = new CalculateRepositoryImpl(); + Console console = new ConsoleImpl(calculateRepository); + new Calculator(calculateEngine, console).run(); + } +} diff --git a/calculator/src/main/java/org/calculator/Calculator.java b/calculator/src/main/java/org/calculator/Calculator.java new file mode 100644 index 000000000..23e3a6829 --- /dev/null +++ b/calculator/src/main/java/org/calculator/Calculator.java @@ -0,0 +1,59 @@ +package org.calculator; + +import lombok.AllArgsConstructor; +import org.calculator.engine.CalculateEngine; +import org.calculator.engine.domain.Condition; +import org.calculator.engine.io.Console; + +@AllArgsConstructor +public class Calculator implements Runnable { + private static boolean STOPPER = true; + private CalculateEngine calculateEngine; + private Console console; + + @Override + public void run() { + runCalculator(); + } + + private void runCalculator() { + while (STOPPER) { + Condition condition = null; + condition = getUserInput(condition); + printHistory(condition); + calculate(condition); + if (condition == Condition.BREAK) break; + } + } + + private Condition getUserInput(Condition condition) { + try { + condition = console.getCondition(); + } catch (IllegalArgumentException e) { + System.out.println(e.toString()); + } + return condition; + } + + private void printHistory(Condition condition) { + if (condition == Condition.LOOKUP) { + console.printHistory(); + } + } + + private void calculate(Condition condition) { + if (condition == Condition.CALCULATE) { + String equation = console.insertEquation(); + double result = 0; + try { + result = calculateEngine.calculate(equation); + console.printAnswer(result); + } catch (Exception e) { + System.out.println("계산에 문제가 생겼습니다. 문제 원인 : " + e.toString()); + System.out.println(); + } + + } + } + +} diff --git a/calculator/src/main/java/org/calculator/engine/CalculateEngine.java b/calculator/src/main/java/org/calculator/engine/CalculateEngine.java new file mode 100644 index 000000000..a2f7f316c --- /dev/null +++ b/calculator/src/main/java/org/calculator/engine/CalculateEngine.java @@ -0,0 +1,94 @@ +package org.calculator.engine; + + +import org.calculator.engine.domain.History; +import org.calculator.repository.CalculateRepository; +import org.calculator.repository.CalculateRepositoryImpl; + +import java.util.ArrayList; + +public class CalculateEngine { + private String num = ""; + private ArrayList equation = new ArrayList <>(); + private final CalculateRepository calculateRepository = new CalculateRepositoryImpl(); + public double calculate(String inputText) { + num = ""; + fullTextParsing(inputText); + double prev = 0; + double current = 0; + String mode = ""; + + for (int i = 0; i < equation.size(); i++) { + String s = equation.get(i); + + if ("+".equals(s)) { + mode = "add"; + } else if ("-".equals(s)) { + mode = "sub"; + } else if ("*".equals(s)) { + mode = "mul"; + } else if ("/".equals(s)) { + mode = "div"; + } else { + if (("mul".equals(mode) || "div".equals(mode)) && !"+".equals(s) && !"-".equals(s) && !"*".equals(s) && !"/".equals(s)) { + Double one = Double.parseDouble(equation.get(i - 2)); + Double two = Double.parseDouble(equation.get(i)); + Double result = 0.0; + + if ("mul".equals(mode)) { + result = one * two; + } else if ("div".equals(mode)) { + result = one / two; + } + + equation.add(i + 1, Double.toString(result)); + + for (int j = 0; j < 3; j++) { + equation.remove(i - 2); + } + + i -= 2; // 결과값이 생긴 인덱스로 이동 + } + } + } // 곱셈 나눗셈을 먼저 계산한다 + + mode = ""; + for (String s : equation) { + if ("+".equals(s)) { + mode = "add"; + } else if ("-".equals(s)) { + mode = "sub"; + } else { + current = Double.parseDouble(s); + if ("add".equals(mode)) { + prev += current; + } else if ("sub".equals(mode)) { + prev -= current; + } else { + prev = current; + } + } + prev = Math.round(prev * 100000) / 100000.0; + } + calculateRepository.save(new History(inputText, prev)); + return prev; + + } + + private void fullTextParsing(String inputText) { + equation.clear(); + for (int i = 0; i < inputText.length(); i++) { + char ch = inputText.charAt(i); + + if (ch == '-' || ch == '+' || ch == '*' || ch == '/') { + equation.add(num); + num = ""; + equation.add(ch + ""); + } else { + num = num + ch; + } + } + equation.add(num); + equation.remove(""); + } +} diff --git a/calculator/src/main/java/org/calculator/engine/domain/Condition.java b/calculator/src/main/java/org/calculator/engine/domain/Condition.java new file mode 100644 index 000000000..59f320646 --- /dev/null +++ b/calculator/src/main/java/org/calculator/engine/domain/Condition.java @@ -0,0 +1,21 @@ +package org.calculator.engine.domain; + +import lombok.RequiredArgsConstructor; + +import java.util.Arrays; +import java.util.Optional; + +@RequiredArgsConstructor +public enum Condition { + LOOKUP("1"), + CALCULATE("2"), + BREAK("3"); + + private final String input; + + public static Optional convert(String condition) { + return Arrays.stream(Condition.values()) + .filter(conditionEnum -> conditionEnum.input.equals(condition)) + .findAny(); + } +} diff --git a/calculator/src/main/java/org/calculator/engine/domain/History.java b/calculator/src/main/java/org/calculator/engine/domain/History.java new file mode 100644 index 000000000..2e295a903 --- /dev/null +++ b/calculator/src/main/java/org/calculator/engine/domain/History.java @@ -0,0 +1,11 @@ +package org.calculator.engine.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class History { + private String equation; + private double result; +} diff --git a/calculator/src/main/java/org/calculator/engine/io/Console.java b/calculator/src/main/java/org/calculator/engine/io/Console.java new file mode 100644 index 000000000..7fe8f3c21 --- /dev/null +++ b/calculator/src/main/java/org/calculator/engine/io/Console.java @@ -0,0 +1,13 @@ +package org.calculator.engine.io; + +import org.calculator.engine.domain.Condition; + +public interface Console { + Condition getCondition(); + + String insertEquation(); + + void printAnswer(double answer); + + void printHistory(); +} diff --git a/calculator/src/main/java/org/calculator/engine/io/ConsoleImpl.java b/calculator/src/main/java/org/calculator/engine/io/ConsoleImpl.java new file mode 100644 index 000000000..89efea810 --- /dev/null +++ b/calculator/src/main/java/org/calculator/engine/io/ConsoleImpl.java @@ -0,0 +1,52 @@ +package org.calculator.engine.io; + +import lombok.RequiredArgsConstructor; +import org.calculator.engine.domain.Condition; +import org.calculator.repository.CalculateRepository; + +import java.util.Scanner; + +@RequiredArgsConstructor +public class ConsoleImpl implements Console { + private Scanner scanner = new Scanner(System.in); + private final CalculateRepository calculateRepository; + + @Override + public void printAnswer(double answer) { + System.out.println(); + System.out.println("result = " + answer); + System.out.println(); + } + + + @Override + public void printHistory() { + System.out.println(); + System.out.println("<< History Of Calculation >>"); + calculateRepository.getHistory() + .forEach(h -> System.out.println("Equation : " + h.getEquation() + " | result : " + h.getResult())); + System.out.println(); + } + + @Override + public Condition getCondition() { + System.out.println("1. 조회"); + System.out.println("2. 계산"); + System.out.println("3. 종료"); + System.out.println(); + System.out.print("선택 : "); + return validateInput(); + } + + private Condition validateInput() { + String condition = scanner.nextLine(); + return Condition.convert(condition).orElseThrow(() -> new IllegalArgumentException("잘못된 값을 입력하셨습니다.")); + } + + @Override + public String insertEquation() { + System.out.println(); + System.out.print("방정식을 입력해 주세요 : "); + return scanner.nextLine(); + } +} diff --git a/calculator/src/main/java/org/calculator/repository/CalculateRepository.java b/calculator/src/main/java/org/calculator/repository/CalculateRepository.java new file mode 100644 index 000000000..31fe1cfb1 --- /dev/null +++ b/calculator/src/main/java/org/calculator/repository/CalculateRepository.java @@ -0,0 +1,13 @@ +package org.calculator.repository; + + +import org.calculator.engine.domain.History; + +import java.util.List; + +public interface CalculateRepository { + + void save(History history); + + List getHistory(); +} diff --git a/calculator/src/main/java/org/calculator/repository/CalculateRepositoryImpl.java b/calculator/src/main/java/org/calculator/repository/CalculateRepositoryImpl.java new file mode 100644 index 000000000..c38cc66e5 --- /dev/null +++ b/calculator/src/main/java/org/calculator/repository/CalculateRepositoryImpl.java @@ -0,0 +1,21 @@ +package org.calculator.repository; + + +import org.calculator.engine.domain.History; + +import java.util.ArrayList; +import java.util.List; + +public class CalculateRepositoryImpl implements CalculateRepository { + private static final List histories = new ArrayList<>(); + + @Override + public void save(History history) { + histories.add(history); + } + + @Override + public List getHistory() { + return histories; + } +} diff --git a/calculator/src/test/java/org/calculator/engine/CalculateEngineTest.java b/calculator/src/test/java/org/calculator/engine/CalculateEngineTest.java new file mode 100644 index 000000000..8bd468cd2 --- /dev/null +++ b/calculator/src/test/java/org/calculator/engine/CalculateEngineTest.java @@ -0,0 +1,21 @@ +package org.calculator.engine; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +class CalculateEngineTest { + + CalculateEngine calculateEngine = new CalculateEngine(); + + @ParameterizedTest + @CsvSource( + {"1 + 1,2.0", "0 + 0,0.0", "-1 + 2,1.0", "-1 + 0, -1.0", + "2 - 1,1.0", "1 - 2,-1.0", "-1 - 1, -2.0", + "1 / 2,0.5", "2 / 1,2.0","-2 / 1, -2.0", + "4 * 2 + 10,18.0", " 1 * 3 + 4 / 2,5.0"}) + void tesEngine(String equation, Double result) { + Assertions.assertThat(calculateEngine.calculate(equation)).isEqualTo(result); + } + +} diff --git a/calculator/src/test/java/org/calculator/engine/domain/ConditionTest.java b/calculator/src/test/java/org/calculator/engine/domain/ConditionTest.java new file mode 100644 index 000000000..f4b518fac --- /dev/null +++ b/calculator/src/test/java/org/calculator/engine/domain/ConditionTest.java @@ -0,0 +1,25 @@ +package org.calculator.engine.domain; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +import java.util.Optional; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +class ConditionTest { + + @ParameterizedTest + @ValueSource(strings = {"1", "2", "3", "4", "%"}) + @DisplayName("Condition이 정상적으로 반환 되는지 조회") + void decideCondition(String condition) { + Optional optionalCondition = Condition.convert(condition); + switch (condition) { + case "1" -> assertThat(optionalCondition.get()).isEqualTo(Condition.LOOKUP); + case "2" -> assertThat(optionalCondition.get()).isEqualTo(Condition.CALCULATE); + case "3" -> assertThat(optionalCondition.get()).isEqualTo(Condition.BREAK); + default -> assertThat(optionalCondition).isEmpty(); + } + } +} diff --git a/calculator/src/test/java/org/calculator/repository/CalculateRepositoryImplTest.java b/calculator/src/test/java/org/calculator/repository/CalculateRepositoryImplTest.java new file mode 100644 index 000000000..b9c76a0fc --- /dev/null +++ b/calculator/src/test/java/org/calculator/repository/CalculateRepositoryImplTest.java @@ -0,0 +1,44 @@ +package org.calculator.repository; + +import org.assertj.core.api.Assertions; +import org.calculator.engine.domain.History; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.util.List; + +class CalculateRepositoryImplTest { + CalculateRepositoryImpl calculateRepository; + + @BeforeEach + void beforeEach() { + calculateRepository = new CalculateRepositoryImpl(); + } + @Test + @DisplayName("Repository 저장 정상 작동 확인") + void saveEquation() { + // given + History history = new History("1 + 1", 2.0); + + // when + calculateRepository.save(history); + + // then + Assertions.assertThat(calculateRepository.getHistory().size()).isEqualTo(1); + } + + @Test + @DisplayName("Repository 조회 정상 작동 확인") + void getHistory() { + // given + History history = new History("1 + 1", 2.0); + calculateRepository.save(history); + + // when && then + List histories = calculateRepository.getHistory(); + + Assertions.assertThat(histories).contains(history); + } + +}