Merge pull request #191 from radcortez/master

Added test for jpa criteria project.

Author: arun-gupta

jpa/criteria/pom.xml

@@ -8,8 +8,6 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.javaee7.jpa</groupId>
     <artifactId>criteria</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <packaging>war</packaging>
 </project>

jpa/criteria/src/main/java/org/javaee7/jpa/criteria/Movie.java

@@ -111,6 +111,21 @@ public void setActors(String actors) {
         this.actors = actors;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) { return true; }
+        if (o == null || getClass() != o.getClass()) { return false; }
+
+        Movie movie = (Movie) o;
+
+        return id.equals(movie.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return id.hashCode();
+    }
+
     @Override
     public String toString() {
         return name;

jpa/criteria/src/main/java/org/javaee7/jpa/criteria/MovieBean.java

@@ -56,13 +56,12 @@
  */
 @Stateless
 public class MovieBean {
-
     @PersistenceContext
-    EntityManager em;
+    private EntityManager em;
 
     public List<Movie> listMovies() {
         CriteriaBuilder builder = em.getCriteriaBuilder();
-        CriteriaQuery listCriteria = builder.createQuery(Movie.class);
+        CriteriaQuery<Movie> listCriteria = builder.createQuery(Movie.class);
         Root<Movie> listRoot = listCriteria.from(Movie.class);
         listCriteria.select(listRoot);
         TypedQuery<Movie> query = em.createQuery(listCriteria);
@@ -71,23 +70,22 @@ public List<Movie> listMovies() {
 
     public void updateMovie() {
         CriteriaBuilder builder = em.getCriteriaBuilder();
-        CriteriaUpdate updateCriteria = builder.createCriteriaUpdate(Movie.class);
+        CriteriaUpdate<Movie> updateCriteria = builder.createCriteriaUpdate(Movie.class);
         Root<Movie> updateRoot = updateCriteria.from(Movie.class);
         updateCriteria.where(builder.equal(updateRoot.get(Movie_.name), "Inception"));
         updateCriteria.set(updateRoot.get(Movie_.name), "INCEPTION");
         Query q = em.createQuery(updateCriteria);
         q.executeUpdate();
         em.flush();
     }
-    
+
     public void deleteMovie() {
         CriteriaBuilder builder = em.getCriteriaBuilder();
-        CriteriaDelete deleteCriteria = builder.createCriteriaDelete(Movie.class);
+        CriteriaDelete<Movie> deleteCriteria = builder.createCriteriaDelete(Movie.class);
         Root<Movie> updateRoot = deleteCriteria.from(Movie.class);
         deleteCriteria.where(builder.equal(updateRoot.get(Movie_.name), "The Matrix"));
         Query q = em.createQuery(deleteCriteria);
         q.executeUpdate();
         em.flush();
     }
-    
 }

jpa/criteria/src/main/java/org/javaee7/jpa/criteria/TestServlet.java

@@ -0,0 +1,55 @@
+package org.javaee7.jpa.criteria;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Roberto Cortez
+ */
+@RunWith(Arquillian.class)
+public class JpaCriteriaTest {
+    @Inject
+    private MovieBean movieBean;
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        WebArchive war = ShrinkWrap.create(WebArchive.class)
+                                   .addPackage("org.javaee7.jpa.criteria")
+                                   .addAsResource("META-INF/persistence.xml")
+                                   .addAsResource("META-INF/create.sql")
+                                   .addAsResource("META-INF/drop.sql")
+                                   .addAsResource("META-INF/load.sql");
+        System.out.println(war.toString(true));
+        return war;
+    }
+
+    @Test
+    public void testCriteria() {
+        List<Movie> movies = movieBean.listMovies();
+        assertEquals(4, movies.size());
+        assertTrue(movies.contains(new Movie(1)));
+        assertTrue(movies.contains(new Movie(2)));
+        assertTrue(movies.contains(new Movie(3)));
+        assertTrue(movies.contains(new Movie(4)));
+
+        movieBean.updateMovie();
+        movies = movieBean.listMovies();
+        assertEquals(4, movies.size());
+        assertEquals("INCEPTION", movies.get(2).getName());
+
+        movieBean.deleteMovie();
+        movies = movieBean.listMovies();
+        assertFalse(movies.isEmpty());
+        assertEquals(3, movies.size());
+        assertFalse(movies.contains(new Movie(1)));
+    }
+}