X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fenterprise%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsupport%2Fpersistence%2FDatabaseUtils.java;h=b57cd46184e3c4293da6ca5e25c01f6aec8957cd;hb=c63e76e400f06f51ba235b9e6658bfa3149c1d48;hp=9ad6c9129251c4cd44c5c62c86c431c42ec4d203;hpb=9ceca02f8774188df9159b703dd38a31783ed956;p=utils

diff --git a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java b/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java
index 9ad6c912..b57cd461 100644
--- a/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java
+++ b/test/enterprise/src/main/java/org/wamblee/support/persistence/DatabaseUtils.java
@@ -65,7 +65,6 @@ public class DatabaseUtils {
      */
     private static final String SCHEMA_PATTERN = "%";
     private DataSource dataSource;
-    private ITableFilterSimple tables;
 
     private IDatabaseTester dbtester;
     /**
@@ -77,12 +76,10 @@ public class DatabaseUtils {
     /**
      * Constructs the database utils. 
      * Before use, {@link #start()} must be called. 
-     * @param aDataSource Datasource. 
-     * @param aTables Tables to work with. 
+     * @param aDataSource Datasource.  
      */
-    public DatabaseUtils(DataSource aDataSource, ITableFilterSimple aTables) {
+    public DatabaseUtils(DataSource aDataSource) {
         dataSource = aDataSource;
-        tables = aTables;
         dbtester = new DataSourceDatabaseTester(dataSource);
         connections = new ArrayList<IDatabaseConnection>(); 
     }
@@ -108,10 +105,11 @@ public class DatabaseUtils {
                 LOG.log(Level.WARNING, "Could not close connection", e);
             }
         }
+        connections.clear();
     }
 
-    public IDatabaseTester createDbTester() throws Exception {
-        return createDbTester(getTableNames(tables));
+    public IDatabaseTester createDbTester(ITableFilterSimple aTables) throws Exception {
+        return createDbTester(getTableNames(aTables));
     }
 
     public IDatabaseTester createDbTester(String[] aTables) throws Exception {
@@ -121,10 +119,6 @@ public class DatabaseUtils {
         return dbtester;
     }
 
-    public void cleanDatabase() throws Exception {
-        cleanDatabase(tables);
-    }
-
     public void executeOnTables(ITableFilterSimple aTables,
         final TableSetOperation aOperation) throws Exception {
         final String[] tableNames = getTableNames(aTables);
@@ -169,11 +163,7 @@ public class DatabaseUtils {
             connection.close();
         }
     }
-
-    public String[] getTableNames() throws Exception {
-        return getTableNames(tables);
-    }
-
+    
     /**
      * @throws SQLException
      */
@@ -200,14 +190,6 @@ public class DatabaseUtils {
         }
     }
 
-    public void emptyTables() throws Exception {
-        executeOnTables(tables, new TableSetOperation() {
-            public void execute(String aTable) throws Exception {
-                emptyTable(aTable);
-            }
-        });
-    }
-
     /**
      * @return
      * @throws SQLException
@@ -229,10 +211,6 @@ public class DatabaseUtils {
         executeSql("delete from " + aTable);
     }
 
-    public void dropTables() throws Exception {
-        dropTables(tables);
-    }
-
     public void dropTables(ITableFilterSimple aTables) throws Exception {
         final String[] tableNames = getTableNames(aTables);
         String[] sortedTables = executeInTransaction(new JdbcUnitOfWork<String[]>() {