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/07 20:20:52 UTC
svn commit: r392354 - in /jakarta/jmeter/branches/rel-2-1:
bin/jmeter.properties
src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
Author: sebb
Date: Fri Apr 7 11:20:50 2006
New Revision: 392354
URL: http://svn.apache.org/viewcvs?rev=392354&view=rev
Log:
Add fileName save option for ResultSaver
Modified:
jakarta/jmeter/branches/rel-2-1/bin/jmeter.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/converters/SampleSaveConfigurationConverter.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=392354&r1=392353&r2=392354&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/bin/jmeter.properties (original)
+++ jakarta/jmeter/branches/rel-2-1/bin/jmeter.properties Fri Apr 7 11:20:50 2006
@@ -272,6 +272,7 @@
#jmeter.save.saveservice.encoding=false
#jmeter.save.saveservice.bytes=false
#jmeter.save.saveservice.url=false
+#jmeter.save.saveservice.filename=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/samplers/SampleSaveConfiguration.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java?rev=392354&r1=392353&r2=392354&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 11:20:50 2006
@@ -152,6 +152,9 @@
// Save URL
private static final String SAVE_URL_PROP = "jmeter.save.saveservice.url"; // $NON_NLS-1$
+ // Save fileName for ResultSaver
+ private static final String SAVE_FILENAME_PROP = "jmeter.save.saveservice.filename"; // $NON_NLS-1$
+
/***************************************************************************
* The name of the property indicating whether the time should be saved.
**************************************************************************/
@@ -186,7 +189,7 @@
private boolean saveAssertionResultsFailureMessage = _saveAssertionResultsFailureMessage;
- private boolean url = _url, bytes = _bytes;
+ private boolean url = _url, bytes = _bytes , fileName = _fileName;
private int assertionsResultsToSave = _assertionsResultsToSave;
@@ -227,6 +230,8 @@
private static final boolean _url;
+ private static final boolean _fileName;
+
private static final SimpleDateFormat _formatter;
/**
@@ -275,6 +280,8 @@
_url = TRUE.equalsIgnoreCase(props.getProperty(SAVE_URL_PROP, FALSE));
+ _fileName = TRUE.equalsIgnoreCase(props.getProperty(SAVE_FILENAME_PROP, FALSE));
+
_time = TRUE.equalsIgnoreCase(props.getProperty(SAVE_TIME_PROP, TRUE));
_timeStampFormat = props.getProperty(TIME_STAMP_FORMAT_PROP, MILLISECONDS);
@@ -531,6 +538,14 @@
public void setBytes(boolean save) {
this.bytes = save;
+ }
+
+ public boolean saveFileName() {
+ return fileName;
+ }
+
+ public void setFileName(boolean save) {
+ this.fileName = save;
}
public boolean saveAssertionResultsFailureMessage() {
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java?rev=392354&r1=392353&r2=392354&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java Fri Apr 7 11:20:50 2006
@@ -35,9 +35,14 @@
*/
public class SampleSaveConfigurationConverter extends ReflectionConverter {
- private static final ReflectionProvider rp = new JVM().bestReflectionProvider();
+ private static final ReflectionProvider rp = new JVM().bestReflectionProvider();
- static class MyWrapper extends MapperWrapper{
+ private static final String TRUE = "true"; // $NON-NLS-1$
+ private static final String NODE_FILENAME = "fileName"; // $NON-NLS-1$
+ private static final String NODE_URL = "url"; // $NON-NLS-1$
+ private static final String NODE_BYTES = "bytes"; // $NON-NLS-1$
+
+ static class MyWrapper extends MapperWrapper{
public MyWrapper(ClassMapper wrapped) {
super(wrapped);
@@ -45,8 +50,9 @@
public boolean shouldSerializeMember(Class definedIn, String fieldName) {
if (SampleSaveConfiguration.class != definedIn) return true;
- if (fieldName.equals("url")) return false;
- if (fieldName.equals("bytes")) return false;
+ if (fieldName.equals(NODE_BYTES)) return false;
+ if (fieldName.equals(NODE_URL)) return false;
+ if (fieldName.equals(NODE_FILENAME)) return false;
return true;
}
}
@@ -86,14 +92,20 @@
// Save the new fields - but only if they are not the default
if (prop.saveBytes())
{
- writer.startNode("bytes");
- writer.setValue("true");
+ writer.startNode(NODE_BYTES);
+ writer.setValue(TRUE);
writer.endNode();
}
if (prop.saveUrl())
{
- writer.startNode("url");
- writer.setValue("true");
+ writer.startNode(NODE_URL);
+ writer.setValue(TRUE);
+ writer.endNode();
+ }
+ if (prop.saveFileName())
+ {
+ writer.startNode(NODE_FILENAME);
+ writer.setValue(TRUE);
writer.endNode();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org