Author: dwoods
Date: Fri Oct 8 17:05:57 2010
New Revision: 1005903
URL: http://svn.apache.org/viewvc?rev=1005903&view=rev
Log:
make sure tests cleanup EMs and EMFs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java?rev=1005903&r1=1005902&r2=1005903&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAdvAnnot.java
Fri Oct 8 17:05:57 2010
@@ -27,8 +27,10 @@ import javax.persistence.*;
import
org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
import org.apache.openjpa.persistence.common.utils.*;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
+...@allowfailure(message="excluded")
public class TestAdvAnnot extends AnnotationTestCase
{
public TestAdvAnnot(String name)
@@ -36,8 +38,7 @@ public class TestAdvAnnot extends Annota
super(name, "annotationcactusapp");
}
- public void setUp()
- {
+ public void setUp() {
deleteAll(Schedule.class);
deleteAll(FlightSchedule.class);
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java?rev=1005903&r1=1005902&r2=1005903&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestAnnotationBasics.java
Fri Oct 8 17:05:57 2010
@@ -46,6 +46,7 @@ public class TestAnnotationBasics extend
ClassMetaData.ID_APPLICATION == meta.getIdentityType());
assertTrue("Entity1 should use single-field identity",
meta.isOpenJPAIdentity());
+ endEm(em);
}
/*
public void testVersionField() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java?rev=1005903&r1=1005902&r2=1005903&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java
Fri Oct 8 17:05:57 2010
@@ -24,9 +24,11 @@ import junit.framework.*;
import javax.persistence.*;
import org.apache.openjpa.persistence.common.utils.*;
+import org.apache.openjpa.persistence.test.AllowFailure;
import
org.apache.openjpa.persistence.annotations.common.apps.annotApp.ddtype.*;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
+...@allowfailure(message="excluded")
public class TestDDCallbackMethods extends AnnotationTestCase
{
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java?rev=1005903&r1=1005902&r2=1005903&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEJBEmbedded.java
Fri Oct 8 17:05:57 2010
@@ -33,6 +33,7 @@ import org.apache.openjpa.persistence.Op
import
org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
import org.apache.openjpa.persistence.common.utils.*;
+import org.apache.openjpa.persistence.test.AllowFailure;
import junit.framework.*;
@@ -41,6 +42,7 @@ import junit.framework.*;
*
* @author Steve Kim
*/
+...@allowfailure(message="excluded")
public class TestEJBEmbedded extends AnnotationTestCase
{
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java?rev=1005903&r1=1005902&r2=1005903&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityListenerAnnot.java
Fri Oct 8 17:05:57 2010
@@ -24,11 +24,13 @@ import javax.persistence.*;
import junit.framework.*;
import org.apache.openjpa.persistence.common.utils.*;
+import org.apache.openjpa.persistence.test.AllowFailure;
import
org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
+...@allowfailure(message="excluded")
public class TestEntityListenerAnnot extends AnnotationTestCase
{
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java?rev=1005903&r1=1005902&r2=1005903&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestEntityOrderBy.java
Fri Oct 8 17:05:57 2010
@@ -27,6 +27,7 @@ import org.apache.openjpa.persistence.Op
import
org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
import org.apache.openjpa.persistence.common.utils.*;
+import org.apache.openjpa.persistence.test.AllowFailure;
import junit.framework.*;
@@ -35,6 +36,7 @@ import junit.framework.*;
*
* @author Abe White
*/
+...@allowfailure(message="excluded")
public class TestEntityOrderBy extends AnnotationTestCase
{
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java?rev=1005903&r1=1005902&r2=1005903&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPersistentCollection.java
Fri Oct 8 17:05:57 2010
@@ -41,9 +41,8 @@ public class TestPersistentCollection ex
@SuppressWarnings("unchecked")
public void testPersistentCollectionOfEmbeddables() {
+ EntityManager em = emf.createEntityManager();
try {
- EntityManager em = emf.createEntityManager();
-
em.getTransaction().begin();
PColl_EntityC c = new PColl_EntityC();
@@ -59,6 +58,7 @@ public class TestPersistentCollection ex
em.persist(a);
em.getTransaction().commit();
em.close();
+ em = null;
em = emf.createEntityManager();
Query q = em.createQuery("SELECT o FROM PColl_EntityA o");
@@ -73,16 +73,19 @@ public class TestPersistentCollection ex
assertEquals(101, c1.getId());
assertEquals(1, d1.getId());
em.close();
+ em = null;
} catch (Throwable t) {
fail(t.getMessage());
+ } finally {
+ if (em != null)
+ em.close();
}
}
@SuppressWarnings("unchecked")
public void testPersistentCollectionOfEntities() {
+ EntityManager em = emf.createEntityManager();
try {
- EntityManager em = emf.createEntityManager();
-
em.getTransaction().begin();
PColl_EntityC c = new PColl_EntityC();
@@ -98,6 +101,7 @@ public class TestPersistentCollection ex
em.persist(a);
em.getTransaction().commit();
em.close();
+ em = null;
em = emf.createEntityManager();
Query q = em.createQuery("SELECT o FROM PColl_EntityA1 o");
@@ -113,15 +117,18 @@ public class TestPersistentCollection ex
assertEquals(101, c1.getId());
assertEquals(1, a1.getId());
em.close();
+ em = null;
} catch (Throwable t) {
fail(t.getMessage());
+ } finally {
+ if (em != null)
+ em.close();
}
}
public void testPersistentCollectionStringsLazy() {
+ EntityManager em = emf.createEntityManager();
try {
- EntityManager em = emf.createEntityManager();
-
em.getTransaction().begin();
PColl_EntityStringLazy a = new PColl_EntityStringLazy();
@@ -130,6 +137,7 @@ public class TestPersistentCollection ex
em.persist(a);
em.getTransaction().commit();
em.close();
+ em = null;
em = emf.createEntityManager();
Query q = em.createQuery("SELECT o FROM PColl_EntityStringLazy
o");
@@ -139,15 +147,18 @@ public class TestPersistentCollection ex
assertEquals("one", a1.getCollectionOfStrings().toArray()[0]);
assertEquals(1, a1.getId());
em.close();
+ em = null;
} catch (Throwable t) {
fail(t.getMessage());
+ } finally {
+ if (em != null)
+ em.close();
}
}
public void testPersistentCollectionStringsEager() {
+ EntityManager em = emf.createEntityManager();
try {
- EntityManager em = emf.createEntityManager();
-
em.getTransaction().begin();
PColl_EntityStringEager a = new PColl_EntityStringEager();
@@ -156,6 +167,7 @@ public class TestPersistentCollection ex
em.persist(a);
em.getTransaction().commit();
em.close();
+ em = null;
em = emf.createEntityManager();
Query q = em.createQuery("SELECT o FROM PColl_EntityStringEager
o");
@@ -165,8 +177,12 @@ public class TestPersistentCollection ex
assertEquals("one", a1.getCollectionOfStrings().toArray()[0]);
assertEquals(1, a1.getId());
em.close();
+ em = null;
} catch (Throwable t) {
fail(t.getMessage());
+ } finally {
+ if (em != null)
+ em.close();
}
}
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java?rev=1005903&r1=1005902&r2=1005903&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestPropertyAccess.java
Fri Oct 8 17:05:57 2010
@@ -28,9 +28,9 @@ import
import junit.framework.*;
import org.apache.openjpa.persistence.common.utils.*;
+import org.apache.openjpa.persistence.test.AllowFailure;
-
-
+...@allowfailure(message="excluded")
public class TestPropertyAccess extends AnnotationTestCase
{
public TestPropertyAccess(String name)
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java?rev=1005903&r1=1005902&r2=1005903&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestTablePerClassInheritance.java
Fri Oct 8 17:05:57 2010
@@ -79,7 +79,7 @@ public class TestTablePerClassInheritanc
deleteAll(TablePerClass1.class);
OpenJPAEntityManager em = (OpenJPAEntityManager)
currentEntityManager();
- startTx(em);
+ startTx(em);
TablePerClass1 tpc1 = new TablePerClass1();
tpc1.setBasic(1);
EmbedValue ev = new EmbedValue();
@@ -92,7 +92,7 @@ public class TestTablePerClassInheritanc
ev.setBasic("22");
tpc2.setEmbed(ev);
em.persistAll(tpc1, tpc2);
- endTx(em);
+ endTx(em);
int id1 = tpc1.getPk();
int id2 = tpc2.getPk();
endEm(em);
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java?rev=1005903&r1=1005902&r2=1005903&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestVersion.java
Fri Oct 8 17:05:57 2010
@@ -26,6 +26,7 @@ import org.apache.openjpa.jdbc.meta.stra
import
org.apache.openjpa.persistence.annotations.common.apps.annotApp.annotype.*;
+import org.apache.openjpa.persistence.test.AllowFailure;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
@@ -36,6 +37,7 @@ import org.apache.openjpa.persistence.Op
@author Steve Kim
*/
+...@allowfailure(message="excluded")
public class TestVersion extends AnnotationTestCase
{
private Object oid;
