From 5dda0d1143b7e09d832bdca5388d81b3a165a557 Mon Sep 17 00:00:00 2001
From: haocao <caohaoch@gmail.com>
Date: Fri, 15 Dec 2017 11:46:20 +0800
Subject: [PATCH] Add test cases for #490.

---
 .../integrate/assert/select_pagination.xml    | 33 +++++++++----------
 ...gleTablePagingWithOffsetAndRowCountSql.xml |  6 ++--
 ...gleTablePagingWithOffsetAndRowCountSql.xml |  4 ++-
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/sharding-jdbc-core/src/test/resources/integrate/assert/select_pagination.xml b/sharding-jdbc-core/src/test/resources/integrate/assert/select_pagination.xml
index d2e444df929db..e29d5c7b9bb34 100644
--- a/sharding-jdbc-core/src/test/resources/integrate/assert/select_pagination.xml
+++ b/sharding-jdbc-core/src/test/resources/integrate/assert/select_pagination.xml
@@ -26,11 +26,6 @@
             <data parameter="2,2" expected="select/SelectSingleTablePagingWithOffsetAndRowCountSql.xml" />
         </sharding-rule>
     </sql>
-    <sql id="assertSelectPaginationWithTop">
-        <sharding-rule>
-            <data parameter="2,10,19,1000,1909" expected="select/sqlserver/SelectPagingWithRowCountSql.xml" />
-        </sharding-rule>
-    </sql>
     <sql id="assertSelectPaginationWithRowNumber">
         <sharding-rule>
             <data parameter="10,19,1000,1909,2" expected="select/oracle/SelectPagingWithRowCountSql.xml" />
@@ -41,6 +36,11 @@
             <data parameter="10,19,1000,1909,2,2" expected="select/postgresql/SelectPagingWithOffsetAndRowCountSql.xml" />
         </sharding-rule>
     </sql>
+    <sql id="assertSelectPaginationWithTop">
+        <sharding-rule>
+            <data parameter="2,10,19,1000,1909" expected="select/sqlserver/SelectPagingWithRowCountSql.xml" />
+        </sharding-rule>
+    </sql>
     <sql id="assertSelectPaginationWithTopAndRange">
         <sharding-rule>
             <data parameter="4,10,19,1000,1909,2" expected="select/sqlserver/SelectPagingWithOffsetAndRowCountSql.xml" />
@@ -51,35 +51,34 @@
             <data parameter="4,2" expected="select/sqlserver/SelectSingleTablePagingWithOffsetAndRowCountSql.xml" />
         </sharding-rule>
     </sql>
-    <sql id="assertSelectPaginationWithRowNumberAndRange">
+    <sql id="assertSelectPaginationWithTopAndRangeWithEqual">
         <sharding-rule>
-            <data parameter="10,19,1000,1909,4,2" expected="select/oracle/SelectPagingWithOffsetAndRowCountSql.xml" />
+            <data parameter="7,10,19,1000,1909,3" expected="select/sqlserver/SelectPagingWithOffsetAndRowCountSql.xml" />
         </sharding-rule>
     </sql>
-    <sql id="assertSelectSingleTablePaginationWithRowNumberAndRange">
+    <sql id="assertSelectSingleTablePaginationWithTopAndRangeWithEqual">
         <sharding-rule>
-            <data parameter="4,1" expected="select/oracle/SelectSingleTablePagingWithOffsetAndRowCountSql.xml" />
+            <data parameter="7,4" expected="select/sqlserver/SelectSingleTablePagingWithOffsetAndRowCountSql.xml" />
         </sharding-rule>
     </sql>
-
-    <sql id="assertSelectPaginationWithTopAndRangeWithEqual">
+    <sql id="assertSelectPaginationWithRowNumberAndRange">
         <sharding-rule>
