Spring 5 reff (#1786)

* Fix Spring5 snippets

* Refactor Spring 5 samples

* Refactor Spring 5 samples

* Enable Spring5

spring-5/src/test/java/com/baeldung/Example1IntegrationTest.java

@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class IntegrationTestExample1 {
+public class Example1IntegrationTest {
 
     @Test
     public void test1a() {

spring-5/src/test/java/com/baeldung/Example2IntegrationTest.java

@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class IntegrationTestExample2 {
+public class Example2IntegrationTest {
 
     @Test
     public void test1a() {

spring-5/src/test/java/com/baeldung/ParallelIntegrationTest.java

@@ -5,18 +5,18 @@ import org.junit.experimental.ParallelComputer;
 import org.junit.runner.Computer;
 import org.junit.runner.JUnitCore;
 
-public class ParallelTestExample {
+public class ParallelIntegrationTest {
 
     @Test
     public void runTests() {
-        final Class<?>[] classes = { IntegrationTestExample1.class, IntegrationTestExample2.class };
+        final Class<?>[] classes = { Example1IntegrationTest.class, Example2IntegrationTest.class };
 
         JUnitCore.runClasses(new Computer(), classes);
     }
 
     @Test
     public void runTestsInParallel() {
-        final Class<?>[] classes = { IntegrationTestExample1.class, IntegrationTestExample2.class };
+        final Class<?>[] classes = { Example1IntegrationTest.class, Example2IntegrationTest.class };
 
         JUnitCore.runClasses(new ParallelComputer(true, true), classes);
     }

spring-5/src/test/java/com/baeldung/Spring5ApplicationIntegrationTest.java

@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class Spring5ApplicationTests {
+public class Spring5ApplicationIntegrationTest {
 
     @Test
     public void contextLoads() {

spring-5/src/test/java/com/baeldung/functional/FunctionalWebApplicationIntegrationTest.java

@@ -4,152 +4,139 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.web.server.WebServer;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.MediaType;
-//import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.test.web.reactive.server.WebTestClient;
 
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
-import static org.springframework.web.reactive.function.BodyInserters.fromResource;
-
-// TODO The class does not compile, WebTestClient cannot be resolved. Missing dependency?
 public class FunctionalWebApplicationIntegrationTest {
 
-//    private static WebTestClient client;
-//    private static WebServer server;
-//
-//    @BeforeClass
-//    public static void setup() throws Exception {
-//        server = new FunctionalWebApplication().start();
-//        client = WebTestClient
-//          .bindToServer()
-//          .baseUrl("http://localhost:" + server.getPort())
-//          .build();
-//    }
-//
-//    @AfterClass
-//    public static void destroy() {
-//        server.stop();
-//    }
-//
-//    @Test
-//    public void givenRouter_whenGetTest_thenGotHelloWorld() throws Exception {
-//        client
-//          .get()
-//          .uri("/test")
-//          .exchange()
-//          .expectStatus()
-//          .isOk()
-//          .expectBody(String.class)
-//          .value()
-//          .isEqualTo("helloworld");
-//    }
-//
-//    @Test
-//    public void givenIndexFilter_whenRequestRoot_thenRewrittenToTest() throws Exception {
-//        client
-//          .get()
-//          .uri("/")
-//          .exchange()
-//          .expectStatus()
-//          .isOk()
-//          .expectBody(String.class)
-//          .value()
-//          .isEqualTo("helloworld");
-//    }
-//
-//    @Test
-//    public void givenLoginForm_whenPostValidToken_thenSuccess() throws Exception {
-//        MultiValueMap<String, String> formData = new LinkedMultiValueMap<>(1);
-//        formData.add("user", "baeldung");
-//        formData.add("token", "you_know_what_to_do");
-//
-//        client
-//          .post()
-//          .uri("/login")
-//          .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-//          .exchange(BodyInserters.fromFormData(formData))
-//          .expectStatus()
-//          .isOk()
-//          .expectBody(String.class)
-//          .value()
-//          .isEqualTo("welcome back!");
-//    }
-//
-//    @Test
-//    public void givenLoginForm_whenRequestWithInvalidToken_thenFail() throws Exception {
-//        MultiValueMap<String, String> formData = new LinkedMultiValueMap<>(2);
-//        formData.add("user", "baeldung");
-//        formData.add("token", "try_again");
-//
-//        client
-//          .post()
-//          .uri("/login")
-//          .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-//          .exchange(BodyInserters.fromFormData(formData))
-//          .expectStatus()
-//          .isBadRequest();
-//    }
-//
-//    @Test
-//    public void givenUploadForm_whenRequestWithMultipartData_thenSuccess() throws Exception {
-//        Resource resource = new ClassPathResource("/baeldung-weekly.png");
-//        client
-//          .post()
-//          .uri("/upload")
-//          .contentType(MediaType.MULTIPART_FORM_DATA)
-//          .exchange(fromResource(resource))
-//          .expectStatus()
-//          .isOk()
-//          .expectBody(String.class)
-//          .value()
-//          .isEqualTo(String.valueOf(resource.contentLength()));
-//    }
-//
-//    @Test
-//    public void givenActors_whenAddActor_thenAdded() throws Exception {
-//        client
-//          .get()
-//          .uri("/actor")
-//          .exchange()
-//          .expectStatus()
-//          .isOk()
-//          .expectBody(Actor.class)
-//          .list()
-//          .hasSize(2);
-//
-//        client
-//          .post()
-//          .uri("/actor")
-//          .exchange(fromObject(new Actor("Clint", "Eastwood")))
-//          .expectStatus()
-//          .isOk();
-//
-//        client
-//          .get()
-//          .uri("/actor")
-//          .exchange()
-//          .expectStatus()
-//          .isOk()
-//          .expectBody(Actor.class)
-//          .list()
-//          .hasSize(3);
-//    }
-//
-//    @Test
-//    public void givenResources_whenAccess_thenGot() throws Exception {
-//        client
-//          .get()
-//          .uri("/files/hello.txt")
-//          .exchange()
-//          .expectStatus()
-//          .isOk()
-//          .expectBody(String.class)
-//          .value()
-//          .isEqualTo("hello");
-//    }
+    private static WebTestClient client;
+    private static WebServer server;
+
+    @BeforeClass
+    public static void setup() throws Exception {
+        server = new FunctionalWebApplication().start();
+        client = WebTestClient
+          .bindToServer()
+          .baseUrl("http://localhost:" + server.getPort())
+          .build();
+    }
+
+    @AfterClass
+    public static void destroy() {
+        server.stop();
+    }
+
+    @Test
+    public void givenRouter_whenGetTest_thenGotHelloWorld() throws Exception {
+        client
+          .get()
+          .uri("/test")
+          .exchange()
+          .expectStatus()
+          .isOk()
+          .expectBody(String.class)
+          .isEqualTo("helloworld");
+    }
+
+    @Test
+    public void givenIndexFilter_whenRequestRoot_thenRewrittenToTest() throws Exception {
+        client
+          .get()
+          .uri("/")
+          .exchange()
+          .expectStatus()
+          .isOk()
+          .expectBody(String.class)
+          .isEqualTo("helloworld");
+    }
+
+   /* @Test
+    public void givenLoginForm_whenPostValidToken_thenSuccess() throws Exception {
+        MultiValueMap<String, String> formData = new LinkedMultiValueMap<>(1);
+        formData.add("user", "baeldung");
+        formData.add("token", "you_know_what_to_do");
+
+        client
+          .post()
+          .uri("/login")
+          .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+          .exchange(BodyInserters.fromFormData(formData))
+          .expectStatus()
+          .isOk()
+          .expectBody(String.class)
+          .value()
+          .isEqualTo("welcome back!");
+    }*/
+
+   /* @Test
+    public void givenLoginForm_whenRequestWithInvalidToken_thenFail() throws Exception {
+        MultiValueMap<String, String> formData = new LinkedMultiValueMap<>(2);
+        formData.add("user", "baeldung");
+        formData.add("token", "try_again");
+
+        client
+          .post()
+          .uri("/login")
+          .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+          .exchange(BodyInserters.fromFormData(formData))
+          .expectStatus()
+          .isBadRequest();
+    }
+*/
+   /* @Test
+    public void givenUploadForm_whenRequestWithMultipartData_thenSuccess() throws Exception {
+        Resource resource = new ClassPathResource("/baeldung-weekly.png");
+        client
+          .post()
+          .uri("/upload")
+          .contentType(MediaType.MULTIPART_FORM_DATA)
+          .exchange(fromResource(resource))
+          .expectStatus()
+          .isOk()
+          .expectBody(String.class)
+          .value()
+          .isEqualTo(String.valueOf(resource.contentLength()));
+    }
+*/
+   /* @Test
+    public void givenActors_whenAddActor_thenAdded() throws Exception {
+        client
+          .get()
+          .uri("/actor")
+          .exchange()
+          .expectStatus()
+          .isOk()
+          .expectBody(Actor.class)
+          .list()
+          .hasSize(2);
+
+        client
+          .post()
+          .uri("/actor")
+          .exchange(fromObject(new Actor("Clint", "Eastwood")))
+          .expectStatus()
+          .isOk();
+
+        client
+          .get()
+          .uri("/actor")
+          .exchange()
+          .expectStatus()
+          .isOk()
+          .expectBody(Actor.class)
+          .list()
+          .hasSize(3);
+    }*/
+
+    @Test
+    public void givenResources_whenAccess_thenGot() throws Exception {
+        client
+          .get()
+          .uri("/files/hello.txt")
+          .exchange()
+          .expectStatus()
+          .isOk()
+          .expectBody(String.class)
+          .isEqualTo("hello");
+    }
 
 }

spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelTest.java

@@ -1,7 +1,7 @@
 package com.baeldung.jupiter;
 
-import com.baeldung.IntegrationTestExample1;
-import com.baeldung.IntegrationTestExample2;
+import com.baeldung.Example1IntegrationTest;
+import com.baeldung.Example2IntegrationTest;
 import org.junit.experimental.ParallelComputer;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.Computer;
@@ -12,7 +12,7 @@ public class Spring5JUnit5ParallelTest {
     @Test
     public void givenTwoTestClasses_whenJUnitRunParallel_thenTheTestsExecutingParallel() {
         final Class<?>[] classes = {
-          IntegrationTestExample1.class, IntegrationTestExample2.class
+          Example1IntegrationTest.class, Example2IntegrationTest.class
         };
 
         JUnitCore.runClasses(new ParallelComputer(true, true), classes);
@@ -21,7 +21,7 @@ public class Spring5JUnit5ParallelTest {
     @Test
     public void givenTwoTestClasses_whenJUnitRunParallel_thenTheTestsExecutingLinear() {
         final Class<?>[] classes = {
-          IntegrationTestExample1.class, IntegrationTestExample2.class
+          Example1IntegrationTest.class, Example2IntegrationTest.class
         };
 
         JUnitCore.runClasses(new Computer(), classes);