svn commit: r653152 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java

[sebb]

Author: sebb
Date: Sat May  3 15:04:06 2008
New Revision: 653152

URL: http://svn.apache.org/viewvc?rev=653152&view=rev
Log:
Specify encoding

Modified:
    
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.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=653152&r1=653151&r2=653152&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
 Sat May  3 15:04:06 2008
@@ -29,6 +29,7 @@
 import org.apache.jmeter.junit.JMeterTestCase;
 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) {
@@ -231,7 +232,7 @@
         String contentEncoding = "";
         String param1Value = "yes";
         String param2Value = "0+5 -\u00c5\uc385%C3%85";
-        String param2ValueEncoded = URLEncoder.encode(param2Value);
+        String param2ValueEncoded = URLEncoder.encode(param2Value,"UTF-8");
         String testGetRequest = 
             "GET " + url
             + "?param1=" + param1Value + "&param2=" + param2ValueEncoded + " "
@@ -291,7 +292,7 @@
         String contentEncoding = "";
         String param1Value = "yes";
         String param2Value = "0+5 -\u00c5%C3%85";
-        String param2ValueEncoded = URLEncoder.encode(param2Value);
+        String param2ValueEncoded = URLEncoder.encode(param2Value,"UTF-8");
         String postBody = "param1=" + param1Value + "&param2=" + 
param2ValueEncoded + "\r\n"; 
         String testPostRequest = 
             "POST " + url + " HTTP/1.1\r\n"
@@ -465,9 +466,10 @@
         // Check arguments
         Arguments arguments = s.getArguments();
         assertEquals(0, arguments.getArgumentCount());
-        assertEquals(fileFieldValue, s.getFileField());
-        assertEquals(fileName, s.getFilename());
-        assertEquals(mimeType, s.getMimetype());
+        HTTPFileArg file = s.getFirstHTTPFileArg();
+        assertEquals(fileFieldValue, file.getParamName());
+        assertEquals(fileName, file.getPath());
+        assertEquals(mimeType, file.getMimeType());
     }        
 
     private String createMultipartFormBody(String titleValue, String 
descriptionValue, String contentEncoding, boolean includeExtraHeaders, String 
boundary, String endOfLine) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]