Merge pull request #198 from radcortez/master

Tests for native-sql and native-sql-resultset-mapping projects

Author: arun-gupta

jpa/listeners/src/test/java/org/javaee7/jpa/listeners/JpaListenersTest.java

@@ -17,19 +17,16 @@
 /**
  * In this sample we're going to query a simple +JPA Entity+, using the +JPA EntityManager+ and perform a findAll,
  * persist, merge, and remove operations. By calling these operations we want to demonstrate the behaviour of +Entity
- * Listener Methods+ defined on +MovieListener+:
- * +@PostLoad+
- * +@PrePersist+
- * +@PostPersist+
- * +@PreUpdate+
- * +@PostUpdate+
- * +@PreRemove+
- * +@PostRemove+
+ * Listener Methods+: +@PostLoad+, +@PrePersist+, +@PostPersist+, +@PreUpdate+, +@PostUpdate+, +@PreRemove+,
+ * +@PostRemove+ defined on +MovieListener+:
+ *
+ * include::MovieListener[]
  *
  * The following +JPA Entity+, represents a Movie which has a name and a comma separated list of actors:
  *
  * include::Movie[]
  *
+ *
  * @author Roberto Cortez
  */
 @RunWith(Arquillian.class)

jpa/native-sql-resultset-mapping/pom.xml

@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.javaee7.jpa</groupId>
         <artifactId>jpa-samples</artifactId>
         <version>1.0-SNAPSHOT</version>
-	<relativePath>../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.javaee7.jpa</groupId>
     <artifactId>native-sql-resultset-mapping</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <packaging>war</packaging>
+    <name>JPA Native SQL ResultSet Mapping</name>
+    <description>Using the EntityManager API to perform native SQL queries and map the result with @SqlResultSetMapping
+        annotation
+    </description>
 </project>

jpa/native-sql-resultset-mapping/src/main/java/org/javaee7/jpa/nativesql/resultset/mapping/Employee.java

@@ -40,47 +40,38 @@
 package org.javaee7.jpa.nativesql.resultset.mapping;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityResult;
-import javax.persistence.Id;
-import javax.persistence.SqlResultSetMapping;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * @author Arun Gupta
  */
 @Entity
-@Table(name="EMPLOYEE_NATIVE_SQL_RESULTSET_MAPPING")
+@Table(name = "EMPLOYEE_NATIVE_SQL_RESULTSET_MAPPING")
 @SqlResultSetMapping(name = "myMapping",
-        entities = {@EntityResult(entityClass = Employee.class)})
+                     entities = {@EntityResult(entityClass = Employee.class,
+                                               fields = {@FieldResult(name = "identifier", column = "id"),
+                                                         @FieldResult(name = "simpleName", column = "name")})})
 public class Employee implements Serializable {
     private static final long serialVersionUID = 1L;
     @Id
-    private int id;
-    
-    @Column(length=50)
-    private String name;
-    
-    public Employee() { }
-    
-    public Employee(String name) {
-        this.name = name;
-    }
-    
-    public int getId() {
-        return id;
+    private int identifier;
+
+    @Column(length = 50)
+    private String simpleName;
+
+    public int getIdentifier() {
+        return identifier;
     }
 
-    public void setId(int id) {
-        this.id = id;
+    public void setIdentifier(int identifier) {
+        this.identifier = identifier;
     }
 
-    public String getName() {
-        return name;
+    public String getSimpleName() {
+        return simpleName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setSimpleName(String simpleName) {
+        this.simpleName = simpleName;
     }
 }

jpa/native-sql-resultset-mapping/src/main/java/org/javaee7/jpa/nativesql/resultset/mapping/EmployeeBean.java

@@ -49,14 +49,10 @@
  */
 @Stateless
 public class EmployeeBean {
-
     @PersistenceContext
-    EntityManager em;
-    
-    public void persist(Employee e) {
-        em.persist(e);
-    }
-    
+    private EntityManager em;
+
+    @SuppressWarnings("unchecked")
     public List<Employee> get() {
         return em.createNativeQuery("select * from EMPLOYEE_NATIVE_SQL_RESULTSET_MAPPING", "myMapping").getResultList();
     }

jpa/native-sql-resultset-mapping/src/main/java/org/javaee7/jpa/nativesql/resultset/mapping/TestServlet.java

@@ -0,0 +1,71 @@
+package org.javaee7.jpa.nativesql.resultset.mapping;
+
+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.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+/**
+ * In this sample we're going to query a simple +JPA Entity+, using the +JPA EntityManager Native Query+, perform
+ * a select operation and map the query result using +@SqlResultSetMapping+.
+ *
+ * include::Employee[]
+ *
+ * The select operation is very simple. We just need to call the API method +createNativeQuery+ on the +EntityManager+
+ * and use the mapping defined on +Employee+ by the +@SqlResultSetMapping+ annotation.
+ *
+ * include::EmployeeBean[]#get
+ *
+ * @author Roberto Cortez
+ */
+@RunWith(Arquillian.class)
+public class JpaNativeSqlResultSetMappingTest {
+    @Inject
+    private EmployeeBean employeeBean;
+
+    /**
+     * We're just going to deploy the application as a +web archive+. Note the inclusion of the following files:
+     *
+     * [source,file]
+     * ----
+     * /META-INF/persistence.xml
+     * /META-INF/create.sql
+     * /META-INF/drop.sql
+     * /META-INF/load.sql
+     * ----
+     *
+     * The +persistence.xml+ file is needed of course for the persistence unit definition. A datasource is not
+     * needed, since we can now use the new default datasource available in +JEE7+. We're also using the new
+     * +javax.persistence.schema-generation.*+ propertires to create, populate and drop the database.
+     */
+    @Deployment
+    public static WebArchive createDeployment() {
+        WebArchive war = ShrinkWrap.create(WebArchive.class)
+                                   .addPackage("org.javaee7.jpa.nativesql.resultset.mapping")
+                                   .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;
+    }
+
+    /**
+     * In the test, we're just going to invoke the only available operation in the +EmployeeBean+ and assert a few
+     * details to confirm that the native query was successfully executed.
+     */
+    @Test
+    public void testJpaNativeSqlResultSetMapping() {
+        List<Employee> employees = employeeBean.get();
+        assertFalse(employees.isEmpty());
+        assertEquals(8, employees.size());
+    }
+}