Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A554A17553 for ; Fri, 10 Apr 2015 13:08:03 +0000 (UTC) Received: (qmail 17812 invoked by uid 500); 10 Apr 2015 13:07:05 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 17785 invoked by uid 500); 10 Apr 2015 13:07:05 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 17755 invoked by uid 99); 10 Apr 2015 13:07:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 13:07:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 10 Apr 2015 13:06:43 +0000 Received: (qmail 16292 invoked by uid 99); 10 Apr 2015 13:06:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 13:06:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9ED3DE0414; Fri, 10 Apr 2015 13:06:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 10 Apr 2015 13:06:40 -0000 Message-Id: <5856deb7b05a4d5b826e34e5738e43e9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/50] incubator-ignite git commit: ignite-sprint-3 - sql tests X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-9998 8124c098a -> 73b110af3 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-gg-9998 Commit: 27b6b78875ad803c3c8b19fb4410e00f48791e92 Parents: 245f467 Author: S.Vladykin Authored: Thu Apr 9 18:02:15 2015 +0300 Committer: S.Vladykin 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> rs1 = compareQueryRes0("select id from \"part\".Person where lastname is ?", null); + 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()); } /**