Author: sebb
Date: Mon Feb 8 15:12:52 2010
New Revision: 907682
URL: http://svn.apache.org/viewvc?rev=907682&view=rev
Log:
Also test URLs ending in a directory; use IP address rather than name to avoid
DNS queries
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/TestHTTPUtils.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/TestHTTPUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/TestHTTPUtils.java?rev=907682&r1=907681&r2=907682&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/TestHTTPUtils.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/TestHTTPUtils.java
Mon Feb 8 15:12:52 2010
@@ -39,12 +39,24 @@
}
public void testMakeRelativeURL() throws Exception {
- URL base = new URL("http://host/a/b/c";);
- assertEquals(new
URL("http://host/a/b/d";),ConversionUtils.makeRelativeURL(base,"d"));
- assertEquals(new
URL("http://host/a/d";),ConversionUtils.makeRelativeURL(base,"../d"));
- assertEquals(new
URL("http://host/d";),ConversionUtils.makeRelativeURL(base,"../../d"));
- assertEquals(new
URL("http://host/d";),ConversionUtils.makeRelativeURL(base,"../../../d"));
- assertEquals(new
URL("http://host/d";),ConversionUtils.makeRelativeURL(base,"../../../../d"));
- assertEquals(new
URL("http://host/../d";),ConversionUtils.makeRelativeURL(base,"/../d"));
+ URL base = new URL("http://192.168.0.1/a/b/c";); // Trailing file
+ assertEquals(new
URL("http://192.168.0.1/a/b/d";),ConversionUtils.makeRelativeURL(base,"d"));
+ assertEquals(new
URL("http://192.168.0.1/a/d";),ConversionUtils.makeRelativeURL(base,"../d"));
+ assertEquals(new
URL("http://192.168.0.1/d";),ConversionUtils.makeRelativeURL(base,"../../d"));
+ assertEquals(new
URL("http://192.168.0.1/d";),ConversionUtils.makeRelativeURL(base,"../../../d"));
+ assertEquals(new
URL("http://192.168.0.1/d";),ConversionUtils.makeRelativeURL(base,"../../../../d"));
+ assertEquals(new
URL("http://192.168.0.1/../d";),ConversionUtils.makeRelativeURL(base,"/../d"));
+ assertEquals(new
URL("http://192.168.0.1/a/b/d";),ConversionUtils.makeRelativeURL(base,"./d"));
+ }
+
+ public void testMakeRelativeURL2() throws Exception {
+ URL base = new URL("http://192.168.0.1/a/b/c/";); // Trailing
directory
+ assertEquals(new
URL("http://192.168.0.1/a/b/c/d";),ConversionUtils.makeRelativeURL(base,"d"));
+ assertEquals(new
URL("http://192.168.0.1/a/b/d";),ConversionUtils.makeRelativeURL(base,"../d"));
+ assertEquals(new
URL("http://192.168.0.1/a/d";),ConversionUtils.makeRelativeURL(base,"../../d"));
+ assertEquals(new
URL("http://192.168.0.1/d";),ConversionUtils.makeRelativeURL(base,"../../../d"));
+ assertEquals(new
URL("http://192.168.0.1/d";),ConversionUtils.makeRelativeURL(base,"../../../../d"));
+ assertEquals(new
URL("http://192.168.0.1/../d";),ConversionUtils.makeRelativeURL(base,"/../d"));
+ assertEquals(new
URL("http://192.168.0.1/a/b/c/d";),ConversionUtils.makeRelativeURL(base,"./d"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
