git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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());
dbutils.dropTables();
dbutils.dropTables(JpaCustomizerBuilder.getCustomizer().getJpaTables());
- builder = new JpaBuilder(d
ataSource
, persistenceUnit);
+ builder = new JpaBuilder(d
b.getJdbcUrl(), db.getUsername(), db.getPassword()
, persistenceUnit);
builder.start();
builder.start();
+ assertEquals(0, db.getActiveConnections());
dbtester = dbutils.createDbTester();
}
@After
dbtester = dbutils.createDbTester();
}
@After
- public void tearDown() {
+ public void tearDown() throws Exception {
+ dbtester.getConnection().close();
builder.stop();
builder.stop();
+ dbutils.stop();
+ assertEquals(0, db.getActiveConnections());
db.stop();
}
db.stop();
}
@@
-78,9
+82,9
@@
public class DatabaseUtilsTestBase {
// Put some data in the database.
builder.execute(new JpaUnitOfWork<Void>() {
// Put some data in the database.
builder.execute(new JpaUnitOfWork<Void>() {
- public Void execute(EntityManager
e
m) {
+ public Void execute(EntityManager
aE
m) {
MyEntity entity = new MyEntity("a", "b");
MyEntity entity = new MyEntity("a", "b");
-
e
m.persist(entity);
+
aE
m.persist(entity);
return null;
}
});
return null;
}
});