You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/04/24 19:56:45 UTC
svn commit: r937663 - in /jakarta/jmeter/trunk:
src/components/org/apache/jmeter/extractor/
src/components/org/apache/jmeter/sampler/
src/core/org/apache/jmeter/save/converters/
src/examples/org/apache/jmeter/examples/sampler/ src/examples/org/apache/j...
Author: sebb
Date: Sat Apr 24 17:56:44 2010
New Revision: 937663
URL: http://svn.apache.org/viewvc?rev=937663&view=rev
Log:
Use setResponseData(String, null) where default charset is OK
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/PackageTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/DebugPostProcessor.java Sat Apr 24 17:56:44 2010
@@ -46,7 +46,7 @@ public class DebugPostProcessor extends
sb.append("\n");
}
SampleResult sr = new SampleResult();
- sr.setResponseData(sb.toString().getBytes());
+ sr.setResponseData(sb.toString(), null);
sr.setDataType(SampleResult.TEXT);
sr.setSampleLabel(getName());
sr.setSuccessful(true);
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java Sat Apr 24 17:56:44 2010
@@ -73,7 +73,7 @@ public class DebugSampler extends Abstra
sb.append("\n");
}
- res.setResponseData(sb.toString().getBytes());
+ res.setResponseData(sb.toString(), null);
res.setDataType(SampleResult.TEXT);
res.setSamplerData(rd.toString());
res.setSuccessful(true);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java Sat Apr 24 17:56:44 2010
@@ -347,7 +347,7 @@ public class SampleResultConverter exten
try {
res.setResponseData(responseData.getBytes(dataEncoding));
} catch (UnsupportedEncodingException e) {
- res.setResponseData(("Can't support the char set: " + dataEncoding).getBytes());
+ res.setResponseData(("Can't support the char set: " + dataEncoding), null);
res.setDataType(SampleResult.TEXT);
}
}
Modified: jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java (original)
+++ jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java Sat Apr 24 17:56:44 2010
@@ -81,7 +81,7 @@ public class ExampleSampler extends Abst
* Set up the sample result details
*/
res.setSamplerData(data);
- res.setResponseData(response.getBytes());
+ res.setResponseData(response, null);
res.setDataType(SampleResult.TEXT);
res.setResponseCodeOK();
Modified: jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java (original)
+++ jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java Sat Apr 24 17:56:44 2010
@@ -39,7 +39,7 @@ public class Example1 extends AbstractSa
res.setSamplerData(myStringProperty);
res.sampleStart();
// Do something ...
- res.setResponseData(myStringProperty.toUpperCase().getBytes());
+ res.setResponseData(myStringProperty.toUpperCase(), null);
res.setDataType(SampleResult.TEXT);
res.sampleEnd();
res.setSuccessful(true);
Modified: jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java (original)
+++ jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java Sat Apr 24 17:56:44 2010
@@ -39,7 +39,7 @@ public class Example2 extends AbstractSa
res.setSamplerData(myStringProperty);
res.sampleStart();
// Do something ...
- res.setResponseData(myStringProperty.toLowerCase().getBytes());
+ res.setResponseData(myStringProperty.toLowerCase(), null);
res.setDataType(SampleResult.TEXT);
res.sampleEnd();
res.setSuccessful(true);
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java Sat Apr 24 17:56:44 2010
@@ -538,7 +538,7 @@ public class WebServiceSampler extends H
// performance on slow clients
length=br.read();
result.sampleEnd();
- result.setResponseData(JMeterUtils.getResString("read_response_message").getBytes()); //$NON-NLS-1$
+ result.setResponseData(JMeterUtils.getResString("read_response_message"), null); //$NON-NLS-1$
}
// It is not possible to access the actual HTTP response code, so we assume no data means failure
if (length > 0){
Modified: jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java Sat Apr 24 17:56:44 2010
@@ -151,7 +151,7 @@ public class BSFSampler extends BSFTestE
}
if (bsfOut != null) {
- res.setResponseData(bsfOut.toString().getBytes());
+ res.setResponseData(bsfOut.toString(), null);
}
} catch (BSFException ex) {
log.warn("BSF error", ex);
Modified: jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java Sat Apr 24 17:56:44 2010
@@ -141,7 +141,7 @@ public class BeanShellSampler extends Be
if (bshOut != null) {// Set response data
String out = bshOut.toString();
- res.setResponseData(out.getBytes());
+ res.setResponseData(out, null);
}
// script can also use setResponseData() so long as it returns null
Modified: jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java Sat Apr 24 17:56:44 2010
@@ -61,8 +61,7 @@ public class JSR223Sampler extends JSR22
result.setResponseCodeOK();
result.setResponseMessageOK();
if (ret != null){
- // TODO what encoding to use?
- result.setResponseData(ret.toString().getBytes());
+ result.setResponseData(ret.toString(), null);
}
} catch (IOException e) {
log.warn("Problem in JSR223 script "+e);
Modified: jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java Sat Apr 24 17:56:44 2010
@@ -279,7 +279,7 @@ public class JavaSampler extends Abstrac
Thread.yield();
SampleResult results = new SampleResult();
results.setSuccessful(false);
- results.setResponseData(("Class not found: " + getClassname()).getBytes());
+ results.setResponseData(("Class not found: " + getClassname()), null);
results.setSampleLabel("ERROR: " + getClassname());
return results;
}
Modified: jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java (original)
+++ jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java Sat Apr 24 17:56:44 2010
@@ -272,7 +272,7 @@ public class JavaTest extends AbstractJa
}
if (resultData != null && resultData.length() > 0) {
- results.setResponseData(resultData.getBytes());
+ results.setResponseData(resultData, null);
results.setDataType(SampleResult.TEXT);
}
Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java Sat Apr 24 17:56:44 2010
@@ -137,7 +137,7 @@ public class JMSSampler extends Abstract
if (isOneway()) {
producer.send(msg);
res.setSuccessful(true);
- res.setResponseData("Oneway request has no response data".getBytes());
+ res.setResponseData("Oneway request has no response data", null);
} else {
if (!useTemporyQueue()) {
msg.setJMSReplyTo(receiveQueue);
@@ -151,9 +151,9 @@ public class JMSSampler extends Abstract
}
} else {
if (replyMsg instanceof TextMessage) {
- res.setResponseData(((TextMessage) replyMsg).getText().getBytes());
+ res.setResponseData(((TextMessage) replyMsg).getText(), null);
} else {
- res.setResponseData(replyMsg.toString().getBytes());
+ res.setResponseData(replyMsg.toString(), null);
}
res.setSuccessful(true);
}
Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java Sat Apr 24 17:56:44 2010
@@ -166,9 +166,9 @@ public class SubscriberSampler extends B
result.sampleEnd();
synchronized (this) {// Need to synch because buffer is shared with onMessageHandler
if (this.getReadResponseAsBoolean()) {
- result.setResponseData(this.BUFFER.toString().getBytes());
+ result.setResponseData(this.BUFFER.toString(), null);
} else {
- result.setBytes(this.BUFFER.toString().getBytes().length);
+ result.setBytes(this.BUFFER.toString().length());
}
read=this.count(0);
}
@@ -210,9 +210,9 @@ public class SubscriberSampler extends B
result.sampleEnd();
int read = this.SUBSCRIBER.count(0);
if (this.getReadResponseAsBoolean()) {
- result.setResponseData(this.SUBSCRIBER.getMessage().getBytes());
+ result.setResponseData(this.SUBSCRIBER.getMessage(), null);
} else {
- result.setBytes(this.SUBSCRIBER.getMessage().getBytes().length);
+ result.setBytes(this.SUBSCRIBER.getMessage().length());
}
result.setSuccessful(true);
result.setResponseCodeOK();
Modified: jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java Sat Apr 24 17:56:44 2010
@@ -711,7 +711,7 @@ public class LDAPExtSampler extends Abst
XMLBuffer xmlBuffer = new XMLBuffer();
xmlBuffer.openTag("ldapanswer"); // $NON-NLS-1$
SampleResult res = new SampleResult();
- res.setResponseData("successfull".getBytes());
+ res.setResponseData("successfull", null);
res.setResponseMessage("Success"); // $NON-NLS-1$
res.setResponseCode("0"); // $NON-NLS-1$
res.setContentType("text/xml");// $NON-NLS-1$
@@ -847,7 +847,7 @@ public class LDAPExtSampler extends Abst
xmlBuffer.closeTag("operation"); // $NON-NLS-1$
xmlBuffer.tag("responsecode",res.getResponseCode()); // $NON-NLS-1$
xmlBuffer.tag("responsemessage",res.getResponseMessage()); // $NON-NLS-1$
- res.setResponseData(xmlBuffer.toString().getBytes());
+ res.setResponseData(xmlBuffer.toString(), null);
res.setDataType(SampleResult.TEXT);
res.setSuccessful(isSuccessful);
}
Modified: jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java Sat Apr 24 17:56:44 2010
@@ -443,11 +443,11 @@ public class LDAPSampler extends Abstrac
if (getPropertyAsString(TEST).equals(SEARCHBASE) && !searchFoundEntries) {
res.setResponseCode("201");// TODO is this a sensible number? //$NON-NLS-1$
res.setResponseMessage("OK - no results");
- res.setResponseData("successful - no results".getBytes());
+ res.setResponseData("successful - no results", null);
} else {
res.setResponseCodeOK();
res.setResponseMessage("OK"); //$NON-NLS-1$
- res.setResponseData("successful".getBytes());
+ res.setResponseData("successful", null);
}
res.setDataType(SampleResult.TEXT);
isSuccessful = true;
Modified: jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java Sat Apr 24 17:56:44 2010
@@ -307,7 +307,7 @@ public class TCPSampler extends Abstract
res.setSamplerData(req);
protocolHandler.write(os, req);
String in = protocolHandler.read(is);
- res.setResponseData(in.getBytes());
+ res.setResponseData(in, null);
res.setDataType(SampleResult.TEXT);
res.setResponseCodeOK();
res.setResponseMessage("OK"); //$NON-NLS-1$
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java Sat Apr 24 17:56:44 2010
@@ -48,11 +48,7 @@ public class ResponseAssertionTest exte
vars = new JMeterVariables();
jmctx.setVariables(vars);
jmctx.setPreviousResult(sample);
- sample.setResponseData(
- (
- "response Data\n" +
- "line 2\n\nEOF"
- ).getBytes());
+ sample.setResponseData("response Data\nline 2\n\nEOF", null);
sample.setURL(new URL("http://localhost/Sampler/Data/"));
sample.setResponseCode("401");
sample.setResponseHeaders("X-Header: abcd");
@@ -135,7 +131,7 @@ public class ResponseAssertionTest exte
// Bug 46831 - check can match dollars
public void testResponseAssertionContainsDollar() throws Exception {
- sample.setResponseData("value=\"${ID}\" Group$ctl00$drpEmails".getBytes());
+ sample.setResponseData("value=\"${ID}\" Group$ctl00$drpEmails", null);
assertion.unsetNotType();
assertion.setToContainsType();
assertion.setTestFieldResponseData();
@@ -240,7 +236,7 @@ public class ResponseAssertionTest exte
assertion.setToContainsType();
assertion.addTestString(TEST_PATTERN);
SampleResult response = new SampleResult();
- response.setResponseData(TEST_STRING.getBytes());
+ response.setResponseData(TEST_STRING, null);
for (int i = 0; i < 100; i++) {
AssertionResult result;
result = assertion.getResult(response);
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java Sat Apr 24 17:56:44 2010
@@ -43,7 +43,7 @@ public class SizeAssertionTest extends J
jmctx.setVariables(vars);
sample0 = new SampleResult();
sample1 = new SampleResult();
- sample1.setResponseData(data1.getBytes());
+ sample1.setResponseData(data1, null);
}
public void testSizeAssertionEquals() throws Exception{
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XPathAssertionTest.java Sat Apr 24 17:56:44 2010
@@ -68,7 +68,7 @@ public class XPathAssertionTest extends
+ "<value field=\"pinposition2\">5</value>" + "<value field=\"pinpositionvalue2\"></value>"
+ "<value field=\"pinposition3\">6</value>" + "<value field=\"pinpositionvalue3\"></value>"
+ "</row>" + "</company-xmlext-query-ret>";
- result.setResponseData(data.getBytes());
+ result.setResponseData(data, null);
}
private ByteArrayOutputStream readBA(String name) throws IOException {
@@ -180,7 +180,7 @@ public class XPathAssertionTest extends
}
public void testAssertionEmptyResult() throws Exception {
- result.setResponseData("".getBytes());
+ result.setResponseData("", null);
AssertionResult res = assertion.getResult(result);
testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
testLog.debug("failure message: " + res.getFailureMessage());
@@ -190,7 +190,7 @@ public class XPathAssertionTest extends
}
public void testAssertionBlankResult() throws Exception {
- result.setResponseData(" ".getBytes());
+ result.setResponseData(" ", null);
AssertionResult res = assertion.getResult(result);
testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
testLog.debug("failure message: " + res.getFailureMessage());
@@ -203,7 +203,7 @@ public class XPathAssertionTest extends
String data = "<html><head><title>testtitle</title></head>" + "<body>"
+ "<p><i><b>invalid tag nesting</i></b><hr>" + "</body></html>";
- result.setResponseData(data.getBytes());
+ result.setResponseData(data, null);
vars = new JMeterVariables();
jmctx.setVariables(vars);
jmctx.setPreviousResult(result);
@@ -264,7 +264,7 @@ public class XPathAssertionTest extends
+ "<p>Where should we start?</p>" + "<p>How about more about me?</p>" + "</CHAPTER_TEXT>"
+ "</CHAPTER>" + "</PART>" + "</BOOK>";
- result.setResponseData(data.getBytes());
+ result.setResponseData(data, null);
vars = new JMeterVariables();
jmctx.setVariables(vars);
jmctx.setPreviousResult(result);
@@ -290,7 +290,7 @@ public class XPathAssertionTest extends
+ "<p>Where should we start?</p>" + "<p>How about more about me?</p>" + "</CHAPTER_TEXT>"
+ "</CHAPTER>" + "<illegal>not defined in dtd</illegal>" + "</PART>" + "</BOOK>";
- result.setResponseData(data.getBytes());
+ result.setResponseData(data, null);
vars = new JMeterVariables();
jmctx.setVariables(vars);
jmctx.setPreviousResult(result);
@@ -306,7 +306,7 @@ public class XPathAssertionTest extends
String data = "<html><head><title>testtitle</title></head>" + "<body>"
+ "<p><i><b>invalid tag nesting</i></b><hr>" + "</body></html>";
- result.setResponseData(data.getBytes());
+ result.setResponseData(data, null);
vars = new JMeterVariables();
jmctx.setVariables(vars);
jmctx.setPreviousResult(result);
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/PackageTest.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/PackageTest.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/PackageTest.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/PackageTest.java Sat Apr 24 17:56:44 2010
@@ -56,7 +56,7 @@ public class PackageTest extends JMeterT
variables.put("my_regex", ".*");
variables.put("server", "jakarta.apache.org");
result = new SampleResult();
- result.setResponseData("<html>hello world</html> costs: $3.47,$5.67".getBytes());
+ result.setResponseData("<html>hello world</html> costs: $3.47,$5.67", null);
transformer = new ReplaceStringWithFunctions(new CompoundVariable(), variables);
jmctx.setVariables(new JMeterVariables());
jmctx.setSamplingStarted(true);
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java Sat Apr 24 17:56:44 2010
@@ -56,7 +56,7 @@ public class TestRegexExtractor extends
+ "<value field=\"pinposition2\">5</value>" + "<value field=\"pinpositionvalue2\"></value>"
+ "<value field=\"pinposition3\">6</value>" + "<value field=\"pinpositionvalue3\"></value>"
+ "</row>" + "</company-xmlext-query-ret>";
- result.setResponseData(data.getBytes());
+ result.setResponseData(data, null);
result.setResponseHeaders("Header1: Value1\nHeader2: Value2");
result.setResponseCode("abcd");
result.setResponseMessage("The quick brown fox");
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java Sat Apr 24 17:56:44 2010
@@ -212,7 +212,7 @@ public class TestXPathExtractor extends
}
public void testInvalidDocument() throws Exception {
- result.setResponseData("<z>".getBytes());
+ result.setResponseData("<z>", null);
extractor.setXPathQuery("<");
extractor.process();
assertEquals("Default", vars.get(VAL_NAME));
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java Sat Apr 24 17:56:44 2010
@@ -49,7 +49,7 @@ public class TestJexlFunction extends JM
result = new SampleResult();
jmctx = JMeterContextService.getContext();
String data = "The quick brown fox";
- result.setResponseData(data.getBytes());
+ result.setResponseData(data, null);
vars = new JMeterVariables();
jmctx.setVariables(vars);
jmctx.setPreviousResult(result);
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java Sat Apr 24 17:56:44 2010
@@ -57,7 +57,7 @@ public class TestRegexFunction extends J
+ " field=\"pinposition2\">5</value><value" + " field=\"pinpositionvalue2\"></value><value"
+ " field=\"pinposition3\">6</value><value" + " field=\"pinpositionvalue3\"></value>"
+ "</row></company-xmlext-query-ret>";
- result.setResponseData(data.getBytes());
+ result.setResponseData(data, null);
vars = new JMeterVariables();
String data2 = "The quick brown fox jumped over the lazy dog 123 times";
vars.put(INPUT_VARIABLE_NAME, data2);
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestAnchorModifier.java Sat Apr 24 17:56:44 2010
@@ -55,7 +55,7 @@ public class TestAnchorModifier extends
new FileInputStream(System.getProperty("user.dir") + "/testfiles/Load_JMeter_Page.jmx")).getArray()[0];
jmctx.setCurrentSampler(context);
jmctx.setCurrentSampler(config);
- result.setResponseData(new TextFile(System.getProperty("user.dir") + HTMLFileName).getText().getBytes());
+ result.setResponseData(new TextFile(System.getProperty("user.dir") + HTMLFileName).getText(), null);
result.setSampleLabel(context.toString());
result.setSamplerData(context.toString());
result.setURL(new URL("http://issues.apache.org/fakepage.html"));
@@ -103,7 +103,7 @@ public class TestAnchorModifier extends
HTTPSampleResult result = new HTTPSampleResult();
jmctx.setCurrentSampler(context);
jmctx.setCurrentSampler(config);
- result.setResponseData(responseText.getBytes());
+ result.setResponseData(responseText, null);
result.setSampleLabel(context.toString());
result.setSamplerData(context.toString());
result.setURL(context.getUrl());
@@ -123,7 +123,7 @@ public class TestAnchorModifier extends
HTTPSampleResult result = new HTTPSampleResult();
jmctx.setCurrentSampler(context);
jmctx.setCurrentSampler(config);
- result.setResponseData(responseText.getBytes());
+ result.setResponseData(responseText, null);
result.setSampleLabel(context.toString());
result.setSamplerData(context.toString());
result.setURL(context.getUrl());
@@ -139,7 +139,7 @@ public class TestAnchorModifier extends
+ "<a href=\"/index.html\">Goto index page</a>" + "hfdfjiudfjdfjkjfkdjf"
+ "<b>bold text</b><a href=lowerdir/index.html>lower</a>" + "</body></html>";
HTTPSampleResult result = new HTTPSampleResult();
- result.setResponseData(responseText.getBytes());
+ result.setResponseData(responseText, null);
result.setSampleLabel(context.toString());
result.setURL(context.getUrl());
jmctx.setCurrentSampler(context);
@@ -158,7 +158,7 @@ public class TestAnchorModifier extends
String responseText = "<html><head><title>Test page</title></head><body>"
+ "<a href=\"/home/index.html?param1=value1\">" + "Goto index page</a></body></html>";
HTTPSampleResult result = new HTTPSampleResult();
- result.setResponseData(responseText.getBytes());
+ result.setResponseData(responseText, null);
result.setSampleLabel(context.toString());
result.setURL(context.getUrl());
jmctx.setCurrentSampler(context);
@@ -175,7 +175,7 @@ public class TestAnchorModifier extends
String responseText = "<html><head><title>Test page</title></head><body>"
+ "<A HREF=\"index.html\">Goto index page</A></body></html>";
HTTPSampleResult result = new HTTPSampleResult();
- result.setResponseData(responseText.getBytes());
+ result.setResponseData(responseText, null);
result.setSampleLabel(context.toString());
result.setURL(context.getUrl());
jmctx.setCurrentSampler(context);
@@ -192,7 +192,7 @@ public class TestAnchorModifier extends
String responseText = "<html><head><title>Test page</title></head><body>"
+ "<a href=\"../index.html\">Goto index page</a></body></html>";
HTTPSampleResult result = new HTTPSampleResult();
- result.setResponseData(responseText.getBytes());
+ result.setResponseData(responseText, null);
result.setSampleLabel(context.toString());
result.setURL(context.getUrl());
jmctx.setCurrentSampler(context);
@@ -210,7 +210,7 @@ public class TestAnchorModifier extends
+ "<a href=\"/home/index.html?param1=value1\">" + "Goto index page</a></body></html>";
HTTPSampleResult result = new HTTPSampleResult();
String newUrl = config.getUrl().toString();
- result.setResponseData(responseText.getBytes());
+ result.setResponseData(responseText, null);
result.setSampleLabel(context.toString());
result.setURL(context.getUrl());
jmctx.setCurrentSampler(context);
@@ -227,7 +227,7 @@ public class TestAnchorModifier extends
+ "<a href=\"/home/index.html?param1=value1\">" + "Goto index page</a></body></html>";
HTTPSampleResult result = new HTTPSampleResult();
String newUrl = config.getUrl().toString();
- result.setResponseData(responseText.getBytes());
+ result.setResponseData(responseText, null);
result.setSampleLabel(context.toString());
result.setURL(context.getUrl());
jmctx.setCurrentSampler(context);
@@ -243,7 +243,7 @@ public class TestAnchorModifier extends
String responseText = "<html><head><title>Test page</title></head><body>"
+ "<a href=\"/home/index.html?param1=value1\">" + "Goto index page</a></body></html>";
HTTPSampleResult result = new HTTPSampleResult();
- result.setResponseData(responseText.getBytes());
+ result.setResponseData(responseText, null);
result.setSampleLabel(context.toString());
result.setURL(context.getUrl());
jmctx.setCurrentSampler(context);
@@ -263,7 +263,7 @@ public class TestAnchorModifier extends
+ "<form action=\"index.html\" method=\"POST\">" + "<input type=\"checkbox\" name=\"test\""
+ " value=\"goto\">Goto index page</form></body></html>";
HTTPSampleResult result = new HTTPSampleResult();
- result.setResponseData(responseText.getBytes());
+ result.setResponseData(responseText, null);
result.setSampleLabel(context.toString());
result.setURL(context.getUrl());
jmctx.setCurrentSampler(context);
@@ -283,7 +283,7 @@ public class TestAnchorModifier extends
+ "<form action=\"index.html\" method=\"POST\">" + "<input type=\"checkbox\" name=\"te$st\""
+ " value=\"goto\">Goto index page</form></body></html>";
HTTPSampleResult result = new HTTPSampleResult();
- result.setResponseData(responseText.getBytes());
+ result.setResponseData(responseText, null);
result.setSampleLabel(context.toString());
result.setURL(context.getUrl());
jmctx.setCurrentSampler(context);
@@ -307,7 +307,7 @@ public class TestAnchorModifier extends
+ " value=\"" + htmlEncodedFixture + "\">Goto index page</form></body></html>";
HTTPSampleResult result = new HTTPSampleResult();
- result.setResponseData(responseText.getBytes());
+ result.setResponseData(responseText, null);
result.setSampleLabel(context.toString());
result.setURL(context.getUrl());
jmctx.setCurrentSampler(context);
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java?rev=937663&r1=937662&r2=937663&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java Sat Apr 24 17:56:44 2010
@@ -58,7 +58,7 @@ public class TestURLRewritingModifier ex
public void testGrabSessionId() throws Exception {
String html = "location: http://server.com/index.html" + "?session_id=jfdkjdkf%20jddkfdfjkdjfdf%22;";
response = new SampleResult();
- response.setResponseData(html.getBytes());
+ response.setResponseData(html, null);
mod.setArgumentName("session_id");
HTTPSamplerBase sampler = createSampler();
sampler.addArgument("session_id", "adfasdfdsafasdfasd");
@@ -74,7 +74,7 @@ public class TestURLRewritingModifier ex
public void testGrabSessionId2() throws Exception {
String html = "<a href=\"http://server.com/index.html?" + "session_id=jfdkjdkfjddkfdfjkdjfdf\">";
response = new SampleResult();
- response.setResponseData(html.getBytes());
+ response.setResponseData(html, null);
mod.setArgumentName("session_id");
HTTPSamplerBase sampler = createSampler();
context.setCurrentSampler(sampler);
@@ -96,7 +96,7 @@ public class TestURLRewritingModifier ex
public void testGrabSessionId3() throws Exception {
String html = "href='index.html?session_id=jfdkjdkfjddkfdfjkdjfdf'";
response = new SampleResult();
- response.setResponseData(html.getBytes());
+ response.setResponseData(html, null);
mod.setArgumentName("session_id");
HTTPSamplerBase sampler = createSampler();
context.setCurrentSampler(sampler);
@@ -109,7 +109,7 @@ public class TestURLRewritingModifier ex
public void testGrabSessionIdEndedInTab() throws Exception {
String html = "href='index.html?session_id=jfdkjdkfjddkfdfjkdjfdf\t";
response = new SampleResult();
- response.setResponseData(html.getBytes());
+ response.setResponseData(html, null);
mod.setArgumentName("session_id");
HTTPSamplerBase sampler = createSampler();
context.setCurrentSampler(sampler);
@@ -122,7 +122,7 @@ public class TestURLRewritingModifier ex
public void testGrabSessionId4() throws Exception {
String html = "href='index.html;%24sid%24KQNq3AAADQZoEQAxlkX8uQV5bjqVBPbT'";
response = new SampleResult();
- response.setResponseData(html.getBytes());
+ response.setResponseData(html, null);
mod.setArgumentName("%24sid%24");
mod.setPathExtension(true);
mod.setPathExtensionNoEquals(true);
@@ -137,7 +137,7 @@ public class TestURLRewritingModifier ex
public void testGrabSessionId5() throws Exception {
String html = "location: http://server.com/index.html" + "?session[33]=jfdkjdkf%20jddkfdfjkdjfdf%22;";
response = new SampleResult();
- response.setResponseData(html.getBytes());
+ response.setResponseData(html, null);
mod.setArgumentName("session[33]");
HTTPSamplerBase sampler = createSampler();
sampler.addArgument("session[33]", "adfasdfdsafasdfasd");
@@ -163,7 +163,7 @@ public class TestURLRewritingModifier ex
};
for (int i = 0; i < html.length; i++) {
response = new SampleResult();
- response.setResponseData(html[i].getBytes());
+ response.setResponseData(html[i], null);
URLRewritingModifier newMod = new URLRewritingModifier();
newMod.setThreadContext(context);
newMod.setArgumentName("sid");
@@ -182,7 +182,7 @@ public class TestURLRewritingModifier ex
String html =
"<a href=\"#\" onclick=\"$(\'frame\').src=\'/index?param1=bla&sessionid=xyzxyzxyz\\'";
response = new SampleResult();
- response.setResponseData(html.getBytes());
+ response.setResponseData(html, null);
mod.setArgumentName("sessionid");
HTTPSamplerBase sampler = createSampler();
sampler.addArgument("sessionid", "xyzxyzxyz");
@@ -206,7 +206,7 @@ public class TestURLRewritingModifier ex
newMod.setPathExtension(false);
for (int i = 0; i < html.length; i++) {
response = new SampleResult();
- response.setResponseData(html[i].getBytes());
+ response.setResponseData(html[i], null);
HTTPSamplerBase sampler = createSampler();
context.setCurrentSampler(sampler);
context.setPreviousResult(response);
@@ -228,7 +228,7 @@ public class TestURLRewritingModifier ex
newMod.setShouldCache(false);
for (int i = 0; i < html.length/2; i++) {
response = new SampleResult();
- response.setResponseData(html[i*2].getBytes());
+ response.setResponseData(html[i*2], null);
HTTPSamplerBase sampler = createSampler();
context.setCurrentSampler(sampler);
context.setPreviousResult(response);