From 5894fd8ccbc84515a75b77376bfe4fe279d69da7 Mon Sep 17 00:00:00 2001 From: Philippe Mouawad Date: Fri, 15 Apr 2016 22:21:33 +0000 Subject: [PATCH] Bug 59335 - Report : Drop Response Time Per Sample Graph Bugzilla Id: 59335 git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1739376 13f79535-47bb-0310-9956-ffa450edef68 --- bin/jmeter.properties | 4 - bin/report-template/content/js/graph.js.fmkr | 130 ------------------ .../content/pages/ResponseTimes.html.fmkr | 50 ------- .../ResponseTimePerSampleGraphConsumer.java | 3 +- 4 files changed, 2 insertions(+), 185 deletions(-) diff --git a/bin/jmeter.properties b/bin/jmeter.properties index 9e197d48a5..65fedce847 100644 --- a/bin/jmeter.properties +++ b/bin/jmeter.properties @@ -1212,10 +1212,6 @@ jmeter.reportgenerator.graph.activeThreadsOverTime.classname=org.apache.jmeter.r jmeter.reportgenerator.graph.activeThreadsOverTime.title=Active Threads Over Time jmeter.reportgenerator.graph.activeThreadsOverTime.property.set_granularity=${jmeter.reportgenerator.overall_granularity} -# Response Time Per Sample graph definition -jmeter.reportgenerator.graph.responseTimePerSample.classname=org.apache.jmeter.report.processor.graph.impl.ResponseTimePerSampleGraphConsumer -jmeter.reportgenerator.graph.responseTimePerSample.title=Response Time Per Sample - # Time VS Threads graph definition jmeter.reportgenerator.graph.timeVsThreads.classname=org.apache.jmeter.report.processor.graph.impl.TimeVSThreadGraphConsumer jmeter.reportgenerator.graph.timeVsThreads.title=Time VS Threads diff --git a/bin/report-template/content/js/graph.js.fmkr b/bin/report-template/content/js/graph.js.fmkr index e642e729b7..a59071b995 100644 --- a/bin/report-template/content/js/graph.js.fmkr +++ b/bin/report-template/content/js/graph.js.fmkr @@ -432,128 +432,6 @@ function refreshActiveThreadsOverTime(fixTimestamps) { } }; -var responseTimePerSampleInfos = { - data: ${responseTimePerSample!"{}"}, - getOptions: function() { - var ticks = []; - $.each(this.data.result.sampleNames, function(index, item){ - ticks.push([index, item]); - }); - - return { - series: { - bars: { - show: true - } - }, - bars: { - align: "center", - barWidth: 0.5, - horizontal: true, - fillColor: { colors: [{ opacity: 0.5 }, { opacity: 1}] }, - lineWidth: 1 - }, - xaxis: { - axisLabel: "Response Time in ms", - axisLabelUseCanvas: true, - axisLabelFontSizePixels: 12, - axisLabelFontFamily: 'Verdana, Arial', - axisLabelPadding: 20, - tickColor: "white", - tickFormatter: function (v, axis) { - return $.formatNumber(v, { format: "#,###", locale: "us" }); - }, - color: "black" - }, - yaxis: { - tickColor: "white", - ticks: ticks, - color: "black" - }, - legend: { - noColumns: 0, - labelBoxBorderColor: "#858585", - container: '#legendHorizontalBar' - }, - grid: { - hoverable: true, - borderWidth: 2, - backgroundColor: { colors: ["white", "white"] } - } - }; - }, - createGraph: function() { - var data = this.data; - var options = this.getOptions(); - prepareOptions(options, data); - $.plot($("#flotResponseTimePerSample"), prepareData(data.result.series, $("#choicesResponseTimePerSample")), options); - } - -}; - -// Response Time Per Sample -function refreshResponseTimePerSample() { - var infos = responseTimePerSampleInfos; - prepareSeries(infos.data); - if (isGraph($("#flotResponseTimePerSample"))){ - infos.createGraph(); - } else { - var choiceContainer = $("#choicesResponseTimePerSample"); - createLegend(choiceContainer, infos); - infos.createGraph(); - $('#footerResponseTimePerSample .legendColorBox > div').each(function(i){ - $(this).clone().prependTo(choiceContainer.find("li").eq(i)); - }); - } - - var previousPoint = null, previousLabel = null; - - $.fn.UseTooltip = function () { - $(this).bind("plothover", function (event, pos, item) { - if (item) { - if ((previousLabel != item.series.label) || - (previousPoint != item.dataIndex)) { - previousPoint = item.dataIndex; - previousLabel = item.series.label; - $("#tooltip").remove(); - - var x = item.datapoint[0]; - var y = item.datapoint[1]; - - var color = item.series.color; - - showTooltip(item.pageX, - item.pageY, - color, - "" + item.series.label + "
" + item.series.yaxis.ticks[y].label + - " : " + $.formatNumber(x, { format: "#,###", locale: "us" }) + " ms"); - } - } else { - $("#tooltip").remove(); - previousPoint = null; - } - }); - }; - - function showTooltip(x, y, color, contents) { - $('
' + contents + '
').css({ - position: 'absolute', - display: 'none', - top: y - 10, - left: x + 10, - border: '2px solid ' + color, - padding: '3px', - 'font-size': '9px', - 'border-radius': '5px', - 'background-color': '#fff', - 'font-family': 'Verdana, Arial, Helvetica, Tahoma, sans-serif', - opacity: 0.9 - }).appendTo("body").fadeIn(200); - } - - $("#flotResponseTimePerSample").UseTooltip(); -}; - var timeVsThreadsInfos = { data: ${timeVsThreads!"{}"}, getOptions: function() { @@ -1250,11 +1128,6 @@ function collapse(elem, collapsed){ refreshActiveThreadsOverTime(true); } document.location.href="#activeThreadsOverTime"; - } else if (elem.id == "bodyResponseTimePerSample") { - if (isGraph($(elem).find('.flot-chart-content')) == false) { - refreshResponseTimePerSample(); - } - document.location.href="#responseTimePerSample" ; } else if (elem.id == "bodyTimeVsThreads") { if (isGraph($(elem).find('.flot-chart-content')) == false) { refreshTimeVsThreads(); @@ -1335,9 +1208,6 @@ function toggleAll(id, checked){ } else if ( id == "choicesResponseTimeDistribution"){ choiceContainer = $("#choicesResponseTimeDistribution"); refreshResponseTimeDistribution(); - } else if ( id == "choicesResponseTimePerSample"){ - choiceContainer = $("#choicesResponseTimePerSample"); - refreshResponseTimePerSample(); } else if ( id == "choicesHitsPerSecond"){ choiceContainer = $("#choicesHitsPerSecond"); refreshHitsPerSecond(false); diff --git a/bin/report-template/content/pages/ResponseTimes.html.fmkr b/bin/report-template/content/pages/ResponseTimes.html.fmkr index a8b4253479..c9d7ac1890 100644 --- a/bin/report-template/content/pages/ResponseTimes.html.fmkr +++ b/bin/report-template/content/pages/ResponseTimes.html.fmkr @@ -94,11 +94,6 @@ Response Time Distribution -
  • - - Response Time Per Sample - -
    • @@ -310,51 +305,6 @@ -
    -
    -
    - Response Time Per Sample -
    -
    - - - - - - -
    -
    -
    - -
    -
    - -
    -
    -
    - -
    - -
    - -
    - -
    diff --git a/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java b/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java index 92522a0200..405fb8215d 100644 --- a/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java +++ b/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java @@ -35,8 +35,9 @@ import org.apache.jmeter.util.JMeterUtils; /** * The class ResponseTimePerSampleGraphConsumer provides a graph to visualize * percentiles of response time for each sample name. - * + * NOT USED FOR NOW as of 3.0 * @since 3.0 + * */ public class ResponseTimePerSampleGraphConsumer extends AbstractGraphConsumer {