You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by mi...@apache.org on 2010/07/09 01:12:49 UTC

svn commit: r961977 - /db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java

Author: mikem
Date: Thu Jul  8 23:12:49 2010
New Revision: 961977

URL: http://svn.apache.org/viewvc?rev=961977&view=rev
Log:
DERBY-4460: test_031_derby_4413 failed in nightly regression run

backported svn #886008 from trunk to 10.5 branch.

Added an ORDER BY clause to ensure consistent ordering across
different platforms. 


Modified:
    db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java

Modified: db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java?rev=961977&r1=961976&r2=961977&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java (original)
+++ db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java Thu Jul  8 23:12:49 2010
@@ -5405,14 +5405,14 @@ public class GeneratedColumnsTest extend
         assertResults
             (
                 conn,
-                "select * from t_4413",
+                "select * from t_4413 order by i, j",
                 new String[][]
                 {
                     { "1", "2", },
-                    { "2", "4", },
                     { "1", "2", },
                     { "1", "2", },
                     { "2", "4", },
+                    { "2", "4", },
                 },
                 false
             );