Removed the table names from the persistence unit description.
[utils] / test / enterprise / src / test / java / org / wamblee / support / persistence / DatabaseUtilsTestBase.java
index 1092149ec7f7ef265806bc27001ca613d530d1be..7974529753c03f6c1e32685150c839004a701053 100644 (file)
@@ -47,15 +47,15 @@ public class DatabaseUtilsTestBase {
 
         persistenceUnit = new MyPersistenceUnit();
 
-        dbutils = new DatabaseUtils(dataSource, persistenceUnit.getTables());
-        dbutils.dropTables();
+        dbutils = new DatabaseUtils(dataSource);
+        dbutils.dropTables(new MyTables());
         dbutils.dropTables(JpaCustomizerBuilder.getCustomizer().getJpaTables());
 
         builder = new JpaBuilder(db.getJdbcUrl(), db.getUsername(), db.getPassword(), persistenceUnit);
         builder.start();
 
         assertEquals(0, db.getActiveConnections());
-        dbtester = dbutils.createDbTester();
+        dbtester = dbutils.createDbTester(new MyTables());
     }
 
     @After
@@ -69,14 +69,14 @@ public class DatabaseUtilsTestBase {
 
     @Test
     public void testTablesCorrect() throws Exception {
-        String[] tables = dbutils.getTableNames();
+        String[] tables = dbutils.getTableNames(new MyTables());
         assertEquals(1, tables.length);
         assertEquals("XYZ_MYENTITY", tables[0]);
     }
 
     @Test
     public void testDeleteTables() throws Exception {
-        String[] tables = dbutils.getTableNames();
+        String[] tables = dbutils.getTableNames(new MyTables());
         assertEquals(1, tables.length);
         assertEquals("XYZ_MYENTITY", tables[0]);
 
@@ -94,14 +94,14 @@ public class DatabaseUtilsTestBase {
         assertEquals(1, table.getRowCount());
 
         // Clean the database
-        dbutils.cleanDatabase();
+        dbutils.cleanDatabase(new MyTables());
         table = dbtester.getDataSet().getTable("XYZ_MYENTITY");
         assertEquals(0, table.getRowCount());
 
         // Now drop the database
-        dbutils.dropTables();
+        dbutils.dropTables(new MyTables());
         dbutils.dropTables(JpaCustomizerBuilder.getCustomizer().getJpaTables());
-        tables = dbutils.getTableNames();
+        tables = dbutils.getTableNames(new MyTables());
         assertEquals(0, tables.length);
     }