sebb 2005/05/14 16:37:30
Modified: src/core/org/apache/jmeter/samplers
SampleSaveConfiguration.java
Log:
saveResultData now checks functional mode and result.isSuccess
Revision Changes Path
1.5 +20 -6
jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
Index: SampleSaveConfiguration.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SampleSaveConfiguration.java 8 May 2005 11:27:09 -0000 1.4
+++ SampleSaveConfiguration.java 14 May 2005 23:37:30 -0000 1.5
@@ -10,6 +10,7 @@
import java.text.SimpleDateFormat;
import java.util.Properties;
+import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.util.JMeterUtils;
/**
@@ -99,6 +100,9 @@
public static final String SAVE_RESPONSE_DATA_PROP
= "jmeter.save.saveservice.response_data";
+ public static final String SAVE_RESPONSE_DATA_ON_ERROR_PROP
+ = "jmeter.save.saveservice.response_data.on_error";
+
/** The name of the property indicating whether the response message
should be saved. **/
public static final String SAVE_RESPONSE_MESSAGE_PROP
@@ -167,6 +171,8 @@
_dataType, _encoding, _assertions, _latency,
_subresults, _samplerData, _fieldNames, _responseHeaders,
_requestHeaders;
+ private static final boolean _responseDataOnError;
+
private static final boolean _saveAssertionResultsFailureMessage;
private static final String _timeStampFormat;
private static int _assertionsResultsToSave;
@@ -219,6 +225,9 @@
TRUE.equalsIgnoreCase(
props.getProperty(SAVE_RESPONSE_DATA_PROP, FALSE));
+ _responseDataOnError = TRUE.equalsIgnoreCase(
+ props.getProperty(SAVE_RESPONSE_DATA_ON_ERROR_PROP, FALSE));
+
_message =
TRUE.equalsIgnoreCase(
props.getProperty(SAVE_RESPONSE_MESSAGE_PROP, TRUE));
@@ -463,13 +472,18 @@
}
/**
- * @return Returns the responseData.
- */
- public boolean saveResponseData()
- {
- return responseData;
+ * Should samplerData be saved for the current result?
+ *
+ * @return Returns whether to save the samplerData.
+ */
+ public boolean saveResponseData(SampleResult res)
+ {
+ return responseData
+ || TestPlan.getFunctionalMode()
+ || (_responseDataOnError && !res.isSuccessful());
}
+
/**
* @param responseData
* The responseData to set.
@@ -480,7 +494,7 @@
}
/**
- * @return Returns the samplerData.
+ * @return Returns whether to save the samplerData.
*/
public boolean saveSamplerData()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
