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(dataSource, persistenceUnit);
+ builder = new JpaBuilder(db.getJdbcUrl(), db.getUsername(), db.getPassword(), persistenceUnit);
builder.start();
- dbtester = dbutils.createDbTester();
+ assertEquals(0, db.getActiveConnections());
+ dbtester = dbutils.createDbTester(new MyTables());
}
@After
- public void tearDown() {
+ public void tearDown() throws Exception {
+ dbtester.getConnection().close();
builder.stop();
+ dbutils.stop();
+ assertEquals(0, db.getActiveConnections());
db.stop();
}
@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]);
// Put some data in the database.
builder.execute(new JpaUnitOfWork<Void>() {
- public Void execute(EntityManager em) {
+ public Void execute(EntityManager aEm) {
MyEntity entity = new MyEntity("a", "b");
- em.persist(entity);
+ aEm.persist(entity);
return null;
}
});
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);
}