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

Fix #1672 Proxy tests HttpTester.from usage

This commit is contained in:
Greg Wilkins 2017-07-17 15:24:33 +02:00
parent 6b095d823d
commit 36abb7e295
4 changed files with 61 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-http/src/test/java/org/eclipse/jetty/http/HttpTester.java
View File

@ -121,11 +121,11 @@ public class HttpTester
public abstract static class Input
{
final ByteBuffer _buffer;
boolean _eof=false;
HttpParser _parser;
protected final ByteBuffer _buffer;
protected boolean _eof=false;
protected HttpParser _parser;
Input()
public Input()
{
this(BufferUtil.allocate(8192));
}

6
jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AbstractConnectHandlerTest.java
View File

@ -66,12 +66,6 @@ public abstract class AbstractConnectHandlerTest
proxy.stop();
}
protected HttpTester.Response readResponse(InputStream inputStream) throws IOException
{
HttpTester.Input input = HttpTester.from(inputStream);
return HttpTester.parseResponse(input);
}
protected Socket newSocket() throws IOException
{
Socket socket = new Socket("localhost", proxyConnector.getLocalPort());

8
jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerSSLTest.java
View File

@ -81,7 +81,7 @@ public class ConnectHandlerSSLTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(socket.getInputStream());
HttpTester.Response response = HttpTester.parseResponse(HttpTester.from(socket.getInputStream()));
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
// Upgrade the socket to SSL
@ -96,7 +96,7 @@ public class ConnectHandlerSSLTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(sslSocket.getInputStream());
response = HttpTester.parseResponse(HttpTester.from(sslSocket.getInputStream()));
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("GET /echo", response.getContent());
}
@ -119,7 +119,7 @@ public class ConnectHandlerSSLTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(socket.getInputStream());
HttpTester.Response response = HttpTester.parseResponse(HttpTester.from(socket.getInputStream()));
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
// Upgrade the socket to SSL
@ -138,7 +138,7 @@ public class ConnectHandlerSSLTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(sslSocket.getInputStream());
response = HttpTester.parseResponse(HttpTester.from(sslSocket.getInputStream()));
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("POST /echo?param=" + i + "\r\nHELLO", response.getContent());
}

88
jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
View File

@ -79,7 +79,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(socket.getInputStream());
HttpTester.Response response = HttpTester.parseResponse(HttpTester.from(socket.getInputStream()));
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
}
}
@ -100,7 +100,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(socket.getInputStream());
HttpTester.Response response = HttpTester.parseResponse(HttpTester.from(socket.getInputStream()));
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
}
}
@ -122,7 +122,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
request = "" +
@ -132,7 +133,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("GET /echo", response.getContent());
}
@ -159,7 +160,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 403 from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.FORBIDDEN_403, response.getStatus());
// Socket should be closed
@ -180,7 +182,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
request = "" +
@ -190,7 +193,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("GET /echo", response.getContent());
}
@ -217,7 +220,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 403 from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.FORBIDDEN_403, response.getStatus());
// Socket should be closed
@ -238,7 +242,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
request = "" +
@ -248,7 +253,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("GET /echo", response.getContent());
}
@ -294,7 +299,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 407 from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.PROXY_AUTHENTICATION_REQUIRED_407, response.getStatus());
Assert.assertTrue(response.containsKey("Proxy-Authenticate".toLowerCase(Locale.ENGLISH)));
@ -318,7 +324,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
request = "" +
@ -328,7 +335,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("GET /echo", response.getContent());
}
@ -370,7 +377,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 500 OK from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals("Response Code", HttpStatus.INTERNAL_SERVER_ERROR_500, response.getStatus());
}
}
@ -392,7 +400,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
request = "" +
@ -402,7 +411,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("GET /echo", response.getContent());
}
@ -428,11 +437,12 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
// The pipelined request must have gone up to the server as is
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("GET /echo", response.getContent());
}
@ -455,7 +465,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
for (int i = 0; i < 10; ++i)
@ -467,7 +478,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("GET /echo", response.getContent());
}
@ -491,7 +502,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
request = "" +
@ -501,7 +513,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("GET /echo", response.getContent());
@ -530,7 +542,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
request = "" +
@ -562,7 +575,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
request = "" +
@ -574,7 +588,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("POST /echo\r\nHELLO", response.getContent());
@ -585,7 +599,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("GET /echo", response.getContent());
}
@ -617,7 +631,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
StringBuilder body = new StringBuilder();
@ -634,7 +649,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("POST /echo\r\n" + body, response.getContent());
}
@ -702,7 +717,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
String body = "0123456789ABCDEF";
@ -715,12 +731,12 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("POST /echo\r\n" + body, response.getContent());
}
}
@Test
public void testCONNECTAndGETPipelinedAndOutputShutdown() throws Exception
{
@ -742,11 +758,12 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
socket.shutdownOutput();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
// The pipelined request must have gone up to the server as is
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("GET /echo", response.getContent());
}
@ -769,7 +786,8 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
output.flush();
// Expect 200 OK from the CONNECT request
HttpTester.Response response = readResponse(input);
HttpTester.Input in = HttpTester.from(input);
HttpTester.Response response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
request = "" +
@ -781,7 +799,7 @@ public class ConnectHandlerTest extends AbstractConnectHandlerTest
socket.shutdownOutput();
// The pipelined request must have gone up to the server as is
response = readResponse(input);
response = HttpTester.parseResponse(in);
Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
Assert.assertEquals("GET /echo", response.getContent());
}