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/04/08 00:07:44 UTC
svn commit: r392436 - in /jakarta/jmeter/branches/rel-2-1:
src/core/org/apache/jmeter/resources/ src/core/org/apache/jmeter/samplers/
src/core/org/apache/jmeter/save/
src/core/org/apache/jmeter/save/converters/ xdocs/ xdocs/usermanual/
Author: sebb
Date: Fri Apr 7 15:07:42 2006
New Revision: 392436
URL: http://svn.apache.org/viewcvs?rev=392436&view=rev
Log:
Save Response file name in sample; optionally save in log file
Modified:
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
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/OldSaveService.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/component_reference.xml
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=392436&r1=392435&r2=392436&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 Apr 7 15:07:42 2006
@@ -575,6 +575,7 @@
save_datatype=Save Data Type
save_encoding=Save Encoding
save_fieldnames=Save Field Names
+save_filename=Save Response Filename
save_graphics=Save Graph
save_label=Save Label
save_latency=Save Latency
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=392436&r1=392435&r2=392436&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 Apr 7 15:07:42 2006
@@ -27,6 +27,15 @@
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.util.JMeterUtils;
+/*
+ * N.B. to add a new field, remember the following
+ * - static _xyz
+ * - instance xyz=_xyz
+ * - clone s.xyz = xyz
+ * - setXyz(boolean)
+ * - saveXyz()
+ * - update SampleSaveConfigurationConverter to add new field
+ */
/**
* Holds details of which sample attributes to save.
*
@@ -36,7 +45,7 @@
* - a corresponding "void setXXX(boolean)" method
*
* @author mstover
- *
+ *
*/
public class SampleSaveConfiguration implements Cloneable, Serializable {
static final long serialVersionUID = 3;
@@ -364,6 +373,7 @@
s.responseDataOnError = responseDataOnError;
s.url = url;
s.bytes = bytes;
+ s.fileName = fileName;
return s;
}
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/OldSaveService.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/OldSaveService.java?rev=392436&r1=392435&r2=392436&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/OldSaveService.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/OldSaveService.java Fri Apr 7 15:07:42 2006
@@ -94,6 +94,7 @@
private static final String CSV_TIME = "elapsed"; // $NON-NLS-1$
private static final String CSV_BYTES= "bytes"; // $NON-NLS-1$
private static final String CSV_URL = "URL"; // $NON-NLS-1$
+ private static final String CSV_FILENAME = "Filename"; // $NON-NLS-1$
// Initial config from properties
static private final SampleSaveConfiguration _saveConfig = SampleSaveConfiguration.staticConfig();
@@ -251,6 +252,11 @@
text.append(delim);
}
+ if (saveConfig.saveFileName()) {
+ text.append(CSV_FILENAME);
+ text.append(delim);
+ }
+
String resultString = null;
int size = text.length();
int delSize = delim.length();
@@ -549,6 +555,11 @@
if (saveConfig.saveUrl()) {
text.append(sample.getURL());
+ text.append(delimiter);
+ }
+
+ if (saveConfig.saveFileName()) {
+ text.append(sample.getResultFileName());
text.append(delimiter);
}
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java?rev=392436&r1=392435&r2=392436&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveService.java Fri Apr 7 15:07:42 2006
@@ -304,7 +304,7 @@
checkVersion(TestElementPropertyConverter.class, "332820"); // $NON-NLS-1$
checkVersion(ScriptWrapperConverter.class, "390848"); // $NON-NLS-1$
checkVersion(TestResultWrapperConverter.class, "332820"); // $NON-NLS-1$
- checkVersion(SampleSaveConfigurationConverter.class,"390698"); // $NON-NLS-1$
+ checkVersion(SampleSaveConfigurationConverter.class,"392354"); // $NON-NLS-1$
if (!PROPVERSION.equalsIgnoreCase(propertiesVersion)) {
log.warn("Bad _version - expected " + PROPVERSION + ", found " + propertiesVersion + ".");
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?rev=392436&r1=392435&r2=392436&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java Fri Apr 7 15:07:42 2006
@@ -60,6 +60,7 @@
protected static final String TAG_RESPONSE_DATA = "responseData"; //$NON-NLS-1$
protected static final String TAG_RESPONSE_HEADER = "responseHeader"; //$NON-NLS-1$
protected static final String TAG_SAMPLER_DATA = "samplerData"; //$NON-NLS-1$
+ protected static final String TAG_RESPONSE_FILE = "responseFile"; //$NON-NLS-1$
// samplerData attributes. Must be unique. Keep sorted.
private static final String ATT_BYTES = "by"; //$NON-NLS-1$
@@ -161,6 +162,12 @@
}
writer.endNode();
}
+ if (save.saveFileName()){
+ writer.startNode(TAG_RESPONSE_FILE);
+ writer.addAttribute(ATT_CLASS, JAVA_LANG_STRING);
+ writer.setValue(res.getResultFileName());
+ writer.endNode();
+ }
}
/**
Modified: jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml?rev=392436&r1=392435&r2=392436&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml Fri Apr 7 15:07:42 2006
@@ -72,7 +72,9 @@
<li>Make it easier to change the RMI/Server port</li>
<li>Add property jmeter.save.saveservice.xml_pi to provide optional xml processing instruction in JTL files</li>
<li>Add bytes and URL to items that can be saved in sample log files (XML and CSV)</li>
-<li></li>
+<li>The Post-Processor "Save Responses to a File" now saves the generated file name with the
+sample, and the file name can be included in the sample log file.
+</li>
</ul>
<h4>Bug fixes:</h4>
Modified: jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/component_reference.xml?rev=392436&r1=392435&r2=392436&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/branches/rel-2-1/xdocs/usermanual/component_reference.xml Fri Apr 7 15:07:42 2006
@@ -2752,7 +2752,9 @@
For each sample in its scope, it will create a file of the response Data.
The primary use for this is in creating functional tests.
The file name is created from the specified prefix, plus a number.
- The file extension is created from the document type, if know.
+ The file extension is created from the document type, if known.
+ The generated file name is stored in the sample response, and can be saved
+ in the test log output file if required.
</description>
<properties>
<property name="Name" required="">Descriptive name for this element that is shown in the tree.</property>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org