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 7c3817b431c96450580f4fb20fdb59f9e6a47f61..0c8804d64ebccaa125ed161af6c3571cd78ed753 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 @@ -73,7 +73,7 @@ public final class StartTest { List result = new LinkedList<>(); for (String each : getAssertFiles(integrateResources)) { AssertsDefinition assertsDefinition = unmarshal(each); - SHARDING_RULE_TYPES.addAll(Arrays.asList(assertsDefinition.getBaseConfig().split(","))); + SHARDING_RULE_TYPES.addAll(Arrays.asList(assertsDefinition.getShardingRuleType().split(","))); result.addAll(getParameters(each, assertsDefinition.getAssertDQL())); result.addAll(getParameters(each, assertsDefinition.getAssertDML())); result.addAll(getParameters(each, assertsDefinition.getAssertDDL())); 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 85739992106805327430da70530b2cf4a6e0bd30..69ae75c0473b9b7709cb204c42dda031ea54ad22 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 @@ -84,7 +84,7 @@ public class AssertEngine { String rootPath = path.substring(0, path.lastIndexOf(File.separator) + 1); try { String msg = "The file path " + path + ", under which id is " + id; - for (String each : assertsDefinition.getBaseConfig().split(",")) { + for (String each : assertsDefinition.getShardingRuleType().split(",")) { String initDataFile = rootPath + assertsDefinition.getInitDataFile(); String initDataPath = initDataFile + "/" + each; File fileDirDatabase = new File(initDataPath); @@ -135,7 +135,7 @@ public class AssertEngine { if (!databaseTypes.contains(databaseType)) { break; } - String baseConfig = each.getBaseConfig(); + String baseConfig = each.getShardingRuleType(); if (StringUtils.isNotBlank(baseConfig)) { String[] baseConfigs = StringUtils.split(baseConfig, ","); boolean flag = true; @@ -187,7 +187,7 @@ public class AssertEngine { if (!databaseSubTypes.contains(databaseType)) { break; } - String baseConfig = subAssert.getBaseConfig(); + String baseConfig = subAssert.getShardingRuleType(); if (StringUtils.isNotBlank(baseConfig)) { String[] baseConfigs = StringUtils.split(baseConfig, ","); boolean flag = true; @@ -216,7 +216,7 @@ public class AssertEngine { parameter = anAssert.getParameter(); } AssertDDLDefinition anAssertSub = new AssertDDLDefinition(anAssert.getId(), anAssert.getInitSql(), - anAssert.getBaseConfig(), anAssert.getCleanSql(), expectedDataFileSub, + anAssert.getShardingRuleType(), anAssert.getCleanSql(), expectedDataFileSub, anAssert.getDatabaseConfig(), anAssert.getSql(), anAssert.getTable(), parameter, anAssert.getSubAsserts()); doUpdateUseStatementToExecuteUpdateDDL(shardingRuleType, databaseType, expectedDataFileTmp, dataSource, anAssertSub, rootsql, msg); @@ -233,7 +233,7 @@ public class AssertEngine { if (!databaseTypes.contains(databaseType)) { break; } - String baseConfig = each.getBaseConfig(); + String baseConfig = each.getShardingRuleType(); if (StringUtils.isNotBlank(baseConfig)) { String[] baseConfigs = StringUtils.split(baseConfig, ","); boolean flag = true; @@ -279,7 +279,7 @@ public class AssertEngine { if (!databaseSubTypes.contains(databaseType)) { break; } - String baseConfigSub = subAssert.getBaseConfig(); + String baseConfigSub = subAssert.getShardingRuleType(); if (StringUtils.isNotBlank(baseConfigSub)) { String[] baseConfigs = StringUtils.split(baseConfigSub, ","); boolean flag = true; @@ -313,7 +313,7 @@ public class AssertEngine { expectedParameter = each.getParameter(); } AssertDMLDefinition anAssertSub = new AssertDMLDefinition(each.getId(), - expectedDataFileSub, each.getBaseConfig(), subAssert.getExpectedUpdate(), each.getDatabaseConfig(), each.getSql(), + expectedDataFileSub, each.getShardingRuleType(), subAssert.getExpectedUpdate(), each.getDatabaseConfig(), each.getSql(), each.getExpectedSql(), parameter, expectedParameter, each.getSubAsserts()); resultDoUpdateUseStatementToExecuteUpdate = resultDoUpdateUseStatementToExecuteUpdate + doUpdateUseStatementToExecuteUpdate(expectedDataFileTmp, dataSource, dataSourceMaps, anAssertSub, rootSQL, mapDatasetDefinition, sqls, msg); resultDoUpdateUseStatementToExecute = resultDoUpdateUseStatementToExecute + doUpdateUseStatementToExecute(expectedDataFileTmp, dataSource, dataSourceMaps, anAssertSub, rootSQL, mapDatasetDefinition, sqls, msg); @@ -333,7 +333,7 @@ public class AssertEngine { if (!databaseSubTypes.contains(databaseType)) { break; } - String baseConfigSub = subAssert.getBaseConfig(); + String baseConfigSub = subAssert.getShardingRuleType(); if (StringUtils.isNotBlank(baseConfigSub)) { String[] baseConfigs = StringUtils.split(baseConfigSub, ","); boolean flag = true; @@ -366,7 +366,7 @@ public class AssertEngine { expectedParameter = each.getParameter(); } AssertDMLDefinition anAssertSub = new AssertDMLDefinition(each.getId(), - expectedDataFileSub, each.getBaseConfig(), subAssert.getExpectedUpdate(), each.getDatabaseConfig(), each.getSql(), + expectedDataFileSub, each.getShardingRuleType(), subAssert.getExpectedUpdate(), each.getDatabaseConfig(), each.getSql(), each.getExpectedSql(), parameter, expectedParameter, each.getSubAsserts()); resultDoUpdateUseStatementToExecuteUpdate = resultDoUpdateUseStatementToExecuteUpdate + doUpdateUseStatementToExecuteUpdate(expectedDataFileTmp, dataSource, dataSourceMaps, anAssertSub, rootSQL, mapDatasetDefinition, sqls, msg); resultDoUpdateUseStatementToExecute = resultDoUpdateUseStatementToExecute + doUpdateUseStatementToExecute(expectedDataFileTmp, dataSource, dataSourceMaps, anAssertSub, rootSQL, mapDatasetDefinition, sqls, msg); @@ -394,7 +394,7 @@ public class AssertEngine { if (!databaseTypes.contains(databaseType)) { break; } - String baseConfig = each.getBaseConfig(); + String baseConfig = each.getShardingRuleType(); if (StringUtils.isNotBlank(baseConfig)) { String[] baseConfigs = StringUtils.split(baseConfig, ","); boolean flag = true; @@ -458,7 +458,7 @@ public class AssertEngine { if (!databaseSubTypes.contains(databaseType)) { break; } - String baseSubConfig = subAssert.getBaseConfig(); + String baseSubConfig = subAssert.getShardingRuleType(); if (StringUtils.isNotBlank(baseSubConfig)) { String[] baseConfigs = StringUtils.split(baseSubConfig, ","); boolean flag = true; @@ -487,7 +487,7 @@ public class AssertEngine { parameter = anAssert.getParameter(); } AssertDQLDefinition anAssertSub = new AssertDQLDefinition(anAssert.getId(), - anAssert.getBaseConfig(), expectedDataFileSub, + anAssert.getShardingRuleType(), expectedDataFileSub, anAssert.getDatabaseConfig(), anAssert.getSql(), parameter, anAssert.getSubAsserts()); doSelectUsePreparedStatement(expectedDataFileTmp, dataSource, anAssertSub, rootSQL, msg); diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertDDLDefinition.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertDDLDefinition.java index 5281ee998c01a3f788fd9404ce14be04df29d73e..05c6bd93d640fc4c445f3e208c3f4b26fd21f6e2 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertDDLDefinition.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertDDLDefinition.java @@ -40,8 +40,8 @@ public class AssertDDLDefinition implements AssertDefinition { @XmlAttribute(name = "init-sql") private String initSql; - @XmlAttribute(name = "base-config") - private String baseConfig; + @XmlAttribute(name = "sharding-rule-type") + private String shardingRuleType; @XmlAttribute(name = "clean-sql") private String cleanSql; diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertDMLDefinition.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertDMLDefinition.java index 7104438dc4343515c906bdf0243732d2d56bc844..f5798b3ff563c852fc40dc2320a621ed3cfd811a 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertDMLDefinition.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertDMLDefinition.java @@ -40,8 +40,8 @@ public class AssertDMLDefinition implements AssertDefinition { @XmlAttribute(name = "expected-data-file") private String expectedDataFile; - @XmlAttribute(name = "base-config") - private String baseConfig; + @XmlAttribute(name = "sharding-rule-type") + private String shardingRuleType; @XmlAttribute(name = "expected-update") private Integer expectedUpdate; diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertDQLDefinition.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertDQLDefinition.java index 4e29b9c5ad7041a4dc9f2406ee496056d64ed4f0..0535fb2cc07c08e512921dd0082ae3958b866f65 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertDQLDefinition.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertDQLDefinition.java @@ -40,8 +40,8 @@ public class AssertDQLDefinition implements AssertDefinition { @XmlAttribute(name = "expected-data-file") private String expectedDataFile; - @XmlAttribute(name = "base-config") - private String baseConfig; + @XmlAttribute(name = "sharding-rule-type") + private String shardingRuleType; @XmlAttribute(name = "database-config") private String databaseConfig = "H2,MySQL,Oracle,SQLServer,PostgreSQL"; diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertSubDefinition.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertSubDefinition.java index 7311fa4e5b7c42d664ff87d328990012842225f0..9e402a06c5feac97b5346eb908c7b9972d32e1bb 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertSubDefinition.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertSubDefinition.java @@ -25,8 +25,8 @@ import javax.xml.bind.annotation.*; @XmlAccessorType(XmlAccessType.FIELD) public class AssertSubDefinition { - @XmlAttribute(name = "base-config") - private String baseConfig; + @XmlAttribute(name = "sharding-rule-type") + private String shardingRuleType; @XmlAttribute(name = "expected-data-file") private String expectedDataFile; diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertsDefinition.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertsDefinition.java index 5acb33b0f477db98a1e85710050eca922a2c5053..86f841c5e2537819104ff351248eed588f822966 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertsDefinition.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/dbtest/config/bean/AssertsDefinition.java @@ -29,8 +29,8 @@ import java.util.List; @XmlRootElement(name = "asserts") public class AssertsDefinition { - @XmlAttribute(name = "base-config") - private String baseConfig = "db,dbtbl,nullable"; + @XmlAttribute(name = "sharding-rule-type") + private String shardingRuleType = "db,dbtbl,nullable"; @XmlAttribute(name = "database-config") private String databaseConfig = "H2,MySQL,Oracle,SQLServer,PostgreSQL"; diff --git a/sharding-jdbc-core/src/test/resources/asserts/assert-sharding-database-only-with-hint-for-dml-test/assert-test.xml b/sharding-jdbc-core/src/test/resources/asserts/assert-sharding-database-only-with-hint-for-dml-test/assert-test.xml index e6973e3b883b259e4d4b0b951a517ede16b56f08..6d487012f8468a32f5d9b3703ba88fec8915d102 100644 --- a/sharding-jdbc-core/src/test/resources/asserts/assert-sharding-database-only-with-hint-for-dml-test/assert-test.xml +++ b/sharding-jdbc-core/src/test/resources/asserts/assert-sharding-database-only-with-hint-for-dml-test/assert-test.xml @@ -1,5 +1,5 @@ - - + + @@ -100,7 +100,7 @@ - + @@ -194,7 +194,7 @@