Author: sebb
Date: Wed Nov 14 17:13:31 2007
New Revision: 595172
URL: http://svn.apache.org/viewvc?rev=595172&view=rev
Log:
Errors only flag is now supported when loading XML and CSV files
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/OldSaveService.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=595172&r1=595171&r2=595172&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Wed Nov 14 17:13:31 2007
@@ -193,6 +193,7 @@
boolean parsedOK = false, errorDetected = false;
String filename = getFilename();
File file = new File(filename);
+ boolean showAll = !isErrorLogging();
if (file.exists()) {
clearVisualizer();
BufferedReader dataReader = null;
@@ -216,7 +217,10 @@
while (line != null) { // Already read 1st line
SampleEvent event =
CSVSaveService.makeResultFromDelimitedString(line,saveConfig,lineNumber);
if (event != null){
- visualizer.add(event.getResult());
+ final
SampleResult result = event.getResult();
+ if (showAll || !result.isSuccessful()) {
+
visualizer.add(result);
+ }
}
line = dataReader.readLine();
lineNumber++;
@@ -225,12 +229,12 @@
} else { // We are processing XML
try { // Assume XStream
bufferedInputStream = new BufferedInputStream(new
FileInputStream(file));
-
readSamples(SaveService.loadTestResults(bufferedInputStream), visualizer);
+
readSamples(SaveService.loadTestResults(bufferedInputStream), visualizer,
showAll);
parsedOK = true;
} catch (Exception e) {
log.info("Failed to load "+filename+" using
XStream, trying old XML format. Error was: "+e);
try {
- OldSaveService.processSamples(filename,
visualizer);
+ OldSaveService.processSamples(filename,
visualizer, showAll);
parsedOK = true;
} catch (Exception e1) {
log.warn("Error parsing Avalon XML. " +
e1.getLocalizedMessage());
@@ -359,12 +363,14 @@
}
// Only called if visualizer is non-null
- private void readSamples(TestResultWrapper testResults, Visualizer
visualizer) throws Exception {
+ private void readSamples(TestResultWrapper testResults, Visualizer
visualizer, boolean showAll) throws Exception {
Collection samples = testResults.getSampleResults();
Iterator iter = samples.iterator();
while (iter.hasNext()) {
SampleResult result = (SampleResult) iter.next();
- visualizer.add(result);
+ if (showAll || !result.isSuccessful()) {
+ visualizer.add(result);
+ }
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/OldSaveService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/OldSaveService.java?rev=595172&r1=595171&r2=595172&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/OldSaveService.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/OldSaveService.java
Wed Nov 14 17:13:31 2007
@@ -473,7 +473,7 @@
}
// Called by ResultCollector#loadExistingFile()
- public static void processSamples(String filename, Visualizer
visualizer)
+ public static void processSamples(String filename, Visualizer
visualizer, boolean showAll)
throws SAXException, IOException, ConfigurationException
{
DefaultConfigurationBuilder cfgbuilder = new
DefaultConfigurationBuilder();
@@ -481,7 +481,9 @@
Configuration[] samples = savedSamples.getChildren();
for (int i = 0; i < samples.length; i++) {
SampleResult result =
OldSaveService.getSampleResult(samples[i]);
- visualizer.add(result);
+ if (showAll || !result.isSuccessful()) {
+ visualizer.add(result);
+ }
}
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=595172&r1=595171&r2=595172&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Nov 14 17:13:31 2007
@@ -100,6 +100,7 @@
<li>The javaScript function now has access to JMeter variables and context
etc. See <a href="usermanual/functions.html#__javaScript">JavaScript
function</a></li>
<li>Use drop-down list for BSF Sampler language field</li>
<li>Add hostname to items that can be saved in CSV and XML output files.</li>
+<li>Errors only flag is now supported when loading XML and CSV files</li>
</ul>
<h4>Non-functional Improvements</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
