This is an automated email from the ASF dual-hosted git repository.
tuichenchuxin 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 b2b9232eeb5 Fix expected data set rows message (#30857)
b2b9232eeb5 is described below
commit b2b9232eeb5ac1e21ffa559d4fc07b2bd36f9ed9
Author: ZhangCheng <[email protected]>
AuthorDate: Fri Apr 12 13:40:27 2024 +0800
Fix expected data set rows message (#30857)
---
.../java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java | 4 ++--
.../java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java | 4 ++--
.../java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java | 4 ++--
.../apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java | 2 +-
.../apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
index 35f4df29e3d..1b11175862b 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/DALE2EIT.java
@@ -108,11 +108,11 @@ class DALE2EIT {
int rowCount = 0;
ResultSetMetaData actualMetaData = actual.getMetaData();
while (actual.next()) {
- assertTrue(rowCount < expected.size(), "Size of actual result set
is different with size of expected dat set rows.");
+ assertTrue(rowCount < expected.size(), "Size of actual result set
is different with size of expected data set rows.");
assertRow(actual, actualMetaData, expected.get(rowCount));
rowCount++;
}
- assertThat("Size of actual result set is different with size of
expected dat set rows.", rowCount, is(expected.size()));
+ assertThat("Size of actual result set is different with size of
expected data set rows.", rowCount, is(expected.size()));
}
private void assertRow(final ResultSet actual, final ResultSetMetaData
actualMetaData, final DataSetRow expected) throws SQLException {
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
index 3bb870379f9..ee210eaaa13 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RALE2EIT.java
@@ -163,11 +163,11 @@ class RALE2EIT {
int rowCount = 0;
ResultSetMetaData actualMetaData = actual.getMetaData();
while (actual.next()) {
- assertTrue(rowCount < expected.size(), "Size of actual result set
is different with size of expected dat set rows.");
+ assertTrue(rowCount < expected.size(), "Size of actual result set
is different with size of expected data set rows.");
assertRow(actual, notAssertionColumns, actualMetaData,
expected.get(rowCount));
rowCount++;
}
- assertThat("Size of actual result set is different with size of
expected dat set rows.", rowCount, is(expected.size()));
+ assertThat("Size of actual result set is different with size of
expected data set rows.", rowCount, is(expected.size()));
}
private void assertRow(final ResultSet actual, final Collection<String>
notAssertionColumns, final ResultSetMetaData actualMetaData, final DataSetRow
expected) throws SQLException {
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
index 3e4d607ec3d..0c100fd3458 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/RDLE2EIT.java
@@ -150,11 +150,11 @@ class RDLE2EIT {
int rowCount = 0;
ResultSetMetaData actualMetaData = actual.getMetaData();
while (actual.next()) {
- assertTrue(rowCount < expected.size(), "Size of actual result set
is different with size of expected dat set rows.");
+ assertTrue(rowCount < expected.size(), "Size of actual result set
is different with size of expected data set rows.");
assertRow(actual, actualMetaData, expected.get(rowCount));
rowCount++;
}
- assertThat("Size of actual result set is different with size of
expected dat set rows.", rowCount, is(expected.size()));
+ assertThat("Size of actual result set is different with size of
expected data set rows.", rowCount, is(expected.size()));
}
private void assertRow(final ResultSet actual, final ResultSetMetaData
actualMetaData, final DataSetRow expected) throws SQLException {
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
index b0831ed1b6a..d39bce3d24a 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dml/BaseDMLE2EIT.java
@@ -161,7 +161,7 @@ public abstract class BaseDMLE2EIT {
}
rowCount++;
}
- assertThat("Size of actual result set is different with size of
expected dat set rows.", rowCount, is(expected.size()));
+ assertThat("Size of actual result set is different with size of
expected data set rows.", rowCount, is(expected.size()));
}
private void assertValue(final ResultSet actual, final int columnIndex,
final String expected, final DatabaseType databaseType) throws SQLException {
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
index 85acccb8088..b29470a05ee 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/engine/type/dql/BaseDQLE2EIT.java
@@ -155,11 +155,11 @@ public abstract class BaseDQLE2EIT {
int rowCount = 0;
ResultSetMetaData actualMetaData = actual.getMetaData();
while (actual.next()) {
- assertTrue(rowCount < expected.size(), "Size of actual result set
is different with size of expected dat set rows.");
+ assertTrue(rowCount < expected.size(), "Size of actual result set
is different with size of expected data set rows.");
assertRow(actual, notAssertionColumns, actualMetaData,
expected.get(rowCount));
rowCount++;
}
- assertThat("Size of actual result set is different with size of
expected dat set rows.", rowCount, is(expected.size()));
+ assertThat("Size of actual result set is different with size of
expected data set rows.", rowCount, is(expected.size()));
}
private void assertRow(final ResultSet actualResultSet, final
ResultSetMetaData actualMetaData,
