Don't throw Error

h2/src/test/org/h2/samples/Newsfeed.java

@@ -76,7 +76,7 @@ public class Newsfeed {
         s = StringUtils.replaceAll(s, "<br/>", "");
         s = StringUtils.replaceAll(s, "<br>", "");
         if (s.indexOf('<') >= 0 || s.indexOf('>') >= 0) {
-            throw new Error("Unsupported HTML Tag: < or > in " + s);
+            throw new RuntimeException("Unsupported HTML Tag: < or > in " + s);
         }
         return s;
     }

h2/src/test/org/h2/test/TestBase.java

@@ -121,7 +121,7 @@ public abstract class TestBase {
             println("FAIL " + e.toString());
             logError("FAIL " + e.toString(), e);
             if (config.stopOnError) {
-                throw new Error("ERROR");
+                throw new AssertionError("ERROR");
             }
             if (e instanceof OutOfMemoryError) {
                 throw (OutOfMemoryError) e;
@@ -254,9 +254,6 @@ public abstract class TestBase {
         if (config.mvcc && url.indexOf("MVCC=") < 0) {
             url += ";MVCC=TRUE";
         }
-        if (config.cache2Q && url.indexOf("CACHE_TYPE=") < 0) {
-            url += ";CACHE_TYPE=TQ";
-        }
         if (config.diskResult && admin) {
             url += ";MAX_MEMORY_ROWS=100;CACHE_SIZE=0";
         }