svn commit: r907684 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java

[email protected] Mon, 08 Feb 2010 15:17:35 -0000
Newsgroups gmane.comp.jakarta.jmeter.devel
Message-ID <[email protected]>
Author: sebb
Date: Mon Feb  8 15:17:33 2010
New Revision: 907684

URL: http://svn.apache.org/viewvc?rev=907684&view=rev
Log:
Use IP address rather than name to avoid DNS queries
Add basic redirect test

Modified:
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java?rev=907684&r1=907683&r2=907684&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java Mon Feb  8 15:17:33 2010
@@ -125,14 +125,38 @@
             assertEquals("http://www.apache.org/index.html?param1=value1", config.getUrl().toString());
         }
 
+        public void testRedirect() throws Exception {
+            HTTPSamplerBase config = new HTTPNullSampler();
+            config.setProtocol("http");
+            config.setMethod(HTTPSamplerBase.GET);
+            config.setDomain("192.168.0.1");
+            HTTPSampleResult res = new HTTPSampleResult();
+            res.sampleStart();
+            res.setURL(config.getUrl());
+            res.setResponseCode("301");
+            res.sampleEnd();
+
+            res.setRedirectLocation("./");
+            config.followRedirects(res , 0);
+            assertEquals("http://192.168.0.1/", config.getUrl().toString());
+            
+            res.setRedirectLocation(".");
+            config.followRedirects(res , 0);
+            assertEquals("http://192.168.0.1/", config.getUrl().toString());
+            
+            res.setRedirectLocation("../");
+            config.followRedirects(res , 0);
+            assertEquals("http://192.168.0.1/", config.getUrl().toString());
+        }
+
         public void testMakingUrl2() throws Exception {
             HTTPSamplerBase config = new HTTPNullSampler();
             config.setProtocol("http");
             config.setMethod(HTTPSamplerBase.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());
+            config.setDomain("192.168.0.1");
+            assertEquals("http://192.168.0.1/index.html?param1=value1&p1=p2", config.getUrl().toString());
         }
 
         public void testMakingUrl3() throws Exception {
@@ -141,8 +165,8 @@
             config.setMethod(HTTPSamplerBase.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());
+            config.setDomain("192.168.0.1");
+            assertEquals("http://192.168.0.1/index.html?p1=p2", config.getUrl().toString());
         }
 
         // test cases for making Url, and exercise method
@@ -154,8 +178,8 @@
             config.setMethod(HTTPSamplerBase.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());
+            config.setDomain("192.168.0.1");
+            assertEquals("http://192.168.0.1/index.html?param1=value1", config.getUrl().toString());
         }
 
         public void testMakingUrl5() throws Exception {
@@ -164,8 +188,8 @@
             config.setMethod(HTTPSamplerBase.GET);
             config.addArgument("param1", "", "=");
             config.setPath("/index.html");
-            config.setDomain("www.apache.org");
-            assertEquals("http://www.apache.org/index.html?param1=", config.getUrl().toString());
+            config.setDomain("192.168.0.1");
+            assertEquals("http://192.168.0.1/index.html?param1=", config.getUrl().toString());
         }
 
         public void testMakingUrl6() throws Exception {
@@ -174,8 +198,8 @@
             config.setMethod(HTTPSamplerBase.GET);
             config.addArgument("param1", "", "");
             config.setPath("/index.html");
-            config.setDomain("www.apache.org");
-            assertEquals("http://www.apache.org/index.html?param1", config.getUrl().toString());
+            config.setDomain("192.168.0.1");
+            assertEquals("http://192.168.0.1/index.html?param1", config.getUrl().toString());
         }
 
         // test cases for making Url, and exercise method
@@ -187,8 +211,8 @@
             config.setMethod(HTTPSamplerBase.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());
+            config.setDomain("192.168.0.1");
+            assertEquals("http://192.168.0.1/index.html?param1=value1", config.getUrl().toString());
         }
 
         public void testMakingUrl8() throws Exception {
@@ -197,8 +221,8 @@
             config.setMethod(HTTPSamplerBase.GET);
             config.parseArguments("param1=");
             config.setPath("/index.html");
-            config.setDomain("www.apache.org");
-            assertEquals("http://www.apache.org/index.html?param1=", config.getUrl().toString());
+            config.setDomain("192.168.0.1");
+            assertEquals("http://192.168.0.1/index.html?param1=", config.getUrl().toString());
         }
 
         public void testMakingUrl9() throws Exception {
@@ -207,8 +231,8 @@
             config.setMethod(HTTPSamplerBase.GET);
             config.parseArguments("param1");
             config.setPath("/index.html");
-            config.setDomain("www.apache.org");
-            assertEquals("http://www.apache.org/index.html?param1", config.getUrl().toString());
+            config.setDomain("192.168.0.1");
+            assertEquals("http://192.168.0.1/index.html?param1", config.getUrl().toString());
         }
 
         public void testMakingUrl10() throws Exception {
@@ -217,8 +241,8 @@
             config.setMethod(HTTPSamplerBase.GET);
             config.parseArguments("");
             config.setPath("/index.html");
-            config.setDomain("www.apache.org");
-            assertEquals("http://www.apache.org/index.html", config.getUrl().toString());
+            config.setDomain("192.168.0.1");
+            assertEquals("http://192.168.0.1/index.html", config.getUrl().toString());
         }
         
         public void testFileList(){