clean boot data r2dbc samples

runing-snail · Feb 15, 2020 · 57aef05 · 57aef05
1 parent 930ae26
commit 57aef05
Show file tree

Hide file tree

Showing 13 changed files with 91 additions and 105 deletions.
diff --git a/boot-data-r2dbc-mssql/pom.xml b/boot-data-r2dbc-mssql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.2.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example</groupId>
@@ -53,15 +53,21 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-test</artifactId>
+            <groupId>org.springframework.boot.experimental</groupId>
+            <artifactId>spring-boot-test-autoconfigure-r2dbc</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot.experimental</groupId>
-            <artifactId>spring-boot-test-autoconfigure-r2dbc</artifactId>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/boot-data-r2dbc-mssql/src/test/java/com/example/demo/IntegrationTests.java b/boot-data-r2dbc-mssql/src/test/java/com/example/demo/IntegrationTests.java
@@ -0,0 +1,33 @@
+package com.example.demo;
+
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class IntegrationTests {
+
+    @LocalServerPort
+    int port;
+    WebTestClient webClient;
+
+    @BeforeAll
+    public void setup() {
+        this.webClient = WebTestClient.bindToServer()
+                .baseUrl("http://localhost:" + this.port)
+                .build();
+    }
+
+    @Test
+    public void willLoadPosts() {
+        this.webClient.get().uri("/posts")
+                .exchange()
+                .expectStatus().is2xxSuccessful()
+                .expectBodyList(Post.class).hasSize(1);
+    }
+
+}
+
diff --git a/boot-data-r2dbc-mssql/src/test/resources/junit-platform.properties b/boot-data-r2dbc-mssql/src/test/resources/junit-platform.properties
@@ -0,0 +1 @@
+junit.jupiter.testinstance.lifecycle.default = per_class
diff --git a/boot-data-r2dbc-mysql/pom.xml b/boot-data-r2dbc-mysql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.2.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example</groupId>
@@ -46,11 +46,11 @@
             <version>0.8.0.RELEASE</version>
         </dependency>
 
-<!--        <dependency>
-            <groupId>com.github.jasync-sql</groupId>
-            <artifactId>jasync-r2dbc-mysql</artifactId>
-            <version>1.0.12</version>
-        </dependency>-->
+        <!--        <dependency>
+                    <groupId>com.github.jasync-sql</groupId>
+                    <artifactId>jasync-r2dbc-mysql</artifactId>
+                    <version>1.0.12</version>
+                </dependency>-->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -60,6 +60,17 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot.experimental</groupId>
+            <artifactId>spring-boot-test-autoconfigure-r2dbc</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>

diff --git a/boot-data-r2dbc-mysql/src/test/java/com/example/demo/DemoApplicationTests.java b/boot-data-r2dbc-mysql/src/test/java/com/example/demo/DemoApplicationTests.java
diff --git a/...om/example/demo/DemoApplicationTests.java → ...va/com/example/demo/IntegrationTests.java b/...om/example/demo/DemoApplicationTests.java → ...va/com/example/demo/IntegrationTests.java
@@ -1,22 +1,20 @@
 package com.example.demo;
 
-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.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class DemoApplicationTests {
+public class IntegrationTests {
 
     @LocalServerPort
-    int port;
-    WebTestClient webClient;
+    private int port;
 
-    @Before
+    private WebTestClient webClient;
+
+    @BeforeAll
     public void setup() {
         this.webClient = WebTestClient.bindToServer()
                 .baseUrl("http://localhost:" + this.port)
@@ -28,7 +26,7 @@ public void willLoadPosts() {
     	this.webClient.get().uri("/posts")
 				.exchange()
 				.expectStatus().is2xxSuccessful()
-				.expectBodyList(Post.class).hasSize(1);
+				.expectBodyList(Post.class).hasSize(2);
     }
 
 }

diff --git a/boot-data-r2dbc-mysql/src/test/resources/junit-platform.properties b/boot-data-r2dbc-mysql/src/test/resources/junit-platform.properties
@@ -0,0 +1 @@
+junit.jupiter.testinstance.lifecycle.default = per_class
diff --git a/boot-data-r2dbc-postgresql/pom.xml b/boot-data-r2dbc-postgresql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.2.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example</groupId>
@@ -53,15 +53,21 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-test</artifactId>
+            <groupId>org.springframework.boot.experimental</groupId>
+            <artifactId>spring-boot-test-autoconfigure-r2dbc</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot.experimental</groupId>
-            <artifactId>spring-boot-test-autoconfigure-r2dbc</artifactId>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...om/example/demo/DemoApplicationTests.java → ...va/com/example/demo/IntegrationTests.java b/...om/example/demo/DemoApplicationTests.java → ...va/com/example/demo/IntegrationTests.java
@@ -1,22 +1,20 @@
 package com.example.demo;
 
-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.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class DemoApplicationTests {
+public class IntegrationTests {
 
     @LocalServerPort
-    int port;
-    WebTestClient webClient;
+    private int port;
 
-    @Before
+    private WebTestClient webClient;
+
+    @BeforeAll
     public void setup() {
         this.webClient = WebTestClient.bindToServer()
                 .baseUrl("http://localhost:" + this.port)
@@ -28,7 +26,7 @@ public void willLoadPosts() {
     	this.webClient.get().uri("/posts")
 				.exchange()
 				.expectStatus().is2xxSuccessful()
-				.expectBodyList(Post.class).hasSize(1);
+				.expectBodyList(Post.class).hasSize(2);
     }
 
 }

diff --git a/boot-data-r2dbc-postgresql/src/test/java/com/example/demo/PostRepositoryTest.java b/boot-data-r2dbc-postgresql/src/test/java/com/example/demo/PostRepositoryTest.java
diff --git a/boot-data-r2dbc-postgresql/src/test/resources/junit-platform.properties b/boot-data-r2dbc-postgresql/src/test/resources/junit-platform.properties
@@ -0,0 +1 @@
+junit.jupiter.testinstance.lifecycle.default = per_class
diff --git a/.../com/example/demo/PostRepositoryTest.java → .../com/example/demo/PostRepositoryTest.java b/.../com/example/demo/PostRepositoryTest.java → .../com/example/demo/PostRepositoryTest.java
diff --git a/boot-r2dbc/src/test/java/com/example/demo/IntegrationTests.java b/boot-r2dbc/src/test/java/com/example/demo/IntegrationTests.java
@@ -1,7 +1,6 @@
 package com.example.demo;
 
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		junit.jupiter.testinstance.lifecycle.default = per_class