ignite-sprint-3 - sql tests

Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/27b6b788
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/27b6b788
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/27b6b788

Branch: refs/heads/ignite-537
Commit: 27b6b78875ad803c3c8b19fb4410e00f48791e92
Parents: 245f467
Author: S.Vladykin <svlady...@gridgain.com>
Authored: Thu Apr 9 18:02:15 2015 +0300
Committer: S.Vladykin <svlady...@gridgain.com>
Committed: Thu Apr 9 18:02:15 2015 +0300

----------------------------------------------------------------------
 .../processors/query/h2/sql/BaseH2CompareQueryTest.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27b6b788/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
----------------------------------------------------------------------
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
index 3cafab2..7f07069 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/BaseH2CompareQueryTest.java
@@ -305,17 +305,19 @@ public class BaseH2CompareQueryTest extends 
AbstractH2CompareQueryTest {
      * @throws SQLException If failed.
      */
     public void testAggregateOrderBy() throws SQLException {
-        compareOrderedQueryRes0("select firstName name, count(*) cnt from 
\"part\".Person group by name order by cnt desc");
+        compareOrderedQueryRes0(
+            "select firstName name, count(*) cnt from \"part\".Person " +
+            "group by name order by cnt, name desc");
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testNullParamSubstitution() throws Exception {
-        List<List<?>> rs1 = compareQueryRes0("select id from \"part\".Person 
where lastname is ?", null);
+        List<List<?>> rs1 = compareQueryRes0("select ? from \"part\".Person", 
null);
 
         // Ensure we find something.
-        assertNotSame(0, rs1.size());
+        assertFalse(rs1.isEmpty());
     }
 
     /**
@@ -329,8 +331,8 @@ public class BaseH2CompareQueryTest extends 
AbstractH2CompareQueryTest {
 
         base = "select firstName||lastName name, salary from \"part\".Person";
 
-        assertEquals(10, compareOrderedQueryRes0(base + " union all " + base + 
" order by salary desc").size());
-        assertEquals(5, compareOrderedQueryRes0(base + " union " + base + " 
order by salary desc").size());
+        assertEquals(PERS_CNT * 2, compareOrderedQueryRes0(base + " union all 
" + base + " order by salary desc").size());
+        assertEquals(PERS_CNT, compareOrderedQueryRes0(base + " union " + base 
+ " order by salary desc").size());
     }
 
     /**

Reply via email to