aboutsummaryrefslogtreecommitdiffstats
path: root/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java')
-rw-r--r--container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java489
1 files changed, 244 insertions, 245 deletions
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
index 294e19aa2a1..0f5474cbf57 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
@@ -7,8 +7,7 @@ import com.yahoo.jdisc.http.HttpHeaders;
import com.yahoo.jdisc.http.HttpRequest;
import com.yahoo.jdisc.http.HttpRequest.Version;
import com.yahoo.jdisc.test.TestDriver;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.net.InetSocketAddress;
import java.net.URI;
@@ -18,7 +17,7 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
public class DiscFilterRequestTest {
@@ -32,323 +31,323 @@ public class DiscFilterRequestTest {
return request;
}
- @Test
- public void testRequestConstruction(){
- URI uri = URI.create("http://localhost:8080/test?param1=abc");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "text/html;charset=UTF-8");
- httpReq.headers().add("X-Custom-Header", "custom_header");
- List<Cookie> cookies = new ArrayList<>();
- cookies.add(new Cookie("XYZ", "value"));
- cookies.add(new Cookie("ABC", "value"));
- httpReq.encodeCookieHeader(cookies);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertEquals(request.getHeader("X-Custom-Header"),"custom_header");
- Assert.assertEquals(request.getHeader(HttpHeaders.Names.CONTENT_TYPE),"text/html;charset=UTF-8");
-
- List<Cookie> c = request.getCookies();
- Assert.assertNotNull(c);
- Assert.assertEquals(c.size(), 2);
-
- Assert.assertEquals(request.getParameter("param1"),"abc");
- Assert.assertNull(request.getParameter("param2"));
- Assert.assertEquals(request.getVersion(),Version.HTTP_1_1);
- Assert.assertEquals(request.getProtocol(),Version.HTTP_1_1.name());
- Assert.assertNull(request.getRequestedSessionId());
- }
-
- @Test
- public void testRequestConstruction2() {
- URI uri = URI.create("http://localhost:8080/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- httpReq.headers().add("some-header", "some-value");
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
-
- request.addHeader("some-header", "some-value");
- String value = request.getUntreatedHeaders().get("some-header").get(0);
- Assert.assertEquals(value,"some-value");
- }
-
- @Test
- public void testRequestAttributes() {
- URI uri = URI.create("http://localhost:8080/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
- request.setAttribute("some_attr", "some_value");
-
- Assert.assertTrue(request.containsAttribute("some_attr"));
-
- Assert.assertEquals(request.getAttribute("some_attr"),"some_value");
-
- }
-
- @Test
- public void testGetAttributeNames() {
- URI uri = URI.create("http://localhost:8080/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
- request.setAttribute("some_attr_1", "some_value1");
- request.setAttribute("some_attr_2", "some_value2");
-
- Enumeration<String> e = request.getAttributeNames();
- List<String> attrList = Collections.list(e);
- Assert.assertEquals(2, attrList.size());
- Assert.assertTrue(attrList.contains("some_attr_1"));
- Assert.assertTrue(attrList.contains("some_attr_2"));
-
- }
-
- @Test
- public void testRemoveAttribute() {
- URI uri = URI.create("http://localhost:8080/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ @Test
+ void testRequestConstruction() {
+ URI uri = URI.create("http://localhost:8080/test?param1=abc");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "text/html;charset=UTF-8");
+ httpReq.headers().add("X-Custom-Header", "custom_header");
+ List<Cookie> cookies = new ArrayList<>();
+ cookies.add(new Cookie("XYZ", "value"));
+ cookies.add(new Cookie("ABC", "value"));
+ httpReq.encodeCookieHeader(cookies);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ assertEquals(request.getHeader("X-Custom-Header"), "custom_header");
+ assertEquals(request.getHeader(HttpHeaders.Names.CONTENT_TYPE), "text/html;charset=UTF-8");
+
+ List<Cookie> c = request.getCookies();
+ assertNotNull(c);
+ assertEquals(c.size(), 2);
+
+ assertEquals(request.getParameter("param1"), "abc");
+ assertNull(request.getParameter("param2"));
+ assertEquals(request.getVersion(), Version.HTTP_1_1);
+ assertEquals(request.getProtocol(), Version.HTTP_1_1.name());
+ assertNull(request.getRequestedSessionId());
+ }
+
+ @Test
+ void testRequestConstruction2() {
+ URI uri = URI.create("http://localhost:8080/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ httpReq.headers().add("some-header", "some-value");
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+
+ request.addHeader("some-header", "some-value");
+ String value = request.getUntreatedHeaders().get("some-header").get(0);
+ assertEquals(value, "some-value");
+ }
+
+ @Test
+ void testRequestAttributes() {
+ URI uri = URI.create("http://localhost:8080/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
request.setAttribute("some_attr", "some_value");
- Assert.assertTrue(request.containsAttribute("some_attr"));
+ assertTrue(request.containsAttribute("some_attr"));
- request.removeAttribute("some_attr");
+ assertEquals(request.getAttribute("some_attr"), "some_value");
- Assert.assertFalse(request.containsAttribute("some_attr"));
- }
+ }
- @Test
- public void testGetIntHeader() {
- URI uri = URI.create("http://localhost:8080/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ @Test
+ void testGetAttributeNames() {
+ URI uri = URI.create("http://localhost:8080/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ request.setAttribute("some_attr_1", "some_value1");
+ request.setAttribute("some_attr_2", "some_value2");
- Assert.assertEquals(-1, request.getIntHeader("int_header"));
+ Enumeration<String> e = request.getAttributeNames();
+ List<String> attrList = Collections.list(e);
+ assertEquals(2, attrList.size());
+ assertTrue(attrList.contains("some_attr_1"));
+ assertTrue(attrList.contains("some_attr_2"));
- request.addHeader("int_header", String.valueOf(5));
+ }
- Assert.assertEquals(5, request.getIntHeader("int_header"));
- }
+ @Test
+ void testRemoveAttribute() {
+ URI uri = URI.create("http://localhost:8080/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ request.setAttribute("some_attr", "some_value");
+
+ assertTrue(request.containsAttribute("some_attr"));
+
+ request.removeAttribute("some_attr");
+
+ assertFalse(request.containsAttribute("some_attr"));
+ }
+
+ @Test
+ void testGetIntHeader() {
+ URI uri = URI.create("http://localhost:8080/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+
+ assertEquals(-1, request.getIntHeader("int_header"));
- @Test
- public void testDateHeader() {
- URI uri = URI.create("http://localhost:8080/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ request.addHeader("int_header", String.valueOf(5));
+ assertEquals(5, request.getIntHeader("int_header"));
+ }
+
+ @Test
+ void testDateHeader() {
+ URI uri = URI.create("http://localhost:8080/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertEquals(-1, request.getDateHeader(HttpHeaders.Names.IF_MODIFIED_SINCE));
- request.addHeader(HttpHeaders.Names.IF_MODIFIED_SINCE, "Sat, 29 Oct 1994 19:43:31 GMT");
+ assertEquals(-1, request.getDateHeader(HttpHeaders.Names.IF_MODIFIED_SINCE));
- Assert.assertEquals(783459811000L, request.getDateHeader(HttpHeaders.Names.IF_MODIFIED_SINCE));
- }
+ request.addHeader(HttpHeaders.Names.IF_MODIFIED_SINCE, "Sat, 29 Oct 1994 19:43:31 GMT");
- @Test
- public void testParameterAPIsAsList() {
+ assertEquals(783459811000L, request.getDateHeader(HttpHeaders.Names.IF_MODIFIED_SINCE));
+ }
+
+ @Test
+ void testParameterAPIsAsList() {
URI uri = URI.create("http://example.yahoo.com:8080/test?param1=abc&param2=xyz&param2=pqr");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertEquals(request.getParameter("param1"),"abc");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ assertEquals(request.getParameter("param1"), "abc");
List<String> values = request.getParameterValuesAsList("param2");
- Assert.assertEquals(values.get(0),"xyz");
- Assert.assertEquals(values.get(1),"pqr");
+ assertEquals(values.get(0), "xyz");
+ assertEquals(values.get(1), "pqr");
List<String> paramNames = request.getParameterNamesAsList();
- Assert.assertEquals(paramNames.size(), 2);
+ assertEquals(paramNames.size(), 2);
- }
+ }
- @Test
- public void testParameterAPI(){
- URI uri = URI.create("http://example.yahoo.com:8080/test?param1=abc&param2=xyz&param2=pqr");
+ @Test
+ void testParameterAPI() {
+ URI uri = URI.create("http://example.yahoo.com:8080/test?param1=abc&param2=xyz&param2=pqr");
HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertEquals(request.getParameter("param1"),"abc");
+ assertEquals(request.getParameter("param1"), "abc");
Enumeration<String> values = request.getParameterValues("param2");
List<String> valuesList = Collections.list(values);
- Assert.assertEquals(valuesList.get(0),"xyz");
- Assert.assertEquals(valuesList.get(1),"pqr");
+ assertEquals(valuesList.get(0), "xyz");
+ assertEquals(valuesList.get(1), "pqr");
Enumeration<String> paramNames = request.getParameterNames();
List<String> paramNamesList = Collections.list(paramNames);
- Assert.assertEquals(paramNamesList.size(), 2);
- }
+ assertEquals(paramNamesList.size(), 2);
+ }
- @Test
- public void testGetHeaderNamesAsList() {
- URI uri = URI.create("http://localhost:8080/test");
+ @Test
+ void testGetHeaderNamesAsList() {
+ URI uri = URI.create("http://localhost:8080/test");
HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "multipart/form-data");
httpReq.headers().add("header_1", "value1");
httpReq.headers().add("header_2", "value2");
DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertNotNull(request.getHeaderNamesAsList());
- Assert.assertEquals(request.getHeaderNamesAsList().size(), 3);
- }
+ assertNotNull(request.getHeaderNamesAsList());
+ assertEquals(request.getHeaderNamesAsList().size(), 3);
+ }
- @Test
- public void testGetHeadersAsList() {
+ @Test
+ void testGetHeadersAsList() {
URI uri = URI.create("http://localhost:8080/test");
HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertNotNull(request.getHeaderNamesAsList());
- Assert.assertEquals(request.getHeaderNamesAsList().size(), 0);
+ assertNotNull(request.getHeaderNamesAsList());
+ assertEquals(request.getHeaderNamesAsList().size(), 0);
httpReq.headers().add("header_1", "value1");
httpReq.headers().add("header_1", "value2");
- Assert.assertEquals(request.getHeadersAsList("header_1").size(), 2);
+ assertEquals(request.getHeadersAsList("header_1").size(), 2);
}
- @Test
- public void testIsMultipart() {
+ @Test
+ void testIsMultipart() {
- URI uri = URI.create("http://localhost:8080/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "multipart/form-data");
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ URI uri = URI.create("http://localhost:8080/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "multipart/form-data");
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertTrue(DiscFilterRequest.isMultipart(request));
+ assertTrue(DiscFilterRequest.isMultipart(request));
- httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "text/html;charset=UTF-8");
- request = new DiscFilterRequest(httpReq);
+ httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "text/html;charset=UTF-8");
+ request = new DiscFilterRequest(httpReq);
- Assert.assertFalse(DiscFilterRequest.isMultipart(request));
+ assertFalse(DiscFilterRequest.isMultipart(request));
- Assert.assertFalse(DiscFilterRequest.isMultipart(null));
+ assertFalse(DiscFilterRequest.isMultipart(null));
- httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- request = new DiscFilterRequest(httpReq);
- Assert.assertFalse(DiscFilterRequest.isMultipart(request));
- }
+ httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ request = new DiscFilterRequest(httpReq);
+ assertFalse(DiscFilterRequest.isMultipart(request));
+ }
- @Test
- public void testGetRemotePortLocalPort() {
+ @Test
+ void testGetRemotePortLocalPort() {
URI uri = URI.create("http://example.yahoo.com:8080/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertEquals(69, request.getRemotePort());
- Assert.assertEquals(8080, request.getLocalPort());
+ assertEquals(69, request.getRemotePort());
+ assertEquals(8080, request.getLocalPort());
- if (request.getRemoteHost() != null) // if we have network
- Assert.assertEquals("example.yahoo.com", request.getRemoteHost());
+ if (request.getRemoteHost() != null) // if we have network
+ assertEquals("example.yahoo.com", request.getRemoteHost());
request.setRemoteAddr("1.1.1.1");
- Assert.assertEquals("1.1.1.1",request.getRemoteAddr());
- }
-
- @Test
- public void testCharacterEncoding() {
- URI uri = URI.create("http://example.yahoo.com:8080/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
- request.setHeaders(HttpHeaders.Names.CONTENT_TYPE, "text/html;charset=UTF-8");
-
- Assert.assertEquals(request.getCharacterEncoding(), "UTF-8");
-
- httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- request = new DiscFilterRequest(httpReq);
- request.setHeaders(HttpHeaders.Names.CONTENT_TYPE, "text/html");
- request.setCharacterEncoding("UTF-8");
-
- Assert.assertEquals(request.getCharacterEncoding(),"UTF-8");
-
- Assert.assertEquals(request.getHeader(HttpHeaders.Names.CONTENT_TYPE),"text/html;charset=UTF-8");
- }
-
- @Test
- public void testGetServerPort() {
- {
- URI uri = URI.create("http://example.yahoo.com/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertEquals(request.getServerPort(), 80);
-
- }
- {
- URI uri = URI.create("https://example.yahoo.com/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertEquals(request.getServerPort(), 443);
- }
- }
-
- @Test
- public void testIsSecure() {
- {
- URI uri = URI.create("http://example.yahoo.com/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertFalse(request.isSecure());
- }
- {
- URI uri = URI.create("https://example.yahoo.com/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertTrue(request.isSecure());
- }
- }
+ assertEquals("1.1.1.1", request.getRemoteAddr());
+ }
+
+ @Test
+ void testCharacterEncoding() {
+ URI uri = URI.create("http://example.yahoo.com:8080/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ request.setHeaders(HttpHeaders.Names.CONTENT_TYPE, "text/html;charset=UTF-8");
+
+ assertEquals(request.getCharacterEncoding(), "UTF-8");
+
+ httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ request = new DiscFilterRequest(httpReq);
+ request.setHeaders(HttpHeaders.Names.CONTENT_TYPE, "text/html");
+ request.setCharacterEncoding("UTF-8");
+
+ assertEquals(request.getCharacterEncoding(), "UTF-8");
+
+ assertEquals(request.getHeader(HttpHeaders.Names.CONTENT_TYPE), "text/html;charset=UTF-8");
+ }
+
+ @Test
+ void testGetServerPort() {
+ {
+ URI uri = URI.create("http://example.yahoo.com/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ assertEquals(request.getServerPort(), 80);
+
+ }
+ {
+ URI uri = URI.create("https://example.yahoo.com/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ assertEquals(request.getServerPort(), 443);
+ }
+ }
@Test
- public void requireThatUnresolvableRemoteAddressesAreSupported() {
+ void testIsSecure() {
+ {
+ URI uri = URI.create("http://example.yahoo.com/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ assertFalse(request.isSecure());
+ }
+ {
+ URI uri = URI.create("https://example.yahoo.com/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ assertTrue(request.isSecure());
+ }
+ }
+
+ @Test
+ void requireThatUnresolvableRemoteAddressesAreSupported() {
URI uri = URI.create("http://doesnotresolve.zzz:8080/test");
HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
DiscFilterRequest request = new DiscFilterRequest(httpReq);
- Assert.assertNull(request.getLocalAddr());
+ assertNull(request.getLocalAddr());
}
@Test
- public void testGetUntreatedHeaders() {
- URI uri = URI.create("http://example.yahoo.com/test");
+ void testGetUntreatedHeaders() {
+ URI uri = URI.create("http://example.yahoo.com/test");
HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
httpReq.headers().add("key1", "value1");
- httpReq.headers().add("key2", Arrays.asList("value1","value2"));
+ httpReq.headers().add("key2", Arrays.asList("value1", "value2"));
DiscFilterRequest request = new DiscFilterRequest(httpReq);
HeaderFields headers = request.getUntreatedHeaders();
- Assert.assertEquals(headers.keySet().size(), 2);
- Assert.assertEquals(headers.get("key1").get(0), "value1" );
- Assert.assertEquals(headers.get("key2").get(0), "value1" );
- Assert.assertEquals(headers.get("key2").get(1), "value2" );
+ assertEquals(headers.keySet().size(), 2);
+ assertEquals(headers.get("key1").get(0), "value1");
+ assertEquals(headers.get("key2").get(0), "value1");
+ assertEquals(headers.get("key2").get(1), "value2");
+ }
+
+ @Test
+ void testClearCookies() {
+ URI uri = URI.create("http://example.yahoo.com/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ httpReq.headers().put(HttpHeaders.Names.COOKIE, "XYZ=value");
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ request.clearCookies();
+ assertNull(request.getHeader(HttpHeaders.Names.COOKIE));
+ }
+
+ @Test
+ void testGetWrapedCookies() {
+ URI uri = URI.create("http://example.yahoo.com/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ httpReq.headers().put(HttpHeaders.Names.COOKIE, "XYZ=value");
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ JDiscCookieWrapper[] wrappers = request.getWrappedCookies();
+ assertEquals(wrappers.length, 1);
+ assertEquals(wrappers[0].getName(), "XYZ");
+ assertEquals(wrappers[0].getValue(), "value");
}
- @Test
- public void testClearCookies() {
- URI uri = URI.create("http://example.yahoo.com/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- httpReq.headers().put(HttpHeaders.Names.COOKIE, "XYZ=value");
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
- request.clearCookies();
- Assert.assertNull(request.getHeader(HttpHeaders.Names.COOKIE));
- }
-
- @Test
- public void testGetWrapedCookies() {
- URI uri = URI.create("http://example.yahoo.com/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- httpReq.headers().put(HttpHeaders.Names.COOKIE, "XYZ=value");
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
- JDiscCookieWrapper[] wrappers = request.getWrappedCookies();
- Assert.assertEquals(wrappers.length ,1);
- Assert.assertEquals(wrappers[0].getName(), "XYZ");
- Assert.assertEquals(wrappers[0].getValue(), "value");
- }
-
- @Test
- public void testAddCookie() {
- URI uri = URI.create("http://example.yahoo.com/test");
- HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
- DiscFilterRequest request = new DiscFilterRequest(httpReq);
- request.addCookie(JDiscCookieWrapper.wrap(new Cookie("name", "value")));
-
- List<Cookie> cookies = request.getCookies();
- Assert.assertEquals(cookies.size(), 1);
- Assert.assertEquals(cookies.get(0).getName(), "name");
- Assert.assertEquals(cookies.get(0).getValue(), "value");
- }
+ @Test
+ void testAddCookie() {
+ URI uri = URI.create("http://example.yahoo.com/test");
+ HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+ DiscFilterRequest request = new DiscFilterRequest(httpReq);
+ request.addCookie(JDiscCookieWrapper.wrap(new Cookie("name", "value")));
+
+ List<Cookie> cookies = request.getCookies();
+ assertEquals(cookies.size(), 1);
+ assertEquals(cookies.get(0).getName(), "name");
+ assertEquals(cookies.get(0).getValue(), "value");
+ }
}