-            <data parameter="4,10,19,1000,1909,3" expected="select/sqlserver/SelectPagingWithOffsetAndRowCountSql.xml" />
+            <data parameter="10,19,1000,1909,4,2" expected="select/oracle/SelectPagingWithOffsetAndRowCountSql.xml" />
         </sharding-rule>
     </sql>
-    <sql id="assertSelectSingleTablePaginationWithTopAndRangeWithEqual">
+    <sql id="assertSelectPaginationWithRowNumberAndRangeWithEqual">
         <sharding-rule>
-            <data parameter="4,3" expected="select/sqlserver/SelectSingleTablePagingWithOffsetAndRowCountSql.xml" />
+            <data parameter="10,19,1000,1909,4,3" expected="select/oracle/SelectPagingWithOffsetAndRowCountSql.xml" />
         </sharding-rule>
     </sql>
-    <sql id="assertSelectPaginationWithRowNumberAndRangeWithEqual">
+    <sql id="assertSelectSingleTablePaginationWithRowNumberAndRange">
         <sharding-rule>
-            <data parameter="10,19,1000,1909,4,3" expected="select/oracle/SelectPagingWithOffsetAndRowCountSql.xml" />
+            <data parameter="8,3" expected="select/oracle/SelectSingleTablePagingWithOffsetAndRowCountSql.xml" />
         </sharding-rule>
     </sql>
     <sql id="assertSelectSingleTablePaginationWithRowNumberAndRangeWithEqual">
         <sharding-rule>
-            <data parameter="4,2" expected="select/oracle/SelectSingleTablePagingWithOffsetAndRowCountSql.xml" />
+            <data parameter="7,4" expected="select/oracle/SelectSingleTablePagingWithOffsetAndRowCountSql.xml" />
         </sharding-rule>
     </sql>
 </sqls>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select/oracle/SelectSingleTablePagingWithOffsetAndRowCountSql.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select/oracle/SelectSingleTablePagingWithOffsetAndRowCountSql.xml
index 32f655a09d50d..ee3e2313c3c74 100644
--- a/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select/oracle/SelectSingleTablePagingWithOffsetAndRowCountSql.xml
+++ b/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select/oracle/SelectSingleTablePagingWithOffsetAndRowCountSql.xml
@@ -1,4 +1,6 @@
 <dataset>
-    <t_order order_id="1108" rownum_="1" user_id="11" status="init" />
-    <t_order order_id="1107" rownum_="1" user_id="11" status="init" />
+    <t_order order_id="1106" rownum_="1" user_id="11" status="init" />
+    <t_order order_id="1105" rownum_="1" user_id="11" status="init" />
+    <t_order order_id="1104" rownum_="1" user_id="11" status="init" />
+    <t_order order_id="1103" rownum_="1" user_id="11" status="init" />
 </dataset>
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select/sqlserver/SelectSingleTablePagingWithOffsetAndRowCountSql.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select/sqlserver/SelectSingleTablePagingWithOffsetAndRowCountSql.xml
index 37ca9095fc705..3c87f92c25e0a 100644
--- a/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select/sqlserver/SelectSingleTablePagingWithOffsetAndRowCountSql.xml
+++ b/sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select/sqlserver/SelectSingleTablePagingWithOffsetAndRowCountSql.xml
@@ -1,4 +1,6 @@
 <dataset>
-    <t_order ORDER_BY_DERIVED_0="1107" order_id="1107" rownum_="1" user_id="11" status="init" />
     <t_order ORDER_BY_DERIVED_0="1106" order_id="1106" rownum_="1" user_id="11" status="init" />
+    <t_order ORDER_BY_DERIVED_0="1105" order_id="1105" rownum_="1" user_id="11" status="init" />
+    <t_order ORDER_BY_DERIVED_0="1104" order_id="1104" rownum_="1" user_id="11" status="init" />
+    <t_order ORDER_BY_DERIVED_0="1103" order_id="1103" rownum_="1" user_id="11" status="init" />
 </dataset>