review parsing integrated tests (#4799)

shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/asserts/segment/definition/ColumnPositionAssert.java

@@ -43,23 +43,23 @@ public final class ColumnPositionAssert {
      * @param expected expected column position
      */
     public static void assertIs(final SQLCaseAssertContext assertContext, final ColumnPositionSegment actual, final ExpectedColumnPosition expected) {
-        String columnname = null;
+        String actualColumn = null;
         if (null != actual.getColumnName()) {
-            columnname = actual.getColumnName().getQualifiedName();
+            actualColumn = actual.getColumnName().getQualifiedName();
         }
-        String expectColumnName = null;
+        String expectColumn = null;
         if (null != expected.getColumn()) {
-            expectColumnName = expected.getColumn().getName();
+            expectColumn = expected.getColumn().getName();
         }
-        assertThat(assertContext.getText("Column change position name assertion error: "), columnname, is(expectColumnName));
-        // TODO assert start index and stop index
+        assertThat(assertContext.getText("Column change position name assertion error: "), actualColumn, is(expectColumn));
         if (actual instanceof ColumnAfterPositionSegment) {
             assertNotNull(assertContext.getText("Assignments should exist."), expected.getColumn());
-            assertThat(assertContext.getText("Column change position after name assertion error: "), 
-                    ((ColumnAfterPositionSegment) actual).getColumnName().getIdentifier().getValue(), is(expected.getColumn().getName()));
-            // TODO assert start index and stop index
+            assertThat(assertContext.getText("Column change position after name assertion error: "), actual.getColumnName().getIdentifier().getValue(), is(expected.getColumn().getName()));
+            
         } else {
             assertNull(assertContext.getText("Assignments should not exist."), expected.getColumn());
         }
+        // TODO assert start index and stop index
+//        SQLSegmentAssert.assertIs(assertContext, actual, expected);
     }
 }

shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/asserts/segment/insert/OnDuplicateKeyColumnsAssert.java

@@ -45,7 +45,6 @@ public final class OnDuplicateKeyColumnsAssert {
      */
     public static void assertIs(final SQLCaseAssertContext assertContext, final OnDuplicateKeyColumnsSegment actual, final ExpectedOnDuplicateKeyColumns expected) {
         assertNotNull(assertContext.getText("On duplicate key columns should exist."), expected);
-        // TODO assert start index and stop index
         assertThat(assertContext.getText("On duplicate key columns size assertion error: "), actual.getColumns().size(), is(expected.getAssignments().size()));
         int count = 0;
         for (AssignmentSegment each : actual.getColumns()) {

shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/asserts/segment/where/WhereClauseAssert.java

@@ -109,7 +109,6 @@ public final class WhereClauseAssert {
             assertNotNull(assertContext.getText("Operator assertion error: "), expected);
             assertThat(assertContext.getText("Operator assertion error: "), ((PredicateCompareRightValue) actual.getRightValue()).getOperator(), is(expected.getType()));
         }
-        // TODO assert operator start index and stop index
     }
     
     private static void assertCompareRightValue(final SQLCaseAssertContext assertContext, final PredicateCompareRightValue actual, final ExpectedPredicateCompareRightValue expected) {
@@ -122,8 +121,6 @@ public final class WhereClauseAssert {
         } else if (actual.getExpression() instanceof SubqueryExpressionSegment) {
             ExpressionAssert.assertSubqueryExpression(assertContext, (SubqueryExpressionSegment) actual.getExpression(), expected.getSubquery());
         }
-        // TODO assert start index and stop index
-//        SQLSegmentAssert.assertIs(assertContext, actual, expected);
     }
     
     private static void assertInRightValue(final SQLCaseAssertContext assertContext, final PredicateInRightValue actual, final ExpectedPredicateInRightValue expected) {
@@ -132,8 +129,6 @@ public final class WhereClauseAssert {
         assertLiteralExpressionSegment(assertContext, actual, expected);
         assertCommonExpressionSegment(assertContext, actual, expected);
         assertSubqueryExpressionSegment(assertContext, actual, expected);
-        // TODO assert start index and stop index
-//        SQLSegmentAssert.assertIs(assertContext, actual, expected);
     }
     
     private static void assertParameterMarkerExpressionSegment(final SQLCaseAssertContext assertContext, final PredicateInRightValue actual, final ExpectedPredicateInRightValue expected) {
@@ -180,8 +175,6 @@ public final class WhereClauseAssert {
         assertNotNull(assertContext.getText("Expected predicate between right value can not be null"), expected);
         assertBetweenExpression(assertContext, actual.getBetweenExpression(), expected);
         assertAndExpression(assertContext, actual.getAndExpression(), expected);
-        // TODO assert start index and stop index
-//        SQLSegmentAssert.assertIs(assertContext, actual, expected);
     }
     
     private static void assertBetweenExpression(final SQLCaseAssertContext assertContext, final ExpressionSegment actual, final ExpectedPredicateBetweenRightValue expected) {

shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/jaxb/domain/segment/impl/predicate/value/ExpectedPredicateBetweenRightValue.java

@@ -42,7 +42,7 @@ public final class ExpectedPredicateBetweenRightValue implements ExpectedPredica
     @XmlElement(name = "between-common-expression")
     private ExpectedCommonExpression betweenCommonExpression;
     
-    @XmlElement(name = "between-subquery")
+    @XmlElement(name = "between-subquery-expression")
     private ExpectedSubquery betweenSubquery;
     
     @XmlElement(name = "and-parameter-marker-expression")
@@ -54,6 +54,6 @@ public final class ExpectedPredicateBetweenRightValue implements ExpectedPredica
     @XmlElement(name = "and-common-expression")
     private ExpectedCommonExpression andCommonExpression;
     
-    @XmlElement(name = "and-subquery")
+    @XmlElement(name = "and-subquery-expression")
     private ExpectedSubquery andSubquery;
 }

shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/jaxb/domain/segment/impl/predicate/value/ExpectedPredicateCompareRightValue.java

@@ -46,6 +46,6 @@ public final class ExpectedPredicateCompareRightValue implements ExpectedPredica
     @XmlElement(name = "common-expression")
     private ExpectedCommonExpression commonExpression;
     
-    @XmlElement(name = "subquery")
+    @XmlElement(name = "subquery-expression")
     private ExpectedSubquery subquery;
 }

shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/java/org/apache/shardingsphere/sql/parser/integrate/jaxb/domain/segment/impl/predicate/value/ExpectedPredicateInRightValue.java

@@ -43,6 +43,6 @@ public final class ExpectedPredicateInRightValue implements ExpectedPredicateRig
     @XmlElement(name = "common-expression")
     private List<ExpectedCommonExpression> commonExpressions;
 
-    @XmlElement(name = "subquery")
+    @XmlElement(name = "subquery-expression")
     private List<ExpectedSubquery> subqueries;
 }

shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/resources/sql/dml/select-sub-query.xml

@@ -70,7 +70,7 @@
                     <column-left-value name="user_id" start-index="28" stop-index="34" />
                     <operator type="=" />
                     <compare-right-value>
-                        <subquery>
+                        <subquery-expression>
                             <select>
                                 <tables>
                                     <simple-table name="t_order_item" start-index="59" stop-index="70" />
@@ -90,7 +90,7 @@
                                     </and-predicate>
                                 </where>
                             </select>
-                        </subquery>
+                        </subquery-expression>
                     </compare-right-value>
                 </predicate>
             </and-predicate>
@@ -109,7 +109,7 @@
                 <predicate start-index="28" literal-stop-index="93">
                     <column-left-value name="user_id" start-index="28" stop-index="34" />
                     <in-right-value>
-                        <subquery>
+                        <subquery-expression>
                             <select>
                                 <tables>
                                     <simple-table name="t_order_item" start-index="60" stop-index="71" />
@@ -129,7 +129,7 @@
                                     </and-predicate>
                                 </where>
                             </select>
-                        </subquery>
+                        </subquery-expression>
                     </in-right-value>
                 </predicate>
             </and-predicate>
@@ -148,7 +148,7 @@
                 <predicate start-index="28" stop-index="103" literal-stop-index="104">
                     <column-left-value name="user_id" start-index="28" stop-index="34" />
                     <between-right-value>
-                        <between-subquery>
+                        <between-subquery-expression>
                             <select>
                                 <tables>
                                     <simple-table name="t_order_item" start-index="65" stop-index="76" />
@@ -168,7 +168,7 @@
                                     </and-predicate>
                                 </where>
                             </select>
-                        </between-subquery>
+                        </between-subquery-expression>
                         <and-parameter-marker-expression value="0" />
                         <and-literal-expression value="12" />
                     </between-right-value>