Better debugging

1 files changed, 5 insertions, 34 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java
index 2ab6f0bda2..056769c997 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
@@ -16,15 +16,12 @@ import org.eclipse.net4j.db.DBUtil;
 import org.eclipse.net4j.db.IDBAdapter;
 import org.eclipse.net4j.db.h2.H2Adapter;
 import org.eclipse.net4j.util.io.IOUtil;
-import org.eclipse.net4j.util.io.TMPUtil;
 
 import org.h2.jdbcx.JdbcDataSource;
 
 import javax.sql.DataSource;
 
 import java.io.File;
-import java.sql.Connection;
-import java.sql.Statement;
 
 /**
  * @author Eike Stepper
@@ -39,8 +36,6 @@ public class H2Config extends DBConfig
 
   private static JdbcDataSource defaultDataSource;
 
-  protected transient File dbFolder;
-
   public H2Config(boolean supportingAudits, boolean supportingBranches, boolean withRanges, boolean copyOnBranch,
       IDGenerationLocation idGenerationLocation)
   {
@@ -68,45 +63,21 @@ public class H2Config extends DBConfig
       IOUtil.delete(reusableFolder);
     }
 
-    dbFolder = reusableFolder;
     if (defaultDataSource == null)
     {
       defaultDataSource = new JdbcDataSource();
-      defaultDataSource.setURL("jdbc:h2:" + dbFolder.getAbsolutePath() + "/h2test");
+      defaultDataSource.setURL("jdbc:h2:" + reusableFolder.getAbsolutePath() + "/h2test");
     }
 
-    Connection conn = null;
-    Statement stmt = null;
-
-    try
-    {
-      conn = defaultDataSource.getConnection();
-      stmt = conn.createStatement();
-
-      if (!isRestarting())
-      {
-        stmt.execute("DROP SCHEMA IF EXISTS " + repoName);
-      }
-
-      stmt.execute("CREATE SCHEMA IF NOT EXISTS " + repoName);
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-    finally
-    {
-      DBUtil.close(conn);
-      DBUtil.close(stmt);
-    }
+    DBUtil.createSchema(defaultDataSource, repoName, !isRestarting());
 
     JdbcDataSource dataSource = new JdbcDataSource();
-    dataSource.setURL("jdbc:h2:" + dbFolder.getAbsolutePath() + "/h2test;SCHEMA=" + repoName);
+    dataSource.setURL("jdbc:h2:" + reusableFolder.getAbsolutePath() + "/h2test;SCHEMA=" + repoName);
     return dataSource;
   }
 
   protected File createDBFolder()
   {
-    return TMPUtil.createTempFolder("h2_", "_test");
+    return getCurrentTest().createTempFolder("h2_", "_test");
   }
 }