You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/02/01 21:34:40 UTC
svn commit: r1728001 - in /jmeter/trunk:
src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
xdocs/changes.xml
Author: pmouawad
Date: Mon Feb 1 20:34:40 2016
New Revision: 1728001
URL: http://svn.apache.org/viewvc?rev=1728001&view=rev
Log:
Bug 58952 - Report/Dashboard: Generation of aggregated series in graphs does not work
Bugzilla Id: 58952
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java?rev=1728001&r1=1728000&r2=1728001&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java Mon Feb 1 20:34:40 2016
@@ -236,6 +236,10 @@ public abstract class AbstractGraphConsu
private void addKeyData(MapResultData result, String group, String series,
SeriesData seriesData, boolean aggregated) {
+ // Override series name when aggregated
+ if (aggregated) {
+ series = String.format(aggregatedKeysSeriesFormat, series);
+ }
// Add to the result map
ListResultData seriesList = (ListResultData) result
.getResult(RESULT_SERIES);
@@ -272,13 +276,12 @@ public abstract class AbstractGraphConsu
// Populate it with data from groupData
Map<Double, Aggregator> aggInfo;
- if (!aggregated) {
- aggInfo = seriesData.getAggregatorInfo();
- } else {
- series = String.format(aggregatedKeysSeriesFormat, series);
+ if (aggregated) {
aggInfo = new HashMap<>();
aggInfo.put(Double.valueOf(seriesData.getKeysAggregator().getResult()),
seriesData.getValuesAggregator());
+ } else {
+ aggInfo = seriesData.getAggregatorInfo();
}
if (!renderPercentiles) {
for (Map.Entry<Double, Aggregator> entry : aggInfo.entrySet()) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java?rev=1728001&r1=1728000&r2=1728001&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java Mon Feb 1 20:34:40 2016
@@ -65,7 +65,7 @@ public class TimeVSThreadGraphConsumer e
groupInfos.put(AbstractGraphConsumer.DEFAULT_GROUP, new GroupInfo(
new MeanAggregatorFactory(), new NameSeriesSelector(),
- new ElapsedTimeValueSelector(), false, false));
+ new ElapsedTimeValueSelector(), false, true));
return groupInfos;
}
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1728001&r1=1728000&r2=1728001&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon Feb 1 20:34:40 2016
@@ -285,6 +285,7 @@ Summary
<li><bug>58781</bug>Command line option "-?" shows Unknown option</li>
<li><bug>58795</bug>NPE may occur in GuiPackage#getTestElementCheckSum with some 3rd party plugins</li>
<li><bug>58913</bug>When closing jmeter should not interpret cancel as "destroy my test plan". Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
+ <li><bug>58952</bug>Report/Dashboard: Generation of aggregated series in graphs does not work. Developed by Florent Sabbe (f dot sabbe at ubik-ingenierie.com) and contributed by Ubik-Ingenierie</li>
</ul>
<!-- =================== Thanks =================== -->
@@ -306,6 +307,7 @@ Summary
<li>Oleg Kalnichevski (olegk at apache.org)</li>
<li>Pascal Schumacher (pascalschumacher at gmx.net)</li>
<li>Vincent Herilier (vherilier at gmail.com)</li>
+<li>Florent Sabbe (f dot sabbe at ubik-ingenierie.com)</li>
</ul>
<br/>