diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-05-10 11:56:16 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-05-10 11:56:16 +0200 |
commit | db673ae0d3b610defcbb222a3521b45d66235b49 (patch) | |
tree | a7c5a47f4218b7787ede2c717b9891ef00386e03 /jdisc_core/src/test | |
parent | ca26335f40ee0be1df0afdd213f649fa91aa2fed (diff) |
Change timeout response code from 408 to 504
Diffstat (limited to 'jdisc_core/src/test')
-rw-r--r-- | jdisc_core/src/test/java/com/yahoo/jdisc/core/TimeoutManagerImplTestCase.java | 22 | ||||
-rw-r--r-- | jdisc_core/src/test/java/com/yahoo/jdisc/handler/AbstractRequestHandlerTestCase.java | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/TimeoutManagerImplTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/TimeoutManagerImplTestCase.java index 46464a9b05a..0a7d5c6b0f8 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/TimeoutManagerImplTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/TimeoutManagerImplTestCase.java @@ -82,8 +82,8 @@ public class TimeoutManagerImplTestCase { @Test public void requireThatNullRequestContentCanTimeout() throws InterruptedException { Context ctx = new Context(MyRequestHandler.newNullContent()); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); assertTrue(ctx.close()); } @@ -96,31 +96,31 @@ public class TimeoutManagerImplTestCase { } catch (RequestDeniedException e) { } - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); assertTrue(ctx.close()); } @Test public void requireThatTimeoutWorksAfterResponseDenied() throws InterruptedException { Context ctx = new Context(MyRequestHandler.newInstance()); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newResponseDenied())); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newResponseDenied())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); assertTrue(ctx.close()); } @Test public void requireThatTimeoutWorksAfterResponseThrowsException() throws InterruptedException { Context ctx = new Context(MyRequestHandler.newInstance()); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newThrowException())); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newThrowException())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); assertTrue(ctx.close()); } @Test public void requireThatTimeoutWorksAfterResponseInterruptsThread() throws InterruptedException { Context ctx = new Context(MyRequestHandler.newInstance()); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInterruptThread())); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInterruptThread())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); assertTrue(ctx.close()); } @@ -154,7 +154,7 @@ public class TimeoutManagerImplTestCase { @Test public void requireThatResponseHandlerIsWellBehavedAfterTimeout() throws InterruptedException { Context ctx = new Context(MyRequestHandler.newInstance()); - assertEquals(Response.Status.REQUEST_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); + assertEquals(Response.Status.GATEWAY_TIMEOUT, ctx.awaitResponse(69L, MyResponseHandler.newInstance())); ContentChannel content = ctx.requestHandler.responseHandler.handleResponse(new Response(Response.Status.OK)); assertNotNull(content); @@ -246,7 +246,7 @@ public class TimeoutManagerImplTestCase { Response response = responseHandler.response.get(); assertNotNull(response); - assertEquals(Response.Status.REQUEST_TIMEOUT, response.getStatus()); + assertEquals(Response.Status.GATEWAY_TIMEOUT, response.getStatus()); assertTrue(ctx.close()); } diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/handler/AbstractRequestHandlerTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/handler/AbstractRequestHandlerTestCase.java index 661165ac5e8..47f3fd122fa 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/handler/AbstractRequestHandlerTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/handler/AbstractRequestHandlerTestCase.java @@ -40,7 +40,7 @@ public class AbstractRequestHandlerTestCase { }.handleTimeout(NonWorkingRequest.newInstance("http://localhost/"), handler); Response response = handler.get(600, TimeUnit.SECONDS); assertNotNull(response); - assertEquals(Response.Status.REQUEST_TIMEOUT, response.getStatus()); + assertEquals(Response.Status.GATEWAY_TIMEOUT, response.getStatus()); } @Test |