Tests fix
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/188a0a6a Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/188a0a6a Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/188a0a6a Branch: refs/heads/master Commit: 188a0a6a0b70741c2399ca61158576ad38702564 Parents: c1272b1 Author: Arseni Bulatski <ancars...@gmail.com> Authored: Fri Jan 4 17:21:32 2019 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Fri Jan 4 17:21:32 2019 +0300 ---------------------------------------------------------------------- .../cayenne/exp/property/PathAliasesIT.java | 21 ++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/188a0a6a/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 37b3f16..e73402d 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 @@ -131,7 +131,8 @@ public class PathAliasesIT extends ServerCase { query.setQualifier(expression); List<Painting> paintings = query.select(context); assertEquals(2, paintings.size()); - assertEquals("painting5", paintings.get(0).getPaintingTitle()); + assertEquals("artist1", paintings.get(0).getToArtist().getArtistName()); + assertEquals("artist1", paintings.get(1).getToArtist().getArtistName()); } @Test @@ -173,11 +174,11 @@ public class PathAliasesIT extends ServerCase { @Test public void testOrderWithAlias() { ObjectSelect<Artist> query = ObjectSelect.query(Artist.class) - .orderBy(Artist.PAINTING_ARRAY.alias("p1").dot(Painting.ESTIMATED_PRICE).asc()) - .prefetch(Artist.PAINTING_ARRAY.disjoint()); + .orderBy(Artist.PAINTING_ARRAY.alias("p1").dot(Painting.TO_GALLERY).dot(Gallery.GALLERY_NAME).asc()); List<Artist> artists = query.select(context); - assertEquals(5, artists.size()); - assertEquals(2, artists.get(0).getPaintingArray().size()); + 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()); } @Test(expected = CayenneRuntimeException.class) @@ -280,13 +281,13 @@ public class PathAliasesIT extends ServerCase { @Test public void testOrderWithAliasForExp() { - Expression e1 = ExpressionFactory.exp("paintingArray#p1.estimatedPrice"); + Expression e1 = ExpressionFactory.exp("paintingArray#p1.toGallery#p2.galleryName"); ObjectSelect<Artist> query = ObjectSelect.query(Artist.class) - .orderBy(PropertyFactory.createBase(e1, Number.class).asc()) - .prefetch(Artist.PAINTING_ARRAY.disjoint()); + .orderBy(PropertyFactory.createBase(e1, String.class).asc()); List<Artist> artists = query.select(context); - assertEquals(5, artists.size()); - assertEquals(2, artists.get(0).getPaintingArray().size()); + 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()); } @Test
