Author: pmouawad Date: Sat Jul 28 14:14:58 2018 New Revision: 1836911 URL: http://svn.apache.org/viewvc?rev=1836911&view=rev Log: Bug 62550 - Modify SubResult Naming Policy
Bugzilla Id: 62550 Modified: jmeter/trunk/bin/testfiles/Bug52310.xml jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.xml jmeter/trunk/bin/testfiles/TEST_HTTP_HttpClient4.xml jmeter/trunk/bin/testfiles/TEST_HTTP_Java.xml jmeter/trunk/bin/testfiles/TestRedirectionPolicies.xml Modified: jmeter/trunk/bin/testfiles/Bug52310.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/Bug52310.xml?rev=1836911&r1=1836910&r2=1836911&view=diff ============================================================================== --- jmeter/trunk/bin/testfiles/Bug52310.xml (original) +++ jmeter/trunk/bin/testfiles/Bug52310.xml Sat Jul 28 14:14:58 2018 @@ -2,16 +2,16 @@ <testResults version="1.2"> <sample s="true" lb="ComputeIPAddr" rc="200" rm="OK" dt="text"/> <httpSample s="true" lb="HTTP-Request-HC31" rc="200" rm="OK" dt="text"> - <httpSample s="true" lb="http://jmeter.apache.org/" rc="200" rm="OK" dt="text"/> - <httpSample s="true" lb="http://jmeter.apache.org/css/new-style.css" rc="200" rm="OK" dt="text"/> - <httpSample s="true" lb="http://jmeter.apache.org/images/asf-logo.svg" rc="200" rm="OK" dt="bin"/> - <httpSample s="true" lb="http://jmeter.apache.org/images/logo.svg" rc="200" rm="OK" dt="bin"/> + <httpSample s="true" lb="HTTP-Request-HC31-0" rc="200" rm="OK" dt="text"/> + <httpSample s="true" lb="HTTP-Request-HC31-1" rc="200" rm="OK" dt="text"/> + <httpSample s="true" lb="HTTP-Request-HC31-2" rc="200" rm="OK" dt="bin"/> + <httpSample s="true" lb="HTTP-Request-HC31-3" rc="200" rm="OK" dt="bin"/> </httpSample> <httpSample s="true" lb="HTTP-Request-HC4" rc="200" rm="OK" dt="text"> - <httpSample s="true" lb="http://jmeter.apache.org/" rc="200" rm="OK" dt="text"/> - <httpSample s="true" lb="http://jmeter.apache.org/css/new-style.css" rc="200" rm="OK" dt="text"/> - <httpSample s="true" lb="http://jmeter.apache.org/images/asf-logo.svg" rc="200" rm="OK" dt="bin"/> - <httpSample s="true" lb="http://jmeter.apache.org/images/logo.svg" rc="200" rm="OK" dt="bin"/> + <httpSample s="true" lb="HTTP-Request-HC4-0" rc="200" rm="OK" dt="text"/> + <httpSample s="true" lb="HTTP-Request-HC4-1" rc="200" rm="OK" dt="text"/> + <httpSample s="true" lb="HTTP-Request-HC4-2" rc="200" rm="OK" dt="bin"/> + <httpSample s="true" lb="HTTP-Request-HC4-3" rc="200" rm="OK" dt="bin"/> </httpSample> </testResults> Modified: jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.xml?rev=1836911&r1=1836910&r2=1836911&view=diff ============================================================================== --- jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.xml (original) +++ jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.xml Sat Jul 28 14:14:58 2018 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <testResults version="1.2"> <httpSample s="true" lb="Download embedded" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="76146" sc="1" ec="0" ng="1" na="1"> - <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="40176" sc="1" ec="0" ng="1" na="1"> + <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-0" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="40176" sc="1" ec="0" ng="1" na="1"> <responseHeader class="java.lang.String"></responseHeader> <requestHeader class="java.lang.String"></requestHeader> <responseFile class="java.lang.String"></responseFile> @@ -10,7 +10,7 @@ <queryString class="java.lang.String"></queryString> <java.net.URL>file:testfiles/HTMLParserTestFile_2.html</java.net.URL> </httpSample> - <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/style.css" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="1321" sc="1" ec="0" ng="1" na="1"> + <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-1" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="1321" sc="1" ec="0" ng="1" na="1"> <responseHeader class="java.lang.String"></responseHeader> <requestHeader class="java.lang.String"></requestHeader> <responseFile class="java.lang.String"></responseFile> @@ -19,8 +19,8 @@ <queryString class="java.lang.String"></queryString> <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/style.css</java.net.URL> </httpSample> - <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="5819" sc="1" ec="0" ng="1" na="1"> - <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm" rc="200" rm="OK" tn="" dt="text" de="UTF-8" by="398" sc="1" ec="0" ng="0" na="0"> + <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-2" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="UTF-8" by="5819" sc="1" ec="0" ng="1" na="1"> + <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm-0" rc="200" rm="OK" tn="" dt="text" de="UTF-8" by="398" sc="1" ec="0" ng="0" na="0"> <responseHeader class="java.lang.String"></responseHeader> <requestHeader class="java.lang.String"></requestHeader> <responseFile class="java.lang.String"></responseFile> @@ -29,7 +29,7 @@ <queryString class="java.lang.String"></queryString> <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm</java.net.URL> </httpSample> - <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/halfbanner_data/2011-na-234x60.png" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="5421" sc="1" ec="0" ng="0" na="0"> + <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm-1" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="5421" sc="1" ec="0" ng="0" na="0"> <responseHeader class="java.lang.String"></responseHeader> <requestHeader class="java.lang.String"></requestHeader> <responseFile class="java.lang.String"></responseFile> @@ -46,7 +46,7 @@ <queryString class="java.lang.String"></queryString> <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/halfbanner.htm</java.net.URL> </httpSample> - <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/jakarta-logo.gif" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="8584" sc="1" ec="0" ng="1" na="1"> + <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-3" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="8584" sc="1" ec="0" ng="1" na="1"> <responseHeader class="java.lang.String"></responseHeader> <requestHeader class="java.lang.String"></requestHeader> <responseFile class="java.lang.String"></responseFile> @@ -55,7 +55,7 @@ <queryString class="java.lang.String"></queryString> <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/jakarta-logo.gif</java.net.URL> </httpSample> - <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/logo.jpg" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="8886" sc="1" ec="0" ng="1" na="1"> + <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-4" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="8886" sc="1" ec="0" ng="1" na="1"> <responseHeader class="java.lang.String"></responseHeader> <requestHeader class="java.lang.String"></requestHeader> <responseFile class="java.lang.String"></responseFile> @@ -64,7 +64,7 @@ <queryString class="java.lang.String"></queryString> <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/logo.jpg</java.net.URL> </httpSample> - <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/http-config-example.png" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="3064" sc="1" ec="0" ng="1" na="1"> + <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-5" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="3064" sc="1" ec="0" ng="1" na="1"> <responseHeader class="java.lang.String"></responseHeader> <requestHeader class="java.lang.String"></requestHeader> <responseFile class="java.lang.String"></responseFile> @@ -73,7 +73,7 @@ <queryString class="java.lang.String"></queryString> <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/http-config-example.png</java.net.URL> </httpSample> - <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/scoping1.png" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="2395" sc="1" ec="0" ng="1" na="1"> + <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-6" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="2395" sc="1" ec="0" ng="1" na="1"> <responseHeader class="java.lang.String"></responseHeader> <requestHeader class="java.lang.String"></requestHeader> <responseFile class="java.lang.String"></responseFile> @@ -82,7 +82,7 @@ <queryString class="java.lang.String"></queryString> <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/scoping1.png</java.net.URL> </httpSample> - <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/scoping2.png" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="2641" sc="1" ec="0" ng="1" na="1"> + <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-7" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="2641" sc="1" ec="0" ng="1" na="1"> <responseHeader class="java.lang.String"></responseHeader> <requestHeader class="java.lang.String"></requestHeader> <responseFile class="java.lang.String"></responseFile> @@ -91,7 +91,7 @@ <queryString class="java.lang.String"></queryString> <java.net.URL>file:testfiles/HTMLParserTestFile_2_files/scoping2.png</java.net.URL> </httpSample> - <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2_files/scoping3.png" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="3260" sc="1" ec="0" ng="1" na="1"> + <httpSample s="true" lb="file:testfiles/HTMLParserTestFile_2.html-8" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" de="" by="3260" sc="1" ec="0" ng="1" na="1"> <responseHeader class="java.lang.String"></responseHeader> <requestHeader class="java.lang.String"></requestHeader> <responseFile class="java.lang.String"></responseFile> Modified: jmeter/trunk/bin/testfiles/TEST_HTTP_HttpClient4.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/TEST_HTTP_HttpClient4.xml?rev=1836911&r1=1836910&r2=1836911&view=diff ============================================================================== --- jmeter/trunk/bin/testfiles/TEST_HTTP_HttpClient4.xml (original) +++ jmeter/trunk/bin/testfiles/TEST_HTTP_HttpClient4.xml Sat Jul 28 14:14:58 2018 @@ -123,28 +123,28 @@ <failure>false</failure> <error>false</error> </assertionResult> - <httpSample s="true" lb="http://localhost:8081/" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="false" lb="http://localhost:8081/redirect" rc="Non HTTP response code: java.io.IOException" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-0" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-1" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-2" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-3" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-4" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-5" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-6" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-7" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-8" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-9" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-10" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-11" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-12" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-13" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-14" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-15" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-16" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-17" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-18" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-19" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-20" rc="302" dt="text"/> + <httpSample s="false" lb="HR-FollowRedirect-21" rc="Non HTTP response code: java.io.IOException" dt="text"/> </httpSample> <httpSample s="true" lb="HR-FollowRedirect" rc="Non HTTP response code: org.apache.http.client.ClientProtocolException" 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=1836911&r1=1836910&r2=1836911&view=diff ============================================================================== --- jmeter/trunk/bin/testfiles/TEST_HTTP_Java.xml (original) +++ jmeter/trunk/bin/testfiles/TEST_HTTP_Java.xml Sat Jul 28 14:14:58 2018 @@ -99,28 +99,28 @@ <failure>false</failure> <error>false</error> </assertionResult> - <httpSample s="true" lb="http://localhost:8081/" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="true" lb="http://localhost:8081/redirect" rc="302" dt="text"/> - <httpSample s="false" lb="http://localhost:8081/redirect" rc="Non HTTP response code: java.io.IOException" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-0" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-1" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-2" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-3" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-4" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-5" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-6" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-7" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-8" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-9" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-10" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-11" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-12" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-13" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-14" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-15" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-16" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-17" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-18" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-19" rc="302" dt="text"/> + <httpSample s="true" lb="HR-FollowRedirect-20" rc="302" dt="text"/> + <httpSample s="false" lb="HR-FollowRedirect-21" rc="Non HTTP response code: java.io.IOException" dt="text"/> </httpSample> <httpSample s="true" lb="HR-FollowRedirect" rc="Non HTTP response code: java.net.ProtocolException" dt="text"> <assertionResult> Modified: jmeter/trunk/bin/testfiles/TestRedirectionPolicies.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/TestRedirectionPolicies.xml?rev=1836911&r1=1836910&r2=1836911&view=diff ============================================================================== --- jmeter/trunk/bin/testfiles/TestRedirectionPolicies.xml (original) +++ jmeter/trunk/bin/testfiles/TestRedirectionPolicies.xml Sat Jul 28 14:14:58 2018 @@ -45,8 +45,8 @@ <failure>false</failure> <error>false</error> </assertionResult> - <httpSample s="true" lb="http://httpbin.org/redirect/1" rc="302" rm="FOUND" dt="text"/> - <httpSample s="true" lb="http://httpbin.org/get" rc="200" rm="OK" dt="text"/> + <httpSample s="true" lb="HR_FollowRedirect-0" rc="302" rm="FOUND" dt="text"/> + <httpSample s="true" lb="HR_FollowRedirect-1" rc="200" rm="OK" dt="text"/> </httpSample> <httpSample s="true" lb="HR_NoAutoRedirect" rc="302" rm="FOUND" dt="text"> <assertionResult> @@ -76,8 +76,8 @@ <failure>false</failure> <error>false</error> </assertionResult> - <httpSample s="true" lb="http://httpbin.org/redirect/1" rc="302" rm="FOUND" dt="text"/> - <httpSample s="true" lb="http://httpbin.org/get" rc="200" rm="OK" dt="text"/> + <httpSample s="true" lb="HR_FollowRedirect-0" rc="302" rm="FOUND" dt="text"/> + <httpSample s="true" lb="HR_FollowRedirect-1" rc="200" rm="OK" dt="text"/> </httpSample> <httpSample s="true" lb="HR_AutoRedirect" rc="200" rm="OK" dt="text"> <assertionResult>