diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/common/base/AbstractSQLTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/common/base/AbstractSQLTest.java index f758bfedc37add619daa2d0d2aecd9f4f33a6d85..356e193646e6f3013cc8a0e9054c8455e36ddc02 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/common/base/AbstractSQLTest.java +++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/common/base/AbstractSQLTest.java @@ -33,6 +33,7 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.Arrays; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -62,7 +63,7 @@ public abstract class AbstractSQLTest { private static void createDataSources(final String dbName, final DatabaseType databaseType) { Map dataSourceMap = databaseTypeMap.get(databaseType); if (null == dataSourceMap) { - dataSourceMap = new HashMap<>(); + dataSourceMap = new LinkedHashMap<>(); databaseTypeMap.put(databaseType, dataSourceMap); } BasicDataSource result = buildDataSource(dbName, databaseType); diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatementTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatementTest.java index e461db296e4d717f3b5b8ff1519d5f88933533b7..be019afcb146fbddecc8cdecafae8b543af02cf4 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatementTest.java +++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatementTest.java @@ -17,6 +17,7 @@ package org.apache.shardingsphere.shardingjdbc.jdbc.core.statement; +import org.apache.shardingsphere.core.database.DatabaseTypes; import org.apache.shardingsphere.core.constant.properties.ShardingPropertiesConstant; import org.apache.shardingsphere.shardingjdbc.common.base.AbstractEncryptJDBCDatabaseAndTableTest; import org.junit.Test; @@ -149,7 +150,7 @@ public final class EncryptPreparedStatementTest extends AbstractEncryptJDBCDatab } private void assertResultSet(final int resultSetCount, final int id, final Object pwd, final Object assistPwd) throws SQLException { - try (Connection conn = getDatabaseTypeMap().values().iterator().next().values().iterator().next().getConnection(); + try (Connection conn = getDatabaseTypeMap().get(DatabaseTypes.getActualDatabaseType("H2")).get("encrypt").getConnection(); Statement stmt = conn.createStatement()) { ResultSet resultSet = stmt.executeQuery(SELECT_ALL_SQL); int count = 1; diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptStatementTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptStatementTest.java index b8f020851b03e40379db69a4df8b9d2618d86123..fb9719ecbb06c13deade4befbeee5454c92acd91 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptStatementTest.java +++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptStatementTest.java @@ -17,6 +17,7 @@ package org.apache.shardingsphere.shardingjdbc.jdbc.core.statement; +import org.apache.shardingsphere.core.database.DatabaseTypes; import org.apache.shardingsphere.core.constant.properties.ShardingPropertiesConstant; import org.apache.shardingsphere.shardingjdbc.common.base.AbstractEncryptJDBCDatabaseAndTableTest; import org.junit.Test; @@ -166,7 +167,7 @@ public final class EncryptStatementTest extends AbstractEncryptJDBCDatabaseAndTa } private void assertResultSet(final int resultSetCount, final int id, final Object pwd, final Object plain) throws SQLException { - try (Connection conn = getDatabaseTypeMap().values().iterator().next().values().iterator().next().getConnection(); + try (Connection conn = getDatabaseTypeMap().get(DatabaseTypes.getActualDatabaseType("H2")).get("encrypt").getConnection(); Statement stmt = conn.createStatement()) { ResultSet resultSet = stmt.executeQuery(SELECT_SQL_TO_ASSERT); int count = 1;