WIP:it FIX!

[demos/testing] / src / test / java / de / juplo / demo / DemoApplicationIT.java

diff --git a/src/test/java/de/juplo/demo/DemoApplicationIT.java b/src/test/java/de/juplo/demo/DemoApplicationIT.java
index 3e06567..1c628c4 100644 (file)
--- a/src/test/java/de/juplo/demo/DemoApplicationIT.java
+++ b/src/test/java/de/juplo/demo/DemoApplicationIT.java
@@ -1,34 +1,26 @@
 package de.juplo.demo;
 
-import de.juplo.demo.DemoApplicationIT.Application;
 import java.net.URI;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import static org.mockserver.matchers.Times.exactly;
 import static org.mockserver.model.HttpForward.forward;
 import static org.mockserver.model.HttpRequest.request;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
+import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.reactive.function.client.WebClient;
 
-@SpringJUnitConfig(Application.class)
+@ExtendWith(SpringExtension.class)
+@WebFluxTest
 class DemoApplicationIT extends IntegrationTestBase
 {
-  WebTestClient webClient;
   @Autowired
-  ApplicationContext context;
-
-
-  @BeforeEach
-  void setUp()
-  {
-    webClient = WebTestClient.bindToApplicationContext(context).build();
-  }
+  WebTestClient webClient;
 
 
   @Test
@@ -43,7 +35,7 @@ class DemoApplicationIT extends IntegrationTestBase
         .get()
         .uri(URI.create("http://S.U.T/?path=test.txt"))
         .exchange()
-        .expectStatus().is2xxSuccessful()
+        .expectStatus().isOk()
         .expectHeader().contentType(MediaType.TEXT_HTML)
         .expectBody(String.class).isEqualTo("Hello World!\n");
   }
@@ -57,8 +49,7 @@ class DemoApplicationIT extends IntegrationTestBase
       return new RemoteContentService(
           WebClient
               .builder()
-              .baseUrl("http://localhost:" +
-                  DemoApplicationIT.MOCK_SERVER.getLocalPort())
+              .baseUrl("http://localhost:" + MOCK_SERVER.getLocalPort())
               .build());
     }