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 2014/11/29 21:57:06 UTC
svn commit: r1642476 - in /jmeter/trunk:
src/components/org/apache/jmeter/visualizers/ xdocs/
Author: pmouawad
Date: Sat Nov 29 20:57:05 2014
New Revision: 1642476
URL: http://svn.apache.org/r1642476
Log:
Bug 57262 - Aggregate Report, Aggregate Graph and Summary Report export : headers use keys instead of labels
Bugzilla Id: 57262
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?rev=1642476&r1=1642475&r2=1642476&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java Sat Nov 29 20:57:05 2014
@@ -573,9 +573,10 @@ public class StatGraphVisualizer extends
* We use this method to get the data, since we are using
* ObjectTableModel, so the calling getDataVector doesn't
* work as expected.
+ * @param model {@link ObjectTableModel}
* @return the data from the model
*/
- public List<List<Object>> getAllTableData() {
+ public static List<List<Object>> getAllTableData(ObjectTableModel model) {
List<List<Object>> data = new ArrayList<List<Object>>();
if (model.getRowCount() > 0) {
for (int rw=0; rw < model.getRowCount(); rw++) {
@@ -614,7 +615,7 @@ public class StatGraphVisualizer extends
FileWriter writer = null;
try {
writer = new FileWriter(chooser.getSelectedFile()); // TODO Charset ?
- CSVSaveService.saveCSVStats(getAllTableData(),writer,saveHeaders.isSelected() ? COLUMNS : null);
+ CSVSaveService.saveCSVStats(getAllTableData(model),writer,saveHeaders.isSelected() ? getLabels(COLUMNS) : null);
} catch (FileNotFoundException e) {
JMeterUtils.reportErrorToUser(e.getMessage(), "Error saving data");
} catch (IOException e) {
@@ -686,6 +687,19 @@ public class StatGraphVisualizer extends
}
}
+ /**
+ *
+ * @param keys I18N keys
+ * @return labels
+ */
+ static String[] getLabels(String[] keys) {
+ String[] labels = new String[keys.length];
+ for (int i = 0; i < labels.length; i++) {
+ labels[i]=MessageFormat.format(JMeterUtils.getResString(keys[i]), COLUMNS_MSG_PARAMETERS[i]);
+ }
+ return labels;
+ }
+
private void actionMakeGraph() {
if (model.getRowCount() > 1) {
makeGraph();
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=1642476&r1=1642475&r2=1642476&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java Sat Nov 29 20:57:05 2014
@@ -212,7 +212,8 @@ public class StatVisualizer extends Abst
FileWriter writer = null;
try {
writer = new FileWriter(chooser.getSelectedFile()); // TODO Charset ?
- CSVSaveService.saveCSVStats(model,writer, saveHeaders.isSelected());
+ CSVSaveService.saveCSVStats(StatGraphVisualizer.getAllTableData(model),writer,
+ saveHeaders.isSelected() ? StatGraphVisualizer.getLabels(StatGraphVisualizer.COLUMNS) : null);
} catch (FileNotFoundException e) {
JMeterUtils.reportErrorToUser(e.getMessage(), "Error saving data");
} catch (IOException e) {
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java?rev=1642476&r1=1642475&r2=1642476&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java Sat Nov 29 20:57:05 2014
@@ -257,7 +257,8 @@ public class SummaryReport extends Abstr
FileWriter writer = null;
try {
writer = new FileWriter(chooser.getSelectedFile());
- CSVSaveService.saveCSVStats(model,writer, saveHeaders.isSelected());
+ CSVSaveService.saveCSVStats(StatGraphVisualizer.getAllTableData(model),writer,
+ saveHeaders.isSelected() ? StatGraphVisualizer.getLabels(COLUMNS) : null);
} catch (FileNotFoundException e) {
JMeterUtils.reportErrorToUser(e.getMessage(), "Error saving data");
} catch (IOException e) {
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1642476&r1=1642475&r2=1642476&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sat Nov 29 20:57:05 2014
@@ -152,6 +152,7 @@ See <bugzilla>56357</bugzilla> for deta
<h3>Listeners</h3>
<ul>
+<li><bugzilla>57262</bugzilla> - Aggregate Report, Aggregate Graph and Summary Report export : headers use keys instead of labels</li>
</ul>
<h3>Timers, Assertions, Config, Pre- & Post-Processors</h3>