X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fenterprise%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsupport%2Fpersistence%2FDatabaseUtilsTestBase.java;h=789fabf25f85dc834a7221990946220c78caa466;hb=d8b0740d3117a4c2bbde38efd5233a0d828604de;hp=8ca1a156f479641d94ba31f79db6dd5102c77f1e;hpb=f7fc25fbfd96a245bb09e14242107ed633d86dd8;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 8ca1a156..789fabf2 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 @@ -54,12 +54,16 @@ public class DatabaseUtilsTestBase { builder = new JpaBuilder(dataSource, 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(); } @@ -78,9 +82,9 @@ public class DatabaseUtilsTestBase { // Put some data in the database. builder.execute(new JpaUnitOfWork() { - public Void execute(EntityManager em) { + public Void execute(EntityManager aEm) { MyEntity entity = new MyEntity("a", "b"); - em.persist(entity); + aEm.persist(entity); return null; } });