From fac41373b58c7795cb0a82a4115e77abfbd8412e Mon Sep 17 00:00:00 2001 From: bumwoo Date: Fri, 9 Jun 2023 19:48:21 +0900 Subject: [PATCH 01/11] feat: setup calculator project --- .gitattributes | 9 + .gitignore | 25 ++ app/build.gradle | 42 +++ app/src/main/java/java/calculator/App.java | 14 + .../test/java/java/calculator/AppTest.java | 14 + gradlew | 245 ++++++++++++++++++ gradlew.bat | 92 +++++++ settings.gradle | 16 ++ 8 files changed, 457 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 app/build.gradle create mode 100644 app/src/main/java/java/calculator/App.java create mode 100644 app/src/test/java/java/calculator/AppTest.java create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..097f9f98d --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ffc7a1641 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# Compiled class files +*.class + +# Log files +*.log + +# IntelliJ IDEA files +.idea/ + +# Eclipse files +.classpath +.project +.settings/ + +# Build output +build/ +out/ + +# Dependency directories +.lib/ +libs/ + +# Gradle specific +.gradle/ +gradle/ \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 000000000..5c295fd53 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,42 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Java application project to get you started. + * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle + * User Manual available at https://docs.gradle.org/8.1.1/userguide/building_java_projects.html + */ + +plugins { + // Apply the application plugin to add support for building a CLI application in Java. + id 'application' +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +dependencies { + // Use JUnit Jupiter for testing. + testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1' + + // This dependency is used by the application. + implementation 'com.google.guava:guava:31.1-jre' +} + +// Apply a specific Java toolchain to ease working on different environments. +java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } +} + +application { + // Define the main class for the application. + mainClass = 'java.calculator.App' +} + +tasks.named('test') { + // Use JUnit Platform for unit tests. + useJUnitPlatform() +} diff --git a/app/src/main/java/java/calculator/App.java b/app/src/main/java/java/calculator/App.java new file mode 100644 index 000000000..253d03169 --- /dev/null +++ b/app/src/main/java/java/calculator/App.java @@ -0,0 +1,14 @@ +/* + * This Java source file was generated by the Gradle 'init' task. + */ +package java.calculator; + +public class App { + public String getGreeting() { + return "Hello World!"; + } + + public static void main(String[] args) { + System.out.println(new App().getGreeting()); + } +} diff --git a/app/src/test/java/java/calculator/AppTest.java b/app/src/test/java/java/calculator/AppTest.java new file mode 100644 index 000000000..6bc4c6308 --- /dev/null +++ b/app/src/test/java/java/calculator/AppTest.java @@ -0,0 +1,14 @@ +/* + * This Java source file was generated by the Gradle 'init' task. + */ +package java.calculator; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +class AppTest { + @Test void appHasAGreeting() { + App classUnderTest = new App(); + assertNotNull(classUnderTest.getGreeting(), "app should have a greeting"); + } +} diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..aeb74cbb4 --- /dev/null +++ b/gradlew @@ -0,0 +1,245 @@ +#!/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/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && 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 + 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*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=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=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, 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 \ + "$@" + +# 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/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..93e3f59f1 --- /dev/null +++ b/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. +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% 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/settings.gradle b/settings.gradle new file mode 100644 index 000000000..24a4aa2a0 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,16 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/8.1.1/userguide/multi_project_builds.html + */ + +plugins { + // Apply the foojay-resolver plugin to allow automatic download of JDKs + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' +} + +rootProject.name = 'java-calculator' +include('app') From c6aa8382e264729f8d39a50173e40ac4227bb954 Mon Sep 17 00:00:00 2001 From: bumwoo Date: Sat, 10 Jun 2023 11:33:09 +0900 Subject: [PATCH 02/11] =?UTF-8?q?feat:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EB=94=94=ED=8E=9C=EB=8D=98=EC=8B=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 5c295fd53..d85977dc6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,6 +22,10 @@ dependencies { // This dependency is used by the application. implementation 'com.google.guava:guava:31.1-jre' + testImplementation 'org.assertj:assertj-core:3.21.0' + // JUnit 5 + testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2' } // Apply a specific Java toolchain to ease working on different environments. From 6c74d03aae37c84851f903708f18be11d47626b4 Mon Sep 17 00:00:00 2001 From: bumwoo Date: Sat, 10 Jun 2023 11:52:07 +0900 Subject: [PATCH 03/11] =?UTF-8?q?feat:=20main=20=EC=B4=88=EA=B8=B0?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/java/calculator/App.java | 14 -------------- app/src/test/java/java/calculator/AppTest.java | 14 -------------- 2 files changed, 28 deletions(-) delete mode 100644 app/src/main/java/java/calculator/App.java delete mode 100644 app/src/test/java/java/calculator/AppTest.java diff --git a/app/src/main/java/java/calculator/App.java b/app/src/main/java/java/calculator/App.java deleted file mode 100644 index 253d03169..000000000 --- a/app/src/main/java/java/calculator/App.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This Java source file was generated by the Gradle 'init' task. - */ -package java.calculator; - -public class App { - public String getGreeting() { - return "Hello World!"; - } - - public static void main(String[] args) { - System.out.println(new App().getGreeting()); - } -} diff --git a/app/src/test/java/java/calculator/AppTest.java b/app/src/test/java/java/calculator/AppTest.java deleted file mode 100644 index 6bc4c6308..000000000 --- a/app/src/test/java/java/calculator/AppTest.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This Java source file was generated by the Gradle 'init' task. - */ -package java.calculator; - -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - -class AppTest { - @Test void appHasAGreeting() { - App classUnderTest = new App(); - assertNotNull(classUnderTest.getGreeting(), "app should have a greeting"); - } -} From 856cad6cd7c4442a5818e43ce9fc488e1d9ed4bf Mon Sep 17 00:00:00 2001 From: bumwoo Date: Sat, 10 Jun 2023 11:52:47 +0900 Subject: [PATCH 04/11] =?UTF-8?q?feat:=20operation=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calculator/model/operation/Addition.java | 13 +++++++++++++ .../model/operation/CalculationOperation.java | 7 +++++++ .../calculator/model/operation/Division.java | 17 +++++++++++++++++ .../model/operation/Multiplication.java | 13 +++++++++++++ .../calculator/model/operation/Subtraction.java | 13 +++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 app/src/main/java/example/calculator/model/operation/Addition.java create mode 100644 app/src/main/java/example/calculator/model/operation/CalculationOperation.java create mode 100644 app/src/main/java/example/calculator/model/operation/Division.java create mode 100644 app/src/main/java/example/calculator/model/operation/Multiplication.java create mode 100644 app/src/main/java/example/calculator/model/operation/Subtraction.java diff --git a/app/src/main/java/example/calculator/model/operation/Addition.java b/app/src/main/java/example/calculator/model/operation/Addition.java new file mode 100644 index 000000000..162b98aec --- /dev/null +++ b/app/src/main/java/example/calculator/model/operation/Addition.java @@ -0,0 +1,13 @@ +package example.calculator.model.operation; + +public class Addition implements CalculationOperation { + @Override + public double calculate(double a, double b) { + return a + b; + } + + @Override + public String getOperator() { + return "+"; + } +} diff --git a/app/src/main/java/example/calculator/model/operation/CalculationOperation.java b/app/src/main/java/example/calculator/model/operation/CalculationOperation.java new file mode 100644 index 000000000..1ff06ce0e --- /dev/null +++ b/app/src/main/java/example/calculator/model/operation/CalculationOperation.java @@ -0,0 +1,7 @@ +package example.calculator.model.operation; + +public interface CalculationOperation { + double calculate(double a, double b); + + String getOperator(); +} diff --git a/app/src/main/java/example/calculator/model/operation/Division.java b/app/src/main/java/example/calculator/model/operation/Division.java new file mode 100644 index 000000000..81fbc92b1 --- /dev/null +++ b/app/src/main/java/example/calculator/model/operation/Division.java @@ -0,0 +1,17 @@ +package example.calculator.model.operation; + +public class Division implements CalculationOperation { + @Override + public double calculate(double a, double b) { + if (b != 0) { + return a / b; + } else { + throw new IllegalArgumentException("Cannot divide by zero."); + } + } + + @Override + public String getOperator() { + return "/"; + } +} diff --git a/app/src/main/java/example/calculator/model/operation/Multiplication.java b/app/src/main/java/example/calculator/model/operation/Multiplication.java new file mode 100644 index 000000000..c406821b7 --- /dev/null +++ b/app/src/main/java/example/calculator/model/operation/Multiplication.java @@ -0,0 +1,13 @@ +package example.calculator.model.operation; + +public class Multiplication implements CalculationOperation { + @Override + public double calculate(double a, double b) { + return a * b; + } + + @Override + public String getOperator() { + return "*"; + } +} diff --git a/app/src/main/java/example/calculator/model/operation/Subtraction.java b/app/src/main/java/example/calculator/model/operation/Subtraction.java new file mode 100644 index 000000000..c3b8c5187 --- /dev/null +++ b/app/src/main/java/example/calculator/model/operation/Subtraction.java @@ -0,0 +1,13 @@ +package example.calculator.model.operation; + +public class Subtraction implements CalculationOperation { + @Override + public double calculate(double a, double b) { + return a - b; + } + + @Override + public String getOperator() { + return "-"; + } +} From e8a7b09776a811ea41526d71a1eeeba202e63c82 Mon Sep 17 00:00:00 2001 From: bumwoo Date: Sat, 10 Jun 2023 11:53:17 +0900 Subject: [PATCH 05/11] =?UTF-8?q?feat:=20ui=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/example/calculator/view/Input.java | 19 +++++++++++++++++ .../java/example/calculator/view/Output.java | 21 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 app/src/main/java/example/calculator/view/Input.java create mode 100644 app/src/main/java/example/calculator/view/Output.java diff --git a/app/src/main/java/example/calculator/view/Input.java b/app/src/main/java/example/calculator/view/Input.java new file mode 100644 index 000000000..82fa643d0 --- /dev/null +++ b/app/src/main/java/example/calculator/view/Input.java @@ -0,0 +1,19 @@ +package example.calculator.view; + +import java.util.Scanner; + +public class Input { + private Scanner scanner; + + public Input() { + scanner = new Scanner(System.in); + } + + public int getIntInput() { + return scanner.nextInt(); + } + + public String getStringInput() { + return scanner.nextLine(); + } +} diff --git a/app/src/main/java/example/calculator/view/Output.java b/app/src/main/java/example/calculator/view/Output.java new file mode 100644 index 000000000..e488a086c --- /dev/null +++ b/app/src/main/java/example/calculator/view/Output.java @@ -0,0 +1,21 @@ +package example.calculator.view; + +import example.calculator.model.Menu; +import java.util.List; + +public class Output { + public void printCalculationHistory(List calculationHistory) { + for (String history : calculationHistory) { + System.out.println(history); + } + } + + public void printMenu() { + System.out.println(Menu.조회.getValue() + ". " + Menu.조회); + System.out.println(Menu.계산.getValue() + ". " + Menu.계산); + } + + public void printResult(double result) { + System.out.println("결과: " + result); + } +} From 344e591b65b815ad01dbb2614caa14b4d1c18dcd Mon Sep 17 00:00:00 2001 From: bumwoo Date: Sat, 10 Jun 2023 11:53:35 +0900 Subject: [PATCH 06/11] =?UTF-8?q?feat:=20=EC=82=AC=EC=B9=99=EC=97=B0?= =?UTF-8?q?=EC=82=B0=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/example/Main.java | 14 +++ .../calculator/CalculatorController.java | 47 ++++++++++ .../example/calculator/model/Calculator.java | 87 +++++++++++++++++++ .../java/example/calculator/model/Menu.java | 16 ++++ 4 files changed, 164 insertions(+) create mode 100644 app/src/main/java/example/Main.java create mode 100644 app/src/main/java/example/calculator/CalculatorController.java create mode 100644 app/src/main/java/example/calculator/model/Calculator.java create mode 100644 app/src/main/java/example/calculator/model/Menu.java diff --git a/app/src/main/java/example/Main.java b/app/src/main/java/example/Main.java new file mode 100644 index 000000000..81f6425cf --- /dev/null +++ b/app/src/main/java/example/Main.java @@ -0,0 +1,14 @@ +package example; + +import example.calculator.CalculatorController; +import example.calculator.model.Calculator; +import example.calculator.view.Input; +import example.calculator.view.Output; + +public class Main { + public static void main(String[] args) { + CalculatorController calculatorController = new CalculatorController(new Input(), new Output(), + new Calculator()); + calculatorController.start(); + } +} diff --git a/app/src/main/java/example/calculator/CalculatorController.java b/app/src/main/java/example/calculator/CalculatorController.java new file mode 100644 index 000000000..5a8b83e75 --- /dev/null +++ b/app/src/main/java/example/calculator/CalculatorController.java @@ -0,0 +1,47 @@ +package example.calculator; + +import example.calculator.model.Calculator; +import example.calculator.view.Output; +import example.calculator.view.Input; + +public class CalculatorController { + private Input input; + private Output output; + private Calculator calculator; + + public CalculatorController(Input input, Output output, Calculator calculator) { + this.input = input; + this.output = output; + this.calculator = calculator; + } + + public void start() { + while (true) { + output.printMenu(); + int choice = input.getIntInput(); + + switch (choice) { + case 1: + output.printCalculationHistory(calculator.getCalculationHistory()); + break; + case 2: + handleCalculation(); + break; + default: + System.out.println("잘못된 선택입니다. 다시 선택해주세요."); + } + } + } + + private void handleCalculation() { + input.getStringInput(); + + System.out.print("수식을 입력하세요: "); + String expression = input.getStringInput(); + + String[] tokens = expression.split("\\s+"); + double result = calculator.handleCalculation(tokens, expression); + + output.printResult(result); + } +} diff --git a/app/src/main/java/example/calculator/model/Calculator.java b/app/src/main/java/example/calculator/model/Calculator.java new file mode 100644 index 000000000..c6819c65b --- /dev/null +++ b/app/src/main/java/example/calculator/model/Calculator.java @@ -0,0 +1,87 @@ +package example.calculator.model; + +import example.calculator.model.operation.Addition; +import example.calculator.model.operation.CalculationOperation; +import example.calculator.model.operation.Division; +import example.calculator.model.operation.Multiplication; +import example.calculator.model.operation.Subtraction; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class Calculator { + private Map calculationOperations; + private List calculationHistory; + + public Calculator() { + calculationOperations = new HashMap<>(); + calculationOperations.put("*", new Multiplication()); + calculationOperations.put("/", new Division()); + calculationOperations.put("+", new Addition()); + calculationOperations.put("-", new Subtraction()); + + calculationHistory = new ArrayList<>(); + } + + public List getCalculationHistory() { + return calculationHistory; + } + + public double calculate(double a, double b, String operator) { + CalculationOperation operation = calculationOperations.get(operator); + if (operation == null) { + throw new IllegalArgumentException("Invalid operator: " + operator); + } + + return operation.calculate(a, b); + } + + private void addToCalculationHistory(String expression) { + calculationHistory.add(expression); + } + + public double handleCalculation(String[] tokens, String expression) { + List operators = new ArrayList<>(); + List operands = new ArrayList<>(); + + for (String token : tokens) { + if (token.matches("[+\\-*/]")) { + operators.add(token); + } else { + operands.add(Double.parseDouble(token)); + } + } + + double result = getResult(operators, operands); + + String calculationExpression = expression.replaceAll("\\s+", ""); + addToCalculationHistory(calculationExpression + " = " + result); + return result; + } + + private double getResult(List operators, List operands) { + calculateOperations(operands, operators, "*", "/"); + calculateOperations(operands, operators, "+", "-"); + + return operands.get(0); + } + + private void calculateOperations(List operands, List operators, String... targetOperators) { + for (String targetOperator : targetOperators) { + for (int i = 0; i < operators.size(); i++) { + String operator = operators.get(i); + if (operator.equals(targetOperator)) { + double operand1 = operands.get(i); + double operand2 = operands.get(i + 1); + double result = calculate(operand1, operand2, operator); + + operands.set(i, result); + operands.remove(i + 1); + operators.remove(i); + i--; + } + } + } + } +} diff --git a/app/src/main/java/example/calculator/model/Menu.java b/app/src/main/java/example/calculator/model/Menu.java new file mode 100644 index 000000000..0b8085e65 --- /dev/null +++ b/app/src/main/java/example/calculator/model/Menu.java @@ -0,0 +1,16 @@ +package example.calculator.model; + +public enum Menu { + 조회(1), + 계산(2); + + private final int value; + + Menu(int value) { + this.value = value; + } + + public int getValue() { + return value; + } +} From 844bad2459afee1a2c6b79ec6eb23088c4bb8362 Mon Sep 17 00:00:00 2001 From: bumwoo Date: Sat, 10 Jun 2023 11:55:24 +0900 Subject: [PATCH 07/11] =?UTF-8?q?test:=20=EC=82=AC=EC=B9=99=EC=97=B0?= =?UTF-8?q?=EC=82=B0=20=EA=B8=B0=EB=8A=A5=20=ED=85=8C=EC=8A=A4=ED=8A=B8=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 --- .../calculator/model/CalculatorTest.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 app/src/test/java/example/calculator/model/CalculatorTest.java diff --git a/app/src/test/java/example/calculator/model/CalculatorTest.java b/app/src/test/java/example/calculator/model/CalculatorTest.java new file mode 100644 index 000000000..b0edacd7c --- /dev/null +++ b/app/src/test/java/example/calculator/model/CalculatorTest.java @@ -0,0 +1,28 @@ +package example.calculator.model; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.stream.Stream; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +public class CalculatorTest { + + @ParameterizedTest + @MethodSource("testData") + public void testCalculate(double operand1, double operand2, String operator, double expected) { + Calculator calculator = new Calculator(); + double result = calculator.calculate(operand1, operand2, operator); + assertThat(result).isEqualTo(expected); + } + + private static Stream testData() { + return Stream.of( + Arguments.of(1, 2, "+", 3), + Arguments.of(1, 2, "-", -1), + Arguments.of(2, 3, "*", 6), + Arguments.of(4, 2, "/", 2) + ); + } +} \ No newline at end of file From 6f0ad7b0edd6cab6b6dbf82cbb904884fb4e6601 Mon Sep 17 00:00:00 2001 From: bumwoo Date: Thu, 15 Jun 2023 18:24:00 +0900 Subject: [PATCH 08/11] =?UTF-8?q?feat:=20Menu=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/example/calculator/model/Menu.java | 18 ++++++++++++++---- .../java/example/calculator/view/Output.java | 4 ++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/example/calculator/model/Menu.java b/app/src/main/java/example/calculator/model/Menu.java index 0b8085e65..c34f4aff9 100644 --- a/app/src/main/java/example/calculator/model/Menu.java +++ b/app/src/main/java/example/calculator/model/Menu.java @@ -1,16 +1,26 @@ package example.calculator.model; - public enum Menu { - 조회(1), - 계산(2); + 조회(1, "조회"), + 계산(2, "계산"); private final int value; + private final String name; - Menu(int value) { + Menu(int value, String name) { this.value = value; + this.name = name; } public int getValue() { return value; } + + public String getName() { + return name; + } + + public String getFormattedInfo() { + return value + ". " + name; + } } + diff --git a/app/src/main/java/example/calculator/view/Output.java b/app/src/main/java/example/calculator/view/Output.java index e488a086c..a35f24861 100644 --- a/app/src/main/java/example/calculator/view/Output.java +++ b/app/src/main/java/example/calculator/view/Output.java @@ -11,8 +11,8 @@ public void printCalculationHistory(List calculationHistory) { } public void printMenu() { - System.out.println(Menu.조회.getValue() + ". " + Menu.조회); - System.out.println(Menu.계산.getValue() + ". " + Menu.계산); + System.out.println(Menu.조회.getFormattedInfo()); + System.out.println(Menu.계산.getFormattedInfo()); } public void printResult(double result) { From 8ea8204b569b09310801a23800f13dedeef57735 Mon Sep 17 00:00:00 2001 From: bumwoo Date: Thu, 15 Jun 2023 18:31:41 +0900 Subject: [PATCH 09/11] =?UTF-8?q?refactor:=20=EB=A7=A4=EC=A7=81=20?= =?UTF-8?q?=EB=84=98=EB=B2=84=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calculator/CalculatorController.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/example/calculator/CalculatorController.java b/app/src/main/java/example/calculator/CalculatorController.java index 5a8b83e75..56c33f715 100644 --- a/app/src/main/java/example/calculator/CalculatorController.java +++ b/app/src/main/java/example/calculator/CalculatorController.java @@ -5,6 +5,8 @@ import example.calculator.view.Input; public class CalculatorController { + private static final int MENU_VIEW_HISTORY = 1; + private static final int MENU_HANDLE_CALCULATION = 2; private Input input; private Output output; private Calculator calculator; @@ -16,19 +18,22 @@ public CalculatorController(Input input, Output output, Calculator calculator) { } public void start() { - while (true) { + boolean isRunning = true; + + while (isRunning) { output.printMenu(); - int choice = input.getIntInput(); + int userChoice = input.getIntInput(); - switch (choice) { - case 1: + switch (userChoice) { + case MENU_VIEW_HISTORY: output.printCalculationHistory(calculator.getCalculationHistory()); break; - case 2: + case MENU_HANDLE_CALCULATION: handleCalculation(); break; default: - System.out.println("잘못된 선택입니다. 다시 선택해주세요."); + isRunning = false; // 루프 종료 조건 + break; } } } @@ -36,7 +41,7 @@ public void start() { private void handleCalculation() { input.getStringInput(); - System.out.print("수식을 입력하세요: "); + output.printMessage(); String expression = input.getStringInput(); String[] tokens = expression.split("\\s+"); From 81b1bc2ed3cda69409e74007f0b66b82124fa700 Mon Sep 17 00:00:00 2001 From: bumwoo Date: Thu, 15 Jun 2023 18:32:07 +0900 Subject: [PATCH 10/11] =?UTF-8?q?refactor:=20printMessage=20output=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=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 --- app/src/main/java/example/calculator/view/Output.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/example/calculator/view/Output.java b/app/src/main/java/example/calculator/view/Output.java index a35f24861..6649459b7 100644 --- a/app/src/main/java/example/calculator/view/Output.java +++ b/app/src/main/java/example/calculator/view/Output.java @@ -18,4 +18,8 @@ public void printMenu() { public void printResult(double result) { System.out.println("결과: " + result); } + + public void printMessage() { + System.out.print("수식을 입력하세요: "); + } } From 8aace2ee2a9b455ac3517ad5fb52df183db1278e Mon Sep 17 00:00:00 2001 From: bumwoo Date: Thu, 15 Jun 2023 18:33:31 +0900 Subject: [PATCH 11/11] =?UTF-8?q?refactor:=20Pattern=20=EA=B0=9D=EC=B2=B4?= =?UTF-8?q?=20=EC=83=81=EC=88=98=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/example/calculator/model/Calculator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/example/calculator/model/Calculator.java b/app/src/main/java/example/calculator/model/Calculator.java index c6819c65b..e61d3a8de 100644 --- a/app/src/main/java/example/calculator/model/Calculator.java +++ b/app/src/main/java/example/calculator/model/Calculator.java @@ -9,8 +9,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; public class Calculator { + private static final Pattern OPERATOR_PATTERN = Pattern.compile("[+\\-*/]"); private Map calculationOperations; private List calculationHistory; @@ -46,7 +48,7 @@ public double handleCalculation(String[] tokens, String expression) { List operands = new ArrayList<>(); for (String token : tokens) { - if (token.matches("[+\\-*/]")) { + if (OPERATOR_PATTERN.matcher(token).matches()) { operators.add(token); } else { operands.add(Double.parseDouble(token));