提交 184b84e6 authored 作者: Thomas Mueller's avatar Thomas Mueller

--no commit message

--no commit message
上级 8da94fcb
...@@ -38,10 +38,6 @@ public abstract class TestBase { ...@@ -38,10 +38,6 @@ public abstract class TestBase {
config.beforeTest(); config.beforeTest();
} }
protected void stopServerIfRequired() throws SQLException {
config.afterTest();
}
public TestBase init(TestAll conf) throws Exception { public TestBase init(TestAll conf) throws Exception {
this.config = conf; this.config = conf;
return this; return this;
......
...@@ -362,7 +362,7 @@ public class TestCrashAPI extends TestBase { ...@@ -362,7 +362,7 @@ public class TestCrashAPI extends TestBase {
public TestBase init(TestAll conf) throws Exception { public TestBase init(TestAll conf) throws Exception {
super.init(conf); super.init(conf);
if (config.mvcc) { if (config.mvcc || config.networked) {
return this; return this;
} }
if (config.logMode == 0) { if (config.logMode == 0) {
...@@ -385,7 +385,7 @@ public class TestCrashAPI extends TestBase { ...@@ -385,7 +385,7 @@ public class TestCrashAPI extends TestBase {
} }
public void test() throws Exception { public void test() throws Exception {
if (config.mvcc) { if (config.mvcc || config.networked) {
return; return;
} }
int len = getSize(2, 6); int len = getSize(2, 6);
......
...@@ -17,6 +17,9 @@ import org.h2.test.TestBase; ...@@ -17,6 +17,9 @@ import org.h2.test.TestBase;
public class TestKillRestart extends TestBase { public class TestKillRestart extends TestBase {
public void test() throws Exception { public void test() throws Exception {
if (config.networked) {
return;
}
deleteDb("corrupt"); deleteDb("corrupt");
String url = getURL("corrupt", true); String url = getURL("corrupt", true);
// String url = getURL("corrupt;CACHE_SIZE=2048;WRITE_DELAY=0;STORAGE=TEXT", true); // String url = getURL("corrupt;CACHE_SIZE=2048;WRITE_DELAY=0;STORAGE=TEXT", true);
......
...@@ -170,6 +170,9 @@ public class TestRandomSQL extends TestBase { ...@@ -170,6 +170,9 @@ public class TestRandomSQL extends TestBase {
} }
public void test() throws Exception { public void test() throws Exception {
if (config.networked) {
return;
}
int len = getSize(2, 6); int len = getSize(2, 6);
exitOnError = false; exitOnError = false;
showSQL = false; showSQL = false;
......
...@@ -16,7 +16,7 @@ import org.h2.test.TestBase; ...@@ -16,7 +16,7 @@ import org.h2.test.TestBase;
public class TestExit extends TestBase implements DatabaseEventListener { public class TestExit extends TestBase implements DatabaseEventListener {
public void test() throws Exception { public void test() throws Exception {
if (config.codeCoverage) { if (config.codeCoverage || config.networked) {
return; return;
} }
String classPath = "bin" + File.pathSeparator + "."; String classPath = "bin" + File.pathSeparator + ".";
......
...@@ -32,6 +32,9 @@ public class TestFileSystem extends TestBase { ...@@ -32,6 +32,9 @@ public class TestFileSystem extends TestBase {
} }
private void testDatabaseInJar() throws Exception { private void testDatabaseInJar() throws Exception {
if (config.networked) {
return;
}
Class.forName("org.h2.Driver"); Class.forName("org.h2.Driver");
String url = "jdbc:h2:" + baseDir + "/fsJar"; String url = "jdbc:h2:" + baseDir + "/fsJar";
Connection conn = DriverManager.getConnection(url, "sa", "sa"); Connection conn = DriverManager.getConnection(url, "sa", "sa");
......
...@@ -33,6 +33,9 @@ public class TestTools extends TestBase { ...@@ -33,6 +33,9 @@ public class TestTools extends TestBase {
private Server server; private Server server;
public void test() throws Exception { public void test() throws Exception {
if (config.networked) {
return;
}
deleteDb("utils"); deleteDb("utils");
testServerMain(); testServerMain();
testRemove(); testRemove();
...@@ -237,9 +240,6 @@ public class TestTools extends TestBase { ...@@ -237,9 +240,6 @@ public class TestTools extends TestBase {
} }
private void testManagementDb() throws Exception { private void testManagementDb() throws Exception {
if (config.networked) {
return;
}
int count = getSize(2, 10); int count = getSize(2, 10);
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
Server server = Server.createTcpServer(new String[] {}).start(); Server server = Server.createTcpServer(new String[] {}).start();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论