for #660: refactor AggregationSelectItemAssert aggregationType to type

sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/engine/ParserAssertsLoader.java → sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/asserts/ParserAssertsLoader.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingjdbc.core.parsing.integrate.engine;
+package io.shardingjdbc.core.parsing.integrate.asserts;
 
 import com.google.common.base.Preconditions;
 import io.shardingjdbc.core.parsing.integrate.jaxb.root.ParserAssert;

sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/engine/IntegrateSupportedSQLParsingTest.java

@@ -20,6 +20,7 @@ package io.shardingjdbc.core.parsing.integrate.engine;
 import com.google.common.base.Optional;
 import io.shardingjdbc.core.constant.DatabaseType;
 import io.shardingjdbc.core.parsing.SQLParsingEngine;
+import io.shardingjdbc.core.parsing.integrate.asserts.ParserAssertsLoader;
 import io.shardingjdbc.core.parsing.integrate.jaxb.condition.ConditionAssert;
 import io.shardingjdbc.core.parsing.integrate.jaxb.condition.Value;
 import io.shardingjdbc.core.parsing.integrate.jaxb.groupby.GroupByColumnAssert;
@@ -397,7 +398,7 @@ public final class IntegrateSupportedSQLParsingTest extends AbstractBaseIntegrat
     }
     
     private void assertAggregationSelectItem(final AggregationSelectItem actual, final AggregationSelectItemAssert expected) {
-        assertThat(getFullAssertMessage("Aggregation select item aggregation type assertion error: "), actual.getType().name(), is(expected.getAggregationType()));
+        assertThat(getFullAssertMessage("Aggregation select item aggregation type assertion error: "), actual.getType().name(), is(expected.getType()));
         assertThat(getFullAssertMessage("Aggregation select item inner expression assertion error: "), actual.getInnerExpression(), is(expected.getInnerExpression()));
         assertThat(getFullAssertMessage("Aggregation select item alias assertion error: "), actual.getAlias().orNull(), is(expected.getAlias()));
         assertThat(getFullAssertMessage("Aggregation select item index assertion error: "), actual.getIndex(), is(expected.getIndex()));

sharding-core/src/test/java/io/shardingjdbc/core/parsing/integrate/jaxb/item/AggregationSelectItemAssert.java

@@ -32,8 +32,8 @@ import java.util.List;
 @XmlAccessorType(XmlAccessType.FIELD)
 public final class AggregationSelectItemAssert {
     
-    @XmlAttribute(name = "aggregation-type")
-    private String aggregationType;
+    @XmlAttribute(name = "type")
+    private String type;
     
     @XmlAttribute(name = "inner-expression")
     private String innerExpression;

sharding-core/src/test/resources/parser/select.xml

@@ -188,7 +188,7 @@
             </condition>
         </conditions>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(0)" aggregation-type="COUNT" alias="orders_count"/>
+            <aggregation-select-item type="COUNT" inner-expression="(0)" alias="orders_count"/>
         </aggregation-select-items>
     </parser-assert>
     
@@ -328,7 +328,7 @@
             </condition>
         </conditions>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(*)" aggregation-type="COUNT" alias="items_count"/>
+            <aggregation-select-item type="COUNT" inner-expression="(*)" alias="items_count"/>
         </aggregation-select-items>
     </parser-assert>
     
@@ -352,7 +352,7 @@
             </condition>
         </conditions>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(*)" aggregation-type="COUNT" alias="items_count"/>
+            <aggregation-select-item type="COUNT" inner-expression="(*)" alias="items_count"/>
         </aggregation-select-items>
     </parser-assert>
     

sharding-core/src/test/resources/parser/select_aggregate.xml

@@ -8,7 +8,7 @@
             <table-token begin-position="40" original-literals="t_order" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(user_id)" aggregation-type="SUM" alias="user_id_sum" />
+            <aggregation-select-item type="SUM" inner-expression="(user_id)" alias="user_id_sum" />
         </aggregation-select-items>
     </parser-assert>
     
@@ -20,7 +20,7 @@
             <table-token begin-position="37" original-literals="t_order" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(*)" aggregation-type="COUNT" alias="orders_count" />
+            <aggregation-select-item type="COUNT" inner-expression="(*)" alias="orders_count" />
         </aggregation-select-items>
     </parser-assert>
     
@@ -32,7 +32,7 @@
             <table-token begin-position="40" original-literals="t_order" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(user_id)" aggregation-type="MAX" alias="max_user_id" />
+            <aggregation-select-item type="MAX" inner-expression="(user_id)" alias="max_user_id" />
         </aggregation-select-items>
     </parser-assert>
     
@@ -44,7 +44,7 @@
             <table-token begin-position="40" original-literals="t_order" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(user_id)" aggregation-type="MIN" alias="min_user_id" />
+            <aggregation-select-item type="MIN" inner-expression="(user_id)" alias="min_user_id" />
         </aggregation-select-items>
     </parser-assert>
     
@@ -62,9 +62,9 @@
             </items-token>
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(user_id)" aggregation-type="AVG" alias="user_id_avg">
-                <derived-column inner-expression="(user_id)" aggregation-type="COUNT" alias="AVG_DERIVED_COUNT_0" />
-                <derived-column inner-expression="(user_id)" aggregation-type="SUM" alias="AVG_DERIVED_SUM_0" />
+            <aggregation-select-item type="AVG" inner-expression="(user_id)" alias="user_id_avg">
+                <derived-column type="COUNT" inner-expression="(user_id)" alias="AVG_DERIVED_COUNT_0" />
+                <derived-column type="SUM" inner-expression="(user_id)" alias="AVG_DERIVED_SUM_0" />
             </aggregation-select-item>
         </aggregation-select-items>
     </parser-assert>
@@ -77,7 +77,7 @@
             <table-token begin-position="46" original-literals="t_order" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(`order_id`)" aggregation-type="COUNT" alias="orders_count" />
+            <aggregation-select-item type="COUNT" inner-expression="(`order_id`)" alias="orders_count" />
         </aggregation-select-items>
     </parser-assert>
 </parser-asserts>

sharding-core/src/test/resources/parser/select_expression.xml

@@ -37,7 +37,7 @@
             <table-token begin-position="36" original-literals="t_order" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item aggregation-type="COUNT" inner-expression="(o.order_id)" />
+            <aggregation-select-item type="COUNT" inner-expression="(o.order_id)" />
         </aggregation-select-items>
     </parser-assert>
     

sharding-core/src/test/resources/parser/select_group_by.xml

@@ -15,7 +15,7 @@
             </condition>
         </conditions>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(*)" aggregation-type="COUNT" alias="c_number" />
+            <aggregation-select-item type="COUNT" inner-expression="(*)" alias="c_number" />
         </aggregation-select-items>
         <group-by-columns>
             <group-by-column name="date_format(c_date, '%y-%m-%d')" order-direction="ASC" alias="c_date" />
@@ -33,7 +33,7 @@
             <table-token begin-position="49" original-literals="t_order" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(order_id)" aggregation-type="SUM" alias="orders_sum" />
+            <aggregation-select-item type="SUM" inner-expression="(order_id)" alias="orders_sum" />
         </aggregation-select-items>
         <group-by-columns>
             <group-by-column name="user_id" order-direction="ASC" />
@@ -51,7 +51,7 @@
             <table-token begin-position="53" original-literals="t_order" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(order_id)" aggregation-type="COUNT" alias="orders_count" />
+            <aggregation-select-item type="COUNT" inner-expression="(order_id)" alias="orders_count" />
         </aggregation-select-items>
         <group-by-columns>
             <group-by-column name="user_id" order-direction="ASC" />
@@ -69,7 +69,7 @@
             <table-token begin-position="51" original-literals="t_order" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(order_id)" aggregation-type="MAX" alias="max_order_id" />
+            <aggregation-select-item type="MAX" inner-expression="(order_id)" alias="max_order_id" />
         </aggregation-select-items>
         <group-by-columns>
             <group-by-column name="user_id" order-direction="ASC" />
@@ -87,7 +87,7 @@
             <table-token begin-position="51" original-literals="t_order" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(order_id)" aggregation-type="MIN" alias="min_order_id"/>
+            <aggregation-select-item type="MIN" inner-expression="(order_id)" alias="min_order_id"/>
         </aggregation-select-items>
         <group-by-columns>
             <group-by-column name="user_id" order-direction="ASC" />
@@ -111,9 +111,9 @@
             </items-token>
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(order_id)" aggregation-type="AVG" alias="orders_avg">
-                <derived-column inner-expression="(order_id)" aggregation-type="COUNT" alias="AVG_DERIVED_COUNT_0" />
-                <derived-column inner-expression="(order_id)" aggregation-type="SUM" alias="AVG_DERIVED_SUM_0" />
+            <aggregation-select-item type="AVG" inner-expression="(order_id)" alias="orders_avg">
+                <derived-column type="COUNT" inner-expression="(order_id)" alias="AVG_DERIVED_COUNT_0" />
+                <derived-column type="SUM" inner-expression="(order_id)" alias="AVG_DERIVED_SUM_0" />
             </aggregation-select-item>
         </aggregation-select-items>
         <group-by-columns>
@@ -132,7 +132,7 @@
             <table-token begin-position="49" original-literals="t_order" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(order_id)" aggregation-type="SUM" alias="orders_sum" />
+            <aggregation-select-item type="SUM" inner-expression="(order_id)" alias="orders_sum" />
         </aggregation-select-items>
         <group-by-columns>
             <group-by-column name="user_id" order-direction="ASC" />
@@ -168,7 +168,7 @@
             </condition>
         </conditions>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(*)" aggregation-type="COUNT" alias="items_count" />
+            <aggregation-select-item type="COUNT" inner-expression="(*)" alias="items_count" />
         </aggregation-select-items>
         <group-by-columns>
             <group-by-column name="user_id" alias="GROUP_BY_DERIVED_0" owner="o" order-direction="ASC" />
@@ -198,7 +198,7 @@
             </condition>
         </conditions>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(*)" aggregation-type="COUNT" alias="items_count" />
+            <aggregation-select-item type="COUNT" inner-expression="(*)" alias="items_count" />
         </aggregation-select-items>
         <group-by-columns>
             <group-by-column name="user_id" owner="o" order-direction="ASC" />
@@ -234,7 +234,7 @@
             <row-count-token row-count="5" begin-position="89" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(order_id)" aggregation-type="SUM"/>
+            <aggregation-select-item type="SUM" inner-expression="(order_id)" />
         </aggregation-select-items>
         <group-by-columns>
             <group-by-column name="user_id" order-direction="ASC" />
@@ -269,7 +269,7 @@
             <order-by-token begin-position-with-placeholder="80" begin-position-without-placeholder="80" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(order_id)" aggregation-type="SUM" alias="orders_sum" />
+            <aggregation-select-item type="SUM" inner-expression="(order_id)" alias="orders_sum" />
         </aggregation-select-items>
         <group-by-columns>
             <group-by-column name="key" alias="key" order-direction="ASC" />

sharding-core/src/test/resources/parser/select_sub_query.xml

@@ -42,7 +42,7 @@
             <table-token begin-position="52" original-literals="t_order" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(1)" aggregation-type="COUNT" alias="orders_count" />
+            <aggregation-select-item type="COUNT" inner-expression="(1)" alias="orders_count" />
         </aggregation-select-items>
     </parser-assert>
     
@@ -54,7 +54,7 @@
             <table-token begin-position="64" original-literals="t_order_item" />
         </tokens>
         <aggregation-select-items>
-            <aggregation-select-item inner-expression="(1)" aggregation-type="COUNT" alias="order_items_count" />
+            <aggregation-select-item type="COUNT" inner-expression="(1)" alias="order_items_count" />
         </aggregation-select-items>
     </parser-assert>
 </parser-asserts>