svn commit: r1673275 - in /openjpa/branches/2.2.1.x: ./ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java

[hthomann]

Author: hthomann
Date: Mon Apr 13 20:29:47 2015
New Revision: 1673275

URL: http://svn.apache.org/r1673275
Log:
OPENJPA-1988: Made an update to the test case for this JIRA, i.e. merged 
r1641906 from 2.2.x to 2.2.1.x.

Modified:
    openjpa/branches/2.2.1.x/   (props changed)
    
openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java

Propchange: openjpa/branches/2.2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 20:29:47 2015
@@ -1,5 +1,5 @@
 /openjpa/branches/1.0.x:736493
 /openjpa/branches/2.0.x:1419659,1484136,1484287,1504611
 
/openjpa/branches/2.1.x:1415379,1415398,1436150,1469090,1469949,1484300,1484313,1485010,1505837,1513249,1517838,1529241,1530146,1533218,1533280,1539188,1569528,1575444,1591536,1614935,1636464,1648430,1655218,1662610
-/openjpa/branches/2.2.x:1580898,1580939,1591681
+/openjpa/branches/2.2.x:1580898,1580939,1591681,1641906
 
/openjpa/trunk:1416742,1420324,1430117,1431649,1436957,1436960,1448662,1448796,1451369,1456574,1456614,1459091,1461833,1469646,1469649,1469652,1504282,1600757,1603251

Modified: 
openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java?rev=1673275&r1=1673274&r2=1673275&view=diff
==============================================================================
--- 
openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
 (original)
+++ 
openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/pudefault/TestPUDefaultCascadePersist.java
 Mon Apr 13 20:29:47 2015
@@ -31,6 +31,26 @@ public class TestPUDefaultCascadePersist
         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);