To test recovery, append ;RECOVER_TEST=64 to the database URL.

h2/src/main/org/h2/util/RecoverTester.java

@@ -26,7 +26,7 @@ import org.h2.tools.Recover;
  */
 public class RecoverTester implements Recorder {
 
-    private static final RecoverTester INSTANCE = new RecoverTester();
+    private static RecoverTester instance;
 
     private String testDatabase = "memFS:reopen";
     private int writeCount = Utils.getProperty("h2.recoverTestOffset", 0);
@@ -36,8 +36,11 @@ public class RecoverTester implements Recorder {
     private HashSet<String> knownErrors = New.hashSet();
     private volatile boolean testing;
 
-    public static RecoverTester getInstance() {
-        return INSTANCE;
+    public static synchronized RecoverTester getInstance() {
+        if (instance == null) {
+            instance = new RecoverTester();
+        }
+        return instance;
     }
 
     public void log(int op, String fileName, byte[] data, long x) {
@@ -85,6 +88,7 @@ public class RecoverTester implements Recorder {
             Database database = new Database(ci, null);
             // close the database
             Session session = database.getSystemSession();
+            session.prepare("script to '" + testDatabase + ".sql'").query(0);            
             session.prepare("shutdown immediately").update();
             database.removeSession(null);
             // everything OK - return

h2/src/test/org/h2/test/unit/TestClearReferences.java

@@ -35,6 +35,7 @@ public class TestClearReferences extends TestBase {
         "org.h2.util.DateTimeUtils.cachedCalendar",
         "org.h2.util.MathUtils.cachedSecureRandom",
         "org.h2.util.NetUtils.cachedLocalAddress",
+        "org.h2.util.RecoverTester.instance",
         "org.h2.util.StringUtils.softCache",
         "org.h2.util.Utils.allowedClassNames",
         "org.h2.util.Utils.allowedClassNamePrefixes",

h2/src/test/org/h2/test/unit/TestReopen.java

@@ -106,6 +106,7 @@ public class TestReopen extends TestBase implements Recorder {
             Database database = new Database(ci, null);
             // close the database
             Session session = database.getSystemSession();
+            session.prepare("script to '" + testDatabase + ".sql'").query(0);
             session.prepare("shutdown immediately").update();
             database.removeSession(null);
             // everything OK - return