Use MySQL instead of H2Database in ShardingSphere integration

Author: linghengqian

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
           cache: 'maven'
       - name: Build all test with Maven
         run: |
-          ./mvnw -T1C -B -e clean test
+          ./mvnw -T1C -e clean test
   test-minimum-hotspot-jdk-ci:
     name: Test CI - JDK ${{ matrix.java-version }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -50,6 +50,6 @@ jobs:
           ./mvnw -am -pl orm-samples/mybatis-sample -T1C -B -e clean test
       - name: Build third-part test with Maven
         run: |
-          ./mvnw -am -pl third-part-samples/shardingsphere-sample/shardingsphere-jdbc-4.x-spring-sample -T1C -B -e clean test
-          ./mvnw -am -pl third-part-samples/shardingsphere-sample/shardingsphere-jdbc-5.x-core-sample -T1C -B -e clean test
-          ./mvnw -am -pl third-part-samples/shardingsphere-sample/shardingsphere-jdbc-5.x-spring-sample -T1C -B -e clean test
+          ./mvnw -am -pl third-part-samples/shardingsphere-sample/shardingsphere-jdbc-4.x-spring-sample -T1C -e clean test
+          ./mvnw -am -pl third-part-samples/shardingsphere-sample/shardingsphere-jdbc-5.x-core-sample -T1C -e clean test
+          ./mvnw -am -pl third-part-samples/shardingsphere-sample/shardingsphere-jdbc-5.x-spring-sample -T1C -e clean test

.mvn/wrapper/maven-wrapper.properties

@@ -1,19 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-wrapperVersion=3.3.2
+wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

README.md

@@ -1,8 +1,9 @@
 # 演示例子
 
-大部分数据库连接为 H2Database，仅供测试。
+大部分数据库连接为 `h2database` 或通过 `testcontainers-java` 启动的 `mysql-server`，仅供测试。讨论不同情况，
 
-除开 `com.baomidou:springboot3-sample`， 其他子模块均可在 [OpenJDK 8, OpenJDK 21] 的 JDK 范围及其下游发行版下执行单元测试。
+1. `com.baomidou:springboot3-sample` 可在 [OpenJDK 17, OpenJDK 21] 的 JDK 范围及其下游发行版下执行单元测试
+2. 除开 `com.baomidou:springboot3-sample`， 其他子模块均可在 [OpenJDK 8, OpenJDK 21] 的 JDK 范围及其下游发行版下执行单元测试
 
 所有单元测试在 Github Actions 完成验证。你可能希望参考 [位于 Github Actions 的 CI 文件](./.github/workflows/ci.yml)。
 
@@ -29,10 +30,15 @@
 ## Contributing
 
 我们欢迎社区的贡献。围绕此 git 的讨论与协作应通过 https://github.com/baomidou/dynamic-datasource/issues 进行。
-
-针对 IDE，项目的语言级别应设置为 JDK 8，对于单独的 `com.baomidou:springboot3-sample` 子模块，语言级别应设置为 JDK 17 。
 在提交 Pull Request 之前, 请在本地通过 [OpenJDK 17, OpenJDK 21] 的 JDK 范围下完成此命令的验证。
-我们鼓励通过 `SDKMAN!` 切换到 `21.0.2-graalce` 来验证。
+我们鼓励通过 `SDKMAN!` 或 `version-fox/vfox` 切换到 `21.0.2-graalce` 来验证。
+
+针对 IntelliJ IDEA 等 IDE，项目的语言级别应设置为 JDK 8，对于单独的 `com.baomidou:springboot3-sample` 子模块，语言级别应设置为 JDK 17。
+下文讨论不同情况下可能的测试流程，
+
+### Ubuntu 24.04
+
+假设 `SDKMAN!` 和 `Docker Engine` 已安装，在 Bash 执行如下命令，
 
 ```shell
 sdk install java 21.0.2-graalce
@@ -42,3 +48,19 @@ git clone git@github.com:dynamic-datasource/dynamic-datasource-samples.git
 cd ./dynamic-datasource-samples/
 ./mvnw -T1C -e clean test
 ```
+
+### Windows 11
+
+假设 `PowerShell/PowerShell`, `version-fox/vfox`, `git-for-windows/git` 和 `rancher-sandbox/rancher-desktop` 已安装，
+在 `PowerShell 7` 执行如下命令，
+
+```shell
+rdctl start --application.start-in-background --container-engine.name=moby --kubernetes.enabled=false
+vfox add java
+vfox install java@21.0.2-graalce
+vfox use --global java@21.0.2-graalce
+
+git clone git@github.com:dynamic-datasource/dynamic-datasource-samples.git
+cd ./dynamic-datasource-samples/
+./mvnw -T1C -e clean test
+```

mvnw

@@ -21,6 +21,7 @@
         <h2.version>2.2.224</h2.version>
         <spring-boot-dependencies.version>2.7.18</spring-boot-dependencies.version>
         <lombok.version>1.18.30</lombok.version>
+        <testcontainers-bom.version>1.21.3</testcontainers-bom.version>
     </properties>
 
     <modules>
@@ -53,6 +54,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>${testcontainers-bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.springdoc</groupId>
                 <artifactId>springdoc-openapi-ui</artifactId>

mvnw.cmd

@@ -33,7 +33,6 @@
 
 /**
  * TODO Unit tests for ShardingSphere 5.4.0 need to be synchronized.
- *  Tracked on <a href="https://github.com/apache/shardingsphere/issues/27955">When a logic database uses both `SHARDING` and `READWRITE_SPLITTING` features, CRUD operations on table throw `NoSuchTableException`</a>
  */
 @SpringBootTest
 @Disabled("TODO wait for com.baomidou:dynamic-datasource-spring-boot-starter:4.2.0 release")
@@ -54,21 +53,21 @@ void after() {
 
     @Test
     void whenRequestToFindAll() {
-        assertEquals(tOrderMapper.findAll().size(), 0);
+        assertEquals(0, tOrderMapper.findAll().size());
     }
 
     @Test
     void whenRequestToAddByNameAndUserId() {
         int firstNumberOfAffectedRows = tOrderMapper.addAll(101L, "Bright", 114514L);
         int secondNumberOfAffectedRows = tOrderMapper.addAll(102L, "Jordan", 114515L);
-        assertEquals(firstNumberOfAffectedRows + secondNumberOfAffectedRows, 2);
-        assertEquals(tOrderMapper.findAll().size(), 2);
+        assertEquals(2, firstNumberOfAffectedRows + secondNumberOfAffectedRows);
+        assertEquals(2, tOrderMapper.findAll().size());
     }
 
     @Test
     void whenRequestToAddByNameAndUserIdWithPrimaryKey() {
         List<TOrder> emptyState = tOrderMapper.findAll();
-        assertEquals(emptyState.size(), 0);
+        assertEquals(0, emptyState.size());
         assertThrows(UncategorizedSQLException.class, () -> {
             tOrderMapper.addByNameAndUserId("Bright", 114514L);
             tOrderMapper.addByNameAndUserId("Jordan", 114515L);
@@ -84,8 +83,8 @@ void whenRequestToDeleteByIdTest() {
         tOrderMapper.addAll(105L, "Michael", 114518L);
         tOrderMapper.addAll(106L, "Tony", 114519L);
         int numberOfAffectedRows = tOrderMapper.deleteById(114514L);
-        assertEquals(numberOfAffectedRows, 1);
-        assertEquals(tOrderMapper.findAll().size(), 5);
+        assertEquals(1, numberOfAffectedRows);
+        assertEquals(5, tOrderMapper.findAll().size());
     }
 
     @Test
@@ -97,7 +96,7 @@ void whenRequestToDeleteAll() {
         tOrderMapper.addAll(105L, "Michael", 114518L);
         tOrderMapper.addAll(106L, "Tony", 114519L);
         int numberOfAffectedRows = tOrderMapper.deleteAll();
-        assertEquals(numberOfAffectedRows, 6);
-        assertEquals(tOrderMapper.findAll().size(), 0);
+        assertEquals(6, numberOfAffectedRows);
+        assertEquals(0, tOrderMapper.findAll().size());
     }
 }