X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=test%2Fenterprise%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsupport%2Fpersistence%2FDatabaseUtilsTestBase.java;h=1092149ec7f7ef265806bc27001ca613d530d1be;hb=685578ba5b0c34b26b127405cad1202623280e50;hp=9012dbd575c5d0bcb193054ba39eb98e2b982d0c;hpb=5e33a52ba36ac928b9863ddd79d2d09f6a308af6;p=utils diff --git a/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsTestBase.java b/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsTestBase.java index 9012dbd5..1092149e 100644 --- a/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsTestBase.java +++ b/test/enterprise/src/test/java/org/wamblee/support/persistence/DatabaseUtilsTestBase.java @@ -51,15 +51,19 @@ public class DatabaseUtilsTestBase { dbutils.dropTables(); dbutils.dropTables(JpaCustomizerBuilder.getCustomizer().getJpaTables()); - builder = new JpaBuilder(dataSource, persistenceUnit); + builder = new JpaBuilder(db.getJdbcUrl(), db.getUsername(), db.getPassword(), persistenceUnit); builder.start(); + assertEquals(0, db.getActiveConnections()); dbtester = dbutils.createDbTester(); } @After - public void tearDown() { + public void tearDown() throws Exception { + dbtester.getConnection().close(); builder.stop(); + dbutils.stop(); + assertEquals(0, db.getActiveConnections()); db.stop(); }