diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2008-01-02 07:10:53 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2008-01-02 07:10:53 +0000 |
| commit | f6b504f622da3b523415af9e5ce59d350007eaf7 (patch) | |
| tree | ec72e40d7d035611004103d7438a40e4e9ddc033 | |
| parent | c7f66bb3fde4d9aff9921fec29128d66f19923e0 (diff) | |
| download | vaadin-framework-f6b504f622da3b523415af9e5ce59d350007eaf7.tar.gz vaadin-framework-f6b504f622da3b523415af9e5ce59d350007eaf7.zip | |
simplified test case proxy
svn changeset:3343/svn branch:trunk
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java | 41 |
1 files changed, 8 insertions, 33 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java index c7bac79c07..bcf32a6c07 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java @@ -777,44 +777,19 @@ public class ApplicationServlet extends HttpServlet { } is.close(); - if (builder != null && builder.length() > 0 - && builder.toString().startsWith("TT-TC=")) { - int lineEnd = builder.indexOf("\n"); - String returnedTestCaseId = builder.substring(builder - .indexOf("TT-TC=") + 6, lineEnd); - builder.replace(0, lineEnd + 1, ""); - - String returnedTestSuiteRunId = null; - - if (testSuiteId != null) { - lineEnd = builder.indexOf("\n"); - returnedTestSuiteRunId = builder.substring(builder - .indexOf("TT-TS-RUN-ID=") + 13, lineEnd); - } - - if (builder.length() < lineEnd + 1) { - throw new RuntimeException( - "The received testscript is illegal. Expected testcase script id in first line " - + " and the actual script in following lines. The script: " - + builder.toString()); - } - + if (builder != null && builder.length() > 0) { page .write("<script language=\"JavaScript\" type=\"text/javascript\">\n"); - page.write("itmill.TTtestCaseId = \"" + returnedTestCaseId + "\";"); - page.write("\n"); + page.write("itmill.TTtestCaseId = \"" + testCaseId + "\";\n"); if (testSuiteId != null) { - page.write("itmill.TTtestSuiteId = \"" + testSuiteId + "\";"); - page.write("\n"); + page.write("itmill.TTtestSuiteId = \"" + testSuiteId + "\";\n"); } - if (returnedTestSuiteRunId != null) { - page.write("itmill.TTtestSuiteRunId = \"" - + returnedTestSuiteRunId + "\";"); - page.write("\n"); - builder = builder.delete(0, lineEnd); + if (testSuiteRunId != null) { + page.write("itmill.TTtestSuiteRunId = \"" + testSuiteRunId + + "\";\n"); } - String script = builder.toString().replaceAll("\n", "\\\\n"); - page.write("itmill.TTtestCaseScript = \"" + script + "\";\n"); + page.write("itmill.TTtestCaseScript = \"" + builder.toString() + + "\";\n"); page.write("</script>\n"); } } |