Skip to content

Commit cae4ec2

Browse files
radcortezradcortez
committed
Added tests for jndi-context project.
1 parent 06e2a6e commit cae4ec2

File tree

11 files changed

+93
-217
lines changed

11 files changed

+93
-217
lines changed

‎jaxws/jaxws-endpoint/src/main/webapp/WEB-INF/wsdl/EBookStoreImplService.wsdl

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.5-b03-. -->
3-
<definitions targetNamespace="http://endpoint.jaxws.javaee7.org/" name="EBookStoreImplService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://endpoint.jaxws.javaee7.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
2+
<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.8 svn-revision#13980. -->
3+
<definitions targetNamespace="http://endpoint.jaxws.javaee7.org/" name="EBookStoreImplService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:tns="http://endpoint.jaxws.javaee7.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
44
<types>
55
<xsd:schema>
66
<xsd:import namespace="http://endpoint.jaxws.javaee7.org/" schemaLocation="EBookStoreImplService_schema1.xsd"/>
@@ -12,18 +12,18 @@
1212
<message name="welcomeMessageResponse">
1313
<part name="parameters" element="tns:welcomeMessageResponse"/>
1414
</message>
15-
<message name="takeBook">
16-
<part name="parameters" element="tns:takeBook"/>
17-
</message>
18-
<message name="takeBookResponse">
19-
<part name="parameters" element="tns:takeBookResponse"/>
20-
</message>
2115
<message name="findEBooks">
2216
<part name="parameters" element="tns:findEBooks"/>
2317
</message>
2418
<message name="findEBooksResponse">
2519
<part name="parameters" element="tns:findEBooksResponse"/>
2620
</message>
21+
<message name="takeBook">
22+
<part name="parameters" element="tns:takeBook"/>
23+
</message>
24+
<message name="takeBookResponse">
25+
<part name="parameters" element="tns:takeBookResponse"/>
26+
</message>
2727
<message name="saveBook">
2828
<part name="parameters" element="tns:saveBook"/>
2929
</message>
@@ -38,24 +38,24 @@
3838
</message>
3939
<portType name="EBookStore">
4040
<operation name="welcomeMessage">
41-
<input message="tns:welcomeMessage"/>
42-
<output message="tns:welcomeMessageResponse"/>
43-
</operation>
44-
<operation name="takeBook">
45-
<input message="tns:takeBook"/>
46-
<output message="tns:takeBookResponse"/>
41+
<input wsam:Action="http://endpoint.jaxws.javaee7.org/EBookStore/welcomeMessageRequest" message="tns:welcomeMessage"/>
42+
<output wsam:Action="http://endpoint.jaxws.javaee7.org/EBookStore/welcomeMessageResponse" message="tns:welcomeMessageResponse"/>
4743
</operation>
4844
<operation name="findEBooks">
49-
<input message="tns:findEBooks"/>
50-
<output message="tns:findEBooksResponse"/>
45+
<input wsam:Action="http://endpoint.jaxws.javaee7.org/EBookStore/findEBooksRequest" message="tns:findEBooks"/>
46+
<output wsam:Action="http://endpoint.jaxws.javaee7.org/EBookStore/findEBooksResponse" message="tns:findEBooksResponse"/>
47+
</operation>
48+
<operation name="takeBook">
49+
<input wsam:Action="http://endpoint.jaxws.javaee7.org/EBookStore/takeBookRequest" message="tns:takeBook"/>
50+
<output wsam:Action="http://endpoint.jaxws.javaee7.org/EBookStore/takeBookResponse" message="tns:takeBookResponse"/>
5151
</operation>
5252
<operation name="saveBook">
53-
<input message="tns:saveBook"/>
54-
<output message="tns:saveBookResponse"/>
53+
<input wsam:Action="http://endpoint.jaxws.javaee7.org/EBookStore/saveBookRequest" message="tns:saveBook"/>
54+
<output wsam:Action="http://endpoint.jaxws.javaee7.org/EBookStore/saveBookResponse" message="tns:saveBookResponse"/>
5555
</operation>
5656
<operation name="addAppendix">
57-
<input message="tns:addAppendix"/>
58-
<output message="tns:addAppendixResponse"/>
57+
<input wsam:Action="http://endpoint.jaxws.javaee7.org/EBookStore/addAppendixRequest" message="tns:addAppendix"/>
58+
<output wsam:Action="http://endpoint.jaxws.javaee7.org/EBookStore/addAppendixResponse" message="tns:addAppendixResponse"/>
5959
</operation>
6060
</portType>
6161
<binding name="EBookStoreImplPortBinding" type="tns:EBookStore">
@@ -69,7 +69,7 @@
6969
<soap:body use="literal"/>
7070
</output>
7171
</operation>
72-
<operation name="takeBook">
72+
<operation name="findEBooks">
7373
<soap:operation soapAction=""/>
7474
<input>
7575
<soap:body use="literal"/>
@@ -78,7 +78,7 @@
7878
<soap:body use="literal"/>
7979
</output>
8080
</operation>
81-
<operation name="findEBooks">
81+
<operation name="takeBook">
8282
<soap:operation soapAction=""/>
8383
<input>
8484
<soap:body use="literal"/>

