diff --git a/README.md b/README.md index c1c982e55..514e3c71d 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ - 깃허브를 통한 코드리뷰를 경험해보자 - 기본적인 테스트 코드 작성 및 활용하는 능력해보자 - 스스로 OOP를 생각하고 코드로 옮길 수 있는 능력해보자 - + ### 요구사항 - 콘솔로 구현입니다.(스윙으로 구현하시는 분들 계실까봐) - 객체지향적인 코드로 계산기 구현하기 @@ -67,3 +67,4 @@ -1 ``` + \ No newline at end of file diff --git a/core/.gitignore b/core/.gitignore new file mode 100644 index 000000000..c2065bc26 --- /dev/null +++ b/core/.gitignore @@ -0,0 +1,37 @@ +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 +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 000000000..6f85c73e9 --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.1' + id 'io.spring.dependency-management' version '1.1.5' +} + +group = 'hello' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/core/gradle/wrapper/gradle-wrapper.jar b/core/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..e6441136f Binary files /dev/null and b/core/gradle/wrapper/gradle-wrapper.jar differ diff --git a/core/gradle/wrapper/gradle-wrapper.properties b/core/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..a4413138c --- /dev/null +++ b/core/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/core/gradlew b/core/gradlew new file mode 100755 index 000000000..b740cf133 --- /dev/null +++ b/core/gradlew @@ -0,0 +1,249 @@ +#!/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/HEAD/platforms/jvm/plugins-application/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + 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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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/core/gradlew.bat b/core/gradlew.bat new file mode 100644 index 000000000..25da30dbd --- /dev/null +++ b/core/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/core/settings.gradle b/core/settings.gradle new file mode 100644 index 000000000..4d52ac576 --- /dev/null +++ b/core/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'core' diff --git a/core/src/main/java/hello/core/AppConfig.java b/core/src/main/java/hello/core/AppConfig.java new file mode 100644 index 000000000..f40985e05 --- /dev/null +++ b/core/src/main/java/hello/core/AppConfig.java @@ -0,0 +1,9 @@ +package hello.core; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@ComponentScan +@Configuration +public class AppConfig { +} diff --git a/core/src/main/java/hello/core/CoreApplication.java b/core/src/main/java/hello/core/CoreApplication.java new file mode 100644 index 000000000..5bc183f2f --- /dev/null +++ b/core/src/main/java/hello/core/CoreApplication.java @@ -0,0 +1,13 @@ +package hello.core; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CoreApplication { + + public static void main(String[] args) { + SpringApplication.run(CoreApplication.class, args); + } + +} diff --git a/core/src/main/java/hello/core/calculator/CalculatorService.java b/core/src/main/java/hello/core/calculator/CalculatorService.java new file mode 100644 index 000000000..161b10e2e --- /dev/null +++ b/core/src/main/java/hello/core/calculator/CalculatorService.java @@ -0,0 +1,6 @@ +package hello.core.calculator; + +public interface CalculatorService { + Double calculateExpression(String expression); + void showHistory(); +} diff --git a/core/src/main/java/hello/core/calculator/CalculatorServiceV0.java b/core/src/main/java/hello/core/calculator/CalculatorServiceV0.java new file mode 100644 index 000000000..cef171e97 --- /dev/null +++ b/core/src/main/java/hello/core/calculator/CalculatorServiceV0.java @@ -0,0 +1,109 @@ +package hello.core.calculator; + +import hello.core.repository.CalculatorRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; +@Component +public class CalculatorServiceV0 implements CalculatorService{ + + private CalculatorRepository memory; + private List tmpMemoryOperator = new ArrayList<>(); + private List tmpMemoryOperand = new ArrayList<>(); + private Operator operatorInstance; + @Autowired + public CalculatorServiceV0(Operator operatorInstance, CalculatorRepository memory) { + this.operatorInstance = operatorInstance; + this.memory = memory; + } + + @Override + public void showHistory() { + memory.getHistory(); + } + + @Override + public Double calculateExpression(String expression) { + setExpreesion(expression); // tmp에 데이터 적재 + firstCalculate(); // 곱, 나눗셈 처리 + secondCalculate(); // 뺄셈, 덧셈 처리 + Double result = tmpMemoryOperand.get(0); + tmpMemoryOperand.clear(); + tmpMemoryOperator.clear(); + memory.putHistory(expression, result); + return result; + } + + private void secondCalculate() { + for (int i=0; i { + return operatorInstance.Add(operandFront, operandLast); + } + case "-" -> { + return operatorInstance.Subtract(operandFront, operandLast); + } + case "*" -> { + return operatorInstance.Multiple(operandFront, operandLast); + } + case "/" -> { + return operatorInstance.Divide(operandFront, operandLast); + } + } + //예외 발생시켜서 예외 처리 하면 좋을 것 같음. + return 0.0; + } + + private void setExpreesion(String expression) { + String[] expressionArray = expression.split(" "); + for (String oper : expressionArray) { + if (operatorInstance.getOperator().contains(oper)) { + tmpMemoryOperator.add(oper); + } else if (isParsableAsDouble(oper)) { + tmpMemoryOperand.add(Double.parseDouble(oper)); + } else { + throw new IllegalArgumentException(); + } + + } + } + + private boolean isParsableAsDouble(String str) { + if (str == null || str.isEmpty()) { + return false; + } + try { + Double.parseDouble(str); + return true; + } catch (NumberFormatException e) { + return false; + } + } + +} diff --git a/core/src/main/java/hello/core/calculator/Operator.java b/core/src/main/java/hello/core/calculator/Operator.java new file mode 100644 index 000000000..d05b0ce0d --- /dev/null +++ b/core/src/main/java/hello/core/calculator/Operator.java @@ -0,0 +1,11 @@ +package hello.core.calculator; + +import java.util.List; + +public interface Operator { + double Add(double numberFront, double numberLast); + double Subtract(double numberFront, double numberLast); + double Divide(double numberFront, double numberLast); + double Multiple(double numberFront, double numberLast); + List getOperator(); +} diff --git a/core/src/main/java/hello/core/calculator/OperatorV0.java b/core/src/main/java/hello/core/calculator/OperatorV0.java new file mode 100644 index 000000000..1e4fe317a --- /dev/null +++ b/core/src/main/java/hello/core/calculator/OperatorV0.java @@ -0,0 +1,37 @@ +package hello.core.calculator; + +import org.springframework.stereotype.Component; + +import java.util.List; +@Component +public class OperatorV0 implements Operator{ + private final List operator = List.of("+", "-", "*", "/"); + + @Override + public List getOperator() { + return operator; + } + + @Override + public double Add(double numberFront, double numberLast) { + return numberFront + numberLast; + } + + @Override + public double Subtract(double numberFront, double numberLast) { + return numberFront - numberLast; + } + + @Override + public double Divide(double numberFront, double numberLast) { + if (numberLast == 0.0) { + throw new ArithmeticException(); + } + return numberFront / numberLast; + } + + @Override + public double Multiple(double numberFront, double numberLast) { + return numberFront * numberLast; + } +} diff --git a/core/src/main/java/hello/core/client/Client.java b/core/src/main/java/hello/core/client/Client.java new file mode 100644 index 000000000..08159b2be --- /dev/null +++ b/core/src/main/java/hello/core/client/Client.java @@ -0,0 +1,5 @@ +package hello.core.client; + +public interface Client { + void runCalculator(); +} diff --git a/core/src/main/java/hello/core/client/ClientV0.java b/core/src/main/java/hello/core/client/ClientV0.java new file mode 100644 index 000000000..512c0ca01 --- /dev/null +++ b/core/src/main/java/hello/core/client/ClientV0.java @@ -0,0 +1,38 @@ +package hello.core.client; + +import hello.core.calculator.CalculatorService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Scanner; +@Component +public class ClientV0 implements Client{ + CalculatorService calculatorService; + + @Autowired + public ClientV0(CalculatorService calculatorService) { + this.calculatorService = calculatorService; + } + + @Override + public void runCalculator() { + Scanner sc = new Scanner(System.in); + while (true) { + System.out.println("1. 조회"); + System.out.println("2. 계산"); + System.out.println(" "); + System.out.print("선택 : "); + int choice = sc.nextInt(); + sc.nextLine(); + System.out.println(" "); + + if (choice == 1) { + calculatorService.showHistory(); + } else if (choice == 2) { + String expression = sc.nextLine(); + Double result = calculatorService.calculateExpression(expression); + System.out.println(result.intValue()); + } + } + } +} diff --git a/core/src/main/java/hello/core/main/Main.java b/core/src/main/java/hello/core/main/Main.java new file mode 100644 index 000000000..c6b4f96b3 --- /dev/null +++ b/core/src/main/java/hello/core/main/Main.java @@ -0,0 +1,19 @@ +package hello.core.main; + +import hello.core.AppConfig; +import hello.core.calculator.CalculatorServiceV0; +import hello.core.calculator.OperatorV0; +import hello.core.client.Client; +import hello.core.client.ClientV0; +import hello.core.repository.CalculatorRepositoryV0; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +public class Main { + + public static void main(String[] args) { + AnnotationConfigApplicationContext ac = new AnnotationConfigApplicationContext(AppConfig.class); + + ClientV0 clientV0 = ac.getBean(ClientV0.class); + clientV0.runCalculator(); + } +} diff --git a/core/src/main/java/hello/core/repository/CalculatorRepository.java b/core/src/main/java/hello/core/repository/CalculatorRepository.java new file mode 100644 index 000000000..8ac6be684 --- /dev/null +++ b/core/src/main/java/hello/core/repository/CalculatorRepository.java @@ -0,0 +1,9 @@ +package hello.core.repository; + +import java.util.Map; +import java.util.Set; + +public interface CalculatorRepository { + void putHistory(String order, Double answer); + Set> getHistory(); +} diff --git a/core/src/main/java/hello/core/repository/CalculatorRepositoryV0.java b/core/src/main/java/hello/core/repository/CalculatorRepositoryV0.java new file mode 100644 index 000000000..091c7fa67 --- /dev/null +++ b/core/src/main/java/hello/core/repository/CalculatorRepositoryV0.java @@ -0,0 +1,26 @@ +package hello.core.repository; + +import org.springframework.stereotype.Component; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +@Component +public class CalculatorRepositoryV0 implements CalculatorRepository { + + private Map memory = new LinkedHashMap<>(); + + @Override + public void putHistory(String order, Double answer) { + memory.put(order, answer); + } + + @Override + public Set> getHistory() { + Set> entries = memory.entrySet(); + for (Map.Entry entry : entries) { + System.out.println(entry.getKey() + " = " + entry.getValue().intValue()); + } + return memory.entrySet(); + } +} diff --git a/core/src/main/resources/application.properties b/core/src/main/resources/application.properties new file mode 100644 index 000000000..061bbe4e7 --- /dev/null +++ b/core/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=core diff --git a/core/src/test/java/hello/core/CoreApplicationTests.java b/core/src/test/java/hello/core/CoreApplicationTests.java new file mode 100644 index 000000000..90937b13a --- /dev/null +++ b/core/src/test/java/hello/core/CoreApplicationTests.java @@ -0,0 +1,13 @@ +package hello.core; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CoreApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/core/src/test/java/hello/core/repository/testCalculatorRepository.java b/core/src/test/java/hello/core/repository/testCalculatorRepository.java new file mode 100644 index 000000000..96b4a5e6b --- /dev/null +++ b/core/src/test/java/hello/core/repository/testCalculatorRepository.java @@ -0,0 +1,35 @@ +package hello.core.repository; + +import hello.core.calculator.CalculatorServiceV0; +import hello.core.calculator.OperatorV0; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class testCalculatorRepository { + + @Test + @DisplayName("저장 확인") + void checkGoodSave() { + CalculatorRepositoryV0 calculatorRepositoryV0 = new CalculatorRepositoryV0(); + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), calculatorRepositoryV0); + calculatorServiceV0.calculateExpression("1 + 1"); + calculatorServiceV0.calculateExpression("2 + 2"); + Set> history = calculatorRepositoryV0.getHistory(); + List testList = new ArrayList<>(); + for (Map.Entry stringDoubleEntry : history) { + testList.add(stringDoubleEntry.getKey()); + } + + Assertions.assertThat(testList.get(0)).isEqualTo("1 + 1"); + Assertions.assertThat(testList.get(1)).isEqualTo("2 + 2"); + } + + + +} diff --git a/core/src/test/java/hello/core/scenario/scenarioTest.java b/core/src/test/java/hello/core/scenario/scenarioTest.java new file mode 100644 index 000000000..a7441873f --- /dev/null +++ b/core/src/test/java/hello/core/scenario/scenarioTest.java @@ -0,0 +1,50 @@ +package hello.core.scenario; + +import hello.core.calculator.CalculatorServiceV0; +import hello.core.calculator.OperatorV0; +import hello.core.client.ClientV0; +import hello.core.repository.CalculatorRepositoryV0; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +public class scenarioTest { + @Test + @DisplayName("1 + 2") + public void 시나리오1 () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("1 + 2"); + Assertions.assertThat(result).isEqualTo(3); + + } + + @Test + @DisplayName("1 + 2 * 3") + public void 시나리오2 () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("1 + 2 * 3"); + Assertions.assertThat(result).isEqualTo(7); + } + + @Test + @DisplayName("1 + 2 * 3") + public void 시나리오3 () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("3 - 2 * 2"); + Assertions.assertThat(result).isEqualTo(-1); + } + + @Test + @DisplayName("시나리오 계산 통합") + public void 시나리오4 () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("1 + 2"); + Assertions.assertThat(result).isEqualTo(3); + + Double result2 = calculatorServiceV0.calculateExpression("1 + 2 * 3"); + Assertions.assertThat(result2).isEqualTo(7); + + Double result3 = calculatorServiceV0.calculateExpression("3 - 2 * 2"); + Assertions.assertThat(result3).isEqualTo(-1); + } +} diff --git a/core/src/test/java/hello/core/unitcalculation/testAddition.java b/core/src/test/java/hello/core/unitcalculation/testAddition.java new file mode 100644 index 000000000..9bf0e44da --- /dev/null +++ b/core/src/test/java/hello/core/unitcalculation/testAddition.java @@ -0,0 +1,26 @@ +package hello.core.unitcalculation; + +import hello.core.calculator.CalculatorServiceV0; +import hello.core.calculator.OperatorV0; +import hello.core.repository.CalculatorRepositoryV0; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +public class testAddition { + @Test + @DisplayName("덧셈") + public void Addition () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("4 + 2"); + Assertions.assertThat(result).isEqualTo(6); + } + + @Test + @DisplayName("덧셈 2자리수 이상 포함") + public void AdditionUpScale () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("40 + 288"); + Assertions.assertThat(result).isEqualTo(328); + } +} diff --git a/core/src/test/java/hello/core/unitcalculation/testDivision.java b/core/src/test/java/hello/core/unitcalculation/testDivision.java new file mode 100644 index 000000000..b1eefc952 --- /dev/null +++ b/core/src/test/java/hello/core/unitcalculation/testDivision.java @@ -0,0 +1,42 @@ +package hello.core.unitcalculation; + +import hello.core.calculator.CalculatorServiceV0; +import hello.core.calculator.OperatorV0; +import hello.core.repository.CalculatorRepositoryV0; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +public class testDivision { + @Test + @DisplayName("나눗셈") + public void Division () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("4 / 2"); + Assertions.assertThat(result).isEqualTo(2); + } + + @Test + @DisplayName("나눗셈 2자리수 이상 포함") + public void DivisionUpScale () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("100 / 5"); + Assertions.assertThat(result).isEqualTo(20); + } + + @Test + @DisplayName("나눗셈 소수점 계산 체크") + public void DivisionDetail () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("12 / 5"); + Assertions.assertThat(result).isEqualTo(2.4); + } + + @Test + @DisplayName("0으로 나누기") + public void ZeroDivision () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + org.junit.jupiter.api.Assertions.assertThrows(ArithmeticException.class, + () -> calculatorServiceV0.calculateExpression("12 / 0")); + } +} diff --git a/core/src/test/java/hello/core/unitcalculation/testInvalidOperator.java b/core/src/test/java/hello/core/unitcalculation/testInvalidOperator.java new file mode 100644 index 000000000..7ea7d8c2e --- /dev/null +++ b/core/src/test/java/hello/core/unitcalculation/testInvalidOperator.java @@ -0,0 +1,19 @@ +package hello.core.unitcalculation; + +import hello.core.calculator.CalculatorServiceV0; +import hello.core.calculator.OperatorV0; +import hello.core.repository.CalculatorRepositoryV0; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +public class testInvalidOperator { + + @Test + @DisplayName("잘못된 연산자 테스트") + public void InvalidOperatorTest () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Assertions.assertThrows(IllegalArgumentException.class, + () -> calculatorServiceV0.calculateExpression("250 $ 70")); + } +} diff --git a/core/src/test/java/hello/core/unitcalculation/testMultiplication.java b/core/src/test/java/hello/core/unitcalculation/testMultiplication.java new file mode 100644 index 000000000..f588fa881 --- /dev/null +++ b/core/src/test/java/hello/core/unitcalculation/testMultiplication.java @@ -0,0 +1,26 @@ +package hello.core.unitcalculation; + +import hello.core.calculator.CalculatorServiceV0; +import hello.core.calculator.OperatorV0; +import hello.core.repository.CalculatorRepositoryV0; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +public class testMultiplication { + @Test + @DisplayName("곱셈") + public void Multiplication () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("4 * 2"); + Assertions.assertThat(result).isEqualTo(8); + } + + @Test + @DisplayName("곱셈 2자리수 이상 포함") + public void MultiplicationUpScale () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("100 * 70"); + Assertions.assertThat(result).isEqualTo(7000); + } +} diff --git a/core/src/test/java/hello/core/unitcalculation/testSubtraction.java b/core/src/test/java/hello/core/unitcalculation/testSubtraction.java new file mode 100644 index 000000000..91a18f93f --- /dev/null +++ b/core/src/test/java/hello/core/unitcalculation/testSubtraction.java @@ -0,0 +1,26 @@ +package hello.core.unitcalculation; + +import hello.core.calculator.CalculatorServiceV0; +import hello.core.calculator.OperatorV0; +import hello.core.repository.CalculatorRepositoryV0; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +public class testSubtraction { + @Test + @DisplayName("뺄셈") + public void Subtraction () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("4 - 2"); + Assertions.assertThat(result).isEqualTo(2); + } + + @Test + @DisplayName("뺄셈 2자리수 이상 포함") + public void SubtractionUpScale () { + CalculatorServiceV0 calculatorServiceV0 = new CalculatorServiceV0(new OperatorV0(), new CalculatorRepositoryV0()); + Double result = calculatorServiceV0.calculateExpression("250 - 70"); + Assertions.assertThat(result).isEqualTo(180); + } +}