Author: sebb
Date: Mon Feb 1 23:16:10 2010
New Revision: 905446
URL: http://svn.apache.org/viewvc?rev=905446&view=rev
Log:
Stop using deprecated methods
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java?rev=905446&r1=905445&r2=905446&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
Mon Feb 1 23:16:10 2010
@@ -31,6 +31,7 @@
import org.apache.jmeter.protocol.http.control.HeaderManager;
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
+import org.apache.jmeter.protocol.http.util.HTTPFileArg;
public class TestHttpRequestHdr extends JMeterTestCase {
public TestHttpRequestHdr(String name) {
@@ -473,7 +474,6 @@
assertEquals("value",header.getValue());
}
- @SuppressWarnings("deprecation")
public void testPostMultipartFileUpload() throws Exception {
String url = "http://localhost/matrix.html";;
// A HTTP POST request, multipart/form-data, simple values,
@@ -496,9 +496,10 @@
// Check arguments
Arguments arguments = s.getArguments();
assertEquals(0, arguments.getArgumentCount());
- assertEquals(fileFieldValue, s.getFileField());
- assertEquals(fileName, s.getFilename());
- assertEquals(mimeType, s.getMimetype());
+ HTTPFileArg hfa = s.getHTTPFiles()[0]; // Assume there's at least one
file
+ assertEquals(fileFieldValue, hfa.getParamName());
+ assertEquals(fileName, hfa.getPath());
+ assertEquals(mimeType, hfa.getMimeType());
}
private String createMultipartFormBody(String titleValue, String
descriptionValue, String contentEncoding, boolean includeExtraHeaders, String
boundary, String endOfLine) {
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java?rev=905446&r1=905445&r2=905446&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
Mon Feb 1 23:16:10 2010
@@ -36,6 +36,7 @@
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
+import org.apache.jmeter.protocol.http.util.HTTPFileArg;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -588,16 +589,9 @@
*
* @param httpSampler
*/
- @SuppressWarnings("deprecation")
private void setupFilepart(HTTPSampler httpSampler, String fileField, File
file, String mimeType) {
- httpSampler.setFileField(fileField);
- if(file != null) {
- httpSampler.setFilename(file.getAbsolutePath());
- }
- else {
- httpSampler.setFilename("");
- }
- httpSampler.setMimetype(mimeType);
+ HTTPFileArg[] hfa = {new HTTPFileArg(file == null ? "" :
file.getAbsolutePath(), fileField, mimeType)};
+ httpSampler.setHTTPFiles(hfa);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