‎jpa/jndi-context/pom.xml

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.javaee7.jpa</groupId>
@@ -8,39 +9,7 @@
89
<relativePath>../pom.xml</relativePath>
910
</parent>
1011

11-
<groupId>org.javaee7.jpa</groupId>
1212
<artifactId>jndi-context</artifactId>
1313
<version>1.0-SNAPSHOT</version>
1414
<packaging>war</packaging>
15-
16-
<!--
17-
<repositories>
18-
<repository>
19-
<url>http://download.eclipse.org/rt/eclipselink/maven.repo/</url>
20-
<id>eclipselink</id>
21-
<layout>default</layout>
22-
<name>Repository for library EclipseLink (JPA 2.0)</name>
23-
</repository>
24-
</repositories>
25-
<dependencies>
26-
<dependency>
27-
<groupId>org.eclipse.persistence</groupId>
28-
<artifactId>eclipselink</artifactId>
29-
<version>2.3.2</version>
30-
<scope>provided</scope>
31-
</dependency>
32-
<dependency>
33-
<groupId>org.eclipse.persistence</groupId>
34-
<artifactId>javax.persistence</artifactId>
35-
<version>2.0.3</version>
36-
<scope>provided</scope>
37-
</dependency>
38-
<dependency>
39-
<groupId>org.eclipse.persistence</groupId>
40-
<artifactId>org.eclipse.persistence.jpa.modelgen.processor</artifactId>
41-
<version>2.3.2</version>
42-
<scope>provided</scope>
43-
</dependency>
44-
</dependencies>
45-
-->
4615
</project>

‎jpa/jndi-context/src/main/java/org/javaee7/jpa/jndi/context/Employee.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @author Arun Gupta
1515
*/
1616
@Entity
17-
@Table(name = "EMPLOYEE_SCHEMA_GEN")
17+
@Table(name = "EMPLOYEE_JNDI_CONTEXT")
1818
@NamedQueries({
1919
@NamedQuery(name = "Employee.findAll", query = "SELECT e FROM Employee e")
2020
})

