You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/05/24 20:31:54 UTC
svn commit: r1486155 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java

Author: aadamchik
Date: Fri May 24 18:31:54 2013
New Revision: 1486155

URL: http://svn.apache.org/r1486155
Log:
CAY-1829 Make ResultIterator implement Iterable<T>, create ObjectContext.iterate method

unit tests

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

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java?rev=1486155&r1=1486154&r2=1486155&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextTest.java Fri May 24 18:31:54 2013
@@ -592,10 +592,11 @@ public class DataContextTest extends Ser
         SelectQuery<Artist> q1 = new SelectQuery<Artist>(Artist.class);
 
         context.iterate(q1, new ResultIteratorCallback<Artist>() {
-            public void iterate(ResultIterator<Artist> iterator) {
+            public void iterate(ResultIterator<Artist> it) {
                 int count = 0;
 
-                for (Artist a : iterator) {
+                for (Artist a : it) {
+                    assertNotNull(a.getArtistName());
                     count++;
                 }
 
@@ -604,12 +605,52 @@ public class DataContextTest extends Ser
         });
     }
 
+    public void testIterateDataRows() throws Exception {
+
+        createArtistsDataSet();
+
+        SelectQuery<DataRow> q1 = SelectQuery.dataRowQuery(Artist.class, null);
+
+        context.iterate(q1, new ResultIteratorCallback<DataRow>() {
+            public void iterate(ResultIterator<DataRow> it) {
+                int count = 0;
+
+                for (DataRow a : it) {
+                    assertNotNull(a.get("ARTIST_ID"));
+                    count++;
+                }
+
+                assertEquals(7, count);
+            }
+        });
+    }
+
+    public void testIterator() throws Exception {
+
+        createArtistsDataSet();
+
+        SelectQuery<Artist> q1 = new SelectQuery<Artist>(Artist.class);
+
+        ResultIterator<Artist> it = context.iterator(q1);
+        try {
+            int count = 0;
+
+            for (Artist a : it) {
+                count++;
+            }
+
+            assertEquals(7, count);
+        } finally {
+            it.close();
+        }
+    }
+
     public void testPerformIteratedQuery1() throws Exception {
 
         createArtistsDataSet();
 
-        SelectQuery q1 = new SelectQuery(Artist.class);
-        ResultIterator it = context.performIteratedQuery(q1);
+        SelectQuery<Artist> q1 = new SelectQuery<Artist>(Artist.class);
+        ResultIterator<?> it = context.performIteratedQuery(q1);
 
         try {
             int count = 0;