diff --git a/.idea/aws.xml b/.idea/aws.xml
new file mode 100644
index 0000000..99de319
--- /dev/null
+++ b/.idea/aws.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/java-practice.iml b/.idea/java-practice.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/java-practice.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..350cd12
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+ "java.configuration.updateBuildConfiguration": "interactive",
+ "java.compile.nullAnalysis.mode": "automatic",
+ "java.debug.settings.onBuildFailureProceed": true
+}
diff --git a/build.gradle b/build.gradle
index d92e3e8..857d7fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,18 +1,22 @@
apply plugin: 'java'
-apply plugin: 'eclipse'
-
-version = '1.0.0'
-sourceCompatibility = 1.8
repositories {
mavenCentral()
}
dependencies {
- compile('com.sparkjava:spark-core:2.6.0')
- compile('com.sparkjava:spark-template-handlebars:2.5.5')
- compile('com.google.guava:guava:23.0')
- compile('ch.qos.logback:logback-classic:1.2.3')
- testCompile('junit:junit:4.12')
- testCompile('org.assertj:assertj-core:3.9.0')
-}
\ No newline at end of file
+ implementation('com.sparkjava:spark-core:2.6.0')
+ implementation('com.sparkjava:spark-template-handlebars:2.5.5')
+ implementation('com.google.guava:guava:23.0')
+ implementation('ch.qos.logback:logback-classic:1.2.3')
+
+ //add junit jupiter
+ testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.9.3'
+ testImplementation 'org.assertj:assertj-core:3.11.1'
+ testImplementation 'org.testng:testng:7.1.0'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+}
+
+test {
+ useJUnitPlatform()
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index be52383..1af9e09 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
index 4f906e0..1aa94a4
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# 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.
@@ -17,67 +17,99 @@
#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# 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
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+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
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$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"'
+# 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"
+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
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+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
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
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"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +130,120 @@ 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.
+ 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+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
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-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" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
+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
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ 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
- i=`expr $i + 1`
+ # 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
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# 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/gradlew.bat b/gradlew.bat
index 107acd3..93e3f59 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+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!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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
diff --git a/src/test/java/next/exception/PositionTest.java b/src/test/java/next/exception/PositionTest.java
index 7bd5c76..e7e52c8 100644
--- a/src/test/java/next/exception/PositionTest.java
+++ b/src/test/java/next/exception/PositionTest.java
@@ -1,8 +1,9 @@
package next.exception;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class PositionTest {
@Test
@@ -19,29 +20,35 @@ public void create_77() {
assertThat(p.getY()).isEqualTo(7);
}
- @Test (expected = InValidPositionException.class)
+ @Test
public void 길이가_2가_아닌_경우() {
- new Position("a");
+ assertThatThrownBy(() -> new Position("a"))
+ .isInstanceOf(InValidPositionException.class);
}
- @Test (expected = InValidPositionException.class)
+ @Test
public void notValid_0보다_작은_X() {
- new Position("Z1");
+ assertThatThrownBy(() -> new Position("Z1"))
+ .isInstanceOf(InValidPositionException.class);
}
- @Test (expected = InValidPositionException.class)
+ @Test
public void notValid_7보다_큰_X() {
- new Position("i1");
+ assertThatThrownBy(() -> new Position("i1"))
+ .isInstanceOf(InValidPositionException.class);
}
- @Test (expected = InValidPositionException.class)
+ @Test
public void notValid_0보다_작은_Y() {
new Position("a0");
+ assertThatThrownBy(() -> new Position("a0"))
+ .isInstanceOf(InValidPositionException.class);
}
- @Test (expected = InValidPositionException.class)
+ @Test
public void notValid_7보다_큰_Y() {
- new Position("a9");
+ assertThatThrownBy(() -> new Position("a9"))
+ .isInstanceOf(InValidPositionException.class);
}
}
diff --git a/src/test/java/next/fp/CarTest.java b/src/test/java/next/fp/CarTest.java
index 1c3381b..27c424a 100644
--- a/src/test/java/next/fp/CarTest.java
+++ b/src/test/java/next/fp/CarTest.java
@@ -1,8 +1,9 @@
package next.fp;
+import org.junit.jupiter.api.Test;
+
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
public class CarTest {
@Test
diff --git a/src/test/java/next/fp/LambdaTest.java b/src/test/java/next/fp/LambdaTest.java
index fb8fdd0..af84391 100644
--- a/src/test/java/next/fp/LambdaTest.java
+++ b/src/test/java/next/fp/LambdaTest.java
@@ -1,17 +1,17 @@
package next.fp;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-
public class LambdaTest {
private List numbers;
- @Before
+ @BeforeEach
public void setup() {
numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
}
diff --git a/src/test/java/next/fp/StreamStudyTest.java b/src/test/java/next/fp/StreamStudyTest.java
index a70684b..9db6f5b 100644
--- a/src/test/java/next/fp/StreamStudyTest.java
+++ b/src/test/java/next/fp/StreamStudyTest.java
@@ -1,17 +1,17 @@
package next.fp;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-
public class StreamStudyTest {
private List numbers;
- @Before
+ @BeforeEach
public void setup() {
numbers = Arrays.asList(1, 2, 3, 4, 5, 6);
}
diff --git a/src/test/java/next/optional/ComputerStoreTest.java b/src/test/java/next/optional/ComputerStoreTest.java
index 1691d65..8cdab34 100644
--- a/src/test/java/next/optional/ComputerStoreTest.java
+++ b/src/test/java/next/optional/ComputerStoreTest.java
@@ -2,10 +2,9 @@
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
-
import next.optional.Computer.Soundcard;
import next.optional.Computer.USB;
+import org.junit.jupiter.api.Test;
public class ComputerStoreTest {
@Test
diff --git a/src/test/java/next/optional/ExpressionTest.java b/src/test/java/next/optional/ExpressionTest.java
index 533529e..af2d295 100644
--- a/src/test/java/next/optional/ExpressionTest.java
+++ b/src/test/java/next/optional/ExpressionTest.java
@@ -1,8 +1,9 @@
package next.optional;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.*;
-import org.junit.Test;
public class ExpressionTest {
@@ -11,8 +12,9 @@ public void of() {
assertThat(Expression.PLUS == Expression.of("+")).isTrue();
}
- @Test (expected = IllegalArgumentException.class)
+ @Test
public void notValidExpression() {
Expression.of("&");
+ assertThatThrownBy(() -> Expression.of("&")).isInstanceOf(IllegalArgumentException.class);
}
}
diff --git a/src/test/java/next/optional/UserTest.java b/src/test/java/next/optional/UserTest.java
index c2d8b9c..792d6da 100644
--- a/src/test/java/next/optional/UserTest.java
+++ b/src/test/java/next/optional/UserTest.java
@@ -1,10 +1,11 @@
package next.optional;
+
+import org.junit.jupiter.api.Test;
+
import static next.optional.User.*;
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
-
public class UserTest {
@Test
public void whenFiltersWithoutOptional_thenCorrect() {
diff --git a/src/test/java/next/optional/UsersTest.java b/src/test/java/next/optional/UsersTest.java
index 60a793b..5cef303 100644
--- a/src/test/java/next/optional/UsersTest.java
+++ b/src/test/java/next/optional/UsersTest.java
@@ -1,8 +1,8 @@
package next.optional;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
public class UsersTest {
diff --git a/src/test/java/next/reflection/Junit3Runner.java b/src/test/java/next/reflection/Junit3Runner.java
new file mode 100644
index 0000000..7517b83
--- /dev/null
+++ b/src/test/java/next/reflection/Junit3Runner.java
@@ -0,0 +1,18 @@
+package next.reflection;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Junit3Runner {
+
+ private static final Logger log = LoggerFactory.getLogger(Junit3Runner.class);
+
+ @Test
+ @DisplayName("Question 클래스의 모든 필드, 생성자, 메소드에 대한 정보를 출력한다.")
+ public void runner() throws Exception {
+ Class clazz = Question.class;
+ log.info("clazz: {}", clazz);
+ }
+}
diff --git a/src/test/java/next/reflection/Junit3Test.java b/src/test/java/next/reflection/Junit3Test.java
index 1630946..4bc8511 100644
--- a/src/test/java/next/reflection/Junit3Test.java
+++ b/src/test/java/next/reflection/Junit3Test.java
@@ -1,15 +1,15 @@
package next.reflection;
public class Junit3Test {
- public void test1() throws Exception {
+ public void test1() {
System.out.println("Running Test1");
}
- public void test2() throws Exception {
+ public void test2() {
System.out.println("Running Test2");
}
- public void three() throws Exception {
+ public void three() {
System.out.println("Running Test3");
}
}
diff --git a/src/test/java/next/reflection/Junit3TestRunner.java b/src/test/java/next/reflection/Junit3TestRunner.java
deleted file mode 100644
index 8158c24..0000000
--- a/src/test/java/next/reflection/Junit3TestRunner.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package next.reflection;
-
-import org.junit.Test;
-
-public class Junit3TestRunner {
- @Test
- public void run() throws Exception {
- Class clazz = Junit3Test.class;
- // TODO Junit3Test에서 test로 시작하는 메소드 실행
- }
-}
diff --git a/src/test/java/next/reflection/Junit4Runner.java b/src/test/java/next/reflection/Junit4Runner.java
new file mode 100644
index 0000000..bec7f7f
--- /dev/null
+++ b/src/test/java/next/reflection/Junit4Runner.java
@@ -0,0 +1,13 @@
+package next.reflection;
+
+import org.junit.jupiter.api.Test;
+
+public class Junit4Runner {
+ @Test
+ public void run() throws Exception {
+ Class clazz = Junit4Test.class;
+
+ }
+}
+
+
diff --git a/src/test/java/next/reflection/Junit4TestRunner.java b/src/test/java/next/reflection/Junit4TestRunner.java
deleted file mode 100644
index f72502b..0000000
--- a/src/test/java/next/reflection/Junit4TestRunner.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package next.reflection;
-
-import org.junit.Test;
-
-public class Junit4TestRunner {
- @Test
- public void run() throws Exception {
- Class clazz = Junit4Test.class;
- // TODO Junit4Test에서 @MyTest 애노테이션이 있는 메소드 실행
- }
-}
diff --git a/src/test/java/next/reflection/ReflectionTest.java b/src/test/java/next/reflection/ReflectionTest.java
index 7365f80..eb9b35d 100644
--- a/src/test/java/next/reflection/ReflectionTest.java
+++ b/src/test/java/next/reflection/ReflectionTest.java
@@ -2,21 +2,25 @@
import java.lang.reflect.Constructor;
-import org.junit.Test;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.assertj.core.api.Assertions.*;
public class ReflectionTest {
private static final Logger logger = LoggerFactory.getLogger(ReflectionTest.class);
@Test
+ @DisplayName("테스트1: 리플렉션을 이용해서 클래스와 메소드의 정보를 정확하게 출력해야 한다.")
public void showClass() {
+ SoftAssertions s = new SoftAssertions();
Class clazz = Question.class;
- logger.debug(clazz.getName());
+ logger.debug("Classs Name {}", clazz.getName());
}
@Test
- @SuppressWarnings("rawtypes")
public void constructor() throws Exception {
Class clazz = Question.class;
Constructor[] constructors = clazz.getConstructors();