From e11860cd3e5a7236ce92f27e03fb1472f332e528 Mon Sep 17 00:00:00 2001 From: terrymanu Date: Fri, 4 May 2018 17:43:39 +0800 Subject: [PATCH] for #601: InItCreateSchema => DatabaseEnvironmentManager --- .../io/shardingjdbc/dbtest/StartTest.java | 20 ++++---- .../dbtest/asserts/AssertEngine.java | 50 +++++++++---------- ...a.java => DatabaseEnvironmentManager.java} | 18 +++---- 3 files changed, 44 insertions(+), 44 deletions(-) rename sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/init/{InItCreateSchema.java => DatabaseEnvironmentManager.java} (96%) diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/StartTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/StartTest.java index 77447f7d7860b..2b34602310dec 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/StartTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/StartTest.java @@ -20,7 +20,7 @@ import io.shardingjdbc.dbtest.asserts.AssertEngine; import io.shardingjdbc.dbtest.config.bean.AssertDefinition; import io.shardingjdbc.dbtest.config.bean.AssertsDefinition; -import io.shardingjdbc.dbtest.init.InItCreateSchema; +import io.shardingjdbc.dbtest.init.DatabaseEnvironmentManager; import lombok.RequiredArgsConstructor; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -71,7 +71,7 @@ public static Collection getParameters() throws IOException, JAXBExcep AssertsDefinition assertsDefinition = unmarshal(each); String[] dbs = assertsDefinition.getBaseConfig().split(","); for (String db : dbs) { - InItCreateSchema.addDatabase(db); + DatabaseEnvironmentManager.addDatabase(db); } result.addAll(getParameters(each, assertsDefinition.getAssertDQL())); result.addAll(getParameters(each, assertsDefinition.getAssertDML())); @@ -81,9 +81,9 @@ public static Collection getParameters() throws IOException, JAXBExcep return result; } - private static Collection getParameters(final String path, final List asserts) { + private static Collection getParameters(final String path, final List assertDefinitions) { Collection result = new LinkedList<>(); - for (AssertDefinition each : asserts) { + for (AssertDefinition each : assertDefinitions) { result.add(new String[] {path, each.getId()}); } return result; @@ -114,13 +114,13 @@ private static AssertsDefinition unmarshal(final String assertFilePath) throws I @BeforeClass public static void beforeClass() { if (isInitialized) { - InItCreateSchema.createDatabase(); - InItCreateSchema.createTable(); + DatabaseEnvironmentManager.createDatabase(); + DatabaseEnvironmentManager.createTable(); isInitialized = false; } else { - InItCreateSchema.dropDatabase(); - InItCreateSchema.createDatabase(); - InItCreateSchema.createTable(); + DatabaseEnvironmentManager.dropDatabase(); + DatabaseEnvironmentManager.createDatabase(); + DatabaseEnvironmentManager.createTable(); } } @@ -132,7 +132,7 @@ public void test() { @AfterClass public static void afterClass() { if (isCleaned) { - InItCreateSchema.dropDatabase(); + DatabaseEnvironmentManager.dropDatabase(); isCleaned = false; } } diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/asserts/AssertEngine.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/asserts/AssertEngine.java index aaf0b8ceeccbb..c333a727642c7 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/asserts/AssertEngine.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/asserts/AssertEngine.java @@ -34,7 +34,7 @@ import io.shardingjdbc.dbtest.config.bean.DatasetDefinition; import io.shardingjdbc.dbtest.config.bean.ParameterDefinition; import io.shardingjdbc.dbtest.exception.DbTestException; -import io.shardingjdbc.dbtest.init.InItCreateSchema; +import io.shardingjdbc.dbtest.init.DatabaseEnvironmentManager; import io.shardingjdbc.test.sql.SQLCasesLoader; import org.apache.commons.lang3.StringUtils; import org.junit.Assert; @@ -106,7 +106,7 @@ private static void onlyDatabaseRun(final String dbName, final String path, fina for (DatabaseType each : IntegrateTestEnvironment.getInstance().getDatabaseTypes()) { Map dataSourceMaps = new HashMap<>(); for (String db : dbs) { - DataSource subDataSource = InItCreateSchema.buildDataSource(db, each); + DataSource subDataSource = DatabaseEnvironmentManager.buildDataSource(db, each); dataSourceMaps.put(db, subDataSource); } if ("true".equals(assertsDefinition.getMasterslave())) { @@ -132,7 +132,7 @@ private static void onlyDatabaseRun(final String dbName, final String path, fina private static void ddlRun(final DatabaseType databaseType, final String id, final String dbName, final AssertsDefinition assertsDefinition, final String rootPath, final String msg, final DataSource dataSource) throws SQLException, ParseException, IOException, SAXException, ParserConfigurationException, XPathExpressionException { for (AssertDDLDefinition each : assertsDefinition.getAssertDDL()) { if (id.equals(each.getId())) { - List databaseTypes = InItCreateSchema.getDatabaseTypes(each.getDatabaseConfig()); + List databaseTypes = DatabaseEnvironmentManager.getDatabaseTypes(each.getDatabaseConfig()); if (!databaseTypes.contains(databaseType)) { break; } @@ -183,7 +183,7 @@ private static void ddlRun(final DatabaseType databaseType, final String id, fin private static void ddlSubRun(final DatabaseType databaseType, final String dbName, final String rootPath, final String msg, final DataSource dataSource, final AssertDDLDefinition anAssert, final String rootsql, final String expectedDataFile, final List subAsserts) throws SQLException, ParseException, IOException, SAXException, ParserConfigurationException, XPathExpressionException { for (AssertSubDefinition subAssert : subAsserts) { - List databaseSubTypes = InItCreateSchema.getDatabaseTypes(subAssert.getDatabaseConfig()); + List databaseSubTypes = DatabaseEnvironmentManager.getDatabaseTypes(subAssert.getDatabaseConfig()); if (!databaseSubTypes.contains(databaseType)) { break; @@ -230,7 +230,7 @@ private static void ddlSubRun(final DatabaseType databaseType, final String dbNa private static void dmlRun(final DatabaseType databaseType, final String initDataFile, final String dbName, final String path, final String id, final AssertsDefinition assertsDefinition, final String rootPath, final String msg, final DataSource dataSource, final Map dataSourceMaps, final List dbs) throws IOException, SAXException, ParserConfigurationException, XPathExpressionException, SQLException, ParseException { for (AssertDMLDefinition each : assertsDefinition.getAssertDML()) { if (id.equals(each.getId())) { - List databaseTypes = InItCreateSchema.getDatabaseTypes(each.getDatabaseConfig()); + List databaseTypes = DatabaseEnvironmentManager.getDatabaseTypes(each.getDatabaseConfig()); if (!databaseTypes.contains(databaseType)) { break; } @@ -276,7 +276,7 @@ private static void dmlRun(final DatabaseType databaseType, final String initDat resultDoUpdateUsePreparedStatementToExecute = resultDoUpdateUsePreparedStatementToExecute + doUpdateUsePreparedStatementToExecute(expectedDataFile, dataSource, dataSourceMaps, each, rootSQL, mapDatasetDefinition, sqls, msg); } else { for (AssertSubDefinition subAssert : subAsserts) { - List databaseSubTypes = InItCreateSchema.getDatabaseTypes(subAssert.getDatabaseConfig()); + List databaseSubTypes = DatabaseEnvironmentManager.getDatabaseTypes(subAssert.getDatabaseConfig()); if (!databaseSubTypes.contains(databaseType)) { break; } @@ -330,7 +330,7 @@ private static void dmlRun(final DatabaseType databaseType, final String initDat List subAsserts = each.getSubAsserts(); if (!subAsserts.isEmpty()) { for (AssertSubDefinition subAssert : subAsserts) { - List databaseSubTypes = InItCreateSchema.getDatabaseTypes(subAssert.getDatabaseConfig()); + List databaseSubTypes = DatabaseEnvironmentManager.getDatabaseTypes(subAssert.getDatabaseConfig()); if (!databaseSubTypes.contains(databaseType)) { break; } @@ -391,7 +391,7 @@ private static void dqlRun(final DatabaseType databaseType, final String initDat for (AssertDQLDefinition each : assertsDefinition.getAssertDQL()) { if (id.equals(each.getId())) { - List databaseTypes = InItCreateSchema.getDatabaseTypes(each.getDatabaseConfig()); + List databaseTypes = DatabaseEnvironmentManager.getDatabaseTypes(each.getDatabaseConfig()); if (!databaseTypes.contains(databaseType)) { break; } @@ -455,7 +455,7 @@ private static void dqlRun(final DatabaseType databaseType, final String initDat private static void dqlSubRun(final DatabaseType databaseType, final String dbName, final String rootPath, final String msg, final DataSource dataSource, final AssertDQLDefinition anAssert, final String rootSQL, final String expectedDataFile, final List subAsserts) throws SQLException, ParseException, IOException, SAXException, ParserConfigurationException, XPathExpressionException { for (AssertSubDefinition subAssert : subAsserts) { - List databaseSubTypes = InItCreateSchema.getDatabaseTypes(subAssert.getDatabaseConfig()); + List databaseSubTypes = DatabaseEnvironmentManager.getDatabaseTypes(subAssert.getDatabaseConfig()); if (!databaseSubTypes.contains(databaseType)) { break; } @@ -525,10 +525,10 @@ private static void doUpdateUsePreparedStatementToExecuteDDL(final DatabaseType try { try (Connection con = dataSource.getConnection()) { if (StringUtils.isNotBlank(anAssert.getCleanSql())) { - InItCreateSchema.dropTable(databaseType, anAssert.getCleanSql(), dbName); + DatabaseEnvironmentManager.dropTable(databaseType, anAssert.getCleanSql(), dbName); } if (StringUtils.isNotBlank(anAssert.getInitSql())) { - InItCreateSchema.createTable(databaseType, anAssert.getInitSql(), dbName); + DatabaseEnvironmentManager.createTable(databaseType, anAssert.getInitSql(), dbName); } DatabaseUtil.updateUsePreparedStatementToExecute(con, rootsql, anAssert.getParameter()); @@ -540,10 +540,10 @@ private static void doUpdateUsePreparedStatementToExecuteDDL(final DatabaseType } } finally { if (StringUtils.isNotBlank(anAssert.getCleanSql())) { - InItCreateSchema.dropTable(databaseType, anAssert.getCleanSql(), dbName); + DatabaseEnvironmentManager.dropTable(databaseType, anAssert.getCleanSql(), dbName); } if (StringUtils.isNotBlank(anAssert.getInitSql())) { - InItCreateSchema.createTable(databaseType, anAssert.getInitSql(), dbName); + DatabaseEnvironmentManager.createTable(databaseType, anAssert.getInitSql(), dbName); } } } @@ -576,10 +576,10 @@ private static void doUpdateUsePreparedStatementToExecuteUpdateDDL(final Databas try { try (Connection con = dataSource.getConnection()) { if (StringUtils.isNotBlank(anAssert.getCleanSql())) { - InItCreateSchema.dropTable(databaseType, anAssert.getCleanSql(), dbName); + DatabaseEnvironmentManager.dropTable(databaseType, anAssert.getCleanSql(), dbName); } if (StringUtils.isNotBlank(anAssert.getInitSql())) { - InItCreateSchema.createTable(databaseType, anAssert.getInitSql(), dbName); + DatabaseEnvironmentManager.createTable(databaseType, anAssert.getInitSql(), dbName); } DatabaseUtil.updateUsePreparedStatementToExecuteUpdate(con, rootsql, anAssert.getParameter()); @@ -590,10 +590,10 @@ private static void doUpdateUsePreparedStatementToExecuteUpdateDDL(final Databas } } finally { if (StringUtils.isNotBlank(anAssert.getCleanSql())) { - InItCreateSchema.dropTable(databaseType, anAssert.getCleanSql(), dbName); + DatabaseEnvironmentManager.dropTable(databaseType, anAssert.getCleanSql(), dbName); } if (StringUtils.isNotBlank(anAssert.getInitSql())) { - InItCreateSchema.createTable(databaseType, anAssert.getInitSql(), dbName); + DatabaseEnvironmentManager.createTable(databaseType, anAssert.getInitSql(), dbName); } } } @@ -623,10 +623,10 @@ private static void doUpdateUseStatementToExecuteDDL(final DatabaseType database try { try (Connection con = dataSource.getConnection()) { if (StringUtils.isNotBlank(anAssert.getCleanSql())) { - InItCreateSchema.dropTable(databaseType, anAssert.getCleanSql(), dbName); + DatabaseEnvironmentManager.dropTable(databaseType, anAssert.getCleanSql(), dbName); } if (StringUtils.isNotBlank(anAssert.getInitSql())) { - InItCreateSchema.createTable(databaseType, anAssert.getInitSql(), dbName); + DatabaseEnvironmentManager.createTable(databaseType, anAssert.getInitSql(), dbName); } DatabaseUtil.updateUseStatementToExecute(con, rootsql, anAssert.getParameter()); DatasetDefinition checkDataset = AnalyzeDataset.analyze(new File(expectedDataFile), "data"); @@ -636,10 +636,10 @@ private static void doUpdateUseStatementToExecuteDDL(final DatabaseType database } } finally { if (StringUtils.isNotBlank(anAssert.getCleanSql())) { - InItCreateSchema.dropTable(databaseType, anAssert.getCleanSql(), dbName); + DatabaseEnvironmentManager.dropTable(databaseType, anAssert.getCleanSql(), dbName); } if (StringUtils.isNotBlank(anAssert.getInitSql())) { - InItCreateSchema.createTable(databaseType, anAssert.getInitSql(), dbName); + DatabaseEnvironmentManager.createTable(databaseType, anAssert.getInitSql(), dbName); } } } @@ -669,10 +669,10 @@ private static void doUpdateUseStatementToExecuteUpdateDDL(final DatabaseType da try { try (Connection con = dataSource.getConnection()) { if (StringUtils.isNotBlank(anAssert.getCleanSql())) { - InItCreateSchema.dropTable(databaseType, anAssert.getCleanSql(), dbName); + DatabaseEnvironmentManager.dropTable(databaseType, anAssert.getCleanSql(), dbName); } if (StringUtils.isNotBlank(anAssert.getInitSql())) { - InItCreateSchema.createTable(databaseType, anAssert.getInitSql(), dbName); + DatabaseEnvironmentManager.createTable(databaseType, anAssert.getInitSql(), dbName); } DatabaseUtil.updateUseStatementToExecuteUpdate(con, rootsql, anAssert.getParameter()); DatasetDefinition checkDataset = AnalyzeDataset.analyze(new File(expectedDataFile), "data"); @@ -683,10 +683,10 @@ private static void doUpdateUseStatementToExecuteUpdateDDL(final DatabaseType da } } finally { if (StringUtils.isNotBlank(anAssert.getCleanSql())) { - InItCreateSchema.dropTable(databaseType, anAssert.getCleanSql(), dbName); + DatabaseEnvironmentManager.dropTable(databaseType, anAssert.getCleanSql(), dbName); } if (StringUtils.isNotBlank(anAssert.getInitSql())) { - InItCreateSchema.createTable(databaseType, anAssert.getInitSql(), dbName); + DatabaseEnvironmentManager.createTable(databaseType, anAssert.getInitSql(), dbName); } } } diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/init/InItCreateSchema.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/init/DatabaseEnvironmentManager.java similarity index 96% rename from sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/init/InItCreateSchema.java rename to sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/init/DatabaseEnvironmentManager.java index 4a6f253f17012..ed4467b210cdd 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/init/InItCreateSchema.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/init/DatabaseEnvironmentManager.java @@ -42,7 +42,7 @@ import java.util.List; import java.util.Set; -public final class InItCreateSchema { +public final class DatabaseEnvironmentManager { private static final Set DATABASES = new HashSet<>(); @@ -63,14 +63,14 @@ public static void createDatabase() { ResultSet resultSet = null; try { for (String database : DATABASES) { - String sql = getCreateTableSql(DatabaseType.H2, AnalyzeDatabase.analyze(InItCreateSchema.class.getClassLoader() + String sql = getCreateTableSql(DatabaseType.H2, AnalyzeDatabase.analyze(DatabaseEnvironmentManager.class.getClassLoader() .getResource("integrate/dbtest").getPath() + "/" + database + "/database.xml")); for (DatabaseType each : IntegrateTestEnvironment.getInstance().getDatabaseTypes()) { if (each.equals(DatabaseType.H2)) { continue; } if (DatabaseType.Oracle.equals(each)) { - String oracleSql = getCreateTableSql(DatabaseType.Oracle, AnalyzeDatabase.analyze(InItCreateSchema.class.getClassLoader() + String oracleSql = getCreateTableSql(DatabaseType.Oracle, AnalyzeDatabase.analyze(DatabaseEnvironmentManager.class.getClassLoader() .getResource("integrate/dbtest").getPath() + "/" + database + "/database.xml")); StringReader sr = new StringReader(oracleSql); conn = initialConnection(null, each); @@ -115,14 +115,14 @@ public static synchronized void dropDatabase() { StringReader sr = null; try { for (String database : DATABASES) { - String sql = getDropTableSql(DatabaseType.H2, AnalyzeDatabase.analyze(InItCreateSchema.class.getClassLoader() + String sql = getDropTableSql(DatabaseType.H2, AnalyzeDatabase.analyze(DatabaseEnvironmentManager.class.getClassLoader() .getResource("integrate/dbtest").getPath() + "/" + database + "/database.xml")); for (DatabaseType each : IntegrateTestEnvironment.getInstance().getDatabaseTypes()) { if (each.equals(DatabaseType.H2)) { continue; } if (DatabaseType.Oracle.equals(each)) { - String oracleSql = getDropTableSql(DatabaseType.Oracle, AnalyzeDatabase.analyze(InItCreateSchema.class.getClassLoader() + String oracleSql = getDropTableSql(DatabaseType.Oracle, AnalyzeDatabase.analyze(DatabaseEnvironmentManager.class.getClassLoader() .getResource("integrate/dbtest").getPath() + "/" + database + "/database.xml")); sr = new StringReader(oracleSql); conn = initialConnection(null, each); @@ -179,11 +179,11 @@ private static void createShardingSchema(final DatabaseType dbType) { StringReader sr = null; try { for (String each : DATABASES) { - List databases = AnalyzeDatabase.analyze(InItCreateSchema.class.getClassLoader() + List databases = AnalyzeDatabase.analyze(DatabaseEnvironmentManager.class.getClassLoader() .getResource("integrate/dbtest").getPath() + "/" + each + "/database.xml"); for (String database : databases) { conn = initialConnection(database, dbType); - List tableSqlIds = AnalyzeSql.analyze(InItCreateSchema.class.getClassLoader() + List tableSqlIds = AnalyzeSql.analyze(DatabaseEnvironmentManager.class.getClassLoader() .getResource("integrate/dbtest").getPath() + "/" + each + "/table/create-table.xml"); List tableSqls = new ArrayList<>(); for (String tableSqlId : tableSqlIds) { @@ -242,7 +242,7 @@ private static void createShardingSchema(final DatabaseType dbType, final String continue; } } - List databases = AnalyzeDatabase.analyze(InItCreateSchema.class.getClassLoader() + List databases = AnalyzeDatabase.analyze(DatabaseEnvironmentManager.class.getClassLoader() .getResource("integrate/dbtest").getPath() + "/" + each + "/database.xml"); for (String database : databases) { conn = initialConnection(database, dbType); @@ -286,7 +286,7 @@ private static void dropShardingSchema(final DatabaseType dbType, final String s continue; } } - List databases = AnalyzeDatabase.analyze(InItCreateSchema.class.getClassLoader() + List databases = AnalyzeDatabase.analyze(DatabaseEnvironmentManager.class.getClassLoader() .getResource("integrate/dbtest").getPath() + "/" + each + "/database.xml"); for (String database : databases) { conn = initialConnection(database, dbType);