jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1834399 [2/2] - in /jmeter/trunk: bin/ bin/report-template/ bin/report-template/content/js/ bin/report-template/content/pages/ src/core/org/apache/jmeter/report/dashboard/ src/core/org/apache/jmeter/report/processor/graph/ src/core/org/apa...
Date Tue, 26 Jun 2018 07:30:08 GMT
Added: jmeter/trunk/test/src/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java?rev=1834399&view=auto
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java
(added)
+++ jmeter/trunk/test/src/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java
Tue Jun 26 07:30:08 2018
@@ -0,0 +1,182 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.processor.graph.impl;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.jmeter.report.core.Sample;
+import org.apache.jmeter.report.core.SampleMetadata;
+import org.apache.jmeter.report.dashboard.JsonizerVisitor;
+import org.apache.jmeter.report.processor.MapResultData;
+import org.apache.jmeter.report.processor.ResultData;
+import org.apache.jmeter.report.processor.graph.GroupData;
+import org.apache.jmeter.report.processor.graph.GroupInfo;
+import org.apache.jmeter.report.processor.graph.SeriesData;
+import org.apache.jmeter.report.processor.graph.TimeStampKeysSelector;
+import org.apache.jmeter.save.CSVSaveService;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CustomGraphConsumerTest {
+    
+    private CustomGraphConsumer customGraphConsumer;
+    private MapResultData resultData;
+    private TimeStampKeysSelector keysSelector;
+    private Map<String, GroupInfo> map;
+    // data array can't be initialized in the init()
+    private String[] data = {"1527089951383", "0", "Read-compute", "200", "OK", "setupRegion
1-1", "true", "", "492", "0", "1", "1",
+            "null", "0", "0", "0", "/stream1a/master.m3u8?e=0&h=56345c61b7b415e0260c19963a153092",
"null", "5500000", "null",
+            "null", "null", "null", "null", "null", "null", "null", "null", "null", "null",
"null", "null", "null", "null"}; 
+    private SampleMetadata sampleMetaData = createTestMetaData();
+    
+    @Before
+    public void init() {
+        customGraphConsumer = new CustomGraphConsumer();
+        customGraphConsumer.setGranularity(60000);
+        customGraphConsumer.setTitle("graph title");
+        customGraphConsumer.setXAxis("X axis name");
+        customGraphConsumer.setYAxis("Y axis name");
+        customGraphConsumer.setContentMessage("content message");
+        customGraphConsumer.setSampleVariableName("responseMessage");
+        
+        map = customGraphConsumer.createGroupInfos();
+        
+        resultData = new MapResultData();
+    }
+
+    @Test
+    public void testGetters() {
+        assertThat(customGraphConsumer.getTitle(), equalTo("graph title"));
+        assertThat(customGraphConsumer.getXAxis(), equalTo("X axis name"));
+        assertThat(customGraphConsumer.getYAxis(), equalTo("Y axis name"));
+        assertThat(customGraphConsumer.getContentMessage(), equalTo("content message"));
+        assertThat(customGraphConsumer.getSampleVariableName(), equalTo(CSVSaveService.RESPONSE_MESSAGE));
+        assertThat(customGraphConsumer.getIsNativeSampleVariableName(), equalTo(false));
+        
+        // bytes is one of the native sample variables names
+        customGraphConsumer.setSampleVariableName("bytes");
+        assertThat(customGraphConsumer.getIsNativeSampleVariableName(), equalTo(true));
+    }
+    
+    
+    @Test
+    public void testInitializeExtraResults() {
+        customGraphConsumer.initializeExtraResults(resultData);
+        
+        JsonizerVisitor jsonizer = new JsonizerVisitor();
+        for(Entry<String, ResultData> entrySet : resultData.entrySet()) {
+            Object testedValue = entrySet.getValue().accept(jsonizer);
+            String key = entrySet.getKey();
+            
+            if(key.equals("granularity")) {
+                assertThat(testedValue, equalTo("60000"));
+            }else if(key.equals("X_Axis")) {
+                assertThat(testedValue, equalTo("\"X axis name\""));
+            }else if(key.equals("Y_Axis")) {
+                assertThat(testedValue, equalTo("\"Y axis name\""));
+            }else if(key.equals("sample_Metric_Name")) {
+                assertThat(testedValue, equalTo("\"responseMessage\""));
+            }else if(key.equals("content_Message")) {
+                assertThat(testedValue, equalTo("\"content message\""));
+            }
+        }
+    }
+    
+    @Test
+    public void testCreateTimeStampKeysSelector() {
+        keysSelector = new TimeStampKeysSelector();
+        keysSelector.setSelectBeginTime(false);
+        assertThat(customGraphConsumer.createTimeStampKeysSelector().getGranularity(), equalTo(keysSelector.getGranularity()));
+    }
+    
+    @Test
+    public void testCreateGroupInfos() {
+        // Testing defaults values
+        assertThat(map.containsKey("Generic group"), equalTo(true));
+        assertThat(map.containsKey("foo"), equalTo(false));
+        assertThat(map.get("Generic group").getAggregatorFactory().getClass().toString(),

+                equalTo("class org.apache.jmeter.report.processor.TimeRateAggregatorFactory"));
+        GroupData groupData = map.get("Generic group").getGroupData();
+        assertThat(groupData.getOverallSeries(), equalTo(null));
+        assertThat(groupData.getSeriesInfo(), equalTo(new HashMap<String, SeriesData>()));
+        
+        // Testing native sample variable
+        customGraphConsumer.setSampleVariableName("bytes");
+        Sample sample = new Sample(0, sampleMetaData, data);
+        Double testedValue = map.get("Generic group").getValueSelector().select("bytes",
sample);
+        assertThat(testedValue, equalTo((Double) 492.0));
+        
+        // Testing non-native sample variable
+        customGraphConsumer.setSampleVariableName("mm-miss");
+        testedValue = map.get("Generic group").getValueSelector().select("mm-miss", sample);
+        assertThat(testedValue, equalTo(null));
+        
+        // Testing empty data value, the change between data and data2
+        // is on the last value that switchs from "null" to ""
+        String[] data2 = {"1527089951383", "0", "Read-compute", "200", "OK", "setupRegion
1-1", "true", "", "492", "0", "1", "1",
+                "null", "0", "0", "0", "/stream1a/master.m3u8?e=0&h=56345c61b7b415e0260c19963a153092",
"null", "5500000", "null",
+                "null", "null", "null", "null", "null", "null", "null", "null", "null", "null",
"null", "null", "null", ""};
+        sample = new Sample(0, sampleMetaData, data2);
+        testedValue = map.get("Generic group").getValueSelector().select("mm-miss", sample);
+        assertThat(testedValue, equalTo(null));
+    }
+
+    // Test the exception when the column data is not a Double
+    @Test(expected=IllegalArgumentException.class)
+    public void testCreateGroupInfosExceptions() {
+        Sample sample = new Sample(0, sampleMetaData, data);
+        customGraphConsumer.setSampleVariableName("label");
+        
+        // The following line is giving the exception
+        map.get("Generic group").getValueSelector().select("label", sample);
+    }
+    
+    @Test
+    public void testSelectMetric() {
+        Sample sample = new Sample(0, sampleMetaData, data);
+        String testString = map.get("Generic group").getSeriesSelector().select(sample).toString();
+        assertThat(testString, equalTo("[responseMessage]"));
+    }
+    
+    // Create a static SampleMetadatObject
+    private SampleMetadata createTestMetaData() {
+        String columnsString = "timeStamp,elapsed,label,responseCode,responseMessage,threadName,success,failureMessage,bytes,sentBytes,"
+                + "grpThreads,allThreads,URL,Latency,IdleTime,Connect,\"stream\",\"aws_region\",\"bitrate\",\"ulp_buffer_fill\",\"ulp_lag_time\","
+                + "\"ulp_play_time\",\"ulp_lag_ratio\",\"lag_ratio_wo_bf\",\"ulp_dwn_time\",\"ulp_hits\",\"ulp_avg_chunk_time\","
+                + "\"ulp_avg_manifest_time\",\"mm-hit\",\"mm-miss\",\"cm-hit\",\"cm-miss\",\"ts-hit\",\"ts-miss\"";
+        String[] columns = new String[34];
+        int lastComa = 0;
+        int columnIndex = 0;
+        for(int i = 0; i < columnsString.length(); i++) {
+            if (columnsString.charAt(i)==',') {
+                columns[columnIndex] = columnsString.substring(lastComa, i);
+                lastComa=i+1;
+                columnIndex++;
+            }else if(i+1 == columnsString.length()) {
+                columns[columnIndex] = columnsString.substring(lastComa, i+1);
+            }
+        }
+        return new SampleMetadata(',',columns);
+    }
+    
+}

