svn commit: r771722 - /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java

[jr...@apache.org]

Author: jrbauer
Date: Tue May  5 13:42:15 2009
New Revision: 771722

URL: http://svn.apache.org/viewvc?rev=771722&view=rev
Log:
OPENJPA-869 Fix nondeterministic ordering issue with OrderColumn test

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java?rev=771722&r1=771721&r2=771722&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java Tue May  5 13:42:15 2009
@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
+import java.util.TreeMap;
 
 import javax.persistence.Query;
 
@@ -843,22 +844,25 @@
             String entity, String indexedCol, int base, Object[] objs, String
             idField, Object idValue) {
         String queryString = "SELECT INDEX(b), b FROM " + entity + " a JOIN a." +
-            indexedCol + " b WHERE a." + idField + " = :idVal " +
-            " ORDER BY a." + idField;
+            indexedCol + " b WHERE a." + idField + " = :idVal";
         em.clear();
         Query qry = em.createQuery(queryString);
         qry.setParameter("idVal", idValue);
         List rlist = qry.getResultList();  
         
         assertNotNull(rlist);
-        assertEquals(rlist.size(), objs.length);        
+        assertEquals(rlist.size(), objs.length); 
+        TreeMap<Long, Object> objMap = new TreeMap<Long, Object>();
         for (int i = 0; i < objs.length; i++)
         {
             Object[] rvals = (Object[])rlist.get(i);
             Long idx = (Long)rvals[0];
             Object objVal = rvals[1];
-            assertEquals(idx, new Long(base + i));
-            assertEquals(objVal, objs[i]);
+            objMap.put(idx, objVal);
+        }
+        for (int i = 0; i < objs.length; i++) {
+            Object val = objMap.get((new Long(base + i)));
+            assertEquals(val, objs[i]);
         }
     }