This is an automated email from the ASF dual-hosted git repository.
terrymanu 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 3ed016a6181 Improve diagnostics for missing segments in parser
integration tests (#40297)
3ed016a6181 is described below
commit 3ed016a6181527342ba3b7e45466957276873683
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Oct 20 10:11:17 2026 +0800
Improve diagnostics for missing segments in parser integration tests
(#40297)
---
.../sql/parser/internal/asserts/segment/database/DatabaseAssert.java | 3 +++
.../parser/internal/asserts/segment/orderby/OrderByClauseAssert.java | 3 +++
.../test/it/sql/parser/internal/asserts/segment/table/TableAssert.java | 1 +
.../sql/parser/internal/asserts/segment/where/WhereClauseAssert.java | 3 +++
4 files changed, 10 insertions(+)
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/database/DatabaseAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/database/DatabaseAssert.java
index 8d64eb80bc1..b936410c6cc 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/database/DatabaseAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/database/DatabaseAssert.java
@@ -25,6 +25,8 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.SQL
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.database.ExpectedDatabase;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Database assert.
*/
@@ -39,6 +41,7 @@ public final class DatabaseAssert {
* @param expected expected database
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final DatabaseSegment actual, final ExpectedDatabase expected) {
+ assertNotNull(actual, assertContext.getText("Actual database should
exist."));
IdentifierValueAssert.assertIs(assertContext, actual.getIdentifier(),
expected, "Database");
SQLSegmentAssert.assertIs(assertContext, actual, expected);
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/orderby/OrderByClauseAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/orderby/OrderByClauseAssert.java
index 18d4a19c24d..c8afd482da4 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/orderby/OrderByClauseAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/orderby/OrderByClauseAssert.java
@@ -23,6 +23,8 @@ import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.Ord
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.orderby.ExpectedOrderByClause;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Order by clause assert.
*/
@@ -37,6 +39,7 @@ public final class OrderByClauseAssert {
* @param expected expected order by clause
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final OrderBySegment actual, final ExpectedOrderByClause expected) {
+ assertNotNull(actual, assertContext.getText("Actual order by clause
should exist."));
OrderByItemAssert.assertIs(assertContext, actual.getOrderByItems(),
expected, "Order by");
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/table/TableAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/table/TableAssert.java
index 4dbf87672d4..4cef25d1357 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/table/TableAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/table/TableAssert.java
@@ -133,6 +133,7 @@ public final class TableAssert {
* @param expected expected table
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final SimpleTableSegment actual, final ExpectedSimpleTable expected) {
+ assertNotNull(actual, assertContext.getText("Actual table should
exist."));
assertTableNameSegment(assertContext, actual, expected);
assertThat(assertContext.getText("Table alias assertion error: "),
actual.getAliasName().orElse(null), is(expected.getAlias()));
if (null != expected.getDbLink()) {
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/where/WhereClauseAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/where/WhereClauseAssert.java
index 03ab2ef5444..bf4ff50551a 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/where/WhereClauseAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/where/WhereClauseAssert.java
@@ -25,6 +25,8 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.SQL
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.expression.ExpressionAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.where.ExpectedWhereClause;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Where clause assert.
*/
@@ -39,6 +41,7 @@ public final class WhereClauseAssert {
* @param expected expected where clause
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final WhereSegment actual, final ExpectedWhereClause expected) {
+ assertNotNull(actual, assertContext.getText("Actual where clause
should exist."));
ExpressionAssert.assertExpression(assertContext, actual.getExpr(),
expected.getExpr());
SQLSegmentAssert.assertIs(assertContext, actual, expected);
}
