You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2009/09/10 22:02:53 UTC

svn commit: r813568 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence: generationtype/TestMultipleSchemaNames.java test/SingleEMFTestCase.java

Author: dwoods
Date: Thu Sep 10 20:02:52 2009
New Revision: 813568

URL: http://svn.apache.org/viewvc?rev=813568&view=rev
Log:
back out last getLog() additions, which caused failures on when not using Derby

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java?rev=813568&r1=813567&r2=813568&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/generationtype/TestMultipleSchemaNames.java Thu Sep 10 20:02:52 2009
@@ -48,7 +48,7 @@
                 org.apache.openjpa.jdbc.sql.OracleDictionary.class,
                 org.apache.openjpa.jdbc.sql.SQLServerDictionary.class);
         if (isTestsDisabled()) {
-            getLog().trace("TestMultipleSchemaNames() - Skipping all tests - Not supported on this DB");
+            // getLog().trace("TestMultipleSchemaNames() - Skipping all tests - Not supported on this DB");
             return;
         }
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java?rev=813568&r1=813567&r2=813568&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java Thu Sep 10 20:02:52 2009
@@ -206,19 +206,7 @@
     }
     
     protected Log getLog() {
-        return getLog("Tests");
-    }
-
-    protected Log getLog(String s) {
-        OpenJPAEntityManagerFactorySPI tempEMF = emf;
-        if (tempEMF == null) {
-            tempEMF = createEMF();
-        }
-        Log log = emf.getConfiguration().getLog(s);
-        if (emf == null) {
-            closeEMF(tempEMF);
-        }
-        return log;
+        return emf.getConfiguration().getLog("Tests");
     }
 }