Author: hthomann
Date: Thu Apr 16 23:34:58 2015
New Revision: 1674167
URL: http://svn.apache.org/r1674167
Log:
OPENJPA-1988: Made an update to the test case for this JIRA, i.e. merged
r1642555 from 2.2.x to trunk
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/cascade-persist.xml
- copied unchanged from r1642555,
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/resources/META-INF/cascade-persist.xml
Removed:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/cascade/
Modified:
openjpa/trunk/ (props changed)
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
Propchange: openjpa/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 16 23:34:58 2015
@@ -2,5 +2,5 @@
/openjpa/branches/2.0.x:1504611
/openjpa/branches/2.1.x:1415379,1415398,1485010,1513249,1517838,1530146,1533218,1533280,1539188,1569528,1575444,1591536,1636464,1655218,1662610,1673300,1673491
/openjpa/branches/2.2.1.x:1415367,1415413,1415425,1504719,1508186,1530347,1533222,1539193,1651808
-/openjpa/branches/2.2.x:1384400,1415459-1415460,1415469,1485013,1530364,1533223,1580898,1580939,1591681,1631786,1641906,1666312
+/openjpa/branches/2.2.x:1384400,1415459-1415460,1415469,1485013,1530364,1533223,1580898,1580939,1591681,1631786,1641906,1642555,1666312
/openjpa/branches/2.3.x:1533462,1535560,1536912,1540277,1564121
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java?rev=1674167&r1=1674166&r2=1674167&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
Thu Apr 16 23:34:58 2015
@@ -19,46 +19,22 @@
package org.apache.openjpa.persistence.cascade.pudefault;
import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.test.SingleEMFTestCase;
public class TestPUDefaultCascadePersist extends SingleEMFTestCase {
- private EntityManagerFactory emf = null;
public void setUp() throws Exception {
- super.setUp();
- emf = OpenJPAPersistence.
- createEntityManagerFactory("TestPUDefaultCascadePersist",
-
"org/apache/openjpa/persistence/cascade/pudefault/META-INF/persistence.xml");
-
- EntityManager em = emf.createEntityManager();
- try {
- em.getTransaction().begin();
- em.createQuery("DELETE FROM PUDEntityA01").executeUpdate();
- em.createQuery("DELETE FROM PUDEntityA02").executeUpdate();
- em.createQuery("DELETE FROM PUDEntityAE01").executeUpdate();
- em.createQuery("DELETE FROM PUDEntityB").executeUpdate();
- em.createQuery("DELETE FROM
PUDEntityA01_PUDEntityB").executeUpdate();
- em.createQuery("DELETE FROM
PUDEntityA02_PUDEntityB").executeUpdate();
- em.createQuery("DELETE FROM
PUDEntityAE01_PUDEntityB").executeUpdate();
- em.getTransaction().commit();
- } catch (Throwable t) {
- // Swallow
- } finally {
- if (em.getTransaction().isActive()) {
- em.getTransaction().rollback();
- }
- em.close();
- }
-// super.setUp(PUDEntityA01.class, PUDEntityB.class,
-//
"org/apache/openjpa/persistence/cascade/pudefault/META-INF/cascadepersistorm.xml",
-// CLEAR_TABLES);
+ super.setUp(PUDEntityA01.class, PUDEntityA02.class,
PUDEntityAE01.class, PUDEntityB.class,
+ CLEAR_TABLES);
+ }
+
+ protected String getPersistenceUnitName() {
+ return "TestPUDefaultCascadePersist";
}
+
public void tearDown() throws Exception {
super.tearDown();
- emf.close();
}
public void testPUDefaultCascadePersistOverM2M() {
@@ -83,9 +59,10 @@ public class TestPUDefaultCascadePersist
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
}
+ em.close();
}
- em.close();
+
em = emf.createEntityManager();
try {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml?rev=1674167&r1=1674166&r2=1674167&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
Thu Apr 16 23:34:58 2015
@@ -506,4 +506,19 @@
</properties>
</persistence-unit>
-</persistence>
\ No newline at end of file
+ <persistence-unit name="TestPUDefaultCascadePersist"
transaction-type="RESOURCE_LOCAL">
+ <!--
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> -->
+ <mapping-file>META-INF/cascade-persist.xml</mapping-file>
+
<class>org.apache.openjpa.persistence.cascade.pudefault.PUDEntityA01</class>
+
<class>org.apache.openjpa.persistence.cascade.pudefault.PUDEntityAE01</class>
+
<class>org.apache.openjpa.persistence.cascade.pudefault.PUDEntityA02</class>
+
<class>org.apache.openjpa.persistence.cascade.pudefault.PUDEntityB</class>
+
<class>org.apache.openjpa.persistence.cascade.pudefault.AnEmbeddable</class>
+
<class>org.apache.openjpa.persistence.cascade.pudefault.EmbeddableWithRelationships</class>
+ <properties>
+ <property name="openjpa.ConnectionFactoryProperties"
value="MaxActive=110, MaxIdle=10, ValidationTimeout=50000,
+
MaxCachedStatements=10, ValidationSQL='', MaxWait=10000, TestOnBorrow=true" />
+ <property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema(ForeignKeys=true)" />
+ </properties>
+ </persistence-unit>
+</persistence>
