You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by ti...@apache.org on 2010/06/06 21:39:03 UTC
svn commit: r951936 -
/incubator/vxquery/trunk/vxquery/src/test/java/org/apache/vxquery/xtest/TestCaseResult.java
Author: tillw
Date: Sun Jun 6 19:39:03 2010
New Revision: 951936
URL: http://svn.apache.org/viewvc?rev=951936&view=rev
Log:
- specifically strip XML declaration from the start of the result
Modified:
incubator/vxquery/trunk/vxquery/src/test/java/org/apache/vxquery/xtest/TestCaseResult.java
Modified: incubator/vxquery/trunk/vxquery/src/test/java/org/apache/vxquery/xtest/TestCaseResult.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/test/java/org/apache/vxquery/xtest/TestCaseResult.java?rev=951936&r1=951935&r2=951936&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/test/java/org/apache/vxquery/xtest/TestCaseResult.java (original)
+++ incubator/vxquery/trunk/vxquery/src/test/java/org/apache/vxquery/xtest/TestCaseResult.java Sun Jun 6 19:39:03 2010
@@ -18,12 +18,15 @@ import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.StringWriter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.util.Pair;
public class TestCaseResult {
private static final int DISPLAY_LEN = 1000;
+ private static Pattern XML_RES_PREFIX = Pattern.compile("<\\?[xX][mM][lL][^\\?]*\\?>");
TestCase testCase;
@@ -89,8 +92,10 @@ public class TestCaseResult {
} else {
expResult = expResult.trim();
if (result != null) {
- int idx = result.indexOf("?>");
- result = result.substring(idx + 1).trim();
+ Matcher m = XML_RES_PREFIX.matcher(result);
+ if (m.find() && m.start() == 0) {
+ result = result.substring(m.end()).trim();
+ }
Pair<Boolean, String> cmp = textCompare(expResult, result);
report = cmp.second;
state = cmp.first ? State.EXPECTED_RESULT_GOT_SAME_RESULT