From 090f0794429a1c3d1e6d9ed72a94484132ca7dbe Mon Sep 17 00:00:00 2001 From: James Agnew Date: Mon, 26 Sep 2016 12:56:37 -0400 Subject: [PATCH] Try to fix race conditions in tests --- .../java/ca/uhn/fhir/rest/server/InterceptorDstu3Test.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/InterceptorDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/InterceptorDstu3Test.java index 5f7eb480e65c..fe9bf1af032f 100644 --- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/InterceptorDstu3Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/InterceptorDstu3Test.java @@ -5,6 +5,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -113,6 +114,10 @@ public void testValidate() throws Exception { order.verify(myInterceptor2, times(1)).incomingRequestPreHandled(any(RestOperationTypeEnum.class), any(ActionRequestDetails.class)); order.verify(myInterceptor2, times(1)).outgoingResponse(any(RequestDetails.class), any(IResource.class)); order.verify(myInterceptor1, times(1)).outgoingResponse(any(RequestDetails.class), any(IResource.class)); + + // Avoid concurrency issues + Thread.sleep(500); + order.verify(myInterceptor2, times(1)).processingCompletedNormally(any(ServletRequestDetails.class)); order.verify(myInterceptor1, times(1)).processingCompletedNormally(any(ServletRequestDetails.class)); verifyNoMoreInteractions(myInterceptor1);