Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

jetty · Jun 30, 2022 · 713925f · 713925f
2 parents e285b80 + 6a7a749
commit 713925f
Showing 1 changed file with 70 additions and 2 deletions.
diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/HugeResourceTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/HugeResourceTest.java
@@ -18,6 +18,7 @@
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.net.URI;
+import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.file.FileStore;
@@ -188,6 +189,7 @@ public void startServer() throws Exception
         context.setBaseResource(new PathResource(staticBase));
 
         context.addServlet(PostServlet.class, "/post");
+        context.addServlet(ChunkedServlet.class, "/chunked/*");
 
         String location = multipartTempDir.toString();
         long maxFileSize = Long.MAX_VALUE;
@@ -223,7 +225,7 @@ public void stopClient() throws Exception
 
     @ParameterizedTest
     @MethodSource("staticFiles")
-    public void testDownload(String filename, long expectedSize) throws Exception
+    public void testDownloadStatic(String filename, long expectedSize) throws Exception
     {
         URI destUri = server.getURI().resolve("/" + filename);
         InputStreamResponseListener responseListener = new InputStreamResponseListener();
@@ -250,7 +252,33 @@ public void testDownload(String filename, long expectedSize) throws Exception
 
     @ParameterizedTest
     @MethodSource("staticFiles")
-    public void testHead(String filename, long expectedSize) throws Exception
+    public void testDownloadChunked(String filename, long expectedSize) throws Exception
+    {
+        URI destUri = server.getURI().resolve("/chunked/" + filename);
+        InputStreamResponseListener responseListener = new InputStreamResponseListener();
+
+        Request request = client.newRequest(destUri)
+            .method(HttpMethod.GET);
+        request.send(responseListener);
+        Response response = responseListener.get(5, TimeUnit.SECONDS);
+
+        assertThat("HTTP Response Code", response.getStatus(), is(200));
+        // dumpResponse(response);
+
+        String transferEncoding = response.getHeaders().get(HttpHeader.TRANSFER_ENCODING);
+        assertThat("Http Response Header: \"Transfer-Encoding\"", transferEncoding, is("chunked"));
+
+        try (ByteCountingOutputStream out = new ByteCountingOutputStream();
+             InputStream in = responseListener.getInputStream())
+        {
+            IO.copy(in, out);
+            assertThat("Downloaded Files Size: " + filename, out.getCount(), is(expectedSize));
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("staticFiles")
+    public void testHeadStatic(String filename, long expectedSize) throws Exception
     {
         URI destUri = server.getURI().resolve("/" + filename);
         InputStreamResponseListener responseListener = new InputStreamResponseListener();
@@ -273,6 +301,30 @@ public void testHead(String filename, long expectedSize) throws Exception
         assertThat("Http Response Header: \"Content-Length: " + contentLength + "\"", contentLengthLong, is(expectedSize));
     }
 
+    @ParameterizedTest
+    @MethodSource("staticFiles")
+    public void testHeadChunked(String filename, long expectedSize) throws Exception
+    {
+        URI destUri = server.getURI().resolve("/chunked/" + filename);
+        InputStreamResponseListener responseListener = new InputStreamResponseListener();
+
+        Request request = client.newRequest(destUri)
+            .method(HttpMethod.HEAD);
+        request.send(responseListener);
+        Response response = responseListener.get(5, TimeUnit.SECONDS);
+
+        try (InputStream in = responseListener.getInputStream())
+        {
+            assertThat(in.read(), is(-1));
+        }
+
+        assertThat("HTTP Response Code", response.getStatus(), is(200));
+        // dumpResponse(response);
+
+        String transferEncoding = response.getHeaders().get(HttpHeader.TRANSFER_ENCODING);
+        assertThat("Http Response Header: \"Transfer-Encoding\"", transferEncoding, is("chunked"));
+    }
+
     @ParameterizedTest
     @MethodSource("staticFiles")
     public void testUpload(String filename, long expectedSize) throws Exception
@@ -359,6 +411,22 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
         }
     }
 
+    public static class ChunkedServlet extends HttpServlet
+    {
+        @Override
+        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException
+        {
+            URL resource = req.getServletContext().getResource(req.getPathInfo());
+            OutputStream output = resp.getOutputStream();
+            try (InputStream input = resource.openStream())
+            {
+                resp.setContentType("application/octet-stream");
+                resp.flushBuffer();
+                IO.copy(input, output);
+            }
+        }
+    }
+
     public static class MultipartServlet extends HttpServlet
     {
         @Override