From 8dcc10394d367d6873deec5d2183614ecb318667 Mon Sep 17 00:00:00 2001
From: nancyzrh <zhaoyn10@126.com>
Date: Fri, 11 Oct 2019 18:03:06 +0800
Subject: [PATCH] remove two methods and change xml for tableAssert (#3228)

* test for git corrupt

* remove repeate integration cases

* remove method and change xml for tableAssert

* fix form
---
 .../integrate/asserts/table/TableAssert.java  | 36 +++----------------
 .../integrate/jaxb/table/ExpectedTable.java   |  6 ++++
 .../test/resources/sharding/ddl/create.xml    |  3 +-
 3 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/sharding-core/sharding-core-parse/sharding-core-parse-test/src/test/java/org/apache/shardingsphere/core/parse/integrate/asserts/table/TableAssert.java b/sharding-core/sharding-core-parse/sharding-core-parse-test/src/test/java/org/apache/shardingsphere/core/parse/integrate/asserts/table/TableAssert.java
index 69215ea0e8..3a5b1b04c4 100644
--- a/sharding-core/sharding-core-parse/sharding-core-parse-test/src/test/java/org/apache/shardingsphere/core/parse/integrate/asserts/table/TableAssert.java
+++ b/sharding-core/sharding-core-parse/sharding-core-parse-test/src/test/java/org/apache/shardingsphere/core/parse/integrate/asserts/table/TableAssert.java
@@ -23,12 +23,7 @@ import org.apache.shardingsphere.core.parse.integrate.jaxb.table.ExpectedTable;
 import org.apache.shardingsphere.core.parse.sql.segment.generic.TableSegment;
 
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -50,33 +45,12 @@ public final class TableAssert {
      * @param expected expected tables
      */
     public void assertTables(final Collection<TableSegment> actual, final List<ExpectedTable> expected) {
-        Collection<TableSegment> mergedActual = mergeTableSegments(actual);
-        Map<String, ExpectedTable> expectedMap = getExpectedMap(expected);
-        assertThat(assertMessage.getFullAssertMessage("Tables size assertion error: "), mergedActual.size(), is(expectedMap.size()));
-        for (TableSegment each : mergedActual) {
-            assertThat(assertMessage.getFullAssertMessage("Table name assertion error: "), each.getTableName(), is(expectedMap.get(each.getTableName()).getName()));
-            assertThat(assertMessage.getFullAssertMessage("Table alias assertion error: "), each.getAlias().orNull(), is(expectedMap.get(each.getTableName()).getAlias()));
-        }
-    }
-    
-    // TODO yanan remove this method and make sure the table number of xml is correct
-    private Collection<TableSegment> mergeTableSegments(final Collection<TableSegment> actual) {
-        Collection<TableSegment> result = new LinkedList<>();
-        Set<String> tableNames = new HashSet<>(actual.size(), 1);
+        assertThat(assertMessage.getFullAssertMessage("Tables size assertion error: "), actual.size(), is(expected.size()));
+        int count = 0;
         for (TableSegment each : actual) {
-            if (tableNames.add(each.getTableName())) {
-                result.add(each);
-            }
-        }
-        return result;
-    }
-
-    // TODO yanan remove this method and make sure the seq of xml is correct
-    private Map<String, ExpectedTable> getExpectedMap(final List<ExpectedTable> expected) {
-        Map<String, ExpectedTable> result = new HashMap<>(expected.size(), 1);
-        for (ExpectedTable each : expected) {
-            result.put(each.getName(), each);
+            assertThat(assertMessage.getFullAssertMessage("Table name assertion error: "), each.getTableName(), is(expected.get(count).getName()));
+            assertThat(assertMessage.getFullAssertMessage("Table alias assertion error: "), each.getAlias().orNull(), is(expected.get(count).getAlias()));
+            count++;
         }
-        return result;
     }
 }
diff --git a/sharding-core/sharding-core-parse/sharding-core-parse-test/src/test/java/org/apache/shardingsphere/core/parse/integrate/jaxb/table/ExpectedTable.java b/sharding-core/sharding-core-parse/sharding-core-parse-test/src/test/java/org/apache/shardingsphere/core/parse/integrate/jaxb/table/ExpectedTable.java
index cdffac0d0d..5beb714fba 100644
--- a/sharding-core/sharding-core-parse/sharding-core-parse-test/src/test/java/org/apache/shardingsphere/core/parse/integrate/jaxb/table/ExpectedTable.java
+++ b/sharding-core/sharding-core-parse/sharding-core-parse-test/src/test/java/org/apache/shardingsphere/core/parse/integrate/jaxb/table/ExpectedTable.java
@@ -34,4 +34,10 @@ public final class ExpectedTable {
     
     @XmlAttribute
     private String alias;
+    
+    @XmlAttribute(name = "start-index")
+    private int startIndex;
+    
+    @XmlAttribute(name = "stop-index")
+    private int stopIndex;
 }
diff --git a/sharding-core/sharding-core-parse/sharding-core-parse-test/src/test/resources/sharding/ddl/create.xml b/sharding-core/sharding-core-parse/sharding-core-parse-test/src/test/resources/sharding/ddl/create.xml
index 8647d7803e..f893b35ccc 100644
--- a/sharding-core/sharding-core-parse/sharding-core-parse-test/src/test/resources/sharding/ddl/create.xml
+++ b/sharding-core/sharding-core-parse/sharding-core-parse-test/src/test/resources/sharding/ddl/create.xml
@@ -501,7 +501,8 @@
     
     <parser-result sql-case-id="create_table_with_create_index">
         <tables>
-            <table name="t_order" />
+            <table name="t_order" start-index="13" stop-index="19" />
+            <table name="t_order" start-index="95" stop-index="101" />
         </tables>
         <tokens>
             <table-token start-index="13" table-name="t_order" length="7" />
-- 
GitLab