jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1836667 - in /jmeter/trunk: bin/ bin/report-template/content/pages/ bin/testfiles/ src/core/org/apache/jmeter/samplers/ src/protocol/http/org/apache/jmeter/protocol/http/sampler/ test/src/org/apache/jmeter/save/ xdocs/
Date Wed, 25 Jul 2018 20:23:50 GMT
Author: pmouawad
Date: Wed Jul 25 20:23:50 2018
New Revision: 1836667

URL: http://svn.apache.org/viewvc?rev=1836667&view=rev
Log:
Bug 62550 - Modify SubResult Naming Policy
This also fixed Bug 60917 - Load Test with embedded resources download : Hits per seconds
does not take into account the downloaded resources
Bugzilla Id: 62550

Modified:
    jmeter/trunk/bin/jmeter.properties
    jmeter/trunk/bin/report-template/content/pages/Throughput.html.fmkr
    jmeter/trunk/bin/testfiles/jmeter-batch.properties
    jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
    jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
    jmeter/trunk/test/src/org/apache/jmeter/save/TestCSVSaveService.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1836667&r1=1836666&r2=1836667&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Wed Jul 25 20:23:50 2018
@@ -507,7 +507,7 @@ remote_hosts=127.0.0.1
 #jmeter.save.saveservice.bytes=true
 # Only available with HttpClient4
 #jmeter.save.saveservice.sent_bytes=true
-#jmeter.save.saveservice.url=false
+#jmeter.save.saveservice.url=true
 #jmeter.save.saveservice.filename=false
 #jmeter.save.saveservice.hostname=false
 #jmeter.save.saveservice.thread_counts=true

Modified: jmeter/trunk/bin/report-template/content/pages/Throughput.html.fmkr
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/pages/Throughput.html.fmkr?rev=1836667&r1=1836666&r2=1836667&view=diff
==============================================================================
--- jmeter/trunk/bin/report-template/content/pages/Throughput.html.fmkr (original)
+++ jmeter/trunk/bin/report-template/content/pages/Throughput.html.fmkr Wed Jul 25 20:23:50
2018
@@ -159,7 +159,7 @@
                 <div class="col-lg-12 portlet" id="hitsPerSecond">
                     <div class="panel panel-default">
                         <div class="panel-heading portlet-header">
-                           <i class="fa fa-bar-chart-o fa-fw"> </i>  <span
type="button" class="dropdown-toggle click-title span-title" data-toggle="collapse" href="#bodyHitsPerSecond"
aria-expanded="true" aria-controls="bodyHitsPerSecond">Hits Per Second (excluding embedded
resources)</span>
+                           <i class="fa fa-bar-chart-o fa-fw"> </i>  <span
type="button" class="dropdown-toggle click-title span-title" data-toggle="collapse" href="#bodyHitsPerSecond"
aria-expanded="true" aria-controls="bodyHitsPerSecond">Hits Per Second</span>
                            <div class="pull-right">
                                 <div class="btn-group">
                                     <a class="btn btn-link btn-xs">
@@ -206,7 +206,7 @@
                     <div class="panel panel-default">
                         <div class="panel-heading portlet-header">
                             <i class="fa fa-bar-chart-o fa-fw"></i>
-                            <span type="button" class="dropdown-toggle click-title span-title"
data-toggle="collapse" href="#bodyCodesPerSecond" aria-expanded="true" aria-controls="bodyCodesPerSecond">Codes
Per Second (excluding embedded resources)</span>
+                            <span type="button" class="dropdown-toggle click-title span-title"
data-toggle="collapse" href="#bodyCodesPerSecond" aria-expanded="true" aria-controls="bodyCodesPerSecond">Codes
Per Second</span>
                             <div class="pull-right">
                                 <div class="btn-group">
                                     <a class="btn btn-link btn-xs">

Modified: jmeter/trunk/bin/testfiles/jmeter-batch.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/jmeter-batch.properties?rev=1836667&r1=1836666&r2=1836667&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/jmeter-batch.properties (original)
+++ jmeter/trunk/bin/testfiles/jmeter-batch.properties Wed Jul 25 20:23:50 2018
@@ -28,6 +28,8 @@ jmeter.save.saveservice.idle_time=false
 jmeter.save.saveservice.connect_time=false
 # Since JMeter 3.1, defaults for this property is true
 jmeter.save.saveservice.sent_bytes=false
+# Since JMeter 5.0, defaults for this property is true
+jmeter.save.saveservice.url=false
 
 # add some context in case tests fail (.jtl files are not compared)
 jmeter.save.saveservice.responseHeaders=true

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1836667&r1=1836666&r2=1836667&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Wed Jul 25 20:23:50
2018
@@ -267,6 +267,8 @@ public class SampleResult implements Ser
     private URL location;
 
     private transient boolean ignore;
