svn commit: r1027639 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria: EmbeddableDomainTestCase.java JoinDomainTestCase.java results/TestTypedResults.java

[dw...@apache.org]

Author: dwoods
Date: Tue Oct 26 16:45:15 2010
New Revision: 1027639

URL: http://svn.apache.org/viewvc?rev=1027639&view=rev
Log:
test cleanup

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java?rev=1027639&r1=1027638&r2=1027639&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EmbeddableDomainTestCase.java Tue Oct 26 16:45:15 2010
@@ -63,8 +63,8 @@ public abstract class EmbeddableDomainTe
     protected static OpenJPAEntityManagerFactorySPI emf = null;
     protected static SQLAuditor auditor = null;
 
-    protected CriteriaBuilder cb;
-    protected EntityManager em;
+    protected CriteriaBuilder cb = null;
+    protected EntityManager em = null;
 
     protected static Class<?>[] CLASSES =
         { Company1.class, Company2.class, Department1.class, Department2.class, Department3.class, Division.class,
@@ -94,10 +94,15 @@ public abstract class EmbeddableDomainTe
 
     @Override
     public void tearDown() throws Exception {
+        if (auditor != null) {
+            auditor.clear();
+            auditor = null;
+        }
         if (em != null && em.isOpen()) {
             em.close();
             em = null;
         }
+        cb = null;
         if (emf != null && emf.isOpen()) {
             emf.close();
             emf = null;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java?rev=1027639&r1=1027638&r2=1027639&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/JoinDomainTestCase.java Tue Oct 26 16:45:15 2010
@@ -24,11 +24,11 @@ import javax.persistence.criteria.Criter
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 
 public abstract class JoinDomainTestCase extends AbstractCriteriaTestCase {
-    protected static OpenJPAEntityManagerFactorySPI emf;
-    protected static SQLAuditor auditor;
+    protected static OpenJPAEntityManagerFactorySPI emf = null;
+    protected static SQLAuditor auditor = null;
 
-    protected CriteriaBuilder cb;
-    protected EntityManager em;
+    protected CriteriaBuilder cb = null;
+    protected EntityManager em = null;
 
     protected Class<?>[] getDomainClasses() {
         return new Class[]{A.class,B.class,C.class,D.class};
@@ -49,6 +49,11 @@ public abstract class JoinDomainTestCase
 
     @Override
     public void tearDown() throws Exception {
+        if (auditor != null) {
+            auditor.clear();
+            auditor = null;
+        }
+        cb = null;
         if (em != null && em.isOpen()) {
             em.close();
             em = null;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java?rev=1027639&r1=1027638&r2=1027639&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/results/TestTypedResults.java Tue Oct 26 16:45:15 2010
@@ -53,7 +53,7 @@ public class TestTypedResults extends Si
 
     public void setUp() throws Exception {
         setUp(CLEAR_TABLES, Order.class, Item.class, Shop.class, Producer.class,
-             "openjpa.DynamicEnhancerAgent", "false");
+             "openjpa.DynamicEnhancementAgent", "false");
         populate();
     }