提交 d27d7327 authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov

Log name of the script

上级 f7336dab
...@@ -41,6 +41,7 @@ public class TestScript extends TestBase { ...@@ -41,6 +41,7 @@ public class TestScript extends TestBase {
private boolean reconnectOften; private boolean reconnectOften;
private Connection conn; private Connection conn;
private Statement stat; private Statement stat;
private String fileName;
private LineNumberReader in; private LineNumberReader in;
private int outputLineNo; private int outputLineNo;
private PrintStream out; private PrintStream out;
...@@ -155,6 +156,7 @@ public class TestScript extends TestBase { ...@@ -155,6 +156,7 @@ public class TestScript extends TestBase {
// we processed. // we processed.
conn = null; conn = null;
stat = null; stat = null;
fileName = null;
in = null; in = null;
outputLineNo = 0; outputLineNo = 0;
out = null; out = null;
...@@ -172,7 +174,7 @@ public class TestScript extends TestBase { ...@@ -172,7 +174,7 @@ public class TestScript extends TestBase {
conn.close(); conn.close();
out.close(); out.close();
if (errors.length() > 0) { if (errors.length() > 0) {
throw new Exception("errors found"); throw new Exception("errors in " + scriptFileName + " found");
} }
// new File(outFile).delete(); // new File(outFile).delete();
} }
...@@ -200,6 +202,7 @@ public class TestScript extends TestBase { ...@@ -200,6 +202,7 @@ public class TestScript extends TestBase {
if (is == null) { if (is == null) {
throw new IOException("could not find " + inFile); throw new IOException("could not find " + inFile);
} }
fileName = inFile;
in = new LineNumberReader(new InputStreamReader(is, "Cp1252")); in = new LineNumberReader(new InputStreamReader(is, "Cp1252"));
StringBuilder buff = new StringBuilder(); StringBuilder buff = new StringBuilder();
while (true) { while (true) {
...@@ -435,13 +438,10 @@ public class TestScript extends TestBase { ...@@ -435,13 +438,10 @@ public class TestScript extends TestBase {
if (reconnectOften && sql.toUpperCase().startsWith("EXPLAIN")) { if (reconnectOften && sql.toUpperCase().startsWith("EXPLAIN")) {
return; return;
} }
errors.append("line: "); errors.append(fileName).append('\n');
errors.append(outputLineNo); errors.append("line: ").append(outputLineNo).append('\n');
errors.append("\n" + "exp: "); errors.append("exp: ").append(compare).append('\n');
errors.append(compare); errors.append("got: ").append(s).append('\n');
errors.append("\n" + "got: ");
errors.append(s);
errors.append("\n");
if (e != null) { if (e != null) {
TestBase.logError("script", e); TestBase.logError("script", e);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论