From d928ce0b9552e8caa4309b034f89e900ba0953f0 Mon Sep 17 00:00:00 2001
From: Tommy Ludwig <8924140+shakuzen@users.noreply.github.com>
Date: Mon, 3 Feb 2020 15:02:18 +0900
Subject: [PATCH] Use JUnit Jupiter for spring module tests

---
 starter-spring/build.gradle                               | 4 ++++
 .../PrometheusRSocketAutoConfigurationTest.java           | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/starter-spring/build.gradle b/starter-spring/build.gradle
index fd5c6e1..49e26be 100644
--- a/starter-spring/build.gradle
+++ b/starter-spring/build.gradle
@@ -30,3 +30,7 @@ dependencies {
   testImplementation 'io.projectreactor:reactor-test'
   testImplementation 'io.micrometer:micrometer-registry-prometheus'
 }
+
+test {
+  useJUnitPlatform()
+}
diff --git a/starter-spring/src/test/java/io/micrometer/prometheus/rsocket/autoconfigure/PrometheusRSocketAutoConfigurationTest.java b/starter-spring/src/test/java/io/micrometer/prometheus/rsocket/autoconfigure/PrometheusRSocketAutoConfigurationTest.java
index bec5560..7222d3c 100644
--- a/starter-spring/src/test/java/io/micrometer/prometheus/rsocket/autoconfigure/PrometheusRSocketAutoConfigurationTest.java
+++ b/starter-spring/src/test/java/io/micrometer/prometheus/rsocket/autoconfigure/PrometheusRSocketAutoConfigurationTest.java
@@ -23,7 +23,7 @@
 import io.rsocket.transport.netty.server.CloseableChannel;
 import io.rsocket.transport.netty.server.TcpServerTransport;
 import io.rsocket.transport.netty.server.WebsocketServerTransport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.prometheus.PrometheusMetricsExportAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -36,7 +36,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class PrometheusRSocketAutoConfigurationTest {
+class PrometheusRSocketAutoConfigurationTest {
 
   private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
       .withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class, PrometheusMetricsExportAutoConfiguration.class, PrometheusRSocketAutoConfiguration.class));
@@ -59,7 +59,7 @@ public Mono<Void> fireAndForget(Payload payload) {
   }
 
   @Test
-  public void prometheusRSocketClientTcp() {
+  void prometheusRSocketClientTcp() {
     int port = SocketUtils.findAvailableTcpPort();
     final CountDownLatch latch = new CountDownLatch(1);
     this.startServer(TcpServerTransport.create(port), latch)
@@ -73,7 +73,7 @@ public void prometheusRSocketClientTcp() {
   }
 
   @Test
-  public void prometheusRSocketClientWebsocket() {
+  void prometheusRSocketClientWebsocket() {
     int port = SocketUtils.findAvailableTcpPort();
     final CountDownLatch latch = new CountDownLatch(1);
     this.startServer(WebsocketServerTransport.create(port), latch)