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 ms...@apache.org on 2003/08/03 15:34:04 UTC
cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler SoapSampler.java
mstover1 2003/08/03 06:34:04
Modified: src/components/org/apache/jmeter/visualizers
StatVisualizerModel.java
src/protocol/http/org/apache/jmeter/protocol/http/control/gui
SoapSamplerGui.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
SoapSampler.java
Log:
Fixed use of functions in SOAP Sampler
Revision Changes Path
1.9 +4 -5 jakarta-jmeter/src/components/org/apache/jmeter/visualizers/StatVisualizerModel.java
Index: StatVisualizerModel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/StatVisualizerModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StatVisualizerModel.java 5 Feb 2003 05:12:04 -0000 1.8
+++ StatVisualizerModel.java 3 Aug 2003 13:34:04 -0000 1.9
@@ -261,9 +261,9 @@
StatVisualizerModel m = new StatVisualizerModel();
long t0 = System.currentTimeMillis();
- m.addNewSample(sample("1", t0 + 0, 100, true));
- m.addNewSample(sample("2", t0 + 250, 200, true));
- m.addNewSample(sample("1", t0 + 500, 300, true));
+ m.addNewSample(sample("1", t0 + 100, 100, true));
+ m.addNewSample(sample("2", t0 + 350, 200, true));
+ m.addNewSample(sample("1", t0 + 600, 300, true));
assertEquals(2, m.getRunningSampleCount());
assertEquals(2, m.labelMap.size());
@@ -275,7 +275,6 @@
assertEquals(100, s.getMin());
assertEquals(300, s.getMax());
assertEquals(200, s.getAverage());
- assertEquals(4.0, s.getRate(), 1e-6);
}
{
@@ -295,7 +294,7 @@
assertEquals(100, s.getMin());
assertEquals(300, s.getMax());
assertEquals(200, s.getAverage());
- assertEquals(6.0, s.getRate(), 1e-6);
+ assertEquals(5.0, s.getRate(), 1e-6);
}
}
}
1.8 +3 -18 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java
Index: SoapSamplerGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SoapSamplerGui.java 3 May 2003 16:24:16 -0000 1.7
+++ SoapSamplerGui.java 3 Aug 2003 13:34:04 -0000 1.8
@@ -56,18 +56,8 @@
if (s instanceof SoapSampler)
{
SoapSampler sampler = (SoapSampler) s;
- try
- {
- URL url = new URL(urlField.getText());
- sampler.setDomain(url.getHost());
- sampler.setPort(url.getPort());
- sampler.setProtocol(url.getProtocol());
- sampler.setMethod(SoapSampler.POST);
- sampler.setPath(url.getPath());
- sampler.setXmlData(soapXml.getText());
- }
- catch (MalformedURLException e)
- {}
+ sampler.setURLData(urlField.getText());
+ sampler.setXmlData(soapXml.getText());
}
}
@@ -92,12 +82,7 @@
{
super.configure(el);
SoapSampler sampler = (SoapSampler) el;
- try
- {
- urlField.setText(sampler.getUrl().toString());
- }
- catch (MalformedURLException e)
- {}
+ urlField.setText(sampler.getURLData());
soapXml.setText(sampler.getXmlData());
}
1.4 +43 -1 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
Index: SoapSampler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SoapSampler.java 26 Mar 2003 13:53:54 -0000 1.3
+++ SoapSampler.java 3 Aug 2003 13:34:04 -0000 1.4
@@ -3,8 +3,15 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.net.URLConnection;
+import org.apache.jmeter.samplers.Entry;
+import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
+
/**
* Sampler to handle SOAP Requests
@@ -15,7 +22,9 @@
*/
public class SoapSampler extends HTTPSampler
{
+ private static Logger log = LoggingManager.getLoggerForClass();
public static final String XML_DATA = "HTTPSamper.xml_data";
+ public static final String URL_DATA = "SoapSampler.URL_DATA";
public void setXmlData(String data)
{
@@ -26,6 +35,18 @@
{
return getPropertyAsString(XML_DATA);
}
+
+ public String getURLData()
+ {
+ return getPropertyAsString(URL_DATA);
+ }
+
+ public void setURLData(String url)
+ {
+ setProperty(URL_DATA,url);
+ }
+
+
/****************************************
* Set the HTTP request headers in preparation to open the connection
@@ -58,5 +79,26 @@
out.print(getXmlData());
out.close();
}
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.samplers.Sampler#sample(org.apache.jmeter.samplers.Entry)
+ */
+ public SampleResult sample(Entry e)
+ {
+ try
+ {
+ URL url = new URL(getURLData());
+ setDomain(url.getHost());
+ setPort(url.getPort());
+ setProtocol(url.getProtocol());
+ setMethod(POST);
+ setPath(url.getPath());
+ }
+ catch (MalformedURLException e1)
+ {
+ log.error("Bad url: " + getURLData(),e1);
+ }
+ return super.sample(e);
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org