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

replace GzipTester.issueRequest with preexisting GzipTester.executeRequest

This commit is contained in:
Joakim Erdfelt 2014-11-10 16:04:25 -07:00
parent 006ea256b0
commit 5de887f00f
3 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterContentLengthTest.java
View File

@ -134,7 +134,7 @@ public class GzipFilterContentLengthTest
tester.start();
HttpTester.Response response = tester.issueRequest("GET",testFile.getName(),2,TimeUnit.SECONDS);
HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),2,TimeUnit.SECONDS);
assertThat("Response status", response.getStatus(), is(HttpStatus.OK_200));

8
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterLayeredTest.java
View File

@ -114,7 +114,7 @@ public class GzipFilterLayeredTest
tester.start();
HttpTester.Response response = tester.issueRequest("GET","/" + testFile.getName(), 2, TimeUnit.SECONDS);
HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),2,TimeUnit.SECONDS);
assertThat("Response status", response.getStatus(), is(HttpStatus.OK_200));
@ -161,7 +161,7 @@ public class GzipFilterLayeredTest
tester.start();
HttpTester.Response response = tester.issueRequest("GET","/" + testFile.getName(), 2, TimeUnit.SECONDS);
HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),2,TimeUnit.SECONDS);
assertThat("Response status", response.getStatus(), is(HttpStatus.OK_200));
@ -207,7 +207,7 @@ public class GzipFilterLayeredTest
tester.start();
HttpTester.Response response = tester.issueRequest("GET",testFile.getName(),2,TimeUnit.SECONDS);
HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),2,TimeUnit.SECONDS);
assertThat("Response status", response.getStatus(), is(HttpStatus.OK_200));
@ -257,7 +257,7 @@ public class GzipFilterLayeredTest
tester.start();
HttpTester.Response response = tester.issueRequest("GET",testFile.getName(),2,TimeUnit.SECONDS);
HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),2,TimeUnit.SECONDS);
assertThat("Response status", response.getStatus(), is(HttpStatus.OK_200));

53
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
View File

@ -104,32 +104,6 @@ public class GzipTester
return tester.getConnector().getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().getOutputBufferSize();
}
public HttpTester.Response issueRequest(String method, String path) throws Exception
{
return issueRequest(method, path, 2, TimeUnit.SECONDS);
}
public HttpTester.Response issueRequest(String method, String path, int idleFor, TimeUnit idleUnit) throws Exception
{
HttpTester.Request request = HttpTester.newRequest();
request.setMethod(method);
request.setVersion("HTTP/1.1");
request.setHeader("Host","tester");
request.setHeader("Accept-Encoding",accept);
request.setHeader("Connection","close");
if (this.userAgent != null)
{
request.setHeader("User-Agent",this.userAgent);
}
request.setURI("/context/" + path);
// Issue the request
return HttpTester.parseResponse(tester.getResponses(request.generate(),idleFor,idleUnit));
}
public ContentMetadata getResponseMetadata(Response response) throws Exception
{
long size = response.getContentBytes().length;
@ -546,21 +520,30 @@ public class GzipTester
Assert.assertThat("Response.header[Content-Encoding]",response.get("Content-Encoding"),not(containsString(compressionType)));
}
private HttpTester.Response executeRequest(String method, String uri) throws IOException, Exception
public HttpTester.Response executeRequest(String method, String path, int idleFor, TimeUnit idleUnit) throws Exception
{
HttpTester.Request request = HttpTester.newRequest();
HttpTester.Response response;
request.setMethod(method);
request.setVersion("HTTP/1.0");
request.setVersion("HTTP/1.1");
request.setHeader("Host","tester");
request.setHeader("Accept-Encoding",compressionType);
if (this.userAgent != null)
request.setHeader("User-Agent",this.userAgent);
request.setHeader("Accept-Encoding",accept);
request.setHeader("Connection","close");
request.setURI(uri);
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
return response;
if (this.userAgent != null)
{
request.setHeader("User-Agent",this.userAgent);
}
request.setURI(path);
// Issue the request
return HttpTester.parseResponse(tester.getResponses(request.generate(),idleFor,idleUnit));
}
private HttpTester.Response executeRequest(String method, String path) throws IOException, Exception
{
return executeRequest(method,path,2,TimeUnit.SECONDS);
}
private String readResponse(HttpTester.Response response) throws IOException, UnsupportedEncodingException