From commits-return-8807-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org  Thu Apr  5 20:41:32 2018
Return-Path: <commits-return-8807-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org>
X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org
Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E715218E13
	for <apmail-jmeter-commits-archive@minotaur.apache.org>; Thu,  5 Apr 2018 20:41:31 +0000 (UTC)
Received: (qmail 34120 invoked by uid 500); 5 Apr 2018 20:41:31 -0000
Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org
Received: (qmail 34092 invoked by uid 500); 5 Apr 2018 20:41:31 -0000
Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jmeter.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jmeter.apache.org>
List-Post: <mailto:commits@jmeter.apache.org>
List-Id: <commits.jmeter.apache.org>
Reply-To: dev@jmeter.apache.org
Delivered-To: mailing list commits@jmeter.apache.org
Received: (qmail 34083 invoked by uid 99); 5 Apr 2018 20:41:31 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Apr 2018 20:41:31 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E64CB3A0057
	for <commits@jmeter.apache.org>; Thu,  5 Apr 2018 20:41:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1828477 - in /jmeter/trunk/bin/testfiles: TEST_HTTP.jmx
 TEST_HTTP_HttpClient4.xml TEST_HTTP_Java.xml
Date: Thu, 05 Apr 2018 20:41:30 -0000
To: commits@jmeter.apache.org
From: pmouawad@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20180405204130.E64CB3A0057@svn01-us-west.apache.org>

Author: pmouawad
Date: Thu Apr  5 20:41:30 2018
New Revision: 1828477

URL: http://svn.apache.org/viewvc?rev=1828477&view=rev
Log:
[Bug 60190] Content-Type is added for POST unconditionally
Fix test failure in Java
Bugzilla Id: 60190

Modified:
    jmeter/trunk/bin/testfiles/TEST_HTTP.jmx
    jmeter/trunk/bin/testfiles/TEST_HTTP_HttpClient4.xml
    jmeter/trunk/bin/testfiles/TEST_HTTP_Java.xml

Modified: jmeter/trunk/bin/testfiles/TEST_HTTP.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/TEST_HTTP.jmx?rev=1828477&r1=1828476&r2=1828477&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/TEST_HTTP.jmx (original)
+++ jmeter/trunk/bin/testfiles/TEST_HTTP.jmx Thu Apr  5 20:41:30 2018
@@ -776,7 +776,6 @@ mirrorServer.start();</stringProp>
               <stringProp name="-530323176">POST /test?name0=value0 HTTP/1.1</stringProp>
               <stringProp name="894172713">Connection: keep-alive</stringProp>
               <stringProp name="-1680100360">Accept-Encoding: gzip</stringProp>
-              <stringProp name="-1704395926">Content-Type: application/x-www-form-urlencoded</stringProp>
               <stringProp name="224767425">Content-Length: 12</stringProp>
               <stringProp name="2117109222">Host: localhost:8081</stringProp>
               <stringProp name="1052466409">User-Agent: </stringProp>
@@ -978,12 +977,20 @@ if(prev.getSamplerData().indexOf(textToC
             </collectionProp>
           </HeaderManager>
           <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="REE_contentType" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">request_headers</stringProp>
+            <stringProp name="RegexExtractor.refname">contentType</stringProp>
+            <stringProp name="RegexExtractor.regex">Content-Type: (.*)</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default">nv_contentType</stringProp>
+            <stringProp name="RegexExtractor.match_number">1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
             <collectionProp name="Asserion.test_strings">
               <stringProp name="-530323176">POST /test?name0=value0 HTTP/1.1</stringProp>
               <stringProp name="894172713">Connection: keep-alive</stringProp>
               <stringProp name="-1680100360">Accept-Encoding: gzip</stringProp>
-              <stringProp name="-1752268452">Content-Type: text/plain</stringProp>
               <stringProp name="224767427">Content-Length: 14</stringProp>
               <stringProp name="2117109222">Host: localhost:8081</stringProp>
               <stringProp name="1052466409">User-Agent: </stringProp>
@@ -995,6 +1002,19 @@ if(prev.getSamplerData().indexOf(textToC
             <stringProp name="Assertion.custom_message"></stringProp>
           </ResponseAssertion>
           <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings">
+              <stringProp name="-1049865380">nv_contentType</stringProp>
+              <stringProp name="817335912">text/plain</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">40</intProp>
+            <stringProp name="Assertion.custom_message"></stringProp>
+            <stringProp name="Assertion.scope">variable</stringProp>
+            <stringProp name="Scope.variable">contentType</stringProp>
+          </ResponseAssertion>
+          <hashTree/>
         </hashTree>
         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HR-POST_WITH_FILE" enabled="true">
           <elementProp name="HTTPsampler.Files" elementType="HTTPFileArgs">

Modified: jmeter/trunk/bin/testfiles/TEST_HTTP_HttpClient4.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/TEST_HTTP_HttpClient4.xml?rev=1828477&r1=1828476&r2=1828477&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/TEST_HTTP_HttpClient4.xml (original)
+++ jmeter/trunk/bin/testfiles/TEST_HTTP_HttpClient4.xml Thu Apr  5 20:41:30 2018
@@ -185,6 +185,11 @@
     <failure>false</failure>
     <error>false</error>
   </assertionResult>
+  <assertionResult>
+    <name>Response Assertion</name>
+    <failure>false</failure>
+    <error>false</error>
+  </assertionResult>
 </httpSample>
 <httpSample s="true" lb="HR-POST_WITH_FILE" rc="200" dt="text">
   <assertionResult>

Modified: jmeter/trunk/bin/testfiles/TEST_HTTP_Java.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/TEST_HTTP_Java.xml?rev=1828477&r1=1828476&r2=1828477&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/TEST_HTTP_Java.xml (original)
+++ jmeter/trunk/bin/testfiles/TEST_HTTP_Java.xml Thu Apr  5 20:41:30 2018
@@ -161,6 +161,11 @@
     <failure>false</failure>
     <error>false</error>
   </assertionResult>
+  <assertionResult>
+    <name>Response Assertion</name>
+    <failure>false</failure>
+    <error>false</error>
+  </assertionResult>
 </httpSample>
 <httpSample s="true" lb="HR-POST_WITH_FILE" rc="200" dt="text">
   <assertionResult>