Skip to content

Commit fa297bc

Browse files
radcortezradcortez
committed
Added tests for multiple-pu project.
1 parent cae4ec2 commit fa297bc

File tree

8 files changed

+80
-225
lines changed

8 files changed

+80
-225
lines changed

‎jpa/multiple-pu/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
<artifactId>jpa-samples</artifactId>
77
<version>1.0-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
9-
</parent>
9+
</parent>
1010

11-
<groupId>org.javaee7.jpa</groupId>
1211
<artifactId>multiple-pu</artifactId>
1312
<version>1.0-SNAPSHOT</version>
1413
<packaging>war</packaging>

‎jpa/multiple-pu/src/main/java/org/javaee7/jpa/multiple/pu/Movie.java

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,31 @@
11
package org.javaee7.jpa.multiple.pu;
22

3-
import java.io.Serializable;
4-
import javax.persistence.Entity;
5-
import javax.persistence.EntityListeners;
6-
import javax.persistence.Id;
7-
import javax.persistence.NamedQueries;
8-
import javax.persistence.NamedQuery;
9-
import javax.persistence.Table;
3+
import javax.persistence.*;
104
import javax.validation.constraints.NotNull;
115
import javax.validation.constraints.Size;
12-
import javax.xml.bind.annotation.XmlRootElement;
6+
import java.io.Serializable;
137

