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

Issue #2126 removed sleep from test 

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2018-01-16 17:56:03 +01:00
parent 709da5efc6
commit c606d5f103
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAuthenticationTest.java
View File

@ -41,6 +41,7 @@ import org.eclipse.jetty.client.api.ContentProvider;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.api.Response;
import org.eclipse.jetty.client.api.Response.Listener;
import org.eclipse.jetty.client.api.Result;
import org.eclipse.jetty.client.util.BasicAuthentication;
import org.eclipse.jetty.client.util.DeferredContentProvider;
@ -464,6 +465,7 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest
Assert.assertTrue(resultLatch.await(5, TimeUnit.SECONDS));
}
@Test
public void test_RequestFailsAfterResponse() throws Exception
{
@ -476,9 +478,35 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest
IO.readBytes(jettyRequest.getInputStream());
}
});
CountDownLatch authLatch = new CountDownLatch(1);
client.getProtocolHandlers().remove(WWWAuthenticationProtocolHandler.NAME);
client.getProtocolHandlers().put(new WWWAuthenticationProtocolHandler(client)
{
@Override
public Listener getResponseListener()
{
Response.Listener listener = super.getResponseListener();
return new Listener.Adapter()
{
@Override
public void onSuccess(Response response)
{
authLatch.countDown();
}
@Override
public void onComplete(Result result)
{
listener.onComplete(result);
}
};
}
});
AuthenticationStore authenticationStore = client.getAuthenticationStore();
URI uri = URI.create(scheme + "://localhost:" + connector.getLocalPort());
BasicAuthentication authentication = new BasicAuthentication(uri, realm, "basic", "basic");
authenticationStore.addAuthentication(authentication);
@ -495,8 +523,13 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest
if (fail.compareAndSet(true, false))
{
// Wait for the 401 response to arrive
// to the authentication protocol handler.
sleep(1000);
try
{
authLatch.await();
}
catch(InterruptedException e)
{}
// Trigger request failure.
throw new RuntimeException();
}
@ -504,6 +537,7 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest
{
return null;
}
default:
throw new IllegalStateException();
}
@ -513,6 +547,7 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest
.scheme(scheme)
.path("/secure")
.content(content)
.onResponseSuccess(r->authLatch.countDown())
.send(result ->
{
if (result.isSucceeded() && result.getResponse().getStatus() == HttpStatus.OK_200)
@ -522,18 +557,6 @@ public class HttpClientAuthenticationTest extends AbstractHttpClientServerTest
Assert.assertTrue(resultLatch.await(5, TimeUnit.SECONDS));
}
private void sleep(long time)
{
try
{
Thread.sleep(time);
}
catch (InterruptedException x)
{
throw new RuntimeException(x);
}
}
private static class GeneratingContentProvider implements ContentProvider
{
private static final ByteBuffer DONE = ByteBuffer.allocate(0);