You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ab...@apache.org on 2019/01/09 11:10:02 UTC
cayenne git commit: Test fix
Repository: cayenne
Updated Branches:
refs/heads/master 60c556675 -> 4d42e2679
Test fix
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4d42e267
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4d42e267
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4d42e267
Branch: refs/heads/master
Commit: 4d42e267980035b3c3985e7fd4dc5808347b6e48
Parents: 60c5566
Author: Arseni Bulatski <an...@gmail.com>
Authored: Wed Jan 9 14:09:40 2019 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Wed Jan 9 14:09:40 2019 +0300
----------------------------------------------------------------------
.../cayenne/exp/property/PathAliasesIT.java | 28 +++++++++++---------
1 file changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4d42e267/cayenne-server/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java
index 8c2bdd5..93a68f2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java
@@ -173,12 +173,13 @@ public class PathAliasesIT extends ServerCase {
@Test
public void testOrderWithAlias() {
- ObjectSelect<Artist> query = ObjectSelect.query(Artist.class)
- .orderBy(Artist.PAINTING_ARRAY.alias("p1").dot(Painting.TO_GALLERY).dot(Gallery.GALLERY_NAME).asc());
- List<Artist> artists = query.select(context);
- assertEquals(6, artists.size());
- assertEquals("tate modern", artists.get(0).getPaintingArray().get(0).getToGallery().getGalleryName());
- assertEquals("test gallery", artists.get(artists.size() - 1).getPaintingArray().get(0).getToGallery().getGalleryName());
+ ObjectSelect<Painting> query = ObjectSelect.query(Painting.class)
+ .orderBy(Painting.TO_ARTIST.alias("p1").dot(Artist.ARTIST_NAME).asc())
+ .prefetch(Painting.TO_ARTIST.disjoint());
+
+ List<Painting> paintings = query.select(context);
+ assertEquals(20, paintings.size());
+ assertEquals("artist1", paintings.get(0).getToArtist().getArtistName());
}
@Test(expected = CayenneRuntimeException.class)
@@ -281,13 +282,14 @@ public class PathAliasesIT extends ServerCase {
@Test
public void testOrderWithAliasForExp() {
- Expression e1 = ExpressionFactory.exp("paintingArray#p1.toGallery#p2.galleryName");
- ObjectSelect<Artist> query = ObjectSelect.query(Artist.class)
- .orderBy(PropertyFactory.createBase(e1, String.class).asc());
- List<Artist> artists = query.select(context);
- assertEquals(6, artists.size());
- assertEquals("tate modern", artists.get(0).getPaintingArray().get(0).getToGallery().getGalleryName());
- assertEquals("test gallery", artists.get(artists.size() - 1).getPaintingArray().get(0).getToGallery().getGalleryName());
+ Expression e1 = ExpressionFactory.exp("toArtist#p1.artistName");
+ ObjectSelect<Painting> query = ObjectSelect.query(Painting.class)
+ .orderBy(PropertyFactory.createBase(e1, String.class).asc())
+ .prefetch(Painting.TO_ARTIST.disjoint());
+
+ List<Painting> paintings = query.select(context);
+ assertEquals(20, paintings.size());
+ assertEquals("artist1", paintings.get(0).getToArtist().getArtistName());
}
@Test