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 02:25:47 UTC
svn commit: r392134 - in
/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save:
OldSaveService.java SaveServiceConstants.java TestElementSaver.java
Author: sebb
Date: Thu Apr 6 17:25:46 2006
New Revision: 392134
URL: http://svn.apache.org/viewcvs?rev=392134&view=rev
Log:
Move SaveServiceConstants into OldSaveService
Update CSV header: time->elapsed
Add bytes and URL to output
Removed:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/SaveServiceConstants.java
Modified:
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/TestElementSaver.java
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=392134&r1=392133&r2=392134&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 Thu Apr 6 17:25:46 2006
@@ -61,10 +61,41 @@
*
* @version $Revision$ $Date$
*/
-public final class OldSaveService implements SaveServiceConstants {
+public final class OldSaveService {
private static final Logger log = LoggingManager.getLoggerForClass();
- // Initial config from properties
+ // ---------------------------------------------------------------------
+ // XML RESULT FILE CONSTANTS AND FIELD NAME CONSTANTS
+ // ---------------------------------------------------------------------
+
+ // Shared with TestElementSaver
+ final static String PRESERVE = "preserve"; // $NON-NLS-1$
+ final static String XML_SPACE = "xml:space"; // $NON-NLS-1$
+
+ private static final String ASSERTION_RESULT_TAG_NAME = "assertionResult"; // $NON-NLS-1$
+ private static final String BINARY = "binary"; // $NON-NLS-1$
+ private static final String DATA_TYPE = "dataType"; // $NON-NLS-1$
+ private static final String ERROR = "error"; // $NON-NLS-1$
+ private static final String FAILURE = "failure"; // $NON-NLS-1$
+ private static final String FAILURE_MESSAGE = "failureMessage"; // $NON-NLS-1$
+ private static final String LABEL = "label"; // $NON-NLS-1$
+ private static final String RESPONSE_CODE = "responseCode"; // $NON-NLS-1$
+ private static final String RESPONSE_MESSAGE = "responseMessage"; // $NON-NLS-1$
+ private static final String SAMPLE_RESULT_TAG_NAME = "sampleResult"; // $NON-NLS-1$
+ private static final String SUCCESSFUL = "success"; // $NON-NLS-1$
+ private static final String THREAD_NAME = "threadName"; // $NON-NLS-1$
+ private static final String TIME = "time"; // $NON-NLS-1$
+ private static final String TIME_STAMP = "timeStamp"; // $NON-NLS-1$
+
+ // ---------------------------------------------------------------------
+ // ADDITIONAL CSV RESULT FILE CONSTANTS AND FIELD NAME CONSTANTS
+ // ---------------------------------------------------------------------
+
+ 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$
+
+ // Initial config from properties
static private final SampleSaveConfiguration _saveConfig = SampleSaveConfiguration.staticConfig();
private static DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
@@ -166,50 +197,60 @@
String delim = saveConfig.getDelimiter();
if (saveConfig.saveTimestamp() || (saveConfig.formatter() != null)) {
- text.append(SaveServiceConstants.TIME_STAMP);
+ text.append(TIME_STAMP);
text.append(delim);
}
if (saveConfig.saveTime()) {
- text.append(SaveServiceConstants.TIME);
+ text.append(CSV_TIME);
text.append(delim);
}
if (saveConfig.saveLabel()) {
- text.append(SaveServiceConstants.LABEL);
+ text.append(LABEL);
text.append(delim);
}
if (saveConfig.saveCode()) {
- text.append(SaveServiceConstants.RESPONSE_CODE);
+ text.append(RESPONSE_CODE);
text.append(delim);
}
if (saveConfig.saveMessage()) {
- text.append(SaveServiceConstants.RESPONSE_MESSAGE);
+ text.append(RESPONSE_MESSAGE);
text.append(delim);
}
if (saveConfig.saveThreadName()) {
- text.append(SaveServiceConstants.THREAD_NAME);
+ text.append(THREAD_NAME);
text.append(delim);
}
if (saveConfig.saveDataType()) {
- text.append(SaveServiceConstants.DATA_TYPE);
+ text.append(DATA_TYPE);
text.append(delim);
}
if (saveConfig.saveSuccess()) {
- text.append(SaveServiceConstants.SUCCESSFUL);
+ text.append(SUCCESSFUL);
text.append(delim);
}
if (saveConfig.saveAssertionResultsFailureMessage()) {
- text.append(SaveServiceConstants.FAILURE_MESSAGE);
+ text.append(FAILURE_MESSAGE);
text.append(delim);
}
+ if (saveConfig.saveBytes()) {
+ text.append(CSV_BYTES);
+ text.append(delim);
+ }
+
+ if (saveConfig.saveUrl()) {
+ text.append(CSV_URL);
+ text.append(delim);
+ }
+
String resultString = null;
int size = text.length();
int delSize = delim.length();
@@ -500,8 +541,16 @@
}
text.append(delimiter);
}
- // text.append(sample.getSamplerData().toString());
- // text.append(getAssertionResult(sample));
+
+ if (saveConfig.saveBytes()) {
+ text.append(sample.getBytes());
+ text.append(delimiter);
+ }
+
+ if (saveConfig.saveUrl()) {
+ text.append(sample.getURL());
+ text.append(delimiter);
+ }
String resultString = null;
int size = text.length();
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/TestElementSaver.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/TestElementSaver.java?rev=392134&r1=392133&r2=392134&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/TestElementSaver.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/save/TestElementSaver.java Thu Apr 6 17:25:46 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -31,14 +30,14 @@
import org.apache.jmeter.testelement.property.TestElementProperty;
/**
- * @version $Revision$
+ * Helper class for OldSaveService
*/
-public class TestElementSaver implements TestElementTraverser, SaveServiceConstants {
- String name;
+public class TestElementSaver implements TestElementTraverser {
+ private String name;
- LinkedList stack = new LinkedList();
+ private LinkedList stack = new LinkedList();
- DefaultConfiguration rootConfig = null;
+ private DefaultConfiguration rootConfig = null;
public TestElementSaver(String name) {
this.name = name;
@@ -94,7 +93,7 @@
DefaultConfiguration config = new DefaultConfiguration("property", "property");
config.setValue(value != null ? value.toString() : "");
config.setAttribute("name", parent.toString());
- config.setAttribute(XML_SPACE, PRESERVE);
+ config.setAttribute(OldSaveService.XML_SPACE, OldSaveService.PRESERVE);
stack.removeLast();
stack.add(config);
}
@@ -104,7 +103,7 @@
} else if (parent instanceof DefaultConfiguration && !(value instanceof Configuration)) {
DefaultConfiguration config = new DefaultConfiguration("string", "string");
config.setValue(value.toString());
- config.setAttribute(XML_SPACE, PRESERVE);
+ config.setAttribute(OldSaveService.XML_SPACE, OldSaveService.PRESERVE);
((DefaultConfiguration) parent).addChild(config);
}
} catch (NoSuchElementException e) {
@@ -181,7 +180,7 @@
config.setValue(key.getStringValue());
config.setAttribute("name", key.getName());
config.setAttribute("propType", key.getClass().getName());
- config.setAttribute(XML_SPACE, PRESERVE);
+ config.setAttribute(OldSaveService.XML_SPACE, OldSaveService.PRESERVE);
stack.addLast(config);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org