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 se...@apache.org on 2005/08/04 23:17:07 UTC
cvs commit: jakarta-jmeter/test/src/org/apache/jmeter/protocol/http/sampler HTTPSampler2Test.java
sebb 2005/08/04 14:17:07
Modified: src/protocol/http/org/apache/jmeter/protocol/http/sampler
HTTPSampler2.java
Added: test/src/org/apache/jmeter/protocol/http/sampler
HTTPSampler2Test.java
Log:
Change to use new ThreadListener interface
Move test code to test tree
Revision Changes Path
1.21 +4 -126 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Index: HTTPSampler2.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- HTTPSampler2.java 12 Jul 2005 20:50:56 -0000 1.20
+++ HTTPSampler2.java 4 Aug 2005 21:17:05 -0000 1.21
@@ -41,6 +41,7 @@
import org.apache.jmeter.protocol.http.control.CookieManager;
import org.apache.jmeter.protocol.http.control.HeaderManager;
+import org.apache.jmeter.testelement.ThreadListener;
import org.apache.jmeter.testelement.property.CollectionProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.util.JMeterUtils;
@@ -54,7 +55,7 @@
* HTTP requests, including cookies and authentication.
*
*/
-public class HTTPSampler2 extends HTTPSamplerBase {
+public class HTTPSampler2 extends HTTPSamplerBase implements ThreadListener {
transient private static Logger log = LoggingManager.getLoggerForClass();
static {
@@ -536,135 +537,12 @@
}
public void threadStarted() {
- log.info("Thread Started");
+ log.debug("Thread Started");
}
public void threadFinished() {
- log.info("Thread Finished");
+ log.debug("Thread Finished");
if (httpConn != null)
httpConn.close();
}
-
- // ////////////////////////////////////////////////////////////////////////////////////////////////
-
- public static class Test extends junit.framework.TestCase {
- public Test(String name) {
- super(name);
- }
-
- public void testArgumentWithoutEquals() throws Exception {
- HTTPSampler2 sampler = new HTTPSampler2();
- sampler.setProtocol("http");
- sampler.setMethod(GET);
- sampler.setPath("/index.html?pear");
- sampler.setDomain("www.apache.org");
- assertEquals("http://www.apache.org/index.html?pear", sampler.getUrl().toString());
- }
-
- public void testMakingUrl() throws Exception {
- HTTPSampler2 config = new HTTPSampler2();
- config.setProtocol("http");
- config.setMethod(GET);
- config.addArgument("param1", "value1");
- config.setPath("/index.html");
- config.setDomain("www.apache.org");
- assertEquals("http://www.apache.org/index.html?param1=value1", config.getUrl().toString());
- }
-
- public void testMakingUrl2() throws Exception {
- HTTPSampler2 config = new HTTPSampler2();
- config.setProtocol("http");
- config.setMethod(GET);
- config.addArgument("param1", "value1");
- config.setPath("/index.html?p1=p2");
- config.setDomain("www.apache.org");
- assertEquals("http://www.apache.org/index.html?param1=value1&p1=p2", config.getUrl().toString());
- }
-
- public void testMakingUrl3() throws Exception {
- HTTPSampler2 config = new HTTPSampler2();
- config.setProtocol("http");
- config.setMethod(POST);
- config.addArgument("param1", "value1");
- config.setPath("/index.html?p1=p2");
- config.setDomain("www.apache.org");
- assertEquals("http://www.apache.org/index.html?p1=p2", config.getUrl().toString());
- }
-
- // test cases for making Url, and exercise method
- // addArgument(String name,String value,String metadata)
-
- public void testMakingUrl4() throws Exception {
- HTTPSampler2 config = new HTTPSampler2();
- config.setProtocol("http");
- config.setMethod(GET);
- config.addArgument("param1", "value1", "=");
- config.setPath("/index.html");
- config.setDomain("www.apache.org");
- assertEquals("http://www.apache.org/index.html?param1=value1", config.getUrl().toString());
- }
-
- public void testMakingUrl5() throws Exception {
- HTTPSampler2 config = new HTTPSampler2();
- config.setProtocol("http");
- config.setMethod(GET);
- config.addArgument("param1", "", "=");
- config.setPath("/index.html");
- config.setDomain("www.apache.org");
- assertEquals("http://www.apache.org/index.html?param1=", config.getUrl().toString());
- }
-
- public void testMakingUrl6() throws Exception {
- HTTPSampler2 config = new HTTPSampler2();
- config.setProtocol("http");
- config.setMethod(GET);
- config.addArgument("param1", "", "");
- config.setPath("/index.html");
- config.setDomain("www.apache.org");
- assertEquals("http://www.apache.org/index.html?param1", config.getUrl().toString());
- }
-
- // test cases for making Url, and exercise method
- // parseArguments(String queryString)
-
- public void testMakingUrl7() throws Exception {
- HTTPSampler2 config = new HTTPSampler2();
- config.setProtocol("http");
- config.setMethod(GET);
- config.parseArguments("param1=value1");
- config.setPath("/index.html");
- config.setDomain("www.apache.org");
- assertEquals("http://www.apache.org/index.html?param1=value1", config.getUrl().toString());
- }
-
- public void testMakingUrl8() throws Exception {
- HTTPSampler2 config = new HTTPSampler2();
- config.setProtocol("http");
- config.setMethod(GET);
- config.parseArguments("param1=");
- config.setPath("/index.html");
- config.setDomain("www.apache.org");
- assertEquals("http://www.apache.org/index.html?param1=", config.getUrl().toString());
- }
-
- public void testMakingUrl9() throws Exception {
- HTTPSampler2 config = new HTTPSampler2();
- config.setProtocol("http");
- config.setMethod(GET);
- config.parseArguments("param1");
- config.setPath("/index.html");
- config.setDomain("www.apache.org");
- assertEquals("http://www.apache.org/index.html?param1", config.getUrl().toString());
- }
-
- public void testMakingUrl10() throws Exception {
- HTTPSampler2 config = new HTTPSampler2();
- config.setProtocol("http");
- config.setMethod(GET);
- config.parseArguments("");
- config.setPath("/index.html");
- config.setDomain("www.apache.org");
- assertEquals("http://www.apache.org/index.html", config.getUrl().toString());
- }
- }
}
1.1 jakarta-jmeter/test/src/org/apache/jmeter/protocol/http/sampler/HTTPSampler2Test.java
Index: HTTPSampler2Test.java
===================================================================
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.jmeter.protocol.http.sampler;
/**
* A sampler which understands all the parts necessary to read statistics about
* HTTP requests, including cookies and authentication.
*
*/
public class HTTPSampler2Test extends junit.framework.TestCase {
public HTTPSampler2Test(String name) {
super(name);
}
public void testArgumentWithoutEquals() throws Exception {
HTTPSampler2 sampler = new HTTPSampler2();
sampler.setProtocol("http");
sampler.setMethod(HTTPSampler.GET);
sampler.setPath("/index.html?pear");
sampler.setDomain("www.apache.org");
assertEquals("http://www.apache.org/index.html?pear", sampler.getUrl().toString());
}
public void testMakingUrl() throws Exception {
HTTPSampler2 config = new HTTPSampler2();
config.setProtocol("http");
config.setMethod(HTTPSampler.GET);
config.addArgument("param1", "value1");
config.setPath("/index.html");
config.setDomain("www.apache.org");
assertEquals("http://www.apache.org/index.html?param1=value1", config.getUrl().toString());
}
public void testMakingUrl2() throws Exception {
HTTPSampler2 config = new HTTPSampler2();
config.setProtocol("http");
config.setMethod(HTTPSampler.GET);
config.addArgument("param1", "value1");
config.setPath("/index.html?p1=p2");
config.setDomain("www.apache.org");
assertEquals("http://www.apache.org/index.html?param1=value1&p1=p2", config.getUrl().toString());
}
public void testMakingUrl3() throws Exception {
HTTPSampler2 config = new HTTPSampler2();
config.setProtocol("http");
config.setMethod(HTTPSampler.POST);
config.addArgument("param1", "value1");
config.setPath("/index.html?p1=p2");
config.setDomain("www.apache.org");
assertEquals("http://www.apache.org/index.html?p1=p2", config.getUrl().toString());
}
// test cases for making Url, and exercise method
// addArgument(String name,String value,String metadata)
public void testMakingUrl4() throws Exception {
HTTPSampler2 config = new HTTPSampler2();
config.setProtocol("http");
config.setMethod(HTTPSampler.GET);
config.addArgument("param1", "value1", "=");
config.setPath("/index.html");
config.setDomain("www.apache.org");
assertEquals("http://www.apache.org/index.html?param1=value1", config.getUrl().toString());
}
public void testMakingUrl5() throws Exception {
HTTPSampler2 config = new HTTPSampler2();
config.setProtocol("http");
config.setMethod(HTTPSampler.GET);
config.addArgument("param1", "", "=");
config.setPath("/index.html");
config.setDomain("www.apache.org");
assertEquals("http://www.apache.org/index.html?param1=", config.getUrl().toString());
}
public void testMakingUrl6() throws Exception {
HTTPSampler2 config = new HTTPSampler2();
config.setProtocol("http");
config.setMethod(HTTPSampler.GET);
config.addArgument("param1", "", "");
config.setPath("/index.html");
config.setDomain("www.apache.org");
assertEquals("http://www.apache.org/index.html?param1", config.getUrl().toString());
}
// test cases for making Url, and exercise method
// parseArguments(String queryString)
public void testMakingUrl7() throws Exception {
HTTPSampler2 config = new HTTPSampler2();
config.setProtocol("http");
config.setMethod(HTTPSampler.GET);
config.parseArguments("param1=value1");
config.setPath("/index.html");
config.setDomain("www.apache.org");
assertEquals("http://www.apache.org/index.html?param1=value1", config.getUrl().toString());
}
public void testMakingUrl8() throws Exception {
HTTPSampler2 config = new HTTPSampler2();
config.setProtocol("http");
config.setMethod(HTTPSampler.GET);
config.parseArguments("param1=");
config.setPath("/index.html");
config.setDomain("www.apache.org");
assertEquals("http://www.apache.org/index.html?param1=", config.getUrl().toString());
}
public void testMakingUrl9() throws Exception {
HTTPSampler2 config = new HTTPSampler2();
config.setProtocol("http");
config.setMethod(HTTPSampler.GET);
config.parseArguments("param1");
config.setPath("/index.html");
config.setDomain("www.apache.org");
assertEquals("http://www.apache.org/index.html?param1", config.getUrl().toString());
}
public void testMakingUrl10() throws Exception {
HTTPSampler2 config = new HTTPSampler2();
config.setProtocol("http");
config.setMethod(HTTPSampler.GET);
config.parseArguments("");
config.setPath("/index.html");
config.setDomain("www.apache.org");
assertEquals("http://www.apache.org/index.html", config.getUrl().toString());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org