Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More post-merge IPv6 test corrections (missed merges) 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2018-09-07 13:55:21 -05:00
parent d237b5ca2f
commit 4978321a93
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
View File

@ -2057,7 +2057,7 @@ public class HttpParserTest
HttpParser.RequestHandler handler = new Handler();
HttpParser parser = new HttpParser(handler);
parser.parseNext(buffer);
assertEquals("::1", _host);
assertEquals("[::1]", _host);
assertEquals(0, _port);
}
@ -2138,7 +2138,7 @@ public class HttpParserTest
HttpParser.RequestHandler handler = new Handler();
HttpParser parser = new HttpParser(handler);
parser.parseNext(buffer);
assertEquals("::1", _host);
assertEquals("[::1]", _host);
assertEquals(8888, _port);
}

2
jetty-http/src/test/java/org/eclipse/jetty/http/HttpURIParseTest.java
View File

@ -209,7 +209,7 @@ public class HttpURIParseTest
{
// Ignore, as URI is invalid anyway
}
assumeTrue(javaUri != null, "Skipping, not a valid input URI");
assumeTrue(javaUri != null, "Skipping, not a valid input URI: " + input);
HttpURI httpUri = new HttpURI(javaUri);

4
jetty-server/src/test/java/org/eclipse/jetty/server/CheckReverseProxyHeadersTest.java
View File

@ -65,7 +65,7 @@ public class CheckReverseProxyHeadersTest
@Override
public void validate(HttpServletRequest request)
{
assertEquals("::1", request.getServerName());
assertEquals("[::1]", request.getServerName());
assertEquals(80, request.getServerPort());
assertEquals("10.20.30.40", request.getRemoteAddr());
assertEquals("10.20.30.40", request.getRemoteHost());
@ -83,7 +83,7 @@ public class CheckReverseProxyHeadersTest
@Override
public void validate(HttpServletRequest request)
{
assertEquals("::1", request.getServerName());
assertEquals("[::1]", request.getServerName());
assertEquals(8888, request.getServerPort());
assertEquals("10.20.30.40", request.getRemoteAddr());
assertEquals("10.20.30.40", request.getRemoteHost());

8
jetty-server/src/test/java/org/eclipse/jetty/server/ForwardedRequestCustomizerTest.java
View File

@ -111,7 +111,7 @@ public class ForwardedRequestCustomizerTest
assertEquals("http",_results.poll());
assertEquals("myhost",_results.poll());
assertEquals("80",_results.poll());
assertEquals("2001:db8:cafe::17",_results.poll());
assertEquals("[2001:db8:cafe::17]",_results.poll());
assertEquals("4711",_results.poll());
}
@ -183,7 +183,7 @@ public class ForwardedRequestCustomizerTest
assertEquals("192.0.2.43",_results.poll());
assertEquals("0",_results.poll());
}
@Test
public void testRFC7239_IPv6() throws Exception
{
@ -194,9 +194,9 @@ public class ForwardedRequestCustomizerTest
"\n");
assertEquals("http",_results.poll());
assertEquals("2001:db8:cafe::3",_results.poll());
assertEquals("[2001:db8:cafe::3]",_results.poll());
assertEquals("8888",_results.poll());
assertEquals("2001:db8:cafe::1",_results.poll());
assertEquals("[2001:db8:cafe::1]",_results.poll());
assertEquals("0",_results.poll());
}

8
jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
View File

@ -835,7 +835,7 @@ public class RequestTest
assertThat(response, containsString("200 OK"));
assertEquals("http://[::1]/",results.get(i++));
assertEquals("0.0.0.0",results.get(i++));
assertEquals("::1",results.get(i++));
assertEquals("[::1]",results.get(i++));
assertEquals("80",results.get(i++));
@ -849,7 +849,7 @@ public class RequestTest
assertThat(response, containsString("200 OK"));
assertEquals("http://[::1]:8888/",results.get(i++));
assertEquals("0.0.0.0",results.get(i++));
assertEquals("::1",results.get(i++));
assertEquals("[::1]",results.get(i++));
assertEquals("8888",results.get(i++));
@ -865,7 +865,7 @@ public class RequestTest
assertThat(response, containsString("200 OK"));
assertEquals("https://[::1]/",results.get(i++));
assertEquals("remote",results.get(i++));
assertEquals("::1",results.get(i++));
assertEquals("[::1]",results.get(i++));
assertEquals("443",results.get(i++));
@ -881,7 +881,7 @@ public class RequestTest
assertThat(response, containsString("200 OK"));
assertEquals("https://[::1]:8888/",results.get(i++));
assertEquals("remote",results.get(i++));
assertEquals("::1",results.get(i++));
assertEquals("[::1]",results.get(i++));
assertEquals("8888",results.get(i++));
}