concurrent tests little refactoring

h2/src/test/org/h2/test/synth/TestConcurrentUpdate.java

@@ -100,18 +100,17 @@ public class TestConcurrentUpdate extends TestDb {
                 t.execute();
             }
             // test 2 seconds
-            for (int i = 0; i < 200; i++) {
-                Thread.sleep(10);
-                for (Task t : tasks) {
-                    if (t.isFinished()) {
-                        i = 1000;
-                        break;
-                    }
-                }
-            }
+            Thread.sleep(2000);
+            boolean success = true;
             for (Task t : tasks) {
-                t.get();
+                t.join();
+                Throwable exception = t.getException();
+                if (exception != null) {
+                    logError("", exception);
+                    success = false;
+                }
             }
+            assert success;
         }
     }
 }

h2/src/test/org/h2/test/synth/TestMultiThreaded.java

@@ -25,7 +25,17 @@ public class TestMultiThreaded extends TestDb {
      * @param a ignored
      */
     public static void main(String... a) throws Exception {
-        TestBase.createCaller().init().test();
+        org.h2.test.TestAll config = new org.h2.test.TestAll();
+        config.memory = true;
+        config.big = true;
+        System.out.println(config);
+        TestBase test = createCaller().init(config);
+        for (int i = 0; i < 100; i++) {
+            System.out.println("Pass #" + i);
+            test.config.beforeTest();
+            test.test();
+            test.config.afterTest();
+        }
     }
 
     /**
@@ -128,8 +138,7 @@ public class TestMultiThreaded extends TestDb {
         int size = getSize(2, 4);
         Connection[] connList = new Connection[size];
         for (int i = 0; i < size; i++) {
-            connList[i] = getConnection("multiThreaded;MULTI_THREADED=1;" +
-                    "TRACE_LEVEL_SYSTEM_OUT=1");
+            connList[i] = getConnection("multiThreaded;MULTI_THREADED=1");
         }
         Connection conn = connList[0];
         Statement stat = conn.createStatement();
@@ -148,32 +157,35 @@ public class TestMultiThreaded extends TestDb {
             trace("started " + i);
             Thread.sleep(100);
         }
-        for (int t = 0; t < 2; t++) {
-            Thread.sleep(1000);
+        try {
+            Thread.sleep(2000);
+        } finally {
+            trace("stopping");
             for (int i = 0; i < size; i++) {
                 Processor p = processors[i];
-                if (p.getException() != null) {
-                    throw new Exception("" + i, p.getException());
-                }
+                p.stopNow();
             }
+            for (int i = 0; i < size; i++) {
+                Processor p = processors[i];
+                p.join(1000);
+            }
+            trace("close");
+            for (int i = 0; i < size; i++) {
+                connList[i].close();
+            }
+            deleteDb("multiThreaded");
         }
-        trace("stopping");
-        for (int i = 0; i < size; i++) {
-            Processor p = processors[i];
-            p.stopNow();
-        }
+        
+        boolean success = true;
         for (int i = 0; i < size; i++) {
             Processor p = processors[i];
-            p.join(100);
-            if (p.getException() != null) {
-                throw new Exception(p.getException());
+            p.join(10000);
+            Throwable exception = p.getException();
+            if (exception != null) {
+                logError("", exception);
+                success = false;
             }
         }
-        trace("close");
-        for (int i = 0; i < size; i++) {
-            connList[i].close();
-        }
-        deleteDb("multiThreaded");
+        assert success;
     }
-
 }