Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 69465 invoked from network); 1 Dec 2009 10:55:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Dec 2009 10:55:39 -0000 Received: (qmail 39571 invoked by uid 500); 1 Dec 2009 10:55:39 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 39516 invoked by uid 500); 1 Dec 2009 10:55:39 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 39507 invoked by uid 99); 1 Dec 2009 10:55:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 10:55:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 10:55:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8BCB3238890A; Tue, 1 Dec 2009 10:55:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r885726 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java Date: Tue, 01 Dec 2009 10:55:12 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091201105512.8BCB3238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Tue Dec 1 10:55:12 2009 New Revision: 885726 URL: http://svn.apache.org/viewvc?rev=885726&view=rev Log: DERBY-4457: 'Column value mismatch' in 'testDistinctInsertWithGeneratedColumn(...lang.DistinctTest)' on Jvm 1.5, 1.4, phoneME. SELECT DISTINCT may return rows in different order on different JVMs. Made the test independent of the actual ordering. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java?rev=885726&r1=885725&r2=885726&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java Tue Dec 1 10:55:12 2009 @@ -457,14 +457,20 @@ assertEquals(2, s.executeUpdate("insert into destWithAI(c12) select distinct(c31) from source")); // we should not see gaps in the autoincrement column - String [][] expected = { {"1", "1"}, - {"2", "2"} }; - JDBC.assertFullResultSet(s.executeQuery("select * from destWithAI"), expected); + String [][] expected = { {"1"}, {"2"} }; + JDBC.assertFullResultSet( + s.executeQuery("select c11 from destWithAI order by c11"), + expected); + JDBC.assertFullResultSet( + s.executeQuery("select c12 from destWithAI order by c12"), + expected); assertEquals(2, s.executeUpdate("insert into destWithNoAI(c22) select distinct(c31) from source")); expected = new String [][] { {null, "1"}, {null, "2"} }; - JDBC.assertFullResultSet(s.executeQuery("select * from destWithNoAI"), expected); + JDBC.assertFullResultSet( + s.executeQuery("select * from destWithNoAI order by c22"), + expected); s.execute("drop table source"); s.execute("drop table destWithNoAI");