148
/**
159
* @author Arun Gupta
1610
*/
1711
@Entity
18-
@Table(name = "MOVIE_LISTENER")
19-
@XmlRootElement
12+
@Table(name = "MOVIE_MULTIPLE_PU")
2013
@NamedQueries({
21-
@NamedQuery(name = "Movie.findAll", query = "SELECT m FROM Movie m"),
22-
@NamedQuery(name = "Movie.findById", query = "SELECT m FROM Movie m WHERE m.id = :id"),
23-
@NamedQuery(name = "Movie.findByName", query = "SELECT m FROM Movie m WHERE m.name = :name"),
24-
@NamedQuery(name = "Movie.findByActors", query = "SELECT m FROM Movie m WHERE m.actors = :actors")})
14+
@NamedQuery(name = "Movie.findAll", query = "SELECT m FROM Movie m"),
15+
})
2516
public class Movie implements Serializable {
26-
27-
private static final long serialVersionUID = 1L;
2817
@Id
2918
@NotNull
3019
private Integer id;
31-
20+
3221
@NotNull
3322
@Size(min = 1, max = 50)
3423
private String name;
35-
24+
3625
@NotNull
3726
@Size(min = 1, max = 200)
3827
private String actors;
3928

40-
public Movie() {
41-
}
42-
43-
public Movie(Integer id) {
44-
this.id = id;
45-
}
46-
47-
public Movie(Integer id, String name, String actors) {
48-
this.id = id;
49-
this.name = name;
50-
this.actors = actors;
51-
}
52-
5329
public Integer getId() {
5430
return id;
5531
}
@@ -75,7 +51,17 @@ public void setActors(String actors) {
7551
}
7652

7753
@Override
78-
public String toString() {
79-
return name;
54+
public boolean equals(Object o) {
55+
if (this == o) { return true; }
56+
if (o == null || getClass() != o.getClass()) { return false; }
57+
58+
Movie movie = (Movie) o;
59+
60+
return id.equals(movie.id);
61+
}
62+
63+
@Override
64+
public int hashCode() {
65+
return id.hashCode();
8066
}
8167
}

‎jpa/multiple-pu/src/main/java/org/javaee7/jpa/multiple/pu/MySessionBean.java renamed to ‎jpa/multiple-pu/src/main/java/org/javaee7/jpa/multiple/pu/MultiplePuBean.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
package org.javaee7.jpa.multiple.pu;
22

3-
import java.util.List;
43
import javax.ejb.Stateless;
54
import javax.persistence.EntityManager;
65
import javax.persistence.PersistenceContext;
6+
import java.util.List;
77

88
/**
99
* @author Arun Gupta
1010
*/
1111
@Stateless
12-
public class MySessionBean {
13-
12+
public class MultiplePuBean {
1413
@PersistenceContext(unitName = "defaultPU")
15-
EntityManager defaultEM;
16-
14+
private EntityManager defaultEM;
1715
@PersistenceContext(unitName = "samplePU")
18-
EntityManager sampleEM;
16+
private EntityManager sampleEM;
1917

2018
public List<Movie> listMovies() {
2119
return defaultEM.createNamedQuery("Movie.findAll", Movie.class).getResultList();
2220
}
23-
21+
2422
public List<ProductCode> listProductCode() {
2523
return sampleEM.createNamedQuery("ProductCode.findAll", ProductCode.class).getResultList();
2624
}
27-
2825
}

‎jpa/multiple-pu/src/main/java/org/javaee7/jpa/multiple/pu/TestServlet.java

Lines changed: 0 additions & 113 deletions
This file was deleted.

‎jpa/multiple-pu/src/main/resources/META-INF/persistence.xml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<persistence version="2.1"
3-
xmlns="http://xmlns.jcp.org/xml/ns/persistence"
4-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<persistence version="2.1"
3+
xmlns="http://xmlns.jcp.org/xml/ns/persistence"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
66
<persistence-unit name="defaultPU" transaction-type="JTA">
7-
<jta-data-source>jdbc/__default</jta-data-source>
87
<properties>
98
<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
109
<property name="javax.persistence.schema-generation.create-source" value="script"/>
1110
<property name="javax.persistence.schema-generation.drop-source" value="script"/>
1211
<property name="javax.persistence.schema-generation.create-script-source" value="META-INF/create.sql"/>
1312
<property name="javax.persistence.schema-generation.drop-script-source" value="META-INF/drop.sql"/>
1413
<property name="javax.persistence.sql-load-script-source" value="META-INF/load.sql"/>
15-
</properties>
14+
</properties>
1615
</persistence-unit>
1716
<persistence-unit name="samplePU" transaction-type="JTA">
18-
<jta-data-source>jdbc/sample</jta-data-source>
17+
<class>org.javaee7.jpa.multiple.pu.ProductCode</class>
18+
<exclude-unlisted-classes>true</exclude-unlisted-classes>
19+
<properties>
20+
<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
21+
<property name="javax.persistence.schema-generation.create-source" value="metadata"/>
22+
<property name="javax.persistence.schema-generation.drop-source" value="metadata"/>
23+
</properties>
1924
</persistence-unit>
2025
</persistence>

‎jpa/multiple-pu/src/main/webapp/WEB-INF/beans.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎jpa/multiple-pu/src/main/webapp/index.jsp

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎jpa/multiple-pu/src/test/java/org/javaee7/jpa/multiple/pu/MultiplePuTest.java

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package org.javaee7.jpa.multiple.pu;
2+
3+
import org.jboss.arquillian.container.test.api.Deployment;
4+
import org.jboss.arquillian.junit.Arquillian;
5+
import org.jboss.shrinkwrap.api.ShrinkWrap;
6+
import org.jboss.shrinkwrap.api.spec.WebArchive;
7+
import org.junit.Test;
8+
import org.junit.runner.RunWith;
9+
10+
import javax.inject.Inject;
11+
import java.util.List;
12+
13+
import static org.junit.Assert.assertFalse;
14+
import static org.junit.Assert.assertTrue;
15+
16+
/**
17+
* @author Roberto Cortez
18+
*/
19+
@RunWith(Arquillian.class)
20+
public class MultiplePuTest {
21+
@Inject
22+
private MultiplePuBean bean;
23+
24+
@Deployment
25+
public static WebArchive createDeployment() {
26+
WebArchive war = ShrinkWrap.create(WebArchive.class)
27+
.addPackage("org.javaee7.jpa.multiple.pu")
28+
.addAsResource("META-INF/persistence.xml")
29+
.addAsResource("META-INF/create.sql")
30+
.addAsResource("META-INF/drop.sql")
31+
.addAsResource("META-INF/load.sql");
32+
System.out.println(war.toString(true));
33+
return war;
34+
}
35+
36+
@Test
37+
public void testMultiplePu() throws Exception {
38+
List<Movie> movies = bean.listMovies();
39+
assertFalse(movies.isEmpty());
40+
41+
List<ProductCode> productCodes = bean.listProductCode();
42+
assertTrue(productCodes.isEmpty());
43+
}
44+
}

0 commit comments

Comments
 (0)