svn commit: r739148 - /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java

[pp...@apache.org]

Author: ppoddar
Date: Fri Jan 30 02:41:14 2009
New Revision: 739148

URL: http://svn.apache.org/viewvc?rev=739148&view=rev
Log:
Make some part of the test database dependent because it verifies hardcoded Derby URL

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java?rev=739148&r1=739147&r2=739148&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/lib/conf/TestEquivalentConfiguration.java Fri Jan 30 02:41:14 2009
@@ -26,10 +26,12 @@
 
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.enhance.TestEnhancementWithMultiplePUs;
+import org.apache.openjpa.jdbc.schema.DataSourceFactory;
 import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.apache.openjpa.persistence.common.utils.AbstractTestCase;
 import org.apache.openjpa.persistence.test.AllowFailure;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 import junit.framework.TestCase;
 
@@ -45,7 +47,7 @@
  * @author Pinaki Poddar
  * 
  */
-public class TestEquivalentConfiguration extends TestCase {
+public class TestEquivalentConfiguration extends SingleEMFTestCase {
     private EntityManagerFactory emf;
 
     private Properties _system;
@@ -82,7 +84,6 @@
      */
     @Override
     public void setUp() throws Exception {
-        super.setUp();
         _system = backup();
         clear(_system);
     }
@@ -328,6 +329,8 @@
     }
 
     void verifyDatabaseConnection() {
+        String driver = OpenJPAPersistence.cast(emf).getConfiguration().getConnectionDriverName();
+        
         EntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
         em.flush();