Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4406017C29 for ; Tue, 21 Apr 2015 09:14:53 +0000 (UTC) Received: (qmail 65014 invoked by uid 500); 21 Apr 2015 09:14:53 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 64987 invoked by uid 500); 21 Apr 2015 09:14:53 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 64978 invoked by uid 99); 21 Apr 2015 09:14:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2015 09:14:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DFC25E0990; Tue, 21 Apr 2015 09:14:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aadamchik@apache.org To: commits@cayenne.apache.org Message-Id: <85b889c54dfc4266ba65a7b124612c39@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cayenne git commit: unit test cleanup Date: Tue, 21 Apr 2015 09:14:52 +0000 (UTC) Repository: cayenne Updated Branches: refs/heads/master a9b5facf2 -> 66495119f unit test cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/66495119 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/66495119 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/66495119 Branch: refs/heads/master Commit: 66495119f9a6f63b667221f7246127a940ca4adf Parents: a9b5fac Author: aadamchik Authored: Tue Apr 21 12:14:45 2015 +0300 Committer: aadamchik Committed: Tue Apr 21 12:14:45 2015 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/query/SelectQueryIT.java | 50 ++++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/66495119/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 4a157fa..01d04b3 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 @@ -166,8 +166,8 @@ public class SelectQueryIT extends ServerCase { createArtistsDataSet(); DbEntity artistDbEntity = context.getEntityResolver().getDbEntity("ARTIST"); - SelectQuery query = new SelectQuery(artistDbEntity); - List results = context.performQuery(query); + SelectQuery query = new SelectQuery(artistDbEntity); + List results = context.select(query); assertEquals(20, results.size()); assertTrue(results.get(0) instanceof DataRow); @@ -190,14 +190,14 @@ public class SelectQueryIT extends ServerCase { public void testFetchOffsetWithQualifier() throws Exception { createArtistsDataSet(); SelectQuery query = new SelectQuery(Artist.class); - query.setQualifier(Expression.fromString("db:ARTIST_ID > 3")); + query.setQualifier(ExpressionFactory.exp("db:ARTIST_ID > 3")); query.setFetchOffset(5); List objects = context.performQuery(query); int size = objects.size(); SelectQuery sizeQ = new SelectQuery(Artist.class); - sizeQ.setQualifier(Expression.fromString("db:ARTIST_ID > 3")); + sizeQ.setQualifier(ExpressionFactory.exp("db:ARTIST_ID > 3")); List objects1 = context.performQuery(sizeQ); int sizeAll = objects1.size(); assertEquals(size, sizeAll - 5); @@ -207,7 +207,7 @@ public class SelectQueryIT extends ServerCase { public void testFetchLimitWithQualifier() throws Exception { createArtistsDataSet(); SelectQuery query = new SelectQuery(Artist.class); - query.setQualifier(Expression.fromString("db:ARTIST_ID > 3")); + query.setQualifier(ExpressionFactory.exp("db:ARTIST_ID > 3")); query.setFetchLimit(7); List objects = context.performQuery(query); assertEquals(7, objects.size()); @@ -386,8 +386,8 @@ public class SelectQueryIT extends ServerCase { @Test public void testSelectIn() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); - Expression qual = Expression.fromString("artistName in ('artist1', 'artist2')"); + SelectQuery query = new SelectQuery(Artist.class); + Expression qual = ExpressionFactory.exp("artistName in ('artist1', 'artist2')"); query.setQualifier(qual); List objects = context.performQuery(query); assertEquals(2, objects.size()); @@ -396,8 +396,8 @@ public class SelectQueryIT extends ServerCase { @Test public void testSelectParameterizedIn() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); - Expression qual = Expression.fromString("artistName in $list"); + SelectQuery query = new SelectQuery(Artist.class); + Expression qual = ExpressionFactory.exp("artistName in $list"); query.setQualifier(qual); query = query.queryWithParameters(Collections.singletonMap("list", new Object[] { "artist1", "artist2" })); List objects = context.performQuery(query); @@ -407,8 +407,8 @@ public class SelectQueryIT extends ServerCase { @Test public void testSelectParameterizedEmptyIn() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); - Expression qual = Expression.fromString("artistName in $list"); + SelectQuery query = new SelectQuery(Artist.class); + Expression qual = ExpressionFactory.exp("artistName in $list"); query.setQualifier(qual); query = query.queryWithParameters(Collections.singletonMap("list", new Object[] {})); List objects = context.performQuery(query); @@ -418,8 +418,8 @@ public class SelectQueryIT extends ServerCase { @Test public void testSelectParameterizedEmptyNotIn() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); - Expression qual = Expression.fromString("artistName not in $list"); + SelectQuery query = new SelectQuery(Artist.class); + Expression qual = ExpressionFactory.exp("artistName not in $list"); query.setQualifier(qual); query = query.queryWithParameters(Collections.singletonMap("list", new Object[] {})); List objects = context.performQuery(query); @@ -429,7 +429,7 @@ public class SelectQueryIT extends ServerCase { @Test public void testSelectEmptyIn() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); + SelectQuery query = new SelectQuery(Artist.class); Expression qual = ExpressionFactory.inExp("artistName"); query.setQualifier(qual); List objects = context.performQuery(query); @@ -439,7 +439,7 @@ public class SelectQueryIT extends ServerCase { @Test public void testSelectEmptyNotIn() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); + SelectQuery query = new SelectQuery(Artist.class); Expression qual = ExpressionFactory.notInExp("artistName"); query.setQualifier(qual); List objects = context.performQuery(query); @@ -449,7 +449,7 @@ public class SelectQueryIT extends ServerCase { @Test public void testSelectBooleanTrue() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); + SelectQuery query = new SelectQuery(Artist.class); Expression qual = ExpressionFactory.expTrue(); qual = qual.andExp(ExpressionFactory.matchExp("artistName", "artist1")); query.setQualifier(qual); @@ -460,7 +460,7 @@ public class SelectQueryIT extends ServerCase { @Test public void testSelectBooleanNotTrueOr() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); + SelectQuery query = new SelectQuery(Artist.class); Expression qual = ExpressionFactory.expTrue(); qual = qual.notExp(); qual = qual.orExp(ExpressionFactory.matchExp("artistName", "artist1")); @@ -472,7 +472,7 @@ public class SelectQueryIT extends ServerCase { @Test public void testSelectBooleanFalse() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); + SelectQuery query = new SelectQuery(Artist.class); Expression qual = ExpressionFactory.expFalse(); qual = qual.andExp(ExpressionFactory.matchExp("artistName", "artist1")); query.setQualifier(qual); @@ -483,7 +483,7 @@ public class SelectQueryIT extends ServerCase { @Test public void testSelectBooleanFalseOr() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); + SelectQuery query = new SelectQuery(Artist.class); Expression qual = ExpressionFactory.expFalse(); qual = qual.orExp(ExpressionFactory.matchExp("artistName", "artist1")); query.setQualifier(qual); @@ -495,7 +495,7 @@ public class SelectQueryIT extends ServerCase { public void testSelect() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); + SelectQuery query = new SelectQuery(Artist.class); List objects = query.select(context); assertEquals(20, objects.size()); } @@ -504,7 +504,7 @@ public class SelectQueryIT extends ServerCase { public void testSelectOne() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); + SelectQuery query = new SelectQuery(Artist.class); Expression qual = ExpressionFactory.matchExp("artistName", "artist1"); query.setQualifier(qual); @@ -516,7 +516,7 @@ public class SelectQueryIT extends ServerCase { public void testSelectFirst() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); + SelectQuery query = new SelectQuery(Artist.class); query.addOrdering(new Ordering(Artist.ARTIST_NAME.getName())); Artist artist = (Artist) query.selectFirst(context); @@ -528,7 +528,7 @@ public class SelectQueryIT extends ServerCase { public void testSelectFirstByContext() throws Exception { createArtistsDataSet(); - SelectQuery query = new SelectQuery(Artist.class); + SelectQuery query = new SelectQuery(Artist.class); query.addOrdering(new Ordering(Artist.ARTIST_NAME.getName())); Artist artist = (Artist) context.selectFirst(query); @@ -564,7 +564,7 @@ public class SelectQueryIT extends ServerCase { try { int count = 0; - for (Artist a : it) { + for (@SuppressWarnings("unused") Artist a : it) { count++; } @@ -684,7 +684,7 @@ public class SelectQueryIT extends ServerCase { // at least makes sense) Expression exp = ExpressionFactory.noMatchExp("toArtist", new Object()); - SelectQuery q = new SelectQuery(Painting.class, exp); + SelectQuery q = new SelectQuery(Painting.class, exp); q.addPrefetch("toArtist"); // test how prefetches are resolved in this case - this was a stumbling