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 9012dbd575c5d0bcb193054ba39eb98e2b982d0c..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();
     }