You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2012/01/24 20:06:19 UTC
svn commit: r1235417 - in /jmeter/trunk:
src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
xdocs/changes.xml
Author: pmouawad
Date: Tue Jan 24 19:06:18 2012
New Revision: 1235417
URL: http://svn.apache.org/viewvc?rev=1235417&view=rev
Log:
Bug 52519 - XMLSchemaAssertion uses JMeter JVM file.encoding instead of response encoding
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java?rev=1235417&r1=1235416&r2=1235417&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java Tue Jan 24 19:06:18 2012
@@ -28,9 +28,7 @@ import javax.xml.parsers.ParserConfigura
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jorphan.logging.LoggingManager;
-import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
-// import org.w3c.dom.Document;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -67,11 +65,10 @@ public class XMLSchemaAssertion extends
AssertionResult result = new AssertionResult(getName());
// Note: initialised with error = failure = false
- byte data[] = response.getResponseData();
- if (data.length == 0) {
+ String resultData = response.getResponseDataAsString();
+ if (resultData.length() == 0) {
return result.setResultForNull();
}
- String resultData = new String(getResultBody(data)); // TODO - charset?
String xsdFileName = getXsdFileName();
if (log.isDebugEnabled()) {
@@ -86,18 +83,6 @@ public class XMLSchemaAssertion extends
return result;
}
- /*
- * TODO move to SampleResult class? Return the body of the http return.
- */
- private byte[] getResultBody(byte[] resultData) {
- for (int i = 0; i < (resultData.length - 1); i++) {
- if (resultData[i] == '\n' && resultData[i + 1] == '\n') {
- return JOrphanUtils.getByteArraySlice(resultData, (i + 2), resultData.length - 1);
- }
- }
- return resultData;
- }
-
public void setXsdFileName(String xmlSchemaFileName) throws IllegalArgumentException {
setProperty(XSD_FILENAME_KEY, xmlSchemaFileName);
}
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1235417&r1=1235416&r2=1235417&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Jan 24 19:06:18 2012
@@ -304,6 +304,7 @@ fix code which assumes that a new instan
<h3>Assertions</h3>
<ul>
+<li>Bug 52519 - XMLSchemaAssertion uses JMeter JVM file.encoding instead of response encoding</li>
</ul>
<h3>Functions</h3>