mstover1 02/04/26 16:26:15
Modified: . build.xml
src_1/org/apache/jmeter/assertions Assertion.java
src_1/org/apache/jmeter/assertions/gui AssertionGui.java
src_1/org/apache/jmeter/control LoopController.java
src_1/org/apache/jmeter/control/gui LoopControlPanel.java
src_1/org/apache/jmeter/gui NamePanel.java
src_1/org/apache/jmeter/gui/action Clear.java
src_1/org/apache/jmeter/junit/protocol/http/parser
HtmlParserTester.java
src_1/org/apache/jmeter/protocol/ftp/sampler FTPSampler.java
src_1/org/apache/jmeter/protocol/http/config UrlConfig.java
src_1/org/apache/jmeter/protocol/http/config/gui
MultipartUrlConfigGui.java UrlConfigGui.java
src_1/org/apache/jmeter/protocol/http/control/gui
HttpTestSampleGui.java
src_1/org/apache/jmeter/protocol/http/modifier
AnchorModifier.java
src_1/org/apache/jmeter/protocol/http/parser HtmlParser.java
src_1/org/apache/jmeter/protocol/http/proxy
HttpRequestHdr.java
src_1/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java HTTPSamplerFull.java
MultipartFormSamplerFull.java
src_1/org/apache/jmeter/protocol/jdbc/sampler
JDBCSampler.java
src_1/org/apache/jmeter/reporters ResultCollector.java
src_1/org/apache/jmeter/samplers SampleResult.java
Sampler.java
src_1/org/apache/jmeter/threads JMeterThread.java
src_1/org/apache/jmeter/threads/gui ThreadGroupGui.java
src_1/org/apache/jmeter/visualizers AssertionVisualizer.java
GraphAccumModel.java GraphAccumVisualizer.java
GraphVisualizer.java MailerVisualizer.java
SplineVisualizer.java StatVisualizer.java
StatVisualizerModel.java TableVisualizer.java
ViewResultsFullVisualizer.java
ViewResultsVisualizer.java
src_1/org/apache/jmeter/visualizers/gui
AbstractVisualizer.java
Log:
Cleaning up little issues, fixing unit tests
Revision Changes Path
1.54 +8 -2 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- build.xml 29 Mar 2002 13:43:44 -0000 1.53
+++ build.xml 26 Apr 2002 23:26:12 -0000 1.54
@@ -127,7 +127,13 @@
</target>
<target name="rmi" depends="compile">
- <rmic classpath="bin/classes" base="bin/classes"
classname="org.apache.jmeter.engine.RemoteJMeterEngineImpl"/>
+ <rmic base="bin/classes"
classname="org.apache.jmeter.engine.RemoteJMeterEngineImpl">
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement path="bin/classes"/>
+ </classpath>
+ </rmic>
+
<rmic classpath="bin/classes" base="bin/classes"
classname="org.apache.jmeter.samplers.RemoteSampleListenerImpl"/>
</target>
@@ -161,7 +167,7 @@
</fileset>
</copy>
- <jar jarfile="ApacheJMeter.jar" manifest="src/MANIFEST"
basedir="${classes.dest.dir}"/>
+ <jar jarfile="ApacheJMeter.jar" manifest="${sources.src.dir}/MANIFEST"
basedir="${classes.dest.dir}"/>
</target>
<!--
1.3 +0 -0 jakarta-jmeter/src_1/org/apache/jmeter/assertions/Assertion.java
Index: Assertion.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/assertions/Assertion.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Assertion.java 26 Apr 2002 00:03:55 -0000 1.2
+++ Assertion.java 26 Apr 2002 23:26:12 -0000 1.3
@@ -68,7 +68,7 @@
* Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:55 $
+ *@created $Date: 2002/04/26 23:26:12 $
*@version 1.0
***********************************************************/
1.3 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/assertions/gui/AssertionGui.java
Index: AssertionGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/assertions/gui/AssertionGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AssertionGui.java 26 Apr 2002 00:03:55 -0000 1.2
+++ AssertionGui.java 26 Apr 2002 23:26:13 -0000 1.3
@@ -73,7 +73,7 @@
* Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:55 $
+ *@created $Date: 2002/04/26 23:26:13 $
*@version 1.0
***************************************/
@@ -254,8 +254,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/26 00:03:55 $
- *@version $Revision: 1.2 $
+ *@created $Date: 2002/04/26 23:26:13 $
+ *@version $Revision: 1.3 $
***************************************/
private class ClearPatternsListener implements ActionListener
{
@@ -274,8 +274,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/26 00:03:55 $
- *@version $Revision: 1.2 $
+ *@created $Date: 2002/04/26 23:26:13 $
+ *@version $Revision: 1.3 $
***************************************/
private class AddPatternListener implements ActionListener
{
@@ -296,8 +296,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/26 00:03:55 $
- *@version $Revision: 1.2 $
+ *@created $Date: 2002/04/26 23:26:13 $
+ *@version $Revision: 1.3 $
***************************************/
private class PatternRenderer extends DefaultListCellRenderer
{
@@ -352,8 +352,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/26 00:03:55 $
- *@version $Revision: 1.2 $
+ *@created $Date: 2002/04/26 23:26:13 $
+ *@version $Revision: 1.3 $
***************************************/
private class PatternListModel extends AbstractListModel
{
1.2 +11 -3
jakarta-jmeter/src_1/org/apache/jmeter/control/LoopController.java
Index: LoopController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/control/LoopController.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoopController.java 19 Apr 2002 02:31:47 -0000 1.1
+++ LoopController.java 26 Apr 2002 23:26:13 -0000 1.2
@@ -60,7 +60,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/19 02:31:47 $
+ *@created $Date: 2002/04/26 23:26:13 $
*@version 1.0
***************************************/
@@ -75,6 +75,7 @@
***************************************/
public LoopController()
{
+ setContinueForever(true);
}
/****************************************
@@ -137,7 +138,14 @@
protected void resetLoopCount()
{
- loopCount = 0;
+ if(!getContinueForever() && getLoops() > -1)
+ {
+ this.setShortCircuit(true);
+ }
+ else
+ {
+ loopCount = 0;
+ }
}
protected boolean hasNextAtEnd()
@@ -162,7 +170,7 @@
private boolean endOfLoop()
{
- return !getContinueForever() && (getLoops() > -1 && loopCount >=
getLoops());
+ return (!getContinueForever() || getLoops() > -1) && loopCount >=
getLoops();
}
public static class Test extends junit.framework.TestCase
1.2 +11 -14
jakarta-jmeter/src_1/org/apache/jmeter/control/gui/LoopControlPanel.java
Index: LoopControlPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/control/gui/LoopControlPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoopControlPanel.java 19 Apr 2002 02:31:48 -0000 1.1
+++ LoopControlPanel.java 26 Apr 2002 23:26:13 -0000 1.2
@@ -15,16 +15,13 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/19 02:31:48 $
+ *@created $Date: 2002/04/26 23:26:13 $
*@version 1.0
***************************************/
public class LoopControlPanel extends AbstractControllerGui implements KeyListener,
ActionListener
{
- /****************************************
- * !ToDo (Field description)
- ***************************************/
- public final static String LOOP_COUNT = "LoopControlPanel.loop_count";
+
JCheckBox infinite;
JTextField loops;
@@ -49,10 +46,10 @@
***************************************/
public LoopControlPanel(boolean displayName)
{
- init();
this.displayName = displayName;
+ init();
setName(getStaticLabel());
- setState(-1);
+ setState(1);
}
/****************************************
@@ -63,14 +60,13 @@
public void configure(TestElement element)
{
setName((String)element.getProperty(TestElement.NAME));
- try
+ if(element instanceof LoopController)
{
-
setState(Integer.parseInt((String)element.getProperty(LOOP_COUNT)));
+ setState(((LoopController)element).getLoops());
}
- catch(NumberFormatException e)
+ else
{
- setState(-1);
- e.printStackTrace();
+ setState(1);
}
}
@@ -85,11 +81,11 @@
configureTestElement(lc);
if(loops.getText().length() > 0)
{
- lc.setProperty(LOOP_COUNT, loops.getText());
+ lc.setLoops(Integer.parseInt(loops.getText()));
}
else
{
- lc.setProperty(LOOP_COUNT, "-1");
+ lc.setLoops(-1);
}
return lc;
}
@@ -246,6 +242,7 @@
loopPanel.add(loops);
loops.setName(LOOPS);
loops.addKeyListener(this);
+ loops.setText("1");
// FOREVER CHECKBOX
infinite = new JCheckBox(JMeterUtils.getResString("infinite"));
1.3 +0 -0 jakarta-jmeter/src_1/org/apache/jmeter/gui/NamePanel.java
Index: NamePanel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/NamePanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NamePanel.java 26 Apr 2002 00:03:55 -0000 1.2
+++ NamePanel.java 26 Apr 2002 23:26:13 -0000 1.3
@@ -63,7 +63,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:55 $
+ *@created $Date: 2002/04/26 23:26:13 $
*@version 1.0
***************************************/
1.3 +0 -0 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Clear.java
Index: Clear.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Clear.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Clear.java 26 Apr 2002 00:03:55 -0000 1.2
+++ Clear.java 26 Apr 2002 23:26:13 -0000 1.3
@@ -66,7 +66,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:55 $
+ *@created $Date: 2002/04/26 23:26:13 $
*@version 1.0
***********************************************************/
1.4 +32 -9
jakarta-jmeter/src_1/org/apache/jmeter/junit/protocol/http/parser/HtmlParserTester.java
Index: HtmlParserTester.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/junit/protocol/http/parser/HtmlParserTester.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HtmlParserTester.java 26 Apr 2002 00:03:55 -0000 1.3
+++ HtmlParserTester.java 26 Apr 2002 23:26:13 -0000 1.4
@@ -1,10 +1,11 @@
package org.apache.jmeter.junit.protocol.http.parser;
-import java.net.URL;
+import java.net.*;
import org.apache.jmeter.protocol.http.modifier.AnchorModifier;
import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.protocol.http.config.UrlConfig;
import junit.framework.TestCase;
@@ -39,12 +40,13 @@
public void testSimpleParse() throws Exception
{
HTTPSampler config = makeUrlConfig(".*/index\\.html");
- URL context = new URL("http://www.apache.org/subdir/previous.html";);
+ HTTPSampler context =
makeContext("http://www.apache.org/subdir/previous.html";);
String responseText = "<html><head><title>Test
page</title></head><body>" +
"<a href=\"index.html\">Goto index
page</a></body></html>";
SampleResult result = new SampleResult();
result.setResponseData(responseText.getBytes());
result.setSampleLabel(context.toString());
+ result.setSamplerData(context);
parser.modifyEntry(config, result);
assertEquals("http://www.apache.org:80/subdir/index.html";,
config.getUrl().toString());
@@ -53,13 +55,14 @@
public void testSimpleParse2() throws Exception
{
HTTPSampler config = makeUrlConfig("/index\\.html");
- URL context = new URL("http://www.apache.org/subdir/previous.html";);
+ HTTPSampler context =
makeContext("http://www.apache.org/subdir/previous.html";);
String responseText = "<html><head><title>Test
page</title></head><body>" +
"<a href=\"/index.html\">Goto index
page</a>hfdfjiudfjdfjkjfkdjf"+
"<b>bold text</b><a
href=lowerdir/index.html>lower</a></body></html>";
SampleResult result = new SampleResult();
result.setResponseData(responseText.getBytes());
result.setSampleLabel(context.toString());
+ result.setSamplerData(context);
parser.modifyEntry(config, result);
String newUrl = config.getUrl().toString();
assertTrue("http://www.apache.org:80/index.html".equals(newUrl)
@@ -71,12 +74,13 @@
{
HTTPSampler config = makeUrlConfig(".*index.*");
config.getArguments().addArgument("param1","value1");
- URL context = new URL("http://www.apache.org/subdir/previous.html";);
+ HTTPSampler context =
makeContext("http://www.apache.org/subdir/previous.html";);
String responseText = "<html><head><title>Test
page</title></head><body>" +
"<a href=\"/home/index.html?param1=value1\">Goto index
page</a></body></html>";
SampleResult result = new SampleResult();
result.setResponseData(responseText.getBytes());
result.setSampleLabel(context.toString());
+ result.setSamplerData(context);
parser.modifyEntry(config, result);
String newUrl = config.getUrl().toString();
assertEquals("http://www.apache.org:80/home/index.html?param1=value1",newUrl);
@@ -85,12 +89,13 @@
public void testSimpleParse4() throws Exception
{
HTTPSampler config = makeUrlConfig("/subdir/index\\..*");
- URL context = new URL("http://www.apache.org/subdir/previous.html";);
+ HTTPSampler context =
makeContext("http://www.apache.org/subdir/previous.html";);
String responseText = "<html><head><title>Test
page</title></head><body>" +
"<A HREF=\"index.html\">Goto index
page</A></body></html>";
SampleResult result = new SampleResult();
result.setResponseData(responseText.getBytes());
result.setSampleLabel(context.toString());
+ result.setSamplerData(context);
parser.modifyEntry(config, result);
String newUrl = config.getUrl().toString();
assertEquals("http://www.apache.org:80/subdir/index.html",newUrl);
@@ -99,12 +104,13 @@
public void testSimpleParse5() throws Exception
{
HTTPSampler config = makeUrlConfig("/subdir/index\\.h.*");
- URL context = new
URL("http://www.apache.org/subdir/one/previous.html";);
+ HTTPSampler context =
makeContext("http://www.apache.org/subdir/one/previous.html";);
String responseText = "<html><head><title>Test
page</title></head><body>" +
"<a href=\"../index.html\">Goto index
page</a></body></html>";
SampleResult result = new SampleResult();
result.setResponseData(responseText.getBytes());
result.setSampleLabel(context.toString());
+ result.setSamplerData(context);
parser.modifyEntry(config, result);
String newUrl = config.getUrl().toString();
assertEquals("http://www.apache.org:80/subdir/index.html",newUrl);
@@ -113,12 +119,13 @@
public void testFailSimpleParse1() throws Exception
{
HTTPSampler config = makeUrlConfig(".*index.*param2=.+1");
- URL context = new URL("http://www.apache.org/subdir/previous.html";);
+ HTTPSampler context =
makeContext("http://www.apache.org/subdir/previous.html";);
String responseText = "<html><head><title>Test
page</title></head><body>" +
"<a href=\"/home/index.html?param1=value1\">Goto index
page</a></body></html>";
SampleResult result = new SampleResult();
result.setResponseData(responseText.getBytes());
result.setSampleLabel(context.toString());
+ result.setSamplerData(context);
parser.modifyEntry(config, result);
String newUrl = config.getUrl().toString();
assertEquals(config.getUrl().toString(),newUrl);
@@ -127,12 +134,13 @@
public void testFailSimpleParse2() throws Exception
{
HTTPSampler config = makeUrlConfig(".*login\\.html");
- URL context = new URL("http://www.apache.org/subdir/previous.html";);
+ HTTPSampler context =
makeContext("http://www.apache.org/subdir/previous.html";);
String responseText = "<html><head><title>Test
page</title></head><body>" +
"<a href=\"/home/index.html?param1=value1\">Goto index
page</a></body></html>";
SampleResult result = new SampleResult();
result.setResponseData(responseText.getBytes());
result.setSampleLabel(context.toString());
+ result.setSamplerData(context);
parser.modifyEntry(config, result);
String newUrl = config.getUrl().toString();
this.assertTrue(!"http://www.apache.org:80/home/index.html?param1=value1".equals(newUrl));
@@ -149,17 +157,32 @@
HTTPSampler config = makeUrlConfig(".*index.html");
config.getArguments().addArgument("test","g.*");
config.setMethod(HTTPSampler.POST);
- URL context = new URL("http://www.apache.org/subdir/previous.html";);
+ HTTPSampler context =
makeContext("http://www.apache.org/subdir/previous.html";);
String responseText = "<html><head><title>Test
page</title></head><body>" +
"<form action=\"index.html\" method=\"POST\"><input
type=\"checkbox\" name=\"test\""+
" value=\"goto\">Goto index
page</form></body></html>";
SampleResult result = new SampleResult();
result.setResponseData(responseText.getBytes());
result.setSampleLabel(context.toString());
+ result.setSamplerData(context);
parser.modifyEntry(config, result);
assertEquals("http://www.apache.org:80/subdir/index.html";,
config.getUrl().toString());
assertEquals("test=goto",config.getQueryString());
+ }
+
+ private HTTPSampler makeContext(String url) throws MalformedURLException
+ {
+ URL u = new URL(url);
+ HTTPSampler context = new HTTPSampler();
+ context.setDomain(u.getHost());
+ context.setPath(u.getPath());
+ context.setPort(u.getPort());
+ context.setProtocol(u.getProtocol());
+ UrlConfig config = new UrlConfig();
+ config.parseArguments(u.getQuery());
+ context.setArguments(config.getArguments());
+ return context;
}
private HTTPSampler makeUrlConfig(String path)
1.3 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
Index: FTPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FTPSampler.java 26 Apr 2002 00:03:55 -0000 1.2
+++ FTPSampler.java 26 Apr 2002 23:26:13 -0000 1.3
@@ -68,8 +68,8 @@
* A sampler which understands FTP file requests
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/26 00:03:55 $
- *@version $Revision: 1.2 $
+ *@created $Date: 2002/04/26 23:26:13 $
+ *@version $Revision: 1.3 $
***********************************************************/
public class FTPSampler extends AbstractSampler
1.4 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/config/UrlConfig.java
Index: UrlConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/config/UrlConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UrlConfig.java 26 Apr 2002 00:03:55 -0000 1.3
+++ UrlConfig.java 26 Apr 2002 23:26:13 -0000 1.4
@@ -72,8 +72,8 @@
* the value you specify here.
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:55 $
- *@version $Revision: 1.3 $
+ *@created $Date: 2002/04/26 23:26:13 $
+ *@version $Revision: 1.4 $
*/
public class UrlConfig extends AbstractTestElement implements Serializable
1.3 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
Index: MultipartUrlConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultipartUrlConfigGui.java 26 Apr 2002 00:03:55 -0000 1.2
+++ MultipartUrlConfigGui.java 26 Apr 2002 23:26:13 -0000 1.3
@@ -73,7 +73,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:55 $
+ *@created $Date: 2002/04/26 23:26:13 $
*@version 1.0
***************************************/
1.3 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Index: UrlConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UrlConfigGui.java 26 Apr 2002 00:03:55 -0000 1.2
+++ UrlConfigGui.java 26 Apr 2002 23:26:13 -0000 1.3
@@ -73,7 +73,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:55 $
+ *@created $Date: 2002/04/26 23:26:13 $
*@version 1.0
***************************************/
1.5 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
Index: HttpTestSampleGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HttpTestSampleGui.java 26 Apr 2002 00:03:56 -0000 1.4
+++ HttpTestSampleGui.java 26 Apr 2002 23:26:13 -0000 1.5
@@ -72,7 +72,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:56 $
+ *@created $Date: 2002/04/26 23:26:13 $
*@version 1.0
***************************************/
1.5 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
Index: AnchorModifier.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AnchorModifier.java 26 Apr 2002 00:03:56 -0000 1.4
+++ AnchorModifier.java 26 Apr 2002 23:26:13 -0000 1.5
@@ -80,7 +80,7 @@
* Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:56 $
+ *@created $Date: 2002/04/26 23:26:13 $
*@version 1.0
***********************************************************/
1.4 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/parser/HtmlParser.java
Index: HtmlParser.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/parser/HtmlParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HtmlParser.java 26 Apr 2002 00:03:56 -0000 1.3
+++ HtmlParser.java 26 Apr 2002 23:26:13 -0000 1.4
@@ -478,8 +478,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/26 00:03:56 $
- *@version $Revision: 1.3 $
+ *@created $Date: 2002/04/26 23:26:13 $
+ *@version $Revision: 1.4 $
***************************************/
public static class Test extends TestCase
{
1.5 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
Index: HttpRequestHdr.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HttpRequestHdr.java 26 Apr 2002 00:03:56 -0000 1.4
+++ HttpRequestHdr.java 26 Apr 2002 23:26:13 -0000 1.5
@@ -22,8 +22,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/26 00:03:56 $
- *@version $Revision: 1.4 $
+ *@created $Date: 2002/04/26 23:26:13 $
+ *@version $Revision: 1.5 $
***************************************/
public class HttpRequestHdr
{
1.5 +15 -12
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Index: HTTPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HTTPSampler.java 26 Apr 2002 00:03:56 -0000 1.4
+++ HTTPSampler.java 26 Apr 2002 23:26:13 -0000 1.5
@@ -83,8 +83,8 @@
* HTTP requests, including cookies and authentication.
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:56 $
- *@version $Revision: 1.4 $
+ *@created $Date: 2002/04/26 23:26:13 $
+ *@version $Revision: 1.5 $
***************************************/
public class HTTPSampler extends AbstractSampler
{
@@ -560,18 +560,14 @@
responseCode = ((HttpURLConnection)conn).getResponseCode();
errorLevel = responseCode / 100;
message = ((HttpURLConnection)conn).getResponseMessage();
- res.setAttribute(this.RESPONSE_CODE,
- String.valueOf(responseCode));
- res.setAttribute(this.RESPONSE_MESSAGE,
- message);
+ res.setResponseCode(String.valueOf(responseCode));
+ res.setResponseMessage(message);
}
catch(Exception e2)
{
res.setResponseData(e2.toString().getBytes());
- res.setAttribute(this.RESPONSE_CODE,
- NON_HTTP_RESPONSE_CODE);
- res.setAttribute(this.RESPONSE_MESSAGE,
- NON_HTTP_RESPONSE_MESSAGE);
+ res.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ res.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
res.setTime(System.currentTimeMillis() - time);
res.setSuccessful(false);
}
@@ -707,10 +703,8 @@
{
ex.printStackTrace();
res.setTime((long)0);
- res.setAttribute(this.RESPONSE_CODE,
- NON_HTTP_RESPONSE_CODE);
- res.setAttribute(this.RESPONSE_MESSAGE,
- NON_HTTP_RESPONSE_MESSAGE);
+ res.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ res.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
res.setResponseData(ex.toString().getBytes());
res.setSuccessful(false);
}
@@ -739,6 +733,15 @@
cookieManager.addCookieFromHeader(conn.getHeaderField(i), u);
}
}
+ }
+ }
+
+ public String toString()
+ {
+ try {
+ return this.getUrl().toString();
+ } catch(MalformedURLException e) {
+ return "";
}
}
1.5 +14 -14
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java
Index: HTTPSamplerFull.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HTTPSamplerFull.java 26 Apr 2002 00:03:56 -0000 1.4
+++ HTTPSamplerFull.java 26 Apr 2002 23:26:13 -0000 1.5
@@ -82,7 +82,7 @@
*
* @author Khor Soon Hin
* @version 1.0
- * @created $Date: 2002/04/26 00:03:56 $
+ * @created $Date: 2002/04/26 23:26:13 $
*/
public class HTTPSamplerFull extends HTTPSampler
{
@@ -157,8 +157,8 @@
catClass.error("sample2 : Error parsing document - " + exception);
catClass.error("sample2 : Setting SampleResult SUCCESS value to
false");
res.setResponseData(exception.toString().getBytes());
- res.setAttribute(RESPONSE_CODE, NON_HTTP_RESPONSE_CODE);
- res.setAttribute(RESPONSE_MESSAGE, NON_HTTP_RESPONSE_MESSAGE);
+ res.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ res.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
res.setSuccessful(false);
}
catch(MalformedURLException exception)
@@ -166,8 +166,8 @@
catClass.error("sample2 : Error creating URL - " + exception);
catClass.error("sample2 : Setting SampleResult SUCCESS value to
false");
res.setResponseData(exception.toString().getBytes());
- res.setAttribute(RESPONSE_CODE, NON_HTTP_RESPONSE_CODE);
- res.setAttribute(RESPONSE_MESSAGE, NON_HTTP_RESPONSE_MESSAGE);
+ res.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ res.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
res.setSuccessful(false);
}
// sample result to store image from <img...> tags
@@ -207,8 +207,8 @@
catClass.error("sample2 : Error reading from URL - " + exception);
catClass.error("sample2 : Setting SampleResult SUCCESS value to
false");
imgRes.setResponseData(exception.toString().getBytes());
- imgRes.setAttribute(RESPONSE_CODE, NON_HTTP_RESPONSE_CODE);
- imgRes.setAttribute(RESPONSE_MESSAGE, NON_HTTP_RESPONSE_MESSAGE);
+ imgRes.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ imgRes.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
imgRes.setSuccessful(false);
}
res.addSubResult(imgRes);
@@ -250,8 +250,8 @@
catClass.error("sample2 : Error reading from URL - " + exception);
catClass.error("sample2 : Setting SampleResult SUCCESS value to
false");
appRes.setResponseData(exception.toString().getBytes());
- appRes.setAttribute(RESPONSE_CODE, NON_HTTP_RESPONSE_CODE);
- appRes.setAttribute(RESPONSE_MESSAGE, NON_HTTP_RESPONSE_MESSAGE);
+ appRes.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ appRes.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
appRes.setSuccessful(false);
}
res.addSubResult(appRes);
@@ -307,8 +307,8 @@
catClass.error("sample2 : Error reading from URL - " + exception);
catClass.error("sample2 : Setting SampleResult SUCCESS value to
false");
imgRes.setResponseData(exception.toString().getBytes());
- imgRes.setAttribute(RESPONSE_CODE, NON_HTTP_RESPONSE_CODE);
- imgRes.setAttribute(RESPONSE_MESSAGE, NON_HTTP_RESPONSE_MESSAGE);
+ imgRes.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ imgRes.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
imgRes.setSuccessful(false);
}
res.addSubResult(imgRes);
@@ -411,8 +411,8 @@
int responseCode = ((HttpURLConnection) conn).getResponseCode();
String responseMessage = ((HttpURLConnection)
conn).getResponseMessage();
errorLevel = responseCode/100;
- res.setAttribute(RESPONSE_CODE, String.valueOf(responseCode));
- res.setAttribute(RESPONSE_MESSAGE, responseMessage);
+ res.setResponseCode(String.valueOf(responseCode));
+ res.setResponseMessage(responseMessage);
if(catClass.isDebugEnabled())
{
catClass.debug("getErrorLevel1 : responseCode - " + responseCode);
@@ -429,8 +429,8 @@
catClass.error("getErrorLevel1 : " +
"Setting SampleResult SUCCESS value to false");
res.setResponseData(e2.toString().getBytes());
- res.setAttribute(RESPONSE_CODE, NON_HTTP_RESPONSE_CODE);
- res.setAttribute(RESPONSE_MESSAGE, NON_HTTP_RESPONSE_MESSAGE);
+ res.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ res.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
res.setSuccessful(false);
}
catClass.debug("End : getErrorLevel1");
1.5 +14 -14
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/MultipartFormSamplerFull.java
Index: MultipartFormSamplerFull.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/sampler/MultipartFormSamplerFull.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MultipartFormSamplerFull.java 26 Apr 2002 00:03:56 -0000 1.4
+++ MultipartFormSamplerFull.java 26 Apr 2002 23:26:13 -0000 1.5
@@ -137,8 +137,8 @@
catClass.error("sample2 : Error parsing document - " +
exception);
catClass.error("sample2 : Setting SampleResult SUCCESS value
to false");
res.setResponseData(exception.toString().getBytes());
- res.setAttribute(RESPONSE_CODE, NON_HTTP_RESPONSE_CODE);
- res.setAttribute(RESPONSE_MESSAGE, NON_HTTP_RESPONSE_MESSAGE);
+ res.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ res.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
res.setSuccessful(false);
}
catch(MalformedURLException exception)
@@ -146,8 +146,8 @@
catClass.error("sample2 : Error creating URL - " + exception);
catClass.error("sample2 : Setting SampleResult SUCCESS value
to false");
res.setResponseData(exception.toString().getBytes());
- res.setAttribute(RESPONSE_CODE, NON_HTTP_RESPONSE_CODE);
- res.setAttribute(RESPONSE_MESSAGE, NON_HTTP_RESPONSE_MESSAGE);
+ res.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ res.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
res.setSuccessful(false);
}
@@ -192,8 +192,8 @@
catClass.error("sample2 : Error reading from URL - " +
exception);
catClass.error("sample2 : Setting SampleResult SUCCESS
value to false");
imgRes.setResponseData(exception.toString().getBytes());
- imgRes.setAttribute(RESPONSE_CODE,
NON_HTTP_RESPONSE_CODE);
- imgRes.setAttribute(RESPONSE_MESSAGE,
NON_HTTP_RESPONSE_MESSAGE);
+ imgRes.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ imgRes.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
imgRes.setSuccessful(false);
}
res.addSubResult(imgRes);
@@ -242,8 +242,8 @@
catClass.error("sample2 : Error reading from URL - " +
exception);
catClass.error("sample2 : Setting SampleResult SUCCESS
value to false");
appRes.setResponseData(exception.toString().getBytes());
- appRes.setAttribute(RESPONSE_CODE,
NON_HTTP_RESPONSE_CODE);
- appRes.setAttribute(RESPONSE_MESSAGE,
NON_HTTP_RESPONSE_MESSAGE);
+ appRes.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ appRes.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
appRes.setSuccessful(false);
}
@@ -306,8 +306,8 @@
catClass.error("sample2 : Error reading from URL - " +
exception);
catClass.error("sample2 : Setting SampleResult SUCCESS
value to false");
imgRes.setResponseData(exception.toString().getBytes());
- imgRes.setAttribute(RESPONSE_CODE,
NON_HTTP_RESPONSE_CODE);
- imgRes.setAttribute(RESPONSE_MESSAGE,
NON_HTTP_RESPONSE_MESSAGE);
+ imgRes.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ imgRes.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
imgRes.setSuccessful(false);
}
@@ -423,8 +423,8 @@
int responseCode = ((HttpURLConnection)
conn).getResponseCode();
String responseMessage = ((HttpURLConnection)
conn).getResponseMessage();
errorLevel = responseCode/100;
- res.setAttribute(RESPONSE_CODE, String.valueOf(responseCode));
- res.setAttribute(RESPONSE_MESSAGE, responseMessage);
+ res.setResponseCode(String.valueOf(responseCode));
+ res.setResponseMessage(responseMessage);
if(catClass.isDebugEnabled())
{
@@ -442,8 +442,8 @@
catClass.error("getErrorLevel1 : " +
"Setting SampleResult SUCCESS value to false");
res.setResponseData(e2.toString().getBytes());
- res.setAttribute(RESPONSE_CODE, NON_HTTP_RESPONSE_CODE);
- res.setAttribute(RESPONSE_MESSAGE, NON_HTTP_RESPONSE_MESSAGE);
+ res.setResponseCode(NON_HTTP_RESPONSE_CODE);
+ res.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
res.setSuccessful(false);
}
1.4 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
Index: JDBCSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JDBCSampler.java 26 Apr 2002 00:03:56 -0000 1.3
+++ JDBCSampler.java 26 Apr 2002 23:26:14 -0000 1.4
@@ -70,8 +70,8 @@
* A sampler which understands JDBC database requests
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/26 00:03:56 $
- *@version $Revision: 1.3 $
+ *@created $Date: 2002/04/26 23:26:14 $
+ *@version $Revision: 1.4 $
***********************************************************/
public class JDBCSampler extends AbstractSampler
1.4 +11 -4
jakarta-jmeter/src_1/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResultCollector.java 26 Apr 2002 00:03:57 -0000 1.3
+++ ResultCollector.java 26 Apr 2002 23:26:14 -0000 1.4
@@ -67,7 +67,7 @@
* Title: Description: Copyright: Copyright (c) 2001 Company:
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:57 $
+ *@created $Date: 2002/04/26 23:26:14 $
*@version 1.0
*/
@@ -95,7 +95,7 @@
/**
* Sets the filename attribute of the ResultCollector object
*
- *@param f The new filename value
+ *@param f The new filename value`
*/
public void setFilename(String f) throws IOException
{
@@ -312,7 +312,7 @@
}
catch(Exception err)
{
- err.printStackTrace(); //should throw exception back to caller
+ //err.printStackTrace(); //should throw exception back to
caller
}
}
@@ -335,8 +335,15 @@
{
if(out == null && filename != null)
{
- out = new PrintWriter(new BufferedOutputStream(new
FileOutputStream(filename)));
- writeFileStart();
+ try
+ {
+ out = new PrintWriter(new BufferedOutputStream(new
FileOutputStream(filename)));
+ writeFileStart();
+ }
+ catch(FileNotFoundException e)
+ {
+ out = null;
+ }
}
}
1.4 +52 -3
jakarta-jmeter/src_1/org/apache/jmeter/samplers/SampleResult.java
Index: SampleResult.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/samplers/SampleResult.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SampleResult.java 26 Apr 2002 00:03:57 -0000 1.3
+++ SampleResult.java 26 Apr 2002 23:26:14 -0000 1.4
@@ -67,8 +67,8 @@
* sample of an entry.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/26 00:03:57 $
- *@version $Revision: 1.3 $
+ *@created $Date: 2002/04/26 23:26:14 $
+ *@version $Revision: 1.4 $
*/
public class SampleResult extends DefaultConfiguration implements Serializable
{
@@ -86,6 +86,10 @@
private final static String SAMPLE_LABEL = "displayName";
private final static String SAMPLER_CONFIG = "samplerConfig";
private final static String DATA_TYPE = "dataType";
+ private final static String RESPONSE_CODE = "responseCode";
+ private final static String RESPONSE_MESSAGE = "responseMessage";
+ private final static String THREAD_NAME = "threadName";
+ private final static String TIME_STAMP = "timeStamp";
/**
* Description of the Field
*/
@@ -117,6 +121,46 @@
map = new HashMap();
time = 0;
}
+
+ public String getResponseCode()
+ {
+ return getAttribute(RESPONSE_CODE,"");
+ }
+
+ public void setResponseCode(String code)
+ {
+ setAttribute(RESPONSE_CODE,code);
+ }
+
+ public String getResponseMessage()
+ {
+ return getAttribute(RESPONSE_MESSAGE,"");
+ }
+
+ public void setResponseMessage(String msg)
+ {
+ setAttribute(RESPONSE_MESSAGE,msg);
+ }
+
+ public String getThreadName()
+ {
+ return getAttribute(THREAD_NAME,"");
+ }
+
+ public void setThreadName(String threadName)
+ {
+ setAttribute(THREAD_NAME,threadName);
+ }
+
+ public long getTimeStamp()
+ {
+ return getAttributeAsLong(TIME_STAMP,0L);
+ }
+
+ public void setTimeStamp(long timeStamp)
+ {
+ setAttribute(TIME_STAMP,""+timeStamp);
+ }
public String getSampleLabel()
{
@@ -135,7 +179,13 @@
public AssertionResult[] getAssertionResults()
{
- return (AssertionResult[])getChildren(AssertionResult.TAG_NAME);
+ Configuration[] subs = getChildren(AssertionResult.TAG_NAME);
+ AssertionResult[] subResults = new AssertionResult[subs.length];
+ for(int i = 0;i < subs.length;i++)
+ {
+ subResults[i] = (AssertionResult)subs[i];
+ }
+ return subResults;
}
public void addSubResult(SampleResult subResult)
@@ -314,7 +364,6 @@
*/
public String toString()
{
- String toString = (String)getValue(SAMPLE_LABEL);
- return toString;
+ return getSampleLabel();
}
}
1.3 +2 -5 jakarta-jmeter/src_1/org/apache/jmeter/samplers/Sampler.java
Index: Sampler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/samplers/Sampler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Sampler.java 19 Apr 2002 02:08:50 -0000 1.2
+++ Sampler.java 26 Apr 2002 23:26:14 -0000 1.3
@@ -61,15 +61,12 @@
* implement this interface.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/19 02:08:50 $
- *@version $Revision: 1.2 $
+ *@created $Date: 2002/04/26 23:26:14 $
+ *@version $Revision: 1.3 $
***********************************************************/
public interface Sampler extends java.io.Serializable, TestElement
{
public final static String HEADER = "sampler.HEADER";
- public final static String RESPONSE_CODE = "sampler.RESPONSE_CODE";
- public final static String RESPONSE_MESSAGE =
- "sampler.RESPONSE_MESSAGE";
/************************************************************
*@param e !ToDo (Parameter description)
1.4 +0 -0 jakarta-jmeter/src_1/org/apache/jmeter/threads/JMeterThread.java
Index: JMeterThread.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/threads/JMeterThread.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMeterThread.java 26 Apr 2002 00:03:57 -0000 1.3
+++ JMeterThread.java 26 Apr 2002 23:26:14 -0000 1.4
@@ -71,8 +71,8 @@
* timing, add listeners for sampling events and to stop the sampling process.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/26 00:03:57 $
- *@version $Revision: 1.3 $
+ *@created $Date: 2002/04/26 23:26:14 $
+ *@version $Revision: 1.4 $
***************************************/
public class JMeterThread implements Runnable, java.io.Serializable
{
1.4 +4 -1
jakarta-jmeter/src_1/org/apache/jmeter/threads/gui/ThreadGroupGui.java
Index: ThreadGroupGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/threads/gui/ThreadGroupGui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ThreadGroupGui.java 21 Apr 2002 17:38:50 -0000 1.3
+++ ThreadGroupGui.java 26 Apr 2002 23:26:14 -0000 1.4
@@ -74,7 +74,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/21 17:38:50 $
+ *@created $Date: 2002/04/26 23:26:14 $
*@version 1.0
***************************************/
@@ -185,6 +185,9 @@
public JPanel createControllerPanel()
{
loopPanel = new LoopControlPanel(false);
+ LoopController looper= (LoopController)loopPanel.createTestElement();
+ looper.setLoops(-1);
+ loopPanel.configure(looper);
return loopPanel;
}
1.4 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/AssertionVisualizer.java
Index: AssertionVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/AssertionVisualizer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AssertionVisualizer.java 26 Apr 2002 00:03:57 -0000 1.3
+++ AssertionVisualizer.java 26 Apr 2002 23:26:14 -0000 1.4
@@ -72,7 +72,7 @@
* Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:57 $
+ *@created $Date: 2002/04/26 23:26:14 $
*@version 1.0
***************************************/
1.4 +0 -16
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/GraphAccumModel.java
Index: GraphAccumModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/GraphAccumModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GraphAccumModel.java 26 Apr 2002 00:03:57 -0000 1.3
+++ GraphAccumModel.java 26 Apr 2002 23:26:14 -0000 1.4
@@ -205,7 +205,6 @@
max = 1;
bigChange = true;
this.fireDataChanged();
- this.fireClear();
catClass.debug("End : clear1");
}
@@ -257,21 +256,6 @@
quickUpdate(current);
}
catClass.debug("End : fireDataChanged1");
- }
-
-
- /**
- * Clears all the image visualizers
- */
- protected void fireClear()
- {
- catClass.debug("Start : fireClear1");
- Iterator iter = listeners.iterator();
- while (iter.hasNext())
- {
- ((Clearable) iter.next()).clear();
- }
- catClass.debug("End : fireClear1");
}
1.3 +5 -2
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
Index: GraphAccumVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/GraphAccumVisualizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphAccumVisualizer.java 19 Apr 2002 02:08:52 -0000 1.2
+++ GraphAccumVisualizer.java 26 Apr 2002 23:26:14 -0000 1.3
@@ -61,6 +61,7 @@
import org.apache.jmeter.gui.*;
import org.apache.jmeter.gui.util.VerticalLayout;
import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.samplers.Clearable;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.log4j.*;
@@ -71,10 +72,10 @@
*
*@author Khor Soon Hin
*@created 2001/08/11
- *@version $Revision: 1.2 $ $Date: 2002/04/19 02:08:52 $
+ *@version $Revision: 1.3 $ $Date: 2002/04/26 23:26:14 $
***************************************/
public class GraphAccumVisualizer extends AbstractVisualizer
- implements ImageVisualizer, GraphAccumListener
+ implements ImageVisualizer, GraphAccumListener,Clearable
{
/****************************************
@@ -182,6 +183,8 @@
***************************************/
public synchronized void clear()
{
+ model.clear();
+ graph.clear();
catClass.debug("Start : clear1");
repaint();
catClass.debug("End : clear1");
1.3 +4 -3
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/GraphVisualizer.java
Index: GraphVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/GraphVisualizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphVisualizer.java 19 Apr 2002 02:08:52 -0000 1.2
+++ GraphVisualizer.java 26 Apr 2002 23:26:14 -0000 1.3
@@ -61,6 +61,7 @@
import org.apache.jmeter.gui.*;
import org.apache.jmeter.gui.util.VerticalLayout;
import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.samplers.Clearable;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
@@ -71,10 +72,10 @@
*
*@author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
*@created February 8, 2001
- *@version $Revision: 1.2 $ $Date: 2002/04/19 02:08:52 $
+ *@version $Revision: 1.3 $ $Date: 2002/04/26 23:26:14 $
***************************************/
public class GraphVisualizer extends AbstractVisualizer
- implements ImageVisualizer, ItemListener, GraphListener
+ implements ImageVisualizer, ItemListener, GraphListener,Clearable
{
GraphModel model;
private JTextField maxYField = null;
@@ -194,7 +195,7 @@
public synchronized void clear()
{
//this.graph.clear();
-
+ model.clear();
dataField.setText("0000");
averageField.setText("0000");
deviationField.setText("0000");
1.4 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/MailerVisualizer.java
Index: MailerVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/MailerVisualizer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MailerVisualizer.java 26 Apr 2002 00:03:57 -0000 1.3
+++ MailerVisualizer.java 26 Apr 2002 23:26:14 -0000 1.4
@@ -84,8 +84,8 @@
* occurs.
*
*@author <a href="mailto:[EMAIL PROTECTED]";>Stuart Schmukler</a>
- *@created $Date: 2002/04/26 00:03:57 $
- *@version $Revision: 1.3 $ $Date: 2002/04/26 00:03:57 $
+ *@created $Date: 2002/04/26 23:26:14 $
+ *@version $Revision: 1.4 $ $Date: 2002/04/26 23:26:14 $
***********************************************************/
public class MailerVisualizer extends JPanel implements Visualizer, ActionListener
{
1.3 +11 -5
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/SplineVisualizer.java
Index: SplineVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/SplineVisualizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SplineVisualizer.java 19 Apr 2002 02:08:52 -0000 1.2
+++ SplineVisualizer.java 26 Apr 2002 23:26:14 -0000 1.3
@@ -62,6 +62,7 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
+import org.apache.jmeter.samplers.Clearable;
/****************************************
* This class implements a statistical analyser that takes samples to process a
@@ -69,11 +70,11 @@
* GraphVisualizer.
*
*@author <a href="mailto:[EMAIL PROTECTED]";>Jean-Pierre Norguet</a>
- *@created $Date: 2002/04/19 02:08:52 $
+ *@created $Date: 2002/04/26 23:26:14 $
*@version 0.9.1
***************************************/
public class SplineVisualizer extends AbstractVisualizer implements
ImageVisualizer,
- GraphListener
+ GraphListener,Clearable
{
/****************************************
@@ -145,6 +146,11 @@
{
updateGui();
}
+
+ public void clear()
+ {
+ model.clear();
+ }
/****************************************
* !ToDo (Method description)
@@ -352,8 +358,8 @@
* Component showing a Spline curve.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/19 02:08:52 $
- *@version $Revision: 1.2 $
+ *@created $Date: 2002/04/26 23:26:14 $
+ *@version $Revision: 1.3 $
***************************************/
public class SplineGraph extends JComponent
{
1.3 +12 -11
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/StatVisualizer.java
Index: StatVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/StatVisualizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatVisualizer.java 19 Apr 2002 02:08:52 -0000 1.2
+++ StatVisualizer.java 26 Apr 2002 23:26:14 -0000 1.3
@@ -70,6 +70,7 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
+import org.apache.jmeter.samplers.Clearable;
/****************************************
@@ -80,11 +81,11 @@
* Company: Apache Foundation
*
*@author James Boutcher
- *@created $Date: 2002/04/19 02:08:52 $
+ *@created $Date: 2002/04/26 23:26:14 $
*@version 1.0
***************************************/
-public class StatVisualizer extends AbstractVisualizer implements Scrollable,
GraphListener
+public class StatVisualizer extends AbstractVisualizer implements Scrollable,
GraphListener,Clearable
{
// protected NamePanel namePanel;
@@ -392,8 +393,8 @@
* support our dynamically-sizing TableModel for this visualizer.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/19 02:08:52 $
- *@version $Revision: 1.2 $
+ *@created $Date: 2002/04/26 23:26:14 $
+ *@version $Revision: 1.3 $
***************************************/
class SortFilterModel extends AbstractTableModel
@@ -578,8 +579,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/19 02:08:52 $
- *@version $Revision: 1.2 $
+ *@created $Date: 2002/04/26 23:26:14 $
+ *@version $Revision: 1.3 $
***************************************/
private class Row implements Comparable
{
@@ -628,8 +629,8 @@
* Class which implements the model for our main table in this visualizer.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/19 02:08:52 $
- *@version $Revision: 1.2 $
+ *@created $Date: 2002/04/26 23:26:14 $
+ *@version $Revision: 1.3 $
***************************************/
class StatTableModel extends AbstractTableModel
1.4 +2 -2
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/StatVisualizerModel.java
Index: StatVisualizerModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/StatVisualizerModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StatVisualizerModel.java 26 Apr 2002 00:03:57 -0000 1.3
+++ StatVisualizerModel.java 26 Apr 2002 23:26:14 -0000 1.4
@@ -231,8 +231,8 @@
public void addNewSample(SampleResult res)
{
boolean wasSuccessful = res.isSuccessful();
- addNewSample(res.getTime(), (String)res.getValue("sampler.LABEL"),
wasSuccessful,
- (String)res.getValue("sampler.RESPONSE_CODE"));
+ addNewSample(res.getTime(), (String)res.getSampleLabel(),
wasSuccessful,
+ (String)res.getResponseCode());
this.fireDataChanged();
}
1.3 +2 -2
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/TableVisualizer.java
Index: TableVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/TableVisualizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TableVisualizer.java 19 Apr 2002 02:08:52 -0000 1.2
+++ TableVisualizer.java 26 Apr 2002 23:26:14 -0000 1.3
@@ -72,7 +72,7 @@
*
*@author <a href="mailto:[EMAIL PROTECTED]";>Alf Hogemark</a>
*@created March 10, 2002
- *@version $Revision: 1.2 $
+ *@version $Revision: 1.3 $
***************************************/
public class TableVisualizer extends AbstractVisualizer
implements GraphListener, Clearable
@@ -153,7 +153,7 @@
public synchronized void clear()
{
//this.graph.clear();
-
+ model.clear();
dataField.setText("0000");
averageField.setText("0000");
deviationField.setText("0000");
1.4 +2 -2
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Index: ViewResultsFullVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ViewResultsFullVisualizer.java 26 Apr 2002 00:03:57 -0000 1.3
+++ ViewResultsFullVisualizer.java 26 Apr 2002 23:26:14 -0000 1.4
@@ -78,7 +78,7 @@
*
*@author Khor Soon Hin
*@created 2001/07/25
- *@version $Revision: 1.3 $ $Date: 2002/04/26 00:03:57 $
+ *@version $Revision: 1.4 $ $Date: 2002/04/26 23:26:14 $
***************************************/
public class ViewResultsFullVisualizer extends ViewResultsVisualizer implements
TreeSelectionListener
@@ -279,7 +279,7 @@
resultPanel.add(loadTime);
// response code label
JLabel httpResponseCode = new JLabel();
- String responseCode =
(String)res.getValue(Sampler.RESPONSE_CODE);
+ String responseCode = res.getResponseCode();
catClass.debug("valueChanged1 : response code - " +
responseCode);
int responseLevel = 0;
if(responseCode != null)
@@ -309,7 +309,7 @@
resultPanel.add(httpResponseCode);
// response message label
JLabel httpResponseMsg = new JLabel();
-
String responseMsgStr = (String)res.getValue(Sampler.RESPONSE_MESSAGE);
+
String responseMsgStr = res.getResponseMessage();
catClass.debug("valueChanged1 : response message - " + responseMsgStr);
httpResponseMsg.setText("HTTP response message : " +
responseMsgStr);
1.4 +4 -0
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/ViewResultsVisualizer.java
Index: ViewResultsVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/ViewResultsVisualizer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ViewResultsVisualizer.java 26 Apr 2002 00:03:57 -0000 1.3
+++ ViewResultsVisualizer.java 26 Apr 2002 23:26:14 -0000 1.4
@@ -73,8 +73,8 @@
* "Continue" button.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/04/26 00:03:57 $
- *@version $Revision: 1.3 $ $Date: 2002/04/26 00:03:57 $
+ *@created $Date: 2002/04/26 23:26:14 $
+ *@version $Revision: 1.4 $ $Date: 2002/04/26 23:26:14 $
***************************************/
public class ViewResultsVisualizer extends AbstractVisualizer implements
ActionListener, Clearable
{
@@ -106,6 +106,10 @@
}
}
+ /**
+ * Method getModel.
+ * @return ResultCollector
+ */
protected ResultCollector getModel()
{
return model;
1.4 +4 -1
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
Index: AbstractVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractVisualizer.java 26 Apr 2002 00:03:58 -0000 1.3
+++ AbstractVisualizer.java 26 Apr 2002 23:26:14 -0000 1.4
@@ -17,7 +17,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/26 00:03:58 $
+ *@created $Date: 2002/04/26 23:26:14 $
*@version 1.0
***************************************/
@@ -127,7 +127,10 @@
configureTestElement(collector);
try
{
- collector.setFilename(getFile());
+ if(!getFile().equals(""))
+ {
+ collector.setFilename(getFile());
+ }
}
catch(IOException e)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
