Author: sebb
Date: Fri Nov 7 17:33:00 2008
New Revision: 712341
URL: http://svn.apache.org/viewvc?rev=712341&view=rev
Log:
Factor out retrieval of errorOnly and successOnly settings where
isSampleWanted() is called repeatedly
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/OldSaveService.java
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=712341&r1=712340&r2=712341&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
Fri Nov 7 17:33:00 2008
@@ -181,10 +181,11 @@
}
/**
- * Decides whether or not to a sample is wanted based on:
- * - errorOnly
- * - successOnly
- * - sample success
+ * Decides whether or not to a sample is wanted based on:<br/>
+ * - errorOnly<br/>
+ * - successOnly<br/>
+ * - sample success<br/>
+ * Should only be called for single samples.
*
* @param success is sample successful
* @return whether to log/display the sample
@@ -192,6 +193,23 @@
public boolean isSampleWanted(boolean success){
boolean errorOnly = isErrorLogging();
boolean successOnly = isSuccessOnlyLogging();
+ return isSampleWanted(success, errorOnly, successOnly);
+ }
+
+ /**
+ * Decides whether or not to a sample is wanted based on: <br/>
+ * - errorOnly <br/>
+ * - successOnly <br/>
+ * - sample success <br/>
+ * This version is intended to be called by code that loops over many
samples;
+ * it is cheaper than fetching the settings each time.
+ * @param success status of sample
+ * @param errorOnly if errors only wanted
+ * @param successOnly if success only wanted
+ * @return whether to log/display the sample
+ */
+ public boolean isSampleWanted(boolean success, boolean errorOnly,
+ boolean successOnly) {
return (!errorOnly && !successOnly) ||
(success && successOnly) ||
(!success && errorOnly);
@@ -425,10 +443,12 @@
// Only called if visualizer is non-null
private void readSamples(TestResultWrapper testResults, Visualizer
visualizer) throws Exception {
Collection samples = testResults.getSampleResults();
+ final boolean errorsOnly = isErrorLogging();
+ final boolean successOnly = isSuccessOnlyLogging();
Iterator iter = samples.iterator();
while (iter.hasNext()) {
SampleResult result = (SampleResult) iter.next();
- if (isSampleWanted(result.isSuccessful())) {
+ if (isSampleWanted(result.isSuccessful(), errorsOnly,
successOnly)) {
visualizer.add(result);
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java?rev=712341&r1=712340&r2=712341&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
Fri Nov 7 17:33:00 2008
@@ -118,6 +118,8 @@
public static void processSamples(String filename, Visualizer visualizer,
ResultCollector resultCollector) throws IOException {
BufferedReader dataReader = null;
+ final boolean errorsOnly = resultCollector.isErrorLogging();
+ final boolean successOnly = resultCollector.isSuccessOnlyLogging();
try {
dataReader = new BufferedReader(new FileReader(filename));
dataReader.mark(400);// Enough to read the header column names
@@ -140,7 +142,7 @@
SampleEvent event =
CSVSaveService.makeResultFromDelimitedString(parts,saveConfig,lineNumber);
if (event != null){
final SampleResult result = event.getResult();
- if (resultCollector.isSampleWanted(result.isSuccessful()))
{
+ if
(resultCollector.isSampleWanted(result.isSuccessful(),errorsOnly, successOnly))
{
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=712341&r1=712340&r2=712341&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
Fri Nov 7 17:33:00 2008
@@ -488,9 +488,11 @@
DefaultConfigurationBuilder cfgbuilder = new
DefaultConfigurationBuilder();
Configuration savedSamples = cfgbuilder.buildFromFile(filename);
Configuration[] samples = savedSamples.getChildren();
+ final boolean errorsOnly = rc.isErrorLogging();
+ final boolean successOnly = rc.isSuccessOnlyLogging();
for (int i = 0; i < samples.length; i++) {
SampleResult result = OldSaveService.getSampleResult(samples[i]);
- if (rc.isSampleWanted(result.isSuccessful())) {
+ if (rc.isSampleWanted(result.isSuccessful(), errorsOnly,
successOnly)) {
visualizer.add(result);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
