Now using connections managed by JPA instead of using JNDI mocking.

[utils] / test / enterprise / src / test / java / org / wamblee / support / persistence / DatabaseUtilsTestBase.java

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 8ca1a156f479641d94ba31f79db6dd5102c77f1e..1092149ec7f7ef265806bc27001ca613d530d1be 100644 (file)
--- 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();
     }
 
@@ -78,9 +82,9 @@ public class DatabaseUtilsTestBase {
 
         // 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;
             }
         });