sebb 2004/07/02 19:46:03
Modified: src/protocol/http/org/apache/jmeter/protocol/http/proxy
ProxyControl.java
Log:
Use HTTPSamplerBase, and NullSampler for testing
Revision Changes Path
1.53 +11 -10
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Index: ProxyControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ProxyControl.java 6 Jun 2004 22:23:57 -0000 1.52
+++ ProxyControl.java 3 Jul 2004 02:46:03 -0000 1.53
@@ -40,7 +40,8 @@
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.protocol.http.control.HeaderManager;
import org.apache.jmeter.protocol.http.control.RecordingController;
-import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
+import org.apache.jmeter.protocol.http.sampler.HTTPNullSampler;
import org.apache.jmeter.samplers.SampleEvent;
import org.apache.jmeter.samplers.SampleListener;
import org.apache.jmeter.samplers.SampleResult;
@@ -250,7 +251,7 @@
* while recording. A future consideration.
*/
public void deliverSampler(
- HTTPSampler sampler,
+ HTTPSamplerBase sampler,
TestElement[] subConfigs,
SampleResult result)
{
@@ -291,7 +292,7 @@
}
}
- private boolean filterUrl(HTTPSampler sampler)
+ private boolean filterUrl(HTTPSamplerBase sampler)
{
String domain = sampler.getDomain();
if (domain == null || domain.length() == 0)
@@ -549,7 +550,7 @@
}
private void placeSampler(
- HTTPSampler sampler,
+ HTTPSamplerBase sampler,
TestElement[] subConfigs,
JMeterTreeNode myTarget)
{
@@ -639,7 +640,7 @@
* @param configurations ConfigTestElements in descending priority.
*/
private void removeValuesFromSampler(
- HTTPSampler sampler,
+ HTTPSamplerBase sampler,
Collection configurations)
{
for (PropertyIterator props= sampler.propertyIterator();
@@ -679,7 +680,7 @@
}
}
- private String generateMatchUrl(HTTPSampler sampler)
+ private String generateMatchUrl(HTTPSamplerBase sampler)
{
StringBuffer buf = new StringBuffer(sampler.getDomain());
buf.append(':');
@@ -837,7 +838,7 @@
public static class Test extends TestCase
{
- HTTPSampler sampler;
+ HTTPSamplerBase sampler;
ProxyControl control;
public Test(String name)
@@ -848,7 +849,7 @@
control = new ProxyControl();
control.addIncludedPattern(".*\\.jsp");
control.addExcludedPattern(".*apache.org.*");
- sampler = new HTTPSampler();
+ sampler = new HTTPNullSampler();
}
public void testFilter1() throws Exception
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
