git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
test
/
enterprise
/
src
/
main
/
java
/
org
/
wamblee
/
test
/
persistence
/
JpaTester.java
diff --git
a/test/enterprise/src/main/java/org/wamblee/test/persistence/JpaTester.java
b/test/enterprise/src/main/java/org/wamblee/test/persistence/JpaTester.java
index 564163de296b6a5ae1f42c2566b8e6a510be431b..650c55e8bd4d9fcf955a9a3dfaebdb326e9b5792 100644
(file)
--- a/
test/enterprise/src/main/java/org/wamblee/test/persistence/JpaTester.java
+++ b/
test/enterprise/src/main/java/org/wamblee/test/persistence/JpaTester.java
@@
-19,7
+19,6
@@
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
import javax.naming.NamingException;
import javax.sql.DataSource;
-import org.dbunit.IDatabaseTester;
import org.wamblee.test.jndi.StubInitialContextFactory;
/**
import org.wamblee.test.jndi.StubInitialContextFactory;
/**
@@
-63,7
+62,6
@@
public class JpaTester {
private DataSource dataSource;
private DatabaseUtils dbUtils;
private JpaBuilder jpaBuilder;
private DataSource dataSource;
private DatabaseUtils dbUtils;
private JpaBuilder jpaBuilder;
- private IDatabaseTester dbTester;
/**
* Constructs the tester.
/**
* Constructs the tester.
@@
-83,9
+81,9
@@
public class JpaTester {
public void start() throws Exception {
db = DatabaseBuilder.getDatabase();
dataSource = db.start();
public void start() throws Exception {
db = DatabaseBuilder.getDatabase();
dataSource = db.start();
-
- // NOTE: adding datasource to JNDI is no longer needed for
- //
JPA testing, but is nice to have available for other uses.
+
+ // NOTE: adding datasource to JNDI is no longer needed for
+ // JPA testing, but is nice to have available for other uses.
StubInitialContextFactory.register();
try {
InitialContext ctx = new InitialContext();
StubInitialContextFactory.register();
try {
InitialContext ctx = new InitialContext();
@@
-98,7
+96,8
@@
public class JpaTester {
dbUtils.start();
dbUtils.dropTables(JpaCustomizerBuilder.getCustomizer().getJpaTables());
dbUtils.start();
dbUtils.dropTables(JpaCustomizerBuilder.getCustomizer().getJpaTables());
- jpaBuilder = new JpaBuilder(db.getJdbcUrl(), db.getUsername(), db.getPassword(), persistenceUnit);
+ jpaBuilder = new JpaBuilder(db.getJdbcUrl(), db.getUsername(), db
+ .getPassword(), persistenceUnit);
jpaBuilder.start();
}
jpaBuilder.start();
}
@@
-118,40
+117,45
@@
public class JpaTester {
}
/**
}
/**
- * Gets the database.
- * @return Database.
+ * Gets the database.
+ *
+ * @return Database.
*/
public Database getDb() {
return db;
}
/**
*/
public Database getDb() {
return db;
}
/**
- * Gets the datasource.
- * @return Datasource.
+ * Gets the datasource.
+ *
+ * @return Datasource.
*/
public DataSource getDataSource() {
return dataSource;
}
/**
*/
public DataSource getDataSource() {
return dataSource;
}
/**
- * Gets the database utilities.
- * @return Database utilities.
+ * Gets the database utilities.
+ *
+ * @return Database utilities.
*/
public DatabaseUtils getDbUtils() {
return dbUtils;
}
/**
*/
public DatabaseUtils getDbUtils() {
return dbUtils;
}
/**
- * Gets the jpa builder.
- * @return JPA builder.
+ * Gets the jpa builder.
+ *
+ * @return JPA builder.
*/
public JpaBuilder getJpaBuilder() {
return jpaBuilder;
}
/**
*/
public JpaBuilder getJpaBuilder() {
return jpaBuilder;
}
/**
- * Gets the persistence unit.
- * @return Persistence unit.
+ * Gets the persistence unit.
+ *
+ * @return Persistence unit.
*/
public PersistenceUnitDescription getPersistenceUnit() {
return persistenceUnit;
*/
public PersistenceUnitDescription getPersistenceUnit() {
return persistenceUnit;