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

Merge remote-tracking branch 'origin/jetty-9.2.x'

This commit is contained in:
Greg Wilkins 2014-11-12 13:52:32 +11:00
parent 7939edc8a2 e0fbd6d9f2
commit 39360d91e6
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
View File

@ -126,7 +126,10 @@ public class GzipContentLengthTest
tester.start();
HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),2,TimeUnit.SECONDS);
HttpTester.Response response = tester.executeRequest("GET","/context/" + testFile.getName(),5,TimeUnit.SECONDS);
if (response.getStatus()!=200)
System.err.println("DANG!!!! "+response);
assertThat("Response status", response.getStatus(), is(HttpStatus.OK_200));

10
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultTest.java
View File

@ -139,7 +139,7 @@ public class GzipDefaultTest
tester.assertIsResponseGzipCompressed("POST","file.txt");
tester.assertIsResponseGzipCompressed("WIBBLE","file.txt");
response = tester.executeRequest("GET","/context/file.txt",2,TimeUnit.SECONDS);
response = tester.executeRequest("GET","/context/file.txt",5,TimeUnit.SECONDS);
assertThat("Response status",response.getStatus(),is(HttpStatus.OK_200));
assertThat("Content-Encoding",response.get("Content-Encoding"),not(containsString(compressionType)));
@ -197,7 +197,7 @@ public class GzipDefaultTest
HttpTester.Response response;
response = tester.executeRequest("GET","/context/empty.txt",2,TimeUnit.SECONDS);
response = tester.executeRequest("GET","/context/empty.txt",5,TimeUnit.SECONDS);
assertThat("Response status",response.getStatus(),is(HttpStatus.OK_200));
assertThat("Content-Encoding",response.get("Content-Encoding"),not(containsString(compressionType)));
@ -512,7 +512,7 @@ public class GzipDefaultTest
{
tester.start();
HttpTester.Response response = tester.executeRequest("GET","/context/",2,TimeUnit.SECONDS);
HttpTester.Response response = tester.executeRequest("GET","/context/",5,TimeUnit.SECONDS);
assertThat("Response status",response.getStatus(),is(HttpStatus.NO_CONTENT_204));
assertThat("Content-Encoding",response.get("Content-Encoding"),not(containsString(compressionType)));
@ -539,7 +539,7 @@ public class GzipDefaultTest
{
tester.start();
HttpTester.Response response = tester.executeRequest("GET","/context/",2,TimeUnit.SECONDS);
HttpTester.Response response = tester.executeRequest("GET","/context/",5,TimeUnit.SECONDS);
assertThat("Response status",response.getStatus(),is(HttpStatus.BAD_REQUEST_400));
assertThat("Content-Encoding",response.get("Content-Encoding"),not(containsString(compressionType)));
@ -686,7 +686,7 @@ public class GzipDefaultTest
public HttpTester.Response assertIsResponseNotGzipCompressed(GzipTester tester, String method, String filename, int expectedFilesize, int status)
throws Exception
{
HttpTester.Response response = tester.executeRequest(method,"/context/" + filename,2,TimeUnit.SECONDS);
HttpTester.Response response = tester.executeRequest(method,"/context/" + filename,5,TimeUnit.SECONDS);
assertThat("Response status",response.getStatus(),is(status));
assertThat("Content-Encoding",response.get("Content-Encoding"),not(containsString(compressionType)));

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

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