Skip to content

Commit 8719de5

Browse files
committed
FELIX-6750-Jetty-12.1.0-tryout
- Fix FIXME, handle async with future
1 parent 1dccc80 commit 8719de5

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySizeLimitHandlerIT.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.net.URI;
2626
import java.util.Hashtable;
2727
import java.util.Map;
28+
import java.util.concurrent.CompletableFuture;
2829
import java.util.concurrent.ExecutionException;
2930

3031
import javax.inject.Inject;
@@ -34,8 +35,11 @@
3435
import jakarta.servlet.http.HttpServletRequest;
3536
import jakarta.servlet.http.HttpServletResponse;
3637

38+
import org.eclipse.jetty.client.CompletableResponseListener;
3739
import org.eclipse.jetty.client.ContentResponse;
40+
import org.eclipse.jetty.client.FormRequestContent;
3841
import org.eclipse.jetty.client.HttpClient;
42+
import org.eclipse.jetty.client.Request;
3943
import org.eclipse.jetty.util.Fields;
4044
import org.junit.Before;
4145
import org.junit.Test;
@@ -119,15 +123,12 @@ public void testRequestResponseLimits() throws Exception {
119123
Fields formFieldsLimitExceeded = new Fields();
120124
formFieldsLimitExceeded.add(new Fields.Field("key","valueoverlimit")); // over limit of 10 bytes
121125

122-
try {
123-
ContentResponse responseExceeded = httpClient.FORM(new URI(String.format("http://localhost:%d/withinlimit/a", httpPort)), formFieldsLimitExceeded);
126+
Request request = httpClient.newRequest(new URI(String.format("http://localhost:%d/withinlimit/a", httpPort)))
127+
.body(new FormRequestContent(formFieldsLimitExceeded));
124128

125-
// Request limit exceeded, HTTP 413 directly from Jetty
126-
assertEquals(413, responseExceeded.getStatus());
127-
} catch (ExecutionException e) {
128-
// FIXME this shouldn't happen, but it does with Jetty 12.1.0.beta0
129-
// java.nio.channels.AsynchronousCloseException
130-
}
129+
CompletableFuture<ContentResponse> completable = new CompletableResponseListener(request).send();
130+
ContentResponse response = completable.get();
131+
assertEquals(413, response.getStatus());
131132
}
132133
}
133134

0 commit comments

Comments
 (0)