code style improvements.

[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 dc028290ab3baa500289a4aa6915f885d9a753b3..7974529753c03f6c1e32685150c839004a701053 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
@@ -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;
@@ -32,40 +47,44 @@ public class DatabaseUtilsTestBase {
 
         persistenceUnit = new MyPersistenceUnit();
 
-        dbutils = new DatabaseUtils(dataSource, persistenceUnit.getTables());
-        dbutils.dropTables();
+        dbutils = new DatabaseUtils(dataSource);
+        dbutils.dropTables(new MyTables());
         dbutils.dropTables(JpaCustomizerBuilder.getCustomizer().getJpaTables());
 
-        builder = new JpaBuilder(dataSource, persistenceUnit);
+        builder = new JpaBuilder(db.getJdbcUrl(), db.getUsername(), db.getPassword(), persistenceUnit);
         builder.start();
 
-        dbtester = dbutils.createDbTester();
+        assertEquals(0, db.getActiveConnections());
+        dbtester = dbutils.createDbTester(new MyTables());
     }
 
     @After
-    public void tearDown() {
+    public void tearDown() throws Exception {
+        dbtester.getConnection().close();
         builder.stop();
+        dbutils.stop();
+        assertEquals(0, db.getActiveConnections());
         db.stop();
     }
 
     @Test
     public void testTablesCorrect() throws Exception {
-        String[] tables = dbutils.getTableNames();
+        String[] tables = dbutils.getTableNames(new MyTables());
         assertEquals(1, tables.length);
         assertEquals("XYZ_MYENTITY", tables[0]);
     }
 
     @Test
     public void testDeleteTables() throws Exception {
-        String[] tables = dbutils.getTableNames();
+        String[] tables = dbutils.getTableNames(new MyTables());
         assertEquals(1, tables.length);
         assertEquals("XYZ_MYENTITY", tables[0]);
 
         // 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;
             }
         });
@@ -75,14 +94,14 @@ public class DatabaseUtilsTestBase {
         assertEquals(1, table.getRowCount());
 
         // Clean the database
-        dbutils.cleanDatabase();
+        dbutils.cleanDatabase(new MyTables());
         table = dbtester.getDataSet().getTable("XYZ_MYENTITY");
         assertEquals(0, table.getRowCount());
 
         // Now drop the database
-        dbutils.dropTables();
+        dbutils.dropTables(new MyTables());
         dbutils.dropTables(JpaCustomizerBuilder.getCustomizer().getJpaTables());
-        tables = dbutils.getTableNames();
+        tables = dbutils.getTableNames(new MyTables());
         assertEquals(0, tables.length);
     }