(no commit message)

[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 40e52afac29733d11dfb53d5908fc270f655fd33..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
@@ -12,7 +12,7 @@
  * 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 java.io.File;
@@ -24,6 +24,7 @@ import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.apache.derby.drda.NetworkServerControl;
@@ -110,6 +111,7 @@ public class DerbyDatabase extends AbstractDatabase {
      */
     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();
@@ -167,9 +169,8 @@ public class DerbyDatabase extends AbstractDatabase {
             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");
             }
         }
     }
@@ -243,8 +244,8 @@ public class DerbyDatabase extends AbstractDatabase {
     private void shutdownDerby() {
         try {
             DriverManager.getConnection("jdbc:derby:;shutdown=true");
-            throw new RuntimeException("Derby did not shutdown, "
-                + " should always throw exception at shutdown");
+            throw new RuntimeException(
+                "Derby did not shutdown, should always throw exception at shutdown");
         } catch (Exception e) {
             LOGGER.info("Derby has been shut down.");
         }