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/build.gradle b/build.gradle index d92e3e8..43d0d0d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,23 @@ apply plugin: 'java' apply plugin: 'eclipse' -version = '1.0.0' -sourceCompatibility = 1.8 +sourceCompatibility = 11 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' +} + +targetCompatibility = 11 \ No newline at end of file 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..64e9a3b --- /dev/null +++ b/src/test/java/next/reflection/Junit3Runner.java @@ -0,0 +1,11 @@ +package next.reflection; + +import org.junit.jupiter.api.Test; + +public class Junit3Runner { + @Test + public void runner() throws Exception { + Class clazz = Junit3Test.class; + + } +} 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();