From 1058a69afb1c29786aa1d995329a1866b7e23b01 Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Tue, 26 Oct 2010 18:52:34 +0000
Subject: [PATCH] test should call super.tearDown() for cleanup.  also added
 @AllowFailure to surefire excluded tests.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1027682 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/openjpa/persistence/event/RemoteEventBase.java  | 3 +++
 .../org/apache/openjpa/persistence/event/TestBeforeCommit.java | 3 ++-
 .../java/org/apache/openjpa/persistence/event/TestEvents.java  | 2 ++
 .../apache/openjpa/persistence/event/TestFakeRemoteEvents.java | 2 ++
 .../openjpa/persistence/event/TestLifecycleEventManager.java   | 2 ++
 .../openjpa/persistence/event/TestLocalRemoteEvents.java       | 2 ++
 .../openjpa/persistence/event/TestOrphanedKeyAction.java       | 2 ++
 .../openjpa/persistence/event/TestTCPRemoteClassChanges.java   | 2 ++
 .../apache/openjpa/persistence/event/TestTCPRemoteEvents.java  | 2 ++
 .../openjpa/persistence/event/TestTCPRemoteEventsDuration.java | 2 ++
 .../openjpa/persistence/event/TestTCPRemoteRecovery.java       | 2 ++
 .../persistence/event/TestTCPRemoteRecoveryTransmitAdds.java   | 2 ++
 12 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java
index 29335533d..ff028115d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/RemoteEventBase.java
@@ -47,15 +47,18 @@ public class RemoteEventBase extends AbstractTestCase {
         super(s, "eventcactusapp");
     }
 
+    @Override
     public void setUp() {
         deleteAll(RuntimeTest1.class);
         datacatch.evictAll();
     }
 
+    @Override
     public void tearDown() throws Exception {
         ((OpenJPAEntityManagerSPI) OpenJPAPersistence
             .cast(currentEntityManager())).getConfiguration()
             .getRemoteCommitEventManager().close();
+        super.tearDown();
     }
 
     protected void doTest(Class providerClass, String classProps1,
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java
index 08fa8fe98..e6b5b3d1d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestBeforeCommit.java
@@ -64,9 +64,10 @@ public class TestBeforeCommit extends AbstractPersistenceTestCase implements Tra
     }
 
     @Override
