You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/01/11 14:40:52 UTC
[2/2] cayenne git commit: Revert changes
Revert changes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/af167bdb
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/af167bdb
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/af167bdb
Branch: refs/heads/master
Commit: af167bdb72441b3b01ad6385778c124ebfd5fd54
Parents: cde79c1
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Jan 11 17:40:22 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Jan 11 17:40:22 2018 +0300
----------------------------------------------------------------------
.../cayenne/query/ObjectSelect_RunIT.java | 30 --------------------
1 file changed, 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/af167bdb/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java
index e5a8c39..f1d4ba5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java
@@ -28,12 +28,10 @@ import java.util.List;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataRow;
-import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.ResultBatchIterator;
import org.apache.cayenne.ResultIterator;
import org.apache.cayenne.ResultIteratorCallback;
import org.apache.cayenne.access.DataContext;
-import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.FunctionExpressionFactory;
@@ -41,7 +39,6 @@ import org.apache.cayenne.exp.Property;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.Artist;
-import org.apache.cayenne.testdo.testmap.Painting;
import org.apache.cayenne.unit.di.server.CayenneProjects;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -55,9 +52,6 @@ public class ObjectSelect_RunIT extends ServerCase {
private DataContext context;
@Inject
- ServerRuntime runtime;
-
- @Inject
private DBHelper dbHelper;
@Before
@@ -135,30 +129,6 @@ public class ObjectSelect_RunIT extends ServerCase {
}
@Test
- public void testBatchIteratorWithNullExpression() throws Exception {
-
- ObjectContext insertContext = runtime.newContext();
-
- List<Ordering> orderings = Artist.ARTIST_NAME.ascInsensitives();
- try (ResultBatchIterator<Artist> it = ObjectSelect.query(Artist.class, null, orderings).batchIterator(context, 5);) {
- int count = 0;
-
- for (List<Artist> artistList : it) {
- count++;
- for(Artist artist : artistList) {
- Painting painting = insertContext.newObject(Painting.class);
- painting.setPaintingTitle("painting " + count);
- painting.setPaintingDescription("artist " + artist.getArtistName());
- }
- assertEquals(5, artistList.size());
- insertContext.commitChanges();
- }
-
- assertEquals(4, count);
- }
- }
-
- @Test
public void test_SelectDataRows() throws Exception {
List<DataRow> result = ObjectSelect.dataRowQuery(Artist.class).select(context);
assertEquals(20, result.size());