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
/
main
/
java
/
org
/
wamblee
/
support
/
persistence
/
DerbyDatabase.java
diff --git
a/test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabase.java
b/test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabase.java
index 33bd4f4491c5247186f4eb46ac2b8e5484ece7cf..a41bf0850c4e97cf7cce1c5afb5dd2128acf06fb 100755
(executable)
--- a/
test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabase.java
+++ b/
test/enterprise/src/main/java/org/wamblee/support/persistence/DerbyDatabase.java
@@
-24,6
+24,7
@@
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.logging.Level;
import java.util.logging.Logger;
+import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.derby.drda.NetworkServerControl;
import junit.framework.TestCase;
import org.apache.derby.drda.NetworkServerControl;
@@
-110,6
+111,7
@@
public class DerbyDatabase extends AbstractDatabase {
*/
public void doStart() {
try {
*/
public void doStart() {
try {
+ System.setProperty("derby.stream.error.file", "target/derby.log");
// just in case a previous run was killed without the
// cleanup
cleanPersistentStorage();
// just in case a previous run was killed without the
// cleanup
cleanPersistentStorage();
@@
-167,9
+169,8
@@
public class DerbyDatabase extends AbstractDatabase {
lWaited += POLL_INTERVAL;
if (lWaited > MAX_WAIT_TIME) {
lWaited += POLL_INTERVAL;
if (lWaited > MAX_WAIT_TIME) {
- throw new RuntimeException(
- "Derby database did not start within " + MAX_WAIT_TIME +
- "ms");
+ Assert.fail("Derby database did not start within " +
+ MAX_WAIT_TIME + "ms");
}
}
}
}
}
}