From 89531a81bedf05955fa13f4bdc21f30a36e3e6d7 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 19 May 2016 15:48:40 +0200 Subject: [PATCH] Fixed test. --- .../client/HttpClientAuthenticationTest.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java index b68e7641c59..6e686fcc87e 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java @@ -421,25 +421,26 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest CountDownLatch successLatch = new CountDownLatch(1); CountDownLatch resultLatch = new CountDownLatch(1); DeferredContentProvider content = new DeferredContentProvider(); - client.newRequest("localhost", connector.getLocalPort()) + Request request = client.newRequest("localhost", connector.getLocalPort()) .scheme(scheme) .path("/secure") - .onRequestContent((request, buffer) -> request.abort(new Exception())) .content(content) - .onResponseSuccess(response -> successLatch.countDown()) - .send(result -> - { - if (result.isFailed() && result.getResponseFailure() == null) - resultLatch.countDown(); - }); + .onResponseSuccess(response -> successLatch.countDown()); + request.send(result -> + { + if (result.isFailed() && result.getResponseFailure() == null) + resultLatch.countDown(); + }); + + // Send some content to make sure the request is dispatched on the server. + content.offer(ByteBuffer.wrap("hello".getBytes(StandardCharsets.UTF_8))); // Wait for the response to arrive to // the authentication protocol handler. Thread.sleep(1000); - // Send some content to trigger request failure. - content.offer(ByteBuffer.wrap("test".getBytes(StandardCharsets.UTF_8))); - content.close(); + // Trigger request failure. + request.abort(new Exception()); // Verify that the response was successful, it's the request that failed. Assert.assertTrue(successLatch.await(5, TimeUnit.SECONDS));