Author: sebb
Date: Mon Nov 12 17:15:52 2007
New Revision: 594384
URL: http://svn.apache.org/viewvc?rev=594384&view=rev
Log:
Moving toward using SampleEvent rather than SampleResult so will have access to
hostname
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=594384&r1=594383&r2=594384&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Mon Nov 12 17:15:52 2007
@@ -398,11 +398,11 @@
/**
* When a test result is received, display it and save it.
*
- * @param e
+ * @param event
* the sample event that was received
*/
- public void sampleOccurred(SampleEvent e) {
- SampleResult result = e.getResult();
+ public void sampleOccurred(SampleEvent event) {
+ SampleResult result = event.getResult();
if (!isErrorLogging() || !result.isSuccessful()) {
sendToVisualizer(result);
@@ -411,9 +411,9 @@
result.setSaveConfig(config);
try {
if (config.saveAsXml()) {
- recordResult(result);
+ recordResult(event);
} else {
- String savee =
CSVSaveService.resultToDelimitedString(e);
+ String savee =
CSVSaveService.resultToDelimitedString(event);
out.println(savee);
}
} catch (Exception err) {
@@ -436,14 +436,15 @@
}
// Only called if out != null
- private void recordResult(SampleResult result) throws Exception {
+ private void recordResult(SampleEvent event) throws Exception {
+ SampleResult result = event.getResult();
if (!isResultMarked(result) && !this.isStats) {
if (SaveService.isSaveTestLogFormat20()) {
if (serializer == null)
serializer = new
DefaultConfigurationSerializer();
out.write(getSerializedSampleResult(result));
} else {
- SaveService.saveSampleResult(result, out);
+ SaveService.saveSampleResult(event, out);
}
}
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=594384&r1=594383&r2=594384&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Mon
Nov 12 17:15:52 2007
@@ -33,18 +33,9 @@
import java.util.Properties;
import java.nio.charset.Charset;
+
+import org.apache.jmeter.samplers.SampleEvent;
import org.apache.jmeter.samplers.SampleResult;
-//import org.apache.jmeter.save.converters.BooleanPropertyConverter;
-//import org.apache.jmeter.save.converters.HashTreeConverter;
-//import org.apache.jmeter.save.converters.IntegerPropertyConverter;
-//import org.apache.jmeter.save.converters.LongPropertyConverter;
-//import org.apache.jmeter.save.converters.MultiPropertyConverter;
-//import org.apache.jmeter.save.converters.SampleResultConverter;
-//import org.apache.jmeter.save.converters.SampleSaveConfigurationConverter;
-//import org.apache.jmeter.save.converters.StringPropertyConverter;
-//import org.apache.jmeter.save.converters.TestElementConverter;
-//import org.apache.jmeter.save.converters.TestElementPropertyConverter;
-//import org.apache.jmeter.save.converters.TestResultWrapperConverter;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
@@ -303,12 +294,12 @@
return saver.fromXML(in);
}
- public synchronized static void saveSampleResult(SampleResult res,
OutputStream out) throws Exception {
+ public synchronized static void saveSampleResult(SampleEvent event,
OutputStream out) throws Exception {
// Get the OutputWriter to use
OutputStreamWriter outputStreamWriter =
getOutputStreamWriter(out);
writeXmlHeader(outputStreamWriter);
// Use deprecated method, to avoid duplicating code
- saveSampleResult(res, outputStreamWriter);
+ saveSampleResult(event, outputStreamWriter);
outputStreamWriter.close();
}
@@ -316,8 +307,8 @@
* @deprecated Use saveSampleResult(SampleResult res, OutputStream out)
instead, which
* takes the fileEncoding property of SaveService into consideration
*/
- public synchronized static void saveSampleResult(SampleResult res,
Writer writer) throws Exception {
- saver.toXML(res, writer);
+ public synchronized static void saveSampleResult(SampleEvent evt,
Writer writer) throws Exception {
+ saver.toXML(evt.getResult(), writer); // TODO use event when
can get unmarshall working
writer.write('\n');
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