-    public void tearDown() {
+    public void tearDown() throws Exception {
         closeEMF(emf);
         emf = null;
+        super.tearDown();
     }
     
     public void testQuery() {
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestEvents.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestEvents.java
index 048481896..87bfd6d89 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestEvents.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestEvents.java
@@ -23,6 +23,7 @@ import java.util.Collections;
 
 
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import junit.framework.AssertionFailedError;
 
@@ -32,6 +33,7 @@ import org.apache.openjpa.persistence.CallbackMode;
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerSPI;
 
+@AllowFailure(message="surefire excluded")
 public class TestEvents
     extends AbstractTestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestFakeRemoteEvents.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestFakeRemoteEvents.java
index 802557211..7f16a3903 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestFakeRemoteEvents.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestFakeRemoteEvents.java
@@ -27,6 +27,7 @@ import java.util.Set;
 
 
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 import org.apache.openjpa.event.AbstractRemoteCommitProvider;
@@ -37,6 +38,7 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.util.Id;
 
+@AllowFailure(message="surefire excluded")
 public class TestFakeRemoteEvents extends AbstractTestCase {
 
     /*
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLifecycleEventManager.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLifecycleEventManager.java
index caeccd3a4..cc703f09c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLifecycleEventManager.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLifecycleEventManager.java
@@ -22,6 +22,7 @@ package org.apache.openjpa.persistence.event;
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest2;
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest4;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.event.LifecycleEvent;
 import org.apache.openjpa.event.LifecycleEventManager;
@@ -37,6 +38,7 @@ import org.apache.openjpa.persistence.OpenJPAPersistence;
  *
  * @author Abe White
  */
+@AllowFailure(message="surefire excluded")
 public class TestLifecycleEventManager
     extends AbstractTestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLocalRemoteEvents.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLocalRemoteEvents.java
index e30dd4f81..cd1c5eb9a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLocalRemoteEvents.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestLocalRemoteEvents.java
@@ -20,9 +20,11 @@ package org.apache.openjpa.persistence.event;
 
 
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 import org.apache.openjpa.event.SingleJVMRemoteCommitProvider;
 
+@AllowFailure(message="surefire excluded")
 public class TestLocalRemoteEvents
     extends RemoteEventBase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestOrphanedKeyAction.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestOrphanedKeyAction.java
index a84491ee7..12ac28543 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestOrphanedKeyAction.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestOrphanedKeyAction.java
@@ -23,6 +23,7 @@ import java.util.Map;
 
 
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.common.utils.BufferedLogFactory;
 
@@ -38,6 +39,7 @@ import org.apache.openjpa.util.OpenJPAException;
  *
  * @author Abe White
  */
+@AllowFailure(message="surefire excluded")
 public class TestOrphanedKeyAction
     extends AbstractTestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteClassChanges.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteClassChanges.java
index 8445541d4..219411d2e 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteClassChanges.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteClassChanges.java
@@ -26,6 +26,7 @@ import javax.persistence.EntityManager;
 
 import org.apache.openjpa.persistence.event.common.apps.Duration;
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 import org.apache.openjpa.event.RemoteCommitEvent;
@@ -36,6 +37,7 @@ import org.apache.openjpa.persistence.OpenJPAEntityManager;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 
+@AllowFailure(message="surefire excluded")
 public class TestTCPRemoteClassChanges
     extends AbstractTestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEvents.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEvents.java
index ba3f219e7..daa3b8d90 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEvents.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEvents.java
@@ -20,9 +20,11 @@ package org.apache.openjpa.persistence.event;
 
 
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 
 import org.apache.openjpa.event.TCPRemoteCommitProvider;
 
+@AllowFailure(message="surefire excluded")
 public class TestTCPRemoteEvents
     extends RemoteEventBase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEventsDuration.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEventsDuration.java
index c28fed6d7..6b64cf930 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEventsDuration.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteEventsDuration.java
@@ -26,6 +26,7 @@ import javax.persistence.EntityManager;
 
 import org.apache.openjpa.persistence.event.common.apps.Duration;
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 import org.apache.openjpa.event.RemoteCommitEvent;
@@ -35,6 +36,7 @@ import org.apache.openjpa.lib.conf.Configurations;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 
+@AllowFailure(message="surefire excluded")
 public class TestTCPRemoteEventsDuration
     extends AbstractTestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecovery.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecovery.java
index 947623d1b..f35b6d740 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecovery.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecovery.java
@@ -26,6 +26,7 @@ import javax.persistence.EntityManager;
 
 import org.apache.openjpa.persistence.event.common.apps.Duration;
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 import org.apache.openjpa.event.RemoteCommitEvent;
@@ -35,6 +36,7 @@ import org.apache.openjpa.lib.conf.Configurations;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 
+@AllowFailure(message="surefire excluded")
 public class TestTCPRemoteRecovery
     extends AbstractTestCase {
 
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecoveryTransmitAdds.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecoveryTransmitAdds.java
index 56bfbb599..d1b592628 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecoveryTransmitAdds.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/event/TestTCPRemoteRecoveryTransmitAdds.java
@@ -26,6 +26,7 @@ import javax.persistence.EntityManager;
 
 import org.apache.openjpa.persistence.event.common.apps.Duration;
 import org.apache.openjpa.persistence.event.common.apps.RuntimeTest1;
+import org.apache.openjpa.persistence.test.AllowFailure;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 
 import org.apache.openjpa.event.RemoteCommitEvent;
@@ -35,6 +36,7 @@ import org.apache.openjpa.lib.conf.Configurations;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 
+@AllowFailure(message="surefire excluded")
 public class TestTCPRemoteRecoveryTransmitAdds
     extends AbstractTestCase {