svn commit: r1806384 - in /jmeter/trunk/bin/testfiles: TEST_HTTP.jmx TEST_HTTP_Java.csv

[pm...@apache.org]

Author: pmouawad
Date: Sun Aug 27 17:49:03 2017
New Revision: 1806384

URL: http://svn.apache.org/viewvc?rev=1806384&view=rev
Log:
Bug 61384 - Adding charset to multipart/form-data content type irritates IIS
Fix failing test:
- Java Implementation corrupts parameter name for UTF-8, so add a check
- Fix wrong CSV file for Java
Bugzilla Id: 61384

Modified:
    jmeter/trunk/bin/testfiles/TEST_HTTP.jmx
    jmeter/trunk/bin/testfiles/TEST_HTTP_Java.csv

Modified: jmeter/trunk/bin/testfiles/TEST_HTTP.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/TEST_HTTP.jmx?rev=1806384&r1=1806383&r2=1806384&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/TEST_HTTP.jmx (original)
+++ jmeter/trunk/bin/testfiles/TEST_HTTP.jmx Sun Aug 27 17:49:03 2017
@@ -893,7 +893,6 @@ mirrorServer.start();</stringProp>
               <stringProp name="1052466409">User-Agent: </stringProp>
               <stringProp name="-1722553038">Content-Type: multipart/form-data; boundary=</stringProp>
               <stringProp name="54777371">Content-Disposition: form-data; name=&quot;name1&quot;</stringProp>
-              <stringProp name="2102497404">; charset=UTF-8</stringProp>
               <stringProp name="-823812896">value1</stringProp>
               <stringProp name="-1299776663">boundary=${boundary}</stringProp>
               <stringProp name="182753948">${boundary}</stringProp>
@@ -909,9 +908,13 @@ mirrorServer.start();</stringProp>
             <stringProp name="cacheKey">9e8a05ef-13b4-408f-a030-2702cfff8a88</stringProp>
             <stringProp name="filename"></stringProp>
             <stringProp name="parameters"></stringProp>
-            <stringProp name="script">if(prev.getSamplerData().indexOf(&apos;Content-Disposition: form-data; name=&quot;安_param&quot;&apos;) &lt; 0) {
+            <stringProp name="script">String textToCheck =  &apos;Content-Disposition: form-data; name=&quot;安_param&quot;&apos;;
+if(&quot;Java&quot;.equals(props.getProperty(&quot;jmeter.httpsampler&quot;))) {
+	textToCheck =  &apos;Content-Disposition: form-data; name=&quot;?_param&quot;&apos;;
+}
+if(prev.getSamplerData().indexOf(textToCheck) &lt; 0) {
 	AssertionResult.setFailure(true);
-	AssertionResult.setFailureMessage(&quot;Request does not contains &apos;Content-Disposition: form-data; name=\&quot;安_param\&quot;&apos;&quot;);
+	AssertionResult.setFailureMessage(&quot;Request does not contains &apos;&quot;+textToCheck+&quot;&apos;&quot;);
 }
 </stringProp>
             <stringProp name="scriptLanguage">groovy</stringProp>

Modified: jmeter/trunk/bin/testfiles/TEST_HTTP_Java.csv
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/TEST_HTTP_Java.csv?rev=1806384&r1=1806383&r2=1806384&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/TEST_HTTP_Java.csv (original)
+++ jmeter/trunk/bin/testfiles/TEST_HTTP_Java.csv Sun Aug 27 17:49:03 2017
@@ -9,7 +9,7 @@ HR-FollowRedirect,Non HTTP response code
 HR-FollowRedirect,Non HTTP response code: java.net.ProtocolException,TG_TEST_REDIRECT 3-1,text,true
 HR-POST_WITH_PARAMETERS,200,TG_TEST_POST 4-1,text,true
 HR-POST_WITH_PARAMETERS_MULTIPART,200,TG_TEST_POST 4-1,text,true
-HR-POST_WITH_PARAMETERS_MULTIPART_UTF-8,TG_TEST_POST 4-1,text,true
+HR-POST_WITH_PARAMETERS_MULTIPART_UTF-8,200,TG_TEST_POST 4-1,text,true
 HR-POST_WITH_BODY,200,TG_TEST_POST 4-1,text,true
 HR-POST_WITH_FILE,200,TG_TEST_POST 4-1,text,true
 HR-POST_MULTIPART_WITH_FILE,200,TG_TEST_POST 4-1,text,true