You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by mg...@apache.org on 2012/05/28 16:41:48 UTC
svn commit: r1343268 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java
Author: mgentry
Date: Mon May 28 14:41:48 2012
New Revision: 1343268
URL: http://svn.apache.org/viewvc?rev=1343268&view=rev
Log:
Added unit test for CAY-1658: Add sort ordering enhancements to SelectQuery. Incorporated patch from John Huss, modified to support constructor chaining and moved null-check for orderings to addOrderings() method.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java?rev=1343268&r1=1343267&r2=1343268&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/SelectQueryTest.java Mon May 28 14:41:48 2012
@@ -464,7 +464,7 @@ public class SelectQueryTest extends Ser
List<ReturnTypesMap1> objects = context.performQuery(query);
assertEquals(2, objects.size());
}
-
+
public void testSelectBitwiseOr() throws Exception {
if (!accessStackAdapter.supportsBitwiseOps()) {
@@ -487,7 +487,7 @@ public class SelectQueryTest extends Ser
List<ReturnTypesMap1> objects = context.performQuery(query);
assertEquals(2, objects.size());
}
-
+
public void testSelectBitwiseAnd() throws Exception {
if (!accessStackAdapter.supportsBitwiseOps()) {
@@ -510,7 +510,7 @@ public class SelectQueryTest extends Ser
List<ReturnTypesMap1> objects = context.performQuery(query);
assertEquals(3, objects.size());
}
-
+
public void testSelectBitwiseXor() throws Exception {
if (!accessStackAdapter.supportsBitwiseOps()) {
@@ -717,6 +717,26 @@ public class SelectQueryTest extends Ser
ExpressionFactory.matchAnyExp(Arrays.asList(a1, a3)));
}
+ public void testSelect_WithOrdering() {
+
+ Artist a1 = context.newObject(Artist.class);
+ a1.setArtistName("a1");
+ Artist a2 = context.newObject(Artist.class);
+ a2.setArtistName("a2");
+ Artist a3 = context.newObject(Artist.class);
+ a3.setArtistName("a3");
+ context.commitChanges();
+
+ List<Ordering> orderings = Arrays.asList(new Ordering("artistName", SortOrder.ASCENDING));
+ SelectQuery query = new SelectQuery(Artist.class, null, orderings);
+
+ List<Persistent> list = context.performQuery(query);
+ assertEquals(list.size(), 3);
+ assertSame(list.get(0), a1);
+ assertSame(list.get(1), a2);
+ assertSame(list.get(2), a3);
+ }
+
/**
* Tests INs with more than 1000 elements
*/