Added tests for entitygraph project.

radcortez · radcortez · commit 0a25ef40fada · 2014-12-08T11:56:53.000Z
Mixing a list parameter with entity graph fails in hibernate.
diff --git a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/Movie.java b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/Movie.java
@@ -13,7 +13,9 @@
 @Entity
 @Table(name = "MOVIE_ENTITY_GRAPH")
 @NamedQueries({
-    @NamedQuery(name = "Movie.findAll", query = "SELECT m FROM Movie m")
+    @NamedQuery(name = "Movie.findAll", query = "SELECT m FROM Movie m"),
+    @NamedQuery(name = "Movie.findAllById", query = "SELECT m FROM Movie m WHERE m.id = :movieId"),
+    @NamedQuery(name = "Movie.findAllByIds", query = "SELECT m FROM Movie m WHERE m.id IN :movieIds")
 })
 @NamedEntityGraphs({
     @NamedEntityGraph(
@@ -57,6 +59,10 @@ public class Movie implements Serializable {
     @JoinColumn(name = "ID")
     private Set<MovieAward> movieAwards;
 
+    public Integer getId() {
+        return id;
+    }
+
     public Set<MovieActor> getMovieActors() {
         return movieActors;
     }
diff --git a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieBean.java b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieBean.java
@@ -31,4 +31,18 @@ public List<Movie> listMovies(String hint, EntityGraph<?> entityGraph) {
                             .setHint(hint, entityGraph)
                             .getResultList();
     }
+
+    public List<Movie> listMoviesById(Integer movieId, String hint, String graphName) {
+        return entityManager.createNamedQuery("Movie.findAllById")
+                            .setParameter("movieId", movieId)
+                            .setHint(hint, entityManager.getEntityGraph(graphName))
+                            .getResultList();
+    }
+
+    public List<Movie> listMoviesByIds(List<Integer> movieIds, String hint, String graphName) {
+        return entityManager.createNamedQuery("Movie.findAllByIds")
+                            .setParameter("movieIds", movieIds)
+                            .setHint(hint, entityManager.getEntityGraph(graphName))
+                            .getResultList();
+    }
 }
diff --git a/jpa/entitygraph/src/test/java/org/javaee7/jpa/entitygraph/EntityGraphTest.java b/jpa/entitygraph/src/test/java/org/javaee7/jpa/entitygraph/EntityGraphTest.java
@@ -12,10 +12,10 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceUnitUtil;
+import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * In this sample we're going to query a +JPA Entity+ and control property loading by providing +Hints+ using the new
@@ -144,4 +144,57 @@ public void testEntityGraphProgrammatically() throws Exception {
             assertTrue(persistenceUnitUtil.isLoaded(movie, "movieAwards"));
         }
     }
+
+    @Test
+    public void testEntityGraphWithNamedParameters() throws Exception {
+        PersistenceUnitUtil persistenceUnitUtil = entityManager.getEntityManagerFactory().getPersistenceUnitUtil();
+        List<Movie> listMovieById = movieBean.listMoviesById(1, "javax.persistence.fetchgraph", "movieWithActors");
+        assertFalse(listMovieById.isEmpty());
+        assertEquals(1, listMovieById.size());
+        for (Movie movie : listMovieById) {
+            assertTrue(movie.getId().equals(1));
+
+            assertTrue(persistenceUnitUtil.isLoaded(movie, "movieActors"));
+            assertFalse(movie.getMovieActors().isEmpty());
+            for (MovieActor movieActor : movie.getMovieActors()) {
+                assertFalse(persistenceUnitUtil.isLoaded(movieActor, "movieActorAwards"));
+            }
+
+            // https://hibernate.atlassian.net/browse/HHH-8776
+            // The specification states that by using fetchgraph, attributes should stay unloaded even if defined as
+            // EAGER (movieDirectors), but specification also states that the persistence provider is allowed to fetch
+            // additional state.
+            assertTrue(persistenceUnitUtil.isLoaded(movie, "movieDirectors") ||
+                       !persistenceUnitUtil.isLoaded(movie, "movieDirectors"));
+            assertFalse(persistenceUnitUtil.isLoaded(movie, "movieAwards"));
+        }
+    }
+
+    @Test
+    public void testEntityGraphWithNamedParametersList() throws Exception {
+        PersistenceUnitUtil persistenceUnitUtil = entityManager.getEntityManagerFactory().getPersistenceUnitUtil();
+        // Hibernate fails mixing Entity Graphs and Named Parameters with "IN". Throws NPE
+        List<Movie> listMoviesByIds =
+                movieBean.listMoviesByIds(Arrays.asList(1, 2), "javax.persistence.fetchgraph", "movieWithActors");
+
+        assertFalse(listMoviesByIds.isEmpty());
+        assertEquals(2, listMoviesByIds.size());
+        for (Movie movie : listMoviesByIds) {
+            assertTrue(movie.getId().equals(1) || movie.getId().equals(2));
+
+            assertTrue(persistenceUnitUtil.isLoaded(movie, "movieActors"));
+            assertFalse(movie.getMovieActors().isEmpty());
+            for (MovieActor movieActor : movie.getMovieActors()) {
+                assertFalse(persistenceUnitUtil.isLoaded(movieActor, "movieActorAwards"));
+            }
+
+            // https://hibernate.atlassian.net/browse/HHH-8776
+            // The specification states that by using fetchgraph, attributes should stay unloaded even if defined as
+            // EAGER (movieDirectors), but specification also states that the persistence provider is allowed to fetch
+            // additional state.
+            assertTrue(persistenceUnitUtil.isLoaded(movie, "movieDirectors") ||
+                       !persistenceUnitUtil.isLoaded(movie, "movieDirectors"));
+            assertFalse(persistenceUnitUtil.isLoaded(movie, "movieAwards"));
+        }
+    }
 }
