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 2020/12/30 15:28:49 UTC
[shardingsphere] branch master updated: Add more assert error
messages (#8840)
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 6679b9a Add more assert error messages (#8840)
6679b9a is described below
commit 6679b9a597c7adbbc241027265e88641e0a1f534
Author: Liang Zhang <te...@163.com>
AuthorDate: Wed Dec 30 23:28:22 2020 +0800
Add more assert error messages (#8840)
* Update assert error message for DQL
* Update assert error message for DDL
---
.../test/integration/engine/it/ddl/BaseDDLIT.java | 12 ++++++------
.../test/integration/engine/it/dql/AdditionalDQLIT.java | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
index eb41270..f11ec8e 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/ddl/BaseDDLIT.java
@@ -134,7 +134,7 @@ public abstract class BaseDDLIT extends SingleIT {
}
private void assertNotContainsTable(final Connection connection, final String tableName) throws SQLException {
- assertFalse(connection.getMetaData().getTables(null, null, tableName, new String[]{"TABLE"}).next());
+ assertFalse(String.format("Table `%s` should not existed", tableName), connection.getMetaData().getTables(null, null, tableName, new String[]{"TABLE"}).next());
}
private List<DataSetColumn> getActualColumns(final Collection<DataNode> dataNodes) throws SQLException {
@@ -187,20 +187,20 @@ public abstract class BaseDDLIT extends SingleIT {
}
private void assertColumnMetaData(final List<DataSetColumn> actual, final List<DataSetColumn> expected) {
- assertThat(actual.size(), is(expected.size()));
+ assertThat("Size of actual columns is different with size of expected columns.", actual.size(), is(expected.size()));
for (int i = 0; i < actual.size(); i++) {
assertColumnMetaData(actual.get(i), expected.get(i));
}
}
private void assertColumnMetaData(final DataSetColumn actual, final DataSetColumn expected) {
- assertThat(actual.getName(), is(expected.getName()));
+ assertThat("Mismatched column name.", actual.getName(), is(expected.getName()));
if ("MySQL".equals(getDatabaseType().getName()) && "integer".equals(expected.getType())) {
- assertThat(actual.getType(), is("int"));
+ assertThat("Mismatched column type.", actual.getType(), is("int"));
} else if ("PostgreSQL".equals(getDatabaseType().getName()) && "integer".equals(expected.getType())) {
- assertThat(actual.getType(), is("int4"));
+ assertThat("Mismatched column type.", actual.getType(), is("int4"));
} else {
- assertThat(actual.getType(), is(expected.getType()));
+ assertThat("Mismatched column type.", actual.getType(), is(expected.getType()));
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
index 2871c1e..2f5db85 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/it/dql/AdditionalDQLIT.java
@@ -130,7 +130,7 @@ public final class AdditionalDQLIT extends BaseDQLIT {
private void assertExecuteForStatementWithResultSetTypeAndResultSetConcurrency(final Connection connection) throws SQLException, ParseException {
try (Statement statement = connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)) {
- assertTrue("Not a DQL statement.", statement.execute(String.format(getSql(), assertion.getSQLValues().toArray())));
+ assertTrue("Not a query statement.", statement.execute(String.format(getSql(), assertion.getSQLValues().toArray())));
try (ResultSet resultSet = statement.getResultSet()) {
assertResultSet(resultSet);
}
@@ -142,7 +142,7 @@ public final class AdditionalDQLIT extends BaseDQLIT {
for (SQLValue each : assertion.getSQLValues()) {
preparedStatement.setObject(each.getIndex(), each.getValue());
}
- assertTrue("Not a DQL statement.", preparedStatement.execute());
+ assertTrue("Not a query statement.", preparedStatement.execute());
try (ResultSet resultSet = preparedStatement.getResultSet()) {
assertResultSet(resultSet);
}
@@ -162,7 +162,7 @@ public final class AdditionalDQLIT extends BaseDQLIT {
private void assertExecuteForStatementWithResultSetTypeAndResultSetConcurrencyAndResultSetHoldability(final Connection connection) throws SQLException, ParseException {
try (Statement statement = connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT)) {
- assertTrue("Not a DQL statement.", statement.execute(String.format(getSql(), assertion.getSQLValues().toArray())));
+ assertTrue("Not a query statement.", statement.execute(String.format(getSql(), assertion.getSQLValues().toArray())));
try (ResultSet resultSet = statement.getResultSet()) {
assertResultSet(resultSet);
}
@@ -174,7 +174,7 @@ public final class AdditionalDQLIT extends BaseDQLIT {
for (SQLValue each : assertion.getSQLValues()) {
preparedStatement.setObject(each.getIndex(), each.getValue());
}
- assertTrue("Not a DQL statement.", preparedStatement.execute());
+ assertTrue("Not a query statement.", preparedStatement.execute());
try (ResultSet resultSet = preparedStatement.getResultSet()) {
assertResultSet(resultSet);
}