You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/07/02 23:40:47 UTC
svn commit: r960116 - in /jakarta/jmeter/trunk:
src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java
test/src/org/apache/jmeter/protocol/http/util/TestHTTPUtils.java
Author: sebb
Date: Fri Jul 2 21:40:47 2010
New Revision: 960116
URL: http://svn.apache.org/viewvc?rev=960116&view=rev
Log:
Tab police; correct indentation
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/TestHTTPUtils.java
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java?rev=960116&r1=960115&r2=960116&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java Fri Jul 2 21:40:47 2010
@@ -39,10 +39,10 @@ public class ConversionUtils {
private static final String CHARSET_EQ = "charset="; // $NON-NLS-1$
private static final int CHARSET_EQ_LEN = CHARSET_EQ.length();
- private static final String SLASHDOTDOT = "/..";
- private static final String DOTDOT = "..";
- private static final String SLASH = "/";
- private static final String COLONSLASHSLASH = "://";
+ private static final String SLASHDOTDOT = "/..";
+ private static final String DOTDOT = "..";
+ private static final String SLASH = "/";
+ private static final String COLONSLASHSLASH = "://";
/**
* Extract the encoding (charset) from the Content-Type,
@@ -111,14 +111,14 @@ public class ConversionUtils {
return initial;
}
- /**
- * collapses absolute or relative URLs containing '/..' converting
- * http://host/path1/../path2 to http://host/path2 or /one/two/../three to
- * /one/three
- *
- * @param url
- * @return collapsed URL
- */
+ /**
+ * collapses absolute or relative URLs containing '/..' converting
+ * http://host/path1/../path2 to http://host/path2 or /one/two/../three to
+ * /one/three
+ *
+ * @param url
+ * @return collapsed URL
+ */
public static String removeSlashDotDot(String url)
{
if (url == null || (url = url.trim()).length() < 4 || !url.contains(SLASHDOTDOT))
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=960116&r1=960115&r2=960116&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 Fri Jul 2 21:40:47 2010
@@ -23,61 +23,61 @@ import java.net.URL;
import junit.framework.TestCase;
public class TestHTTPUtils extends TestCase {
- public TestHTTPUtils(String name) {
- super(name);
- }
+ public TestHTTPUtils(String name) {
+ super(name);
+ }
- public void testgetEncoding() throws Exception {
- assertNull(ConversionUtils.getEncodingFromContentType("xyx"));
- assertEquals("utf8",ConversionUtils.getEncodingFromContentType("charset=utf8"));
- assertEquals("utf8",ConversionUtils.getEncodingFromContentType("charset=\"utf8\""));
- assertEquals("utf8",ConversionUtils.getEncodingFromContentType("text/plain ;charset=utf8"));
- assertEquals("utf8",ConversionUtils.getEncodingFromContentType("text/html ;charset=utf8;charset=def"));
- assertNull(ConversionUtils.getEncodingFromContentType("charset="));
- assertNull(ConversionUtils.getEncodingFromContentType(";charset=;"));
- assertNull(ConversionUtils.getEncodingFromContentType(";charset=no-such-charset;"));
- }
-
- public void testMakeRelativeURL() throws Exception {
- 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 testgetEncoding() throws Exception {
+ assertNull(ConversionUtils.getEncodingFromContentType("xyx"));
+ assertEquals("utf8",ConversionUtils.getEncodingFromContentType("charset=utf8"));
+ assertEquals("utf8",ConversionUtils.getEncodingFromContentType("charset=\"utf8\""));
+ assertEquals("utf8",ConversionUtils.getEncodingFromContentType("text/plain ;charset=utf8"));
+ assertEquals("utf8",ConversionUtils.getEncodingFromContentType("text/html ;charset=utf8;charset=def"));
+ assertNull(ConversionUtils.getEncodingFromContentType("charset="));
+ assertNull(ConversionUtils.getEncodingFromContentType(";charset=;"));
+ assertNull(ConversionUtils.getEncodingFromContentType(";charset=no-such-charset;"));
+ }
+
+ public void testMakeRelativeURL() throws Exception {
+ 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"));
- }
-
- public void testRemoveSlashDotDot()
- {
- assertEquals("/path/", ConversionUtils.removeSlashDotDot("/path/"));
- assertEquals("http://host/", ConversionUtils.removeSlashDotDot("http://host/"));
- assertEquals("http://host/one", ConversionUtils.removeSlashDotDot("http://host/one"));
- assertEquals("/two", ConversionUtils.removeSlashDotDot("/one/../two"));
- assertEquals("http://host:8080/two", ConversionUtils.removeSlashDotDot("http://host:8080/one/../two"));
- assertEquals("http://host:8080/two/", ConversionUtils.removeSlashDotDot("http://host:8080/one/../two/"));
- assertEquals("http://usr@host:8080/two/", ConversionUtils.removeSlashDotDot("http://usr@host:8080/one/../two/"));
- assertEquals("http://host:8080/two/?query#anchor", ConversionUtils.removeSlashDotDot("http://host:8080/one/../two/?query#anchor"));
- assertEquals("one", ConversionUtils.removeSlashDotDot("one/two/.."));
- assertEquals("../../path", ConversionUtils.removeSlashDotDot("../../path"));
- assertEquals("/", ConversionUtils.removeSlashDotDot("/one/.."));
- assertEquals("/", ConversionUtils.removeSlashDotDot("/one/../"));
- assertEquals("/?a", ConversionUtils.removeSlashDotDot("/one/..?a"));
- assertEquals("http://host/one", ConversionUtils.removeSlashDotDot("http://host/one/../one"));
- assertEquals("http://host/one/two", ConversionUtils.removeSlashDotDot("http://host/one/two/../../one/two"));
- assertEquals("http://host/..", ConversionUtils.removeSlashDotDot("http://host/.."));
- assertEquals("http://host/../abc", ConversionUtils.removeSlashDotDot("http://host/../abc"));
- }
+ 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"));
+ }
+
+ public void testRemoveSlashDotDot()
+ {
+ assertEquals("/path/", ConversionUtils.removeSlashDotDot("/path/"));
+ assertEquals("http://host/", ConversionUtils.removeSlashDotDot("http://host/"));
+ assertEquals("http://host/one", ConversionUtils.removeSlashDotDot("http://host/one"));
+ assertEquals("/two", ConversionUtils.removeSlashDotDot("/one/../two"));
+ assertEquals("http://host:8080/two", ConversionUtils.removeSlashDotDot("http://host:8080/one/../two"));
+ assertEquals("http://host:8080/two/", ConversionUtils.removeSlashDotDot("http://host:8080/one/../two/"));
+ assertEquals("http://usr@host:8080/two/", ConversionUtils.removeSlashDotDot("http://usr@host:8080/one/../two/"));
+ assertEquals("http://host:8080/two/?query#anchor", ConversionUtils.removeSlashDotDot("http://host:8080/one/../two/?query#anchor"));
+ assertEquals("one", ConversionUtils.removeSlashDotDot("one/two/.."));
+ assertEquals("../../path", ConversionUtils.removeSlashDotDot("../../path"));
+ assertEquals("/", ConversionUtils.removeSlashDotDot("/one/.."));
+ assertEquals("/", ConversionUtils.removeSlashDotDot("/one/../"));
+ assertEquals("/?a", ConversionUtils.removeSlashDotDot("/one/..?a"));
+ assertEquals("http://host/one", ConversionUtils.removeSlashDotDot("http://host/one/../one"));
+ assertEquals("http://host/one/two", ConversionUtils.removeSlashDotDot("http://host/one/two/../../one/two"));
+ assertEquals("http://host/..", ConversionUtils.removeSlashDotDot("http://host/.."));
+ assertEquals("http://host/../abc", ConversionUtils.removeSlashDotDot("http://host/../abc"));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org