Merge pull request #35 from ssimmie/jupiter

Jupiter

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        springBootVersion = '2.1.4.RELEASE'
+        springBootVersion = '2.2.2.RELEASE'
         jacocoVersion = '0.8.3'
     }
     repositories {
@@ -50,7 +50,9 @@ dependencies {
     implementation('org.springframework.boot:spring-boot-starter-actuator')
     implementation('org.springframework.boot:spring-boot-starter-webflux')
     testImplementation("com.jayway.jsonpath:json-path")
-    testImplementation('org.springframework.boot:spring-boot-starter-test')
+    testImplementation('org.springframework.boot:spring-boot-starter-test') {
+        exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
+    }
     testImplementation('io.projectreactor:reactor-test')
 }
 

src/main/resources/application.properties

@@ -1,3 +1,4 @@
 spring.main.banner-mode=off
 logging.level.root=INFO
 logging.level.org.springframework=INFO
+server.port=9090

src/test/java/net/ssimmie/todos/TodosApplicationTests.java

@@ -2,9 +2,9 @@
 
 import static net.ssimmie.todos.TodosApplication.main;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 public class TodosApplicationTests {

src/test/java/net/ssimmie/todos/api/TodoTest.java

@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TodoTest {
 

src/test/java/net/ssimmie/todos/api/TodosResourceIT.java

@@ -3,20 +3,17 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
 
 import java.net.URL;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = RANDOM_PORT)
 public class TodosResourceIT {
 
@@ -28,7 +25,7 @@ public class TodosResourceIT {
   @Autowired
   private TestRestTemplate template;
 
-  @Before
+  @BeforeAll
   public void setUp() throws Exception {
     this.todos = new URL("http://localhost:" + port + "/todos");
   }
@@ -39,7 +36,8 @@ public void getTodos() {
         String.class);
 
     assertThat(response.getStatusCode()).isEqualTo(OK);
-    assertThat(response.getHeaders().getContentType()).isEqualTo(APPLICATION_JSON_UTF8);
-    assertThat(response.getBody()).isEqualTo("[{\"title\":\"Paint room\"},{\"title\":\"Order shelves\"}]");
+    assertThat(response.getHeaders().getContentType()).isEqualTo(APPLICATION_JSON);
+    assertThat(response.getBody())
+        .isEqualTo("[{\"title\":\"Paint room\"},{\"title\":\"Order shelves\"}]");
   }
 }

src/test/java/net/ssimmie/todos/api/TodosResourceTest.java

@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
 public class TodosResourceTest {