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 2015/04/21 11:19:21 UTC
cayenne git commit: unit test cleanup - tests that do not use DB
should be in Test not IT
Repository: cayenne
Updated Branches:
refs/heads/master 66495119f -> 8ae86ba9d
unit test cleanup - tests that do not use DB should be in Test not IT
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8ae86ba9
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8ae86ba9
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8ae86ba9
Branch: refs/heads/master
Commit: 8ae86ba9d74aa4f4189f4107a3c508da864f16c3
Parents: 6649511
Author: aadamchik <aa...@apache.org>
Authored: Tue Apr 21 12:19:16 2015 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Tue Apr 21 12:19:16 2015 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/query/SelectQueryIT.java | 226 ++++++++-----------
.../apache/cayenne/query/SelectQueryTest.java | 118 ++++++----
2 files changed, 170 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8ae86ba9/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java
index 01d04b3..aeebf7e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java
@@ -19,6 +19,17 @@
package org.apache.cayenne.query;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Types;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.cayenne.Cayenne;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectContext;
@@ -46,18 +57,6 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Before;
import org.junit.Test;
-import java.sql.Types;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class SelectQueryIT extends ServerCase {
@@ -74,9 +73,8 @@ public class SelectQueryIT extends ServerCase {
@Before
public void before() {
- this.tArtist = new TableHelper(dbHelper, "ARTIST")
- .setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH")
- .setColumnTypes(Types.BIGINT, Types.CHAR, Types.DATE);
+ this.tArtist = new TableHelper(dbHelper, "ARTIST").setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH")
+ .setColumnTypes(Types.BIGINT, Types.CHAR, Types.DATE);
}
protected void createArtistsDataSet() throws Exception {
@@ -94,45 +92,6 @@ public class SelectQueryIT extends ServerCase {
}
@Test
- public void testSetQualifier() {
- SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
- assertNull(query.getQualifier());
-
- Expression qual = ExpressionFactory.expressionOfType(Expression.AND);
- query.setQualifier(qual);
- assertNotNull(query.getQualifier());
- assertSame(qual, query.getQualifier());
- }
-
- @Test
- public void testAndQualifier() {
- SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
- assertNull(query.getQualifier());
-
- Expression e1 = ExpressionFactory.expressionOfType(Expression.EQUAL_TO);
- query.andQualifier(e1);
- assertSame(e1, query.getQualifier());
-
- Expression e2 = ExpressionFactory.expressionOfType(Expression.NOT_EQUAL_TO);
- query.andQualifier(e2);
- assertEquals(Expression.AND, query.getQualifier().getType());
- }
-
- @Test
- public void testOrQualifier() {
- SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
- assertNull(query.getQualifier());
-
- Expression e1 = ExpressionFactory.expressionOfType(Expression.EQUAL_TO);
- query.orQualifier(e1);
- assertSame(e1, query.getQualifier());
-
- Expression e2 = ExpressionFactory.expressionOfType(Expression.NOT_EQUAL_TO);
- query.orQualifier(e2);
- assertEquals(Expression.OR, query.getQualifier().getType());
- }
-
- @Test
public void testFetchLimit() throws Exception {
createArtistsDataSet();
@@ -491,109 +450,110 @@ public class SelectQueryIT extends ServerCase {
assertEquals(1, objects.size());
}
- @Test
- public void testSelect() throws Exception {
- createArtistsDataSet();
+ @Test
+ public void testSelect() throws Exception {
+ createArtistsDataSet();
- SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
- List<?> objects = query.select(context);
- assertEquals(20, objects.size());
- }
+ SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
+ List<?> objects = query.select(context);
+ assertEquals(20, objects.size());
+ }
- @Test
- public void testSelectOne() throws Exception {
- createArtistsDataSet();
+ @Test
+ public void testSelectOne() throws Exception {
+ createArtistsDataSet();
- SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
- Expression qual = ExpressionFactory.matchExp("artistName", "artist1");
- query.setQualifier(qual);
+ SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
+ Expression qual = ExpressionFactory.matchExp("artistName", "artist1");
+ query.setQualifier(qual);
- Artist artist = (Artist) query.selectOne(context);
- assertEquals("artist1", artist.getArtistName());
- }
+ Artist artist = (Artist) query.selectOne(context);
+ assertEquals("artist1", artist.getArtistName());
+ }
- @Test
- public void testSelectFirst() throws Exception {
- createArtistsDataSet();
+ @Test
+ public void testSelectFirst() throws Exception {
+ createArtistsDataSet();
- SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
- query.addOrdering(new Ordering(Artist.ARTIST_NAME.getName()));
- Artist artist = (Artist) query.selectFirst(context);
+ SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
+ query.addOrdering(new Ordering(Artist.ARTIST_NAME.getName()));
+ Artist artist = (Artist) query.selectFirst(context);
- assertNotNull(artist);
- assertEquals("artist1", artist.getArtistName());
- }
+ assertNotNull(artist);
+ assertEquals("artist1", artist.getArtistName());
+ }
- @Test
- public void testSelectFirstByContext() throws Exception {
- createArtistsDataSet();
+ @Test
+ public void testSelectFirstByContext() throws Exception {
+ createArtistsDataSet();
- SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
- query.addOrdering(new Ordering(Artist.ARTIST_NAME.getName()));
- Artist artist = (Artist) context.selectFirst(query);
+ SelectQuery<Artist> query = new SelectQuery<Artist>(Artist.class);
+ query.addOrdering(new Ordering(Artist.ARTIST_NAME.getName()));
+ Artist artist = (Artist) context.selectFirst(query);
- assertNotNull(artist);
- assertEquals("artist1", artist.getArtistName());
- }
+ assertNotNull(artist);
+ assertEquals("artist1", artist.getArtistName());
+ }
- @Test
- public void testIterate() throws Exception {
- createArtistsDataSet();
+ @Test
+ public void testIterate() throws Exception {
+ createArtistsDataSet();
- SelectQuery<Artist> q1 = new SelectQuery<Artist>(Artist.class);
- final int[] count = new int[1];
- q1.iterate(context, new ResultIteratorCallback<Artist>() {
+ SelectQuery<Artist> q1 = new SelectQuery<Artist>(Artist.class);
+ final int[] count = new int[1];
+ q1.iterate(context, new ResultIteratorCallback<Artist>() {
- @Override
- public void next(Artist object) {
- assertNotNull(object.getArtistName());
- count[0]++;
- }
- });
+ @Override
+ public void next(Artist object) {
+ assertNotNull(object.getArtistName());
+ count[0]++;
+ }
+ });
- assertEquals(20, count[0]);
- }
+ assertEquals(20, count[0]);
+ }
- @Test
- public void testIterator() throws Exception {
- createArtistsDataSet();
+ @Test
+ public void testIterator() throws Exception {
+ createArtistsDataSet();
- SelectQuery<Artist> q1 = new SelectQuery<Artist>(Artist.class);
- ResultIterator<Artist> it = q1.iterator(context);
+ SelectQuery<Artist> q1 = new SelectQuery<Artist>(Artist.class);
+ ResultIterator<Artist> it = q1.iterator(context);
- try {
- int count = 0;
+ try {
+ int count = 0;
- for (@SuppressWarnings("unused") Artist a : it) {
- count++;
- }
+ for (@SuppressWarnings("unused")
+ Artist a : it) {
+ count++;
+ }
- assertEquals(20, count);
- } finally {
- it.close();
- }
- }
+ assertEquals(20, count);
+ } finally {
+ it.close();
+ }
+ }
- @Test
- public void testBatchIterator() throws Exception {
- createArtistsDataSet();
+ @Test
+ public void testBatchIterator() throws Exception {
+ createArtistsDataSet();
- SelectQuery<Artist> q1 = new SelectQuery<Artist>(Artist.class);
- ResultBatchIterator<Artist> it = q1.batchIterator(context, 5);
+ SelectQuery<Artist> q1 = new SelectQuery<Artist>(Artist.class);
+ ResultBatchIterator<Artist> it = q1.batchIterator(context, 5);
- try {
- int count = 0;
+ try {
+ int count = 0;
- for (List<Artist> artistList : it) {
- count++;
- assertEquals(5, artistList.size());
- }
+ for (List<Artist> artistList : it) {
+ count++;
+ assertEquals(5, artistList.size());
+ }
- assertEquals(4, count);
- } finally {
- it.close();
- }
- }
+ assertEquals(4, count);
+ } finally {
+ it.close();
+ }
+ }
/**
* Tests that all queries specified in prefetch are executed in a more
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8ae86ba9/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryTest.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryTest.java
index bbb686f..df6f46e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryTest.java
@@ -41,114 +41,150 @@ import org.junit.Test;
public class SelectQueryTest {
- private SelectQuery<?> q;
+ private SelectQuery<?> query;
@Before
public void before() {
- this.q = new SelectQuery<Object>();
+ this.query = new SelectQuery<Object>();
}
@Test
public void testAddPrefetch() {
- assertNull(q.getPrefetchTree());
- q.addPrefetch("a.b.c");
- assertNotNull(q.getPrefetchTree());
- assertEquals(1, q.getPrefetchTree().nonPhantomNodes().size());
- assertNotNull(q.getPrefetchTree().getNode("a.b.c"));
+ assertNull(query.getPrefetchTree());
+ query.addPrefetch("a.b.c");
+ assertNotNull(query.getPrefetchTree());
+ assertEquals(1, query.getPrefetchTree().nonPhantomNodes().size());
+ assertNotNull(query.getPrefetchTree().getNode("a.b.c"));
}
@Test
public void testAddPrefetchDuplicates() {
- q.addPrefetch("a.b.c");
- q.addPrefetch("a.b.c");
+ query.addPrefetch("a.b.c");
+ query.addPrefetch("a.b.c");
- assertEquals(1, q.getPrefetchTree().nonPhantomNodes().size());
+ assertEquals(1, query.getPrefetchTree().nonPhantomNodes().size());
}
@Test
public void testClearPrefetches() {
- q.addPrefetch("abc");
- q.addPrefetch("xyz");
- assertNotNull(q.getPrefetchTree());
+ query.addPrefetch("abc");
+ query.addPrefetch("xyz");
+ assertNotNull(query.getPrefetchTree());
- q.clearPrefetches();
- assertNull(q.getPrefetchTree());
+ query.clearPrefetches();
+ assertNull(query.getPrefetchTree());
}
@Test
public void testPageSize() throws Exception {
- q.setPageSize(10);
- assertEquals(10, q.getPageSize());
+ query.setPageSize(10);
+ assertEquals(10, query.getPageSize());
}
@Test
public void testAddOrdering1() throws Exception {
Ordering ord = new Ordering();
- q.addOrdering(ord);
- assertEquals(1, q.getOrderings().size());
- assertSame(ord, q.getOrderings().get(0));
+ query.addOrdering(ord);
+ assertEquals(1, query.getOrderings().size());
+ assertSame(ord, query.getOrderings().get(0));
}
@Test
public void testAddOrdering2() throws Exception {
String path = "a.b.c";
- q.addOrdering(path, SortOrder.DESCENDING);
- assertEquals(1, q.getOrderings().size());
+ query.addOrdering(path, SortOrder.DESCENDING);
+ assertEquals(1, query.getOrderings().size());
- Ordering ord = q.getOrderings().get(0);
+ Ordering ord = query.getOrderings().get(0);
assertEquals(path, ord.getSortSpec().getOperand(0));
assertEquals(false, ord.isAscending());
}
@Test
public void testDistinct() throws Exception {
- assertFalse(q.isDistinct());
- q.setDistinct(true);
- assertTrue(q.isDistinct());
+ assertFalse(query.isDistinct());
+ query.setDistinct(true);
+ assertTrue(query.isDistinct());
}
@Test
public void testQueryWithParams1() {
- q.setRoot(Artist.class);
- q.setDistinct(true);
+ query.setRoot(Artist.class);
+ query.setDistinct(true);
- SelectQuery<?> q1 = q.queryWithParameters(new HashMap<String, Object>(), true);
- assertSame(q.getRoot(), q1.getRoot());
- assertEquals(q.isDistinct(), q1.isDistinct());
+ SelectQuery<?> q1 = query.queryWithParameters(new HashMap<String, Object>(), true);
+ assertSame(query.getRoot(), q1.getRoot());
+ assertEquals(query.isDistinct(), q1.isDistinct());
assertNull(q1.getQualifier());
}
@Test
public void testQueryWithParams2() throws Exception {
- q.setRoot(Artist.class);
+ query.setRoot(Artist.class);
List<Expression> list = new ArrayList<Expression>();
list.add(ExpressionFactory.matchExp("k1", new ExpressionParameter("test1")));
list.add(ExpressionFactory.matchExp("k2", new ExpressionParameter("test2")));
list.add(ExpressionFactory.matchExp("k3", new ExpressionParameter("test3")));
list.add(ExpressionFactory.matchExp("k4", new ExpressionParameter("test4")));
- q.setQualifier(ExpressionFactory.joinExp(Expression.OR, list));
+ query.setQualifier(ExpressionFactory.joinExp(Expression.OR, list));
Map<String, Object> params = new HashMap<String, Object>();
params.put("test2", "abc");
params.put("test3", "xyz");
- SelectQuery<?> q1 = q.queryWithParameters(params, true);
- assertSame(q.getRoot(), q1.getRoot());
+ SelectQuery<?> q1 = query.queryWithParameters(params, true);
+ assertSame(query.getRoot(), q1.getRoot());
assertNotNull(q1.getQualifier());
- assertTrue(q1.getQualifier() != q.getQualifier());
+ assertTrue(q1.getQualifier() != query.getQualifier());
}
@Test
public void testQueryWithParamsSkipName() {
- q.setRoot(Artist.class);
- q.setDistinct(true);
- q.setName("name");
+ query.setRoot(Artist.class);
+ query.setDistinct(true);
+ query.setName("name");
- SelectQuery<?> q1 = q.queryWithParameters(Collections.<String, Object> emptyMap());
- assertEquals("name", q.getName());
+ SelectQuery<?> q1 = query.queryWithParameters(Collections.<String, Object> emptyMap());
+ assertEquals("name", query.getName());
assertNull(q1.getName());
}
+
+ @Test
+ public void testAndQualifier() {
+ assertNull(query.getQualifier());
+
+ Expression e1 = ExpressionFactory.expressionOfType(Expression.EQUAL_TO);
+ query.andQualifier(e1);
+ assertSame(e1, query.getQualifier());
+
+ Expression e2 = ExpressionFactory.expressionOfType(Expression.NOT_EQUAL_TO);
+ query.andQualifier(e2);
+ assertEquals(Expression.AND, query.getQualifier().getType());
+ }
+
+ @Test
+ public void testOrQualifier() {
+ assertNull(query.getQualifier());
+
+ Expression e1 = ExpressionFactory.expressionOfType(Expression.EQUAL_TO);
+ query.orQualifier(e1);
+ assertSame(e1, query.getQualifier());
+
+ Expression e2 = ExpressionFactory.expressionOfType(Expression.NOT_EQUAL_TO);
+ query.orQualifier(e2);
+ assertEquals(Expression.OR, query.getQualifier().getType());
+ }
+
+ @Test
+ public void testSetQualifier() {
+ assertNull(query.getQualifier());
+
+ Expression qual = ExpressionFactory.expressionOfType(Expression.AND);
+ query.setQualifier(qual);
+ assertNotNull(query.getQualifier());
+ assertSame(qual, query.getQualifier());
+ }
}