+    
+    private transient int subResultIndex;
 
     /**
      * Cache for responseData as string to avoid multiple computations
@@ -657,6 +659,7 @@ public class SampleResult implements Ser
         if (subResults == null) {
             subResults = new ArrayList<>();
         }
+        subResult.setSampleLabel(getSampleLabel()+"-"+subResultIndex++);
         subResults.add(subResult);
         subResult.setParent(this);
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java?rev=1836667&r1=1836666&r2=1836667&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java Wed Jul
25 20:23:50 2018
@@ -332,7 +332,7 @@ public class SampleSaveConfiguration imp
         
         SENT_BYTES = TRUE.equalsIgnoreCase(props.getProperty(SAVE_SENT_BYTES_PROP, TRUE));
 
-        URL = TRUE.equalsIgnoreCase(props.getProperty(SAVE_URL_PROP, FALSE));
+        URL = TRUE.equalsIgnoreCase(props.getProperty(SAVE_URL_PROP, TRUE));
 
         FILE_NAME = TRUE.equalsIgnoreCase(props.getProperty(SAVE_FILENAME_PROP, FALSE));
 

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1836667&r1=1836666&r2=1836667&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
Wed Jul 25 20:23:50 2018
@@ -803,7 +803,7 @@ public class HTTPHC4Impl extends HTTPHCA
     protected HTTPSampleResult createSampleResult(URL url, String method) {
         HTTPSampleResult res = new HTTPSampleResult();
 
-        res.setSampleLabel(url.toString()); // May be replaced later
+        res.setSampleLabel(this.testElement.getName());
         res.setHTTPMethod(method);
         res.setURL(url);
         

Modified: jmeter/trunk/test/src/org/apache/jmeter/save/TestCSVSaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/save/TestCSVSaveService.java?rev=1836667&r1=1836666&r2=1836667&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/save/TestCSVSaveService.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/save/TestCSVSaveService.java Wed Jul 25 20:23:50
2018
@@ -24,6 +24,8 @@ import static org.junit.Assert.fail;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URL;
 
 import org.apache.jmeter.junit.JMeterTestCase;
 import org.apache.jmeter.samplers.SampleEvent;
@@ -156,15 +158,15 @@ public class TestCSVSaveService extends
     // if this test fails, check whether the default was intentionally changed or not
     public void testHeader() {
         final String HDR = "timeStamp,elapsed,label,responseCode,responseMessage,threadName,dataType,success,"
-                + "failureMessage,bytes,sentBytes,grpThreads,allThreads,Latency,IdleTime,Connect";
+                + "failureMessage,bytes,sentBytes,grpThreads,allThreads,URL,Latency,IdleTime,Connect";
         assertEquals("Header text has changed", HDR, CSVSaveService.printableFieldNamesToString());
     }
 
     @Test
     // sample format should not change unexpectedly
     // if this test fails, check whether the default was intentionally changed or not
-    public void testSample() {
-        final String RESULT = "1,2,3,4,5,6,7,true,,8,9,10,11,12,13,14";
+    public void testSample() throws MalformedURLException {
+        final String RESULT = "1,2,3,4,5,6,7,true,,8,9,10,11,https://jmeter.apache.org,12,13,14";
         SampleResult result = new SampleResult();
         result.setSaveConfig(new SampleSaveConfiguration());
         result.setStampAndTime(1, 2);
@@ -175,6 +177,7 @@ public class TestCSVSaveService extends
         result.setDataType("7");
         result.setSuccessful(true);
         result.setBytes(8L);
+        result.setURL(new URL("https://jmeter.apache.org"));
         result.setSentBytes(9);
         result.setGroupThreads(10);
         result.setAllThreads(11);

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1836667&r1=1836666&r2=1836667&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Jul 25 20:23:50 2018
@@ -137,6 +137,8 @@ this behaviour, set <code>httpclient.res
     <li><bug>62166</bug>Report/Dashboard: Provide ability to register custom
graphs and metrics in the JMeter Dashboard. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
     <li><bug>62542</bug>Report/Dashboard : Display more information on
filters when graph is empty. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
     <li><bug>62426</bug>Optimize performance of report generation. Based
on feedback by Allen (444104595 at qq.com)</li>
+    <li><bug>62550</bug>Modify SubResult Naming Policy</li>
+    <li><bug>60917</bug>Load Test with embedded resources download : Hits
per seconds does not take into account the downloaded resources</li>
 </ul>
 
 <h3>General</h3>



Mime
View raw message