You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/03/31 21:02:30 UTC
svn commit: r390476 - in /jakarta/jmeter/branches/rel-2-1:
bin/jmeter.properties
src/core/org/apache/jmeter/resources/messages.properties
src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
Author: sebb
Date: Fri Mar 31 11:02:28 2006
New Revision: 390476
URL: http://svn.apache.org/viewcvs?rev=390476&view=rev
Log:
Add bytes/Url save options
Modified:
jakarta/jmeter/branches/rel-2-1/bin/jmeter.properties
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
Modified: jakarta/jmeter/branches/rel-2-1/bin/jmeter.properties
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/bin/jmeter.properties?rev=390476&r1=390475&r2=390476&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/bin/jmeter.properties (original)
+++ jakarta/jmeter/branches/rel-2-1/bin/jmeter.properties Fri Mar 31 11:02:28 2006
@@ -264,6 +264,8 @@
#jmeter.save.saveservice.responseHeaders=false
#jmeter.save.saveservice.requestHeaders=false
#jmeter.save.saveservice.encoding=false
+#jmeter.save.saveservice.bytes=false
+#jmeter.save.saveservice.url=false
# Timestamp format
# legitimate values: none, ms, or a format suitable for SimpleDateFormat
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties?rev=390476&r1=390475&r2=390476&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties Fri Mar 31 11:02:28 2006
@@ -570,6 +570,7 @@
save_assertionresultsfailuremessage=Save Assertion Results Failure Message
save_assertions=Save Assertion Results
save_asxml=Save As XML
+save_bytes=Save byte count
save_code=Save Response Code
save_datatype=Save Data Type
save_encoding=Save Encoding
@@ -587,6 +588,7 @@
save_threadname=Save Thread Name
save_time=Save Elapsed Time
save_timestamp=Save Time Stamp
+save_url=Save URL
sbind=Single bind/unbind
scheduler=Scheduler
scheduler_configuration=Scheduler Configuration
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java?rev=390476&r1=390475&r2=390476&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java Fri Mar 31 11:02:28 2006
@@ -145,6 +145,12 @@
**************************************************************************/
private static final String SAVE_THREAD_NAME_PROP = "jmeter.save.saveservice.thread_name"; // $NON_NLS-1$
+ // Save bytes read
+ private static final String SAVE_BYTES_PROP = "jmeter.save.saveservice.bytes"; // $NON_NLS-1$
+
+ // Save URL
+ private static final String SAVE_URL_PROP = "jmeter.save.saveservice.url"; // $NON_NLS-1$
+
/***************************************************************************
* The name of the property indicating whether the time should be saved.
**************************************************************************/
@@ -177,6 +183,8 @@
private boolean saveAssertionResultsFailureMessage = _saveAssertionResultsFailureMessage;
+ private boolean saveUrl = _saveUrl, saveBytes = _saveBytes;
+
private int assertionsResultsToSave = _assertionsResultsToSave;
private String delimiter = _delimiter;
@@ -212,6 +220,10 @@
private static final boolean _printMilliseconds;
+ private static final boolean _saveBytes;
+
+ private static final boolean _saveUrl;
+
private static final SimpleDateFormat _formatter;
/**
@@ -256,6 +268,10 @@
_threadName = TRUE.equalsIgnoreCase(props.getProperty(SAVE_THREAD_NAME_PROP, TRUE));
+ _saveBytes = TRUE.equalsIgnoreCase(props.getProperty(SAVE_BYTES_PROP, FALSE));
+
+ _saveUrl = TRUE.equalsIgnoreCase(props.getProperty(SAVE_BYTES_PROP, FALSE));
+
_time = TRUE.equalsIgnoreCase(props.getProperty(SAVE_TIME_PROP, TRUE));
_timeStampFormat = props.getProperty(TIME_STAMP_FORMAT_PROP, MILLISECONDS);
@@ -339,6 +355,8 @@
return s;
}
+ ///////////////////// Start of standard save/set access methods /////////////////////
+
public boolean saveResponseHeaders() {
return responseHeaders;
}
@@ -355,116 +373,62 @@
requestHeaders = r;
}
- /**
- * @return Returns the assertions.
- */
public boolean saveAssertions() {
return assertions;
}
- /**
- * @param assertions
- * The assertions to set.
- */
public void setAssertions(boolean assertions) {
this.assertions = assertions;
}
- /**
- * @return Returns the code.
- */
public boolean saveCode() {
return code;
}
- /**
- * @param code
- * The code to set.
- */
public void setCode(boolean code) {
this.code = code;
}
- /**
- * @return Returns the dataType.
- */
public boolean saveDataType() {
return dataType;
}
- /**
- * @param dataType
- * The dataType to set.
- */
public void setDataType(boolean dataType) {
this.dataType = dataType;
}
- /**
- * @return Returns the encoding.
- */
public boolean saveEncoding() {
return encoding;
}
- /**
- * @param encoding
- * The encoding to set.
- */
public void setEncoding(boolean encoding) {
this.encoding = encoding;
}
- /**
- * @return Returns the label.
- */
public boolean saveLabel() {
return label;
}
- /**
- * @param label
- * The label to set.
- */
public void setLabel(boolean label) {
this.label = label;
}
- /**
- * @return Returns the latency.
- */
public boolean saveLatency() {
return latency;
}
- /**
- * @param latency
- * The latency to set.
- */
public void setLatency(boolean latency) {
this.latency = latency;
}
- /**
- * @return Returns the message.
- */
public boolean saveMessage() {
return message;
}
- /**
- * @param message
- * The message to set.
- */
public void setMessage(boolean message) {
this.message = message;
}
- /**
- * 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());
}
@@ -474,17 +438,10 @@
return responseData;
}
- /**
- * @param responseData
- * The responseData to set.
- */
public void setResponseData(boolean responseData) {
this.responseData = responseData;
}
- /**
- * @return Returns whether to save the samplerData.
- */
public boolean saveSamplerData(SampleResult res) {
return samplerData || TestPlan.getFunctionalMode() // as per 2.0 branch
|| (responseDataOnError && !res.isSuccessful());
@@ -495,125 +452,80 @@
return samplerData;
}
- /**
- * @param samplerData
- * The samplerData to set.
- */
public void setSamplerData(boolean samplerData) {
this.samplerData = samplerData;
}
- /**
- * @return Returns the subresults.
- */
public boolean saveSubresults() {
return subresults;
}
- /**
- * @param subresults
- * The subresults to set.
- */
public void setSubresults(boolean subresults) {
this.subresults = subresults;
}
- /**
- * @return Returns the success.
- */
public boolean saveSuccess() {
return success;
}
- /**
- * @param success
- * The success to set.
- */
public void setSuccess(boolean success) {
this.success = success;
}
- /**
- * @return Returns the threadName.
- */
public boolean saveThreadName() {
return threadName;
}
- /**
- * @param threadName
- * The threadName to set.
- */
public void setThreadName(boolean threadName) {
this.threadName = threadName;
}
- /**
- * @return Returns the time.
- */
public boolean saveTime() {
return time;
}
- /**
- * @param time
- * The time to set.
- */
public void setTime(boolean time) {
this.time = time;
}
- /**
- * @return Returns the timestamp.
- */
public boolean saveTimestamp() {
return timestamp;
}
- /**
- * @param timestamp
- * The timestamp to set.
- */
public void setTimestamp(boolean timestamp) {
this.timestamp = timestamp;
}
- /**
- * @return Returns the xml.
- */
public boolean saveAsXml() {
return xml;
}
- /**
- * @param xml
- * The xml to set.
- */
public void setAsXml(boolean xml) {
this.xml = xml;
}
- /**
- * @return Returns the printFieldNames.
- */
public boolean saveFieldNames() {
return fieldNames;
}
- /**
- * @param printFieldNames -
- * should field names be printed?
- */
public void setFieldNames(boolean printFieldNames) {
this.fieldNames = printFieldNames;
}
- public boolean printMilliseconds() {
- return printMilliseconds;
+ public boolean saveUrl() {
+ return saveUrl;
}
- public SimpleDateFormat formatter() {
- return formatter;
+ public void setUrl(boolean save) {
+ this.saveUrl = save;
+ }
+
+ public boolean saveBytes() {
+ return saveBytes;
+ }
+
+ public void setBytes(boolean save) {
+ this.saveBytes = save;
}
public boolean saveAssertionResultsFailureMessage() {
@@ -622,6 +534,16 @@
public void setAssertionResultsFailureMessage(boolean b) {
saveAssertionResultsFailureMessage = b;
+ }
+
+ ///////////////// End of standard field accessors /////////////////////
+
+ public boolean printMilliseconds() {
+ return printMilliseconds;
+ }
+
+ public SimpleDateFormat formatter() {
+ return formatter;
}
public int assertionsResultsToSave() {
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org