Propchange: jmeter/trunk/test/src/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/test/src/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumerTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1834399&r1=1834398&r2=1834399&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Tue Jun 26 07:30:08 2018
@@ -132,6 +132,7 @@ this behaviour, set <code>httpclient.res
 <ul>
     <li><bug>62243</bug>Dashboard : make option "<code>--forceDeleteResultFile</code>"/"<code>-f</code>"
option delete folder referenced by "<code>-o</code>" option</li>
     <li><bug>62367</bug>HTML Report Generator: Add Graph Total Transactions
per Second. Contributed mainly by Martha Laks (laks.martha at gmail.com)</li>
+    <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>
 </ul>
 
 <h3>General</h3>

Modified: jmeter/trunk/xdocs/usermanual/generating-dashboard.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/generating-dashboard.xml?rev=1834399&r1=1834398&r2=1834399&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/generating-dashboard.xml (original)
+++ jmeter/trunk/xdocs/usermanual/generating-dashboard.xml Tue Jun 26 07:30:08 2018
@@ -705,7 +705,36 @@ jmeter.reportgenerator.exporter.html.fil
                     </tbody>
                 </table>
             </subsection>
-            <subsection name="&sect-num;.5  Want to improve Report Dashboard ?" anchor="development">
+            <subsection name="&sect-num;.5 Generating customs graphs over time" anchor="customs_graphs">
+                <p>
+                            You can graph any sample_variable in CSV over time, you can customize
your graphs
+                            by settings their properties in the user.properties file.
+                            <br />
+                            They must use the id prefix <code>custom_</code>:
+                            <source>jmeter.reportgenerator.graph.custom_&lt;your_graph_name_id&gt;.property.&lt;your_option_name&gt;</source>
+                            To specify that this graph is a customized one :
+                            <source>jmeter.reportgenerator.graph.custom_&lt;your_graph_name_id&gt;.classname=org.apache.jmeter.report.processor.graph.impl.CustomGraphConsumer</source>
+                        </p>
+                        <properties>
+                            <property name="set_X_Axis" required="Yes">Sets the X axis
name of the graph.</property>
+                            <property name="set_Y_Axis" required="Yes">Sets the Y axis
name of the graph.</property>
+                            <property name="set_Content_Message" required="Yes">Sets
the displayed message when the cursor is on a point of the graph.</property>
+                            <property name="set_Sample_Variable_Name" required="Yes">Name
of the column you want to graph in the csv.</property>
+                        </properties>
+                        
+                        <p>Here is an example of a custom graph configuration that
graphs the variable <code>ts-hit</code>: </p>
+                        <source>
+jmeter.reportgenerator.graph.custom_testGraph.classname=org.apache.jmeter.report.processor.graph.impl.CustomGraphConsumer
+jmeter.reportgenerator.graph.custom_testGraph.title=Chunk Hit
+jmeter.reportgenerator.graph.custom_testGraph.property.set_Y_Axis=Number of Hits
+jmeter.reportgenerator.graph.custom_testGraph.set_X_Axis=Over Time
+jmeter.reportgenerator.graph.custom_testGraph.property.set_granularity=60000
+jmeter.reportgenerator.graph.custom_testGraph.property.set_Sample_Variable_Name=ts-hit
+jmeter.reportgenerator.graph.custom_testGraph.property.set_Content_Message=Number of Hits
:
+                        </source>
+            </subsection>
+            
+            <subsection name="&sect-num;.6  Want to improve Report Dashboard ?" anchor="development">
             If you want to contribute new graphs or improve current ones, you
             can read this <a href="../devguide-dashboard.html" >developer documentation</a>.<br/>
             Read this <a href="../building.html" >documentation</a> on contributing.



Mime
View raw message