cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r902391 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinTest.java
Date Sat, 23 Jan 2010 11:49:12 GMT
Author: aadamchik
Date: Sat Jan 23 11:49:11 2010
New Revision: 902391

URL: http://svn.apache.org/viewvc?rev=902391&view=rev
Log:
CAY-1366 EJBQL: Support for fetch joins

    patch by Ksenia Khailenko - fixing indeterministic ordering in unit tests

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinTest.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinTest.java?rev=902391&r1=902390&r2=902391&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinTest.java
Sat Jan 23 11:49:11 2010
@@ -299,7 +299,7 @@
         populateTables(TestData.SEVERAL_FETCH_JOINS);
         String ejbql = "SELECT DISTINCT a, a.artistName , g "
                 + "FROM Artist a LEFT JOIN FETCH a.paintingArray, Gallery g LEFT JOIN FETCH
g.exhibitArray "
-                + "ORDER BY a.artistName";
+                + "ORDER BY a.artistName, g.galleryName";
 
         EJBQLQuery query = new EJBQLQuery(ejbql);
 
@@ -373,13 +373,13 @@
 
             String artistName2 = (String) row[1];
             assertEquals("A2", artistName2);
-            assertEquals(g2, row[2]);
+            assertEquals(g1, row[2]);
 
             row = (Object[]) objects.get(3);
 
             assertEquals(a2, (Artist) row[0]);
             assertEquals(artistName2, row[1]);
-            assertEquals(g1, row[2]);
+            assertEquals(g2, row[2]);
 
             row = (Object[]) objects.get(4);
 



Mime
View raw message