X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=test%2Fenterprise%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsupport%2Fpersistence%2FDatabaseUtilsTestBase.java;h=789fabf25f85dc834a7221990946220c78caa466;hb=185601ca79008d99e5c2293bc3686fc501720484;hp=e55f13413e8e84161c3d13b6c6f6b6409d1aa53c;hpb=2207a1e695ce23e79678c232cff2ceb84ebaa801;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 e55f1341..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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2005-2010 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ 
 package org.wamblee.support.persistence;
 
 import static junit.framework.Assert.assertEquals;
@@ -38,13 +53,17 @@ 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();
     }
 
@@ -63,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;
             }
         });