mstover1 2003/09/10 08:18:57
Modified: src/core/org/apache/jmeter/reporters ResultCollector.java
src/core/org/apache/jmeter/save SaveService.java
src/core/org/apache/jmeter/util JMeterUtils.java
Log:
Can now load CSV result files
Revision Changes Path
1.26 +13 -2
jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ResultCollector.java 7 Sep 2003 18:54:53 -0000 1.25
+++ ResultCollector.java 10 Sep 2003 15:18:56 -0000 1.26
@@ -56,10 +56,12 @@
import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.io.FileReader;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
@@ -202,11 +204,20 @@
inLoading = true;
if (new File(getFilename()).exists())
{
+ clearVisualizer();
try
{
Configuration savedSamples = getConfiguration(getFilename());
- clearVisualizer();
readSamples(savedSamples);
+ }
+ catch(SAXException e)
+ {
+ BufferedReader dataReader = new BufferedReader(new
FileReader(getFilename()));
+ String line;
+ while((line = dataReader.readLine()) != null)
+ {
+
sendToVisualizer(SaveService.makeResultFromDelimitedString(line));
+ }
}
catch (Exception e)
{
1.28 +81 -1 jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java
Index: SaveService.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- SaveService.java 7 Sep 2003 18:54:54 -0000 1.27
+++ SaveService.java 10 Sep 2003 15:18:56 -0000 1.28
@@ -62,6 +62,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
@@ -70,6 +71,7 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.StringTokenizer;
import junit.framework.TestCase;
@@ -306,6 +308,84 @@
public static boolean getPrintFieldNames()
{
return printFieldNames;
+ }
+
+ /**
+ * Make a SampleResult given a delimited string.
+ * @param delim
+ * @return
+ * SampleResult
+ */
+ public static SampleResult makeResultFromDelimitedString(String delim)
+ {
+ SampleResult result = new SampleResult();
+ StringTokenizer splitter = new StringTokenizer(delim,defaultDelimiter);
+ String text = null;
+ if (printMilliseconds)
+ {
+ text = splitter.nextToken();
+ result.setTimeStamp(Long.parseLong(text));
+ }
+ else if (formatter != null)
+ {
+ text = splitter.nextToken();
+ try
+ {
+ Date stamp = formatter.parse(text);
+ result.setTimeStamp(stamp.getTime());
+ }
+ catch (ParseException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ if (saveTime)
+ {
+ text = splitter.nextToken();
+ result.setTime(Long.parseLong(text));
+ }
+
+ if (saveLabel)
+ {
+ text = splitter.nextToken();
+ result.setSampleLabel(text);
+ }
+ if (saveResponseCode)
+ {
+ text = splitter.nextToken();
+ result.setResponseCode(text);
+ }
+
+ if (saveResponseMessage)
+ {
+ text = splitter.nextToken();
+ result.setResponseMessage(text);
+ }
+
+ if (saveThreadName)
+ {
+ text = splitter.nextToken();
+ result.setThreadName(text);
+ }
+
+ if (saveDataType)
+ {
+ text = splitter.nextToken();
+ result.setDataType(text);
+ }
+
+ if (saveSuccessful)
+ {
+ text = splitter.nextToken();
+ result.setSuccessful(new Boolean(text).booleanValue());
+ }
+
+ if (saveAssertionResultsFailureMessage)
+ {
+ text = splitter.nextToken();
+ }
+ return result;
}
/**
1.42 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- JMeterUtils.java 18 Aug 2003 19:40:41 -0000 1.41
+++ JMeterUtils.java 10 Sep 2003 15:18:57 -0000 1.42
@@ -98,7 +98,7 @@
*/
public class JMeterUtils implements UnitTestManager
{
- private static final String VERSION = "1.9.20030815";
+ private static final String VERSION = "1.9.20030910";
private static PatternCacheLRU patternCache =
new PatternCacheLRU(1000, new Perl5Compiler());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
