Skip to content

Commit a90854d

Browse files
radcortezradcortez
committed
Added tests for schema-gen-scripts-external project.
1 parent 85ff6a2 commit a90854d

File tree

10 files changed

+73
-187
lines changed

10 files changed

+73
-187
lines changed

‎jpa/schema-gen-scripts-external/src/main/java/org/javaee7/jpasamples/schema/gen/scripts/external/Employee.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ public class Employee implements Serializable {
2424
@Column(length=50)
2525
private String name;
2626

27-
public Employee() { }
28-
29-
public Employee(String name) {
30-
this.name = name;
31-
}
32-
3327
public int getId() {
3428
return id;
3529
}

‎jpa/schema-gen-scripts-external/src/main/java/org/javaee7/jpasamples/schema/gen/scripts/external/EmployeeBean.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
package org.javaee7.jpasamples.schema.gen.scripts.external;
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
1212
public class EmployeeBean {
13-
1413
@PersistenceContext
15-
EntityManager em;
16-
17-
public void persist(Employee e) {
18-
em.persist(e);
19-
}
20-
14+
private EntityManager em;
15+
2116
public List<Employee> get() {
2217
return em.createNamedQuery("Employee.findAll", Employee.class).getResultList();
2318
}

‎jpa/schema-gen-scripts-external/src/main/java/org/javaee7/jpasamples/schema/gen/scripts/external/TestServlet.java

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

‎jpa/schema-gen-scripts-external/src/main/webapp/create.sql renamed to ‎jpa/schema-gen-scripts-external/src/main/resources/META-INF/create.sql

File renamed without changes.

‎jpa/schema-gen-scripts-external/src/main/webapp/drop.sql renamed to ‎jpa/schema-gen-scripts-external/src/main/resources/META-INF/drop.sql

File renamed without changes.

‎jpa/schema-gen-scripts-external/src/main/webapp/load.sql renamed to ‎jpa/schema-gen-scripts-external/src/main/resources/META-INF/load.sql

File renamed without changes.

‎jpa/schema-gen-scripts-external/src/main/resources/META-INF/persistence.xml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<persistence
3-
version="2.1"
4-
xmlns="http://xmlns.jcp.org/xml/ns/persistence"
5-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<persistence
3+
version="2.1"
4+
xmlns="http://xmlns.jcp.org/xml/ns/persistence"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
66
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
7-
<persistence-unit name="MyPU" transaction-type="JTA">
8-
<properties>
9-
<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="file:/home/argupta/workspaces/javaee7-samples/jpa/schema-gen-scripts-external/src/main/webapp/create.sql"/>
13-
<property name="javax.persistence.schema-generation.drop-script-source" value="file:/home/argupta/workspaces/javaee7-samples/jpa/schema-gen-scripts-external/src/main/webapp/drop.sql"/>
14-
<property name="javax.persistence.sql-load-script-source" value="file:/home/argupta/workspaces/javaee7-samples/jpa/schema-gen-scripts-external/src/main/webapp/load.sql"/>
15-
<property name="eclipselink.logging.level" value="FINE"/>
16-
</properties>
17-
</persistence-unit>
7+
<persistence-unit name="MyPU" transaction-type="JTA">
8+
<properties>
9+
<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="file:/tmp/create.sql"/>
13+
<property name="javax.persistence.schema-generation.drop-script-source" value="file:/tmp/drop.sql"/>
14+
<property name="javax.persistence.sql-load-script-source" value="file:/tmp/load.sql"/>
15+
</properties>
16+
</persistence-unit>
1817
</persistence>

‎jpa/schema-gen-scripts-external/src/main/webapp/WEB-INF/beans.xml

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

‎jpa/schema-gen-scripts-external/src/main/webapp/index.jsp

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

‎jpa/schema-gen-scripts-external/src/test/java/org/javaee7/jpasamples/schema/gen/scripts/external/SchemaGenScriptsExternalTest.java

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
package org.javaee7.jpasamples.schema.gen.scripts.external;
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.After;
8+
import org.junit.Assert;
9+
import org.junit.Test;
10+
import org.junit.runner.RunWith;
11+
12+
import javax.inject.Inject;
13+
import java.io.File;
14+
15+
import static java.lang.Thread.currentThread;
16+
import static org.apache.commons.io.FileUtils.copyURLToFile;
17+
18+
/**
19+
* @author Roberto Cortez
20+
*/
21+
@RunWith(Arquillian.class)
22+
public class SchemaGenScriptsExternalTest {
23+
@Inject
24+
private EmployeeBean employeeBean;
25+
26+
@Deployment
27+
public static WebArchive createDeployment() throws Exception {
28+
copyURLToFile(currentThread().getContextClassLoader().getResource("META-INF/create.sql"),
29+
new File("/tmp/create.sql"));
30+
copyURLToFile(currentThread().getContextClassLoader().getResource("META-INF/drop.sql"),
31+
new File("/tmp/drop.sql"));
32+
copyURLToFile(currentThread().getContextClassLoader().getResource("META-INF/load.sql"),
33+
new File("/tmp/load.sql"));
34+
35+
WebArchive war = ShrinkWrap.create(WebArchive.class)
36+
.addPackage("org.javaee7.jpasamples.schema.gen.scripts.external")
37+
.addAsResource("META-INF/persistence.xml")
38+
.addAsResource("META-INF/create.sql")
39+
.addAsResource("META-INF/drop.sql")
40+
.addAsResource("META-INF/load.sql");
41+
System.out.println(war.toString(true));
42+
return war;
43+
}
44+
45+
@After
46+
public void tearDown() throws Exception {
47+
new File("/tmp/create.sql").delete();
48+
new File("/tmp/drop.sql").delete();
49+
new File("/tmp/load.sql").delete();
50+
}
51+
52+
@Test
53+
public void testSchemaGenScriptExternal() throws Exception {
54+
Assert.assertFalse(employeeBean.get().isEmpty());
55+
}
56+
}

0 commit comments

Comments
 (0)