Improve tests

h2/src/main/org/h2/mvstore/MVStore.java

@@ -970,7 +970,11 @@ public class MVStore {
         for (MVMap<?, ?> map : maps.values()) {
             map.setWriteVersion(version);
         }
-        meta.setWriteVersion(version);
+        MVMap<String, String> m = meta;
+        if (m == null) {
+            checkOpen();
+        }
+        m.setWriteVersion(version);
     }
 
     /**

h2/src/test/org/h2/test/db/TestRunscript.java

@@ -364,6 +364,7 @@ public class TestRunscript extends TestBase implements Trigger {
         Thread.sleep(100);
         stat.cancel();
         e = (SQLException) task.getException();
+        assertTrue(e != null);
         assertEquals(ErrorCode.STATEMENT_WAS_CANCELED, e.getErrorCode());
 
         conn.close();

h2/src/test/org/h2/test/testScript.sql

@@ -6814,6 +6814,9 @@ SELECT A.ID AID, A.NAME A_NAME, B.ID BID, B.NAME B_NAME FROM TEST_A A INNER JOIN
 > --- ------ --- ------
 > rows: 0
 
+INSERT INTO TEST_B VALUES(1, 'Hallo'), (2, 'Welt'), (3, 'Rekord');
+> update count: 3
+
 CREATE VIEW IF NOT EXISTS TEST_ALL AS SELECT A.ID AID, A.NAME A_NAME, B.ID BID, B.NAME B_NAME FROM TEST_A A, TEST_B B WHERE A.ID = B.ID;
 > ok
 
@@ -6827,23 +6830,8 @@ CREATE VIEW IF NOT EXISTS TEST_ALL AS
 SELECT * FROM TEST_A;
 > ok
 
-INSERT INTO TEST_A VALUES(1, 'Hello');
-> update count: 1
-
-INSERT INTO TEST_B VALUES(1, 'Hallo');
-> update count: 1
-
-INSERT INTO TEST_A VALUES(2, 'World');
-> update count: 1
-
-INSERT INTO TEST_B VALUES(2, 'Welt');
-> update count: 1
-
-INSERT INTO TEST_A VALUES(3, 'Record');
-> update count: 1
-
-INSERT INTO TEST_B VALUES(3, 'Rekord');
-> update count: 1
+INSERT INTO TEST_A VALUES(1, 'Hello'), (2, 'World'), (3, 'Record');
+> update count: 3
 
 SELECT * FROM TEST_ALL;
 > AID A_NAME BID B_NAME