提交 14a106d7 编写于 作者: C contextshuffling 提交者: Liang Zhang

changing HashMap to LinkedHashMap for deterministic iterations (#3164)

上级 a0ffcf02
...@@ -33,6 +33,7 @@ import java.sql.Connection; ...@@ -33,6 +33,7 @@ import java.sql.Connection;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
...@@ -62,7 +63,7 @@ public abstract class AbstractSQLTest { ...@@ -62,7 +63,7 @@ public abstract class AbstractSQLTest {
private static void createDataSources(final String dbName, final DatabaseType databaseType) { private static void createDataSources(final String dbName, final DatabaseType databaseType) {
Map<String, DataSource> dataSourceMap = databaseTypeMap.get(databaseType); Map<String, DataSource> dataSourceMap = databaseTypeMap.get(databaseType);
if (null == dataSourceMap) { if (null == dataSourceMap) {
dataSourceMap = new HashMap<>(); dataSourceMap = new LinkedHashMap<>();
databaseTypeMap.put(databaseType, dataSourceMap); databaseTypeMap.put(databaseType, dataSourceMap);
} }
BasicDataSource result = buildDataSource(dbName, databaseType); BasicDataSource result = buildDataSource(dbName, databaseType);
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package org.apache.shardingsphere.shardingjdbc.jdbc.core.statement; 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.core.constant.properties.ShardingPropertiesConstant;
import org.apache.shardingsphere.shardingjdbc.common.base.AbstractEncryptJDBCDatabaseAndTableTest; import org.apache.shardingsphere.shardingjdbc.common.base.AbstractEncryptJDBCDatabaseAndTableTest;
import org.junit.Test; import org.junit.Test;
...@@ -149,7 +150,7 @@ public final class EncryptPreparedStatementTest extends AbstractEncryptJDBCDatab ...@@ -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 { 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()) { Statement stmt = conn.createStatement()) {
ResultSet resultSet = stmt.executeQuery(SELECT_ALL_SQL); ResultSet resultSet = stmt.executeQuery(SELECT_ALL_SQL);
int count = 1; int count = 1;
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package org.apache.shardingsphere.shardingjdbc.jdbc.core.statement; 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.core.constant.properties.ShardingPropertiesConstant;
import org.apache.shardingsphere.shardingjdbc.common.base.AbstractEncryptJDBCDatabaseAndTableTest; import org.apache.shardingsphere.shardingjdbc.common.base.AbstractEncryptJDBCDatabaseAndTableTest;
import org.junit.Test; import org.junit.Test;
...@@ -166,7 +167,7 @@ public final class EncryptStatementTest extends AbstractEncryptJDBCDatabaseAndTa ...@@ -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 { 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()) { Statement stmt = conn.createStatement()) {
ResultSet resultSet = stmt.executeQuery(SELECT_SQL_TO_ASSERT); ResultSet resultSet = stmt.executeQuery(SELECT_SQL_TO_ASSERT);
int count = 1; int count = 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册