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

Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

This commit is contained in:
Joakim Erdfelt 2011-08-05 09:56:23 -07:00
parent 300f449e6f 4e4099c821
commit 43e7bcc1a0
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
View File

@ -69,6 +69,12 @@ public class GzipFilterTest
IO.copy(testIn,testOut); IO.copy(testIn,testOut);
testOut.close(); testOut.close();
testFile = testdir.getFile("file.mp3");
testOut = new BufferedOutputStream(new FileOutputStream(testFile));
testIn = new ByteArrayInputStream(__content.getBytes("ISO8859_1"));
IO.copy(testIn,testOut);
testOut.close();
tester=new ServletTester(); tester=new ServletTester();
tester.setContextPath("/context"); tester.setContextPath("/context");
tester.setResourceBase(testdir.getDir().getCanonicalPath()); tester.setResourceBase(testdir.getDir().getCanonicalPath());
@ -86,7 +92,7 @@ public class GzipFilterTest
} }
@Test @Test
public void testGzipFilter() throws Exception public void testGzip() throws Exception
{ {
// generated and parsed test // generated and parsed test
HttpTester request = new HttpTester(); HttpTester request = new HttpTester();
@ -112,4 +118,32 @@ public class GzipFilterTest
assertEquals(__content, testOut.toString("ISO8859_1")); assertEquals(__content, testOut.toString("ISO8859_1"));
} }
@Test
public void testNotGzip() throws Exception
{
// generated and parsed test
HttpTester request = new HttpTester();
HttpTester response = new HttpTester();
request.setMethod("GET");
request.setVersion("HTTP/1.0");
request.setHeader("Host","tester");
request.setHeader("accept-encoding","gzip");
request.setURI("/context/file.mp3");
ByteArrayBuffer reqsBuff = new ByteArrayBuffer(request.generate().getBytes());
ByteArrayBuffer respBuff = tester.getResponses(reqsBuff);
response.parse(respBuff.asArray());
assertTrue(response.getMethod()==null);
assertEquals(__content.getBytes().length, Integer.parseInt(response.getHeader("Content-Length")));
assertEquals(HttpServletResponse.SC_OK,response.getStatus());
InputStream testIn = new ByteArrayInputStream(response.getContentBytes());
ByteArrayOutputStream testOut = new ByteArrayOutputStream();
IO.copy(testIn,testOut);
assertEquals(__content, testOut.toString("ISO8859_1"));
}
} }