You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/04/07 10:53:16 UTC

[shardingsphere] branch master updated: Remove H2 compile API for JDBCRepositoryTest (#25058)

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new fce8f514143 Remove H2 compile API for JDBCRepositoryTest (#25058)
fce8f514143 is described below

commit fce8f5141436f8f1736be5122f67008c50168723
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Apr 7 18:53:06 2023 +0800

    Remove H2 compile API for JDBCRepositoryTest (#25058)
---
 .../standalone/jdbc/JDBCRepositoryTest.java          | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepositoryTest.java b/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepositoryTest.java
index 987bd46c5ed..fadf52d118f 100644
--- a/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepositoryTest.java
+++ b/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepositoryTest.java
@@ -21,10 +21,6 @@ import com.zaxxer.hikari.HikariDataSource;
 import org.apache.shardingsphere.mode.repository.standalone.jdbc.fixture.JDBCRepositoryProviderFixture;
 import org.apache.shardingsphere.test.util.PropertiesBuilder;
 import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
-import org.h2.jdbc.JdbcCallableStatement;
-import org.h2.jdbc.JdbcConnection;
-import org.h2.jdbc.JdbcResultSet;
-import org.h2.jdbc.JdbcStatement;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -33,6 +29,10 @@ import org.mockito.Mock;
 import org.mockito.MockedConstruction;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Statement;
 import java.util.List;
 import java.util.Properties;
 
@@ -52,19 +52,19 @@ class JDBCRepositoryTest {
     private final JDBCRepositoryProviderFixture fixture = new JDBCRepositoryProviderFixture();
     
     @Mock
-    private JdbcConnection mockJdbcConnection;
+    private Connection mockJdbcConnection;
     
     @Mock
-    private JdbcStatement mockStatement;
+    private Statement mockStatement;
     
     @Mock
-    private JdbcCallableStatement mockPreparedStatement;
+    private PreparedStatement mockPreparedStatement;
     
     @Mock
-    private JdbcCallableStatement mockPreparedStatementForPersist;
+    private PreparedStatement mockPreparedStatementForPersist;
     
     @Mock
-    private JdbcResultSet mockResultSet;
+    private ResultSet mockResultSet;
     
     private MockedConstruction<HikariDataSource> mockedConstruction;
     
@@ -76,7 +76,7 @@ class JDBCRepositoryTest {
         when(mockJdbcConnection.createStatement()).thenReturn(mockStatement);
         repository = new JDBCRepository();
         Properties props = PropertiesBuilder.build(
-                new Property("jdbc_url", "jdbc:h2:mem:config;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL"),
+                new Property("jdbc_url", "jdbc:h2:mem:config;DB_CLOSE_DELAY=0;DATABASE_TO_UPPER=false;MODE=MYSQL"),
                 new Property("username", "sa"),
                 new Property("password", ""),
                 new Property("provider", "FIXTURE"));