‎jpa/jndi-context/src/main/java/org/javaee7/jpa/jndi/context/EmployeeBean.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
@PersistenceContext(name = "persistence/myJNDI", unitName = "MyPU")
1818
@Stateless
1919
public class EmployeeBean {
20-
21-
EntityManager em;
20+
private EntityManager em;
2221

2322
@PostConstruct
2423
public void postConstruct() {

‎jpa/jndi-context/src/main/java/org/javaee7/jpa/jndi/context/TestServlet.java

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

‎jpa/jndi-context/src/main/resources/META-INF/create.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
CREATE TABLE EMPLOYEE_SCHEMA_GEN_SCRIPTS ("ID" INTEGER not null primary key, "NAME" VARCHAR(50) not null)
1+
CREATE TABLE EMPLOYEE_JNDI_CONTEXT ("ID" INTEGER not null primary key, "NAME" VARCHAR(50) not null)

‎jpa/jndi-context/src/main/resources/META-INF/drop.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DROP TABLE EMPLOYEE_SCHEMA_GEN_SCRIPTS
1+
DROP TABLE EMPLOYEE_JNDI_CONTEXT

‎jpa/jndi-context/src/main/resources/META-INF/load.sql

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
INSERT INTO EMPLOYEE_SCHEMA_GEN_SCRIPTS("ID", "NAME") VALUES (1, 'Penny')
2-
INSERT INTO EMPLOYEE_SCHEMA_GEN_SCRIPTS("ID", "NAME") VALUES (2, 'Sheldon')
3-
INSERT INTO EMPLOYEE_SCHEMA_GEN_SCRIPTS("ID", "NAME") VALUES (3, 'Amy')
4-
INSERT INTO EMPLOYEE_SCHEMA_GEN_SCRIPTS("ID", "NAME") VALUES (4, 'Leonard')
5-
INSERT INTO EMPLOYEE_SCHEMA_GEN_SCRIPTS("ID", "NAME") VALUES (5, 'Bernadette')
6-
INSERT INTO EMPLOYEE_SCHEMA_GEN_SCRIPTS("ID", "NAME") VALUES (6, 'Raj')
7-
INSERT INTO EMPLOYEE_SCHEMA_GEN_SCRIPTS("ID", "NAME") VALUES (7, 'Howard')
8-
INSERT INTO EMPLOYEE_SCHEMA_GEN_SCRIPTS("ID", "NAME") VALUES (8, 'Priya')
1+
INSERT INTO EMPLOYEE_JNDI_CONTEXT("ID", "NAME") VALUES (1, 'Penny')
2+
INSERT INTO EMPLOYEE_JNDI_CONTEXT("ID", "NAME") VALUES (2, 'Sheldon')
3+
INSERT INTO EMPLOYEE_JNDI_CONTEXT("ID", "NAME") VALUES (3, 'Amy')
4+
INSERT INTO EMPLOYEE_JNDI_CONTEXT("ID", "NAME") VALUES (4, 'Leonard')
5+
INSERT INTO EMPLOYEE_JNDI_CONTEXT("ID", "NAME") VALUES (5, 'Bernadette')
6+
INSERT INTO EMPLOYEE_JNDI_CONTEXT("ID", "NAME") VALUES (6, 'Raj')
7+
INSERT INTO EMPLOYEE_JNDI_CONTEXT("ID", "NAME") VALUES (7, 'Howard')
8+
INSERT INTO EMPLOYEE_JNDI_CONTEXT("ID", "NAME") VALUES (8, 'Priya')

‎jpa/jndi-context/src/main/resources/META-INF/persistence.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
<persistence-unit name="MyPU" transaction-type="JTA">
88
<properties>
99
<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
10-
<property name="javax.persistence.schema-generation.create-source" value="script"/>
11-
<property name="javax.persistence.schema-generation.drop-source" value="script"/>
12-
<property name="javax.persistence.schema-generation.create-script-source" value="META-INF/create.sql"/>
13-
<property name="javax.persistence.schema-generation.drop-script-source" value="META-INF/drop.sql"/>
14-
<property name="javax.persistence.sql-load-script-source" value="META-INF/load.sql"/>
15-
<property name="eclipselink.logging.level" value="FINE"/>
10+
<property name="javax.persistence.schema-generation.create-source" value="script"/>
11+
<property name="javax.persistence.schema-generation.drop-source" value="script"/>
12+
<property name="javax.persistence.schema-generation.create-script-source" value="META-INF/create.sql"/>
13+
<property name="javax.persistence.schema-generation.drop-script-source" value="META-INF/drop.sql"/>
14+
<property name="javax.persistence.sql-load-script-source" value="META-INF/load.sql"/>
1615
</properties>
1716
</persistence-unit>
1817
</persistence>

‎jpa/jndi-context/src/main/webapp/index.jsp

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

‎jpa/jndi-context/src/test/java/org/javaee7/jpa/jndi/context/EntityManagerJndiContextTest.java

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package org.javaee7.jpa.jndi.context;
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 javax.naming.InitialContext;
12+
import javax.persistence.EntityManager;
13+
import java.util.List;
14+
15+
import static org.junit.Assert.*;
16+
17+
/**
18+
* @author Roberto Cortez
19+
*/
20+
@RunWith(Arquillian.class)
21+
public class EntityManagerJndiContextTest {
22+
@Inject
23+
private EmployeeBean employeeBean;
24+
25+
@Deployment
26+
public static WebArchive createDeployment() {
27+
WebArchive war = ShrinkWrap.create(WebArchive.class)
28+
.addPackage("org.javaee7.jpa.jndi.context")
29+
.addAsResource("META-INF/persistence.xml")
30+
.addAsResource("META-INF/load.sql");
31+
System.out.println(war.toString(true));
32+
return war;
33+
}
34+
35+
@Test
36+
public void testEntityManagerLookup() throws Exception {
37+
InitialContext context = new InitialContext();
38+
EntityManager entityManager = (EntityManager) context.lookup("java:comp/env/persistence/myJNDI");
39+
assertNotNull(entityManager);
40+
41+
List<Employee> employees = entityManager.createNamedQuery("Employee.findAll", Employee.class).getResultList();
42+
assertFalse(employees.isEmpty());
43+
assertEquals(8, employees.size());
44+
}
45+
46+
@Test
47+
public void testEntityManagerLookupBean() throws Exception {
48+
List<Employee> employees = employeeBean.get();
49+
assertFalse(employees.isEmpty());
50+
assertEquals(8, employees.size());
51+
}
52+
}

0 commit comments

Comments
 (0)