Merge pull request #2 from code-squad/versionUp

honux77 · web-flow · commit d43fdb644ee3 · 2023-04-28T18:01:50.000+09:00
패키지 버전 업데이트
diff --git a/.idea/aws.xml b/.idea/aws.xml
diff --git 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')
-}
+    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
diff --git 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
@@ -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
@@ -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<Integer> 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
@@ -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<Integer> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/src/test/java/next/reflection/Junit4Runner.java 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
diff --git 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<Question> clazz = Question.class;
-        logger.debug(clazz.getName());
+        logger.debug("Classs Name {}", clazz.getName());
     }
 
     @Test
-    @SuppressWarnings("rawtypes")
     public void constructor() throws Exception {
         Class<Question> clazz = Question.class;
         Constructor[] constructors = clazz.getConstructors();

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`package next.optional;`
`2`	`2`
`3`		`-import static org.assertj.core.api.Assertions.assertThat;`
	`3`	`+import org.junit.jupiter.api.Test;`
	`4`	`+`
	`5`	`+import static org.assertj.core.api.Assertions.*;`
`4`	`6`
`5`		`-import org.junit.Test;`
`6`	`7`
`7`	`8`
`8`	`9`	`public class ExpressionTest {`
`@@ -11,8 +12,9 @@ public void of() {`
`11`	`12`	`assertThat(Expression.PLUS == Expression.of("+")).isTrue();`
`12`	`13`	`}`
`13`	`14`
`14`		`- @Test (expected = IllegalArgumentException.class)`
	`15`	`+ @Test`
`15`	`16`	`public void notValidExpression() {`
`16`	`17`	`Expression.of("&");`
	`18`	`+ assertThatThrownBy(() -> Expression.of("&")).isInstanceOf(IllegalArgumentException.class);`
`17`	`19`	`}`
`18`	`20`	`}`