diff --git a/contrib-http-framework/pom.xml b/contrib-http-framework/pom.xml index b17e77e74..1c87cb539 100644 --- a/contrib-http-framework/pom.xml +++ b/contrib-http-framework/pom.xml @@ -43,7 +43,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/contrib-http-framework/src/test/java/org/forgerock/http/filter/ConditionalFilterTest.java b/contrib-http-framework/src/test/java/org/forgerock/http/filter/ConditionalFilterTest.java index aca4db069..c21f151a1 100644 --- a/contrib-http-framework/src/test/java/org/forgerock/http/filter/ConditionalFilterTest.java +++ b/contrib-http-framework/src/test/java/org/forgerock/http/filter/ConditionalFilterTest.java @@ -17,12 +17,12 @@ package org.forgerock.http.filter; import static org.forgerock.util.promise.Promises.newResultPromise; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; @@ -65,7 +65,7 @@ public void shouldExecuteTheDelegatedFilter() throws Exception { @Test public void shouldSkipTheDelegatedFilter() throws Exception { new ConditionalFilter(delegate, false).filter(context, request, next); - verifyZeroInteractions(delegate); + verifyNoMoreInteractions(delegate); verify(next).handle(eq(context), eq(request)); } @@ -79,7 +79,7 @@ public void shouldEvaluateTheConditionForEveryRequest() throws Exception { // First time the function evaluates to false filter.filter(context, request, next); - verifyZeroInteractions(delegate); + verifyNoMoreInteractions(delegate); verify(next).handle(eq(context), eq(request)); // Second time the function evaluates to true @@ -87,7 +87,7 @@ public void shouldEvaluateTheConditionForEveryRequest() throws Exception { filter.filter(context, request, next); verify(delegate).filter(eq(context), eq(request), eq(next)); - verifyZeroInteractions(next); + verifyNoMoreInteractions(next); } @Test @@ -99,7 +99,7 @@ public void shouldSkipTheDelegatedFilterInCaseOfException() throws Exception { filter.filter(context, request, next); - verifyZeroInteractions(delegate); + verifyNoMoreInteractions(delegate); verify(next).handle(eq(context), eq(request)); } } diff --git a/contrib-http-framework/src/test/java/org/forgerock/http/filter/throttling/DefaultRateThrottlingPolicyTest.java b/contrib-http-framework/src/test/java/org/forgerock/http/filter/throttling/DefaultRateThrottlingPolicyTest.java index ee1c2f411..5e6b14da7 100644 --- a/contrib-http-framework/src/test/java/org/forgerock/http/filter/throttling/DefaultRateThrottlingPolicyTest.java +++ b/contrib-http-framework/src/test/java/org/forgerock/http/filter/throttling/DefaultRateThrottlingPolicyTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.util.time.Duration.duration; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/contrib-http-framework/src/test/java/org/forgerock/http/filter/throttling/ThrottlingFilterTest.java b/contrib-http-framework/src/test/java/org/forgerock/http/filter/throttling/ThrottlingFilterTest.java index f8189b1a4..ba05f17a4 100644 --- a/contrib-http-framework/src/test/java/org/forgerock/http/filter/throttling/ThrottlingFilterTest.java +++ b/contrib-http-framework/src/test/java/org/forgerock/http/filter/throttling/ThrottlingFilterTest.java @@ -20,13 +20,13 @@ import static org.forgerock.http.protocol.Responses.newInternalServerError; import static org.forgerock.util.promise.Promises.newResultPromise; import static org.forgerock.util.time.Duration.duration; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.util.concurrent.CountDownLatch; @@ -93,7 +93,7 @@ public Promise lookup(Context context, Request reques // Then verify(handler).handle(eq(context), eq(request)); - verifyZeroInteractions(throttlingStrategy); + verifyNoMoreInteractions(throttlingStrategy); } @Test @@ -183,7 +183,7 @@ public void run() { Response response = filter.filter(new RootContext(), new Request(), spiedHandler).get(); // The throttling strategy refuses it so the handler does not have to be called and must return a 429. - verifyZeroInteractions(spiedHandler); + verifyNoMoreInteractions(spiedHandler); assertThat(response.getStatus()).isEqualTo(Status.TOO_MANY_REQUESTS); assertThat(response.getHeaders().getFirst("Retry-After")).isEqualTo("1"); } finally { diff --git a/contrib-http-framework/src/test/java/org/forgerock/http/filter/throttling/TokenBucketThrottlingStrategyTest.java b/contrib-http-framework/src/test/java/org/forgerock/http/filter/throttling/TokenBucketThrottlingStrategyTest.java index 7471c7f77..a9c337a97 100644 --- a/contrib-http-framework/src/test/java/org/forgerock/http/filter/throttling/TokenBucketThrottlingStrategyTest.java +++ b/contrib-http-framework/src/test/java/org/forgerock/http/filter/throttling/TokenBucketThrottlingStrategyTest.java @@ -25,8 +25,8 @@ import static org.forgerock.util.time.Duration.UNLIMITED; import static org.forgerock.util.time.Duration.ZERO; import static org.forgerock.util.time.Duration.duration; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/openig-core/pom.xml b/openig-core/pom.xml index f4dddea90..a508a3491 100644 --- a/openig-core/pom.xml +++ b/openig-core/pom.xml @@ -163,7 +163,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openig-core/src/test/java/org/forgerock/openig/decoration/baseuri/BaseUriDecoratorTest.java b/openig-core/src/test/java/org/forgerock/openig/decoration/baseuri/BaseUriDecoratorTest.java index 643c4fe4d..a04394a22 100644 --- a/openig-core/src/test/java/org/forgerock/openig/decoration/baseuri/BaseUriDecoratorTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/decoration/baseuri/BaseUriDecoratorTest.java @@ -21,7 +21,7 @@ import static org.forgerock.http.protocol.Response.newResponsePromise; import static org.forgerock.http.protocol.Status.TEAPOT; import static org.forgerock.json.JsonValue.json; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/openig-core/src/test/java/org/forgerock/openig/decoration/capture/CaptureFilterTest.java b/openig-core/src/test/java/org/forgerock/openig/decoration/capture/CaptureFilterTest.java index 68bc71e54..adf4eba9d 100644 --- a/openig-core/src/test/java/org/forgerock/openig/decoration/capture/CaptureFilterTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/decoration/capture/CaptureFilterTest.java @@ -21,7 +21,7 @@ import static org.forgerock.openig.decoration.capture.CapturePoint.FILTERED_RESPONSE; import static org.forgerock.openig.decoration.capture.CapturePoint.REQUEST; import static org.forgerock.openig.decoration.capture.CapturePoint.RESPONSE; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -68,7 +68,7 @@ public Promise filter(final Context context, public void setUp() throws Exception { MockitoAnnotations.initMocks(this); response = new Response(Status.OK); - when(terminal.handle(any(Context.class), any(Request.class))) + when(terminal.handle(any(Context.class), any())) .thenReturn(Promises.newResultPromise(response)); } diff --git a/openig-core/src/test/java/org/forgerock/openig/decoration/capture/CaptureHandlerTest.java b/openig-core/src/test/java/org/forgerock/openig/decoration/capture/CaptureHandlerTest.java index 4d1fa7aae..ad3b78b39 100644 --- a/openig-core/src/test/java/org/forgerock/openig/decoration/capture/CaptureHandlerTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/decoration/capture/CaptureHandlerTest.java @@ -21,7 +21,7 @@ import static org.forgerock.openig.decoration.capture.CapturePoint.FILTERED_RESPONSE; import static org.forgerock.openig.decoration.capture.CapturePoint.REQUEST; import static org.forgerock.openig.decoration.capture.CapturePoint.RESPONSE; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -57,7 +57,7 @@ public class CaptureHandlerTest { public void setUp() throws Exception { MockitoAnnotations.initMocks(this); response = new Response(Status.OK); - when(delegate.handle(any(Context.class), any(Request.class))) + when(delegate.handle(any(Context.class), any())) .thenReturn(Promises.newResultPromise(response)); } diff --git a/openig-core/src/test/java/org/forgerock/openig/decoration/global/GlobalDecoratorTest.java b/openig-core/src/test/java/org/forgerock/openig/decoration/global/GlobalDecoratorTest.java index 44f4fb15f..95d2fcdbf 100644 --- a/openig-core/src/test/java/org/forgerock/openig/decoration/global/GlobalDecoratorTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/decoration/global/GlobalDecoratorTest.java @@ -18,6 +18,7 @@ import static org.assertj.core.api.Assertions.*; import static org.forgerock.json.JsonValue.*; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.*; import org.forgerock.json.JsonValue; @@ -50,7 +51,7 @@ public class GlobalDecoratorTest { public void setUp() throws Exception { MockitoAnnotations.initMocks(this); when(context.getHeap()).thenReturn(heap); - when(decorator.accepts(any(Class.class))).thenReturn(true); + when(decorator.accepts(nullable(Class.class))).thenReturn(true); } @Test @@ -89,7 +90,7 @@ public void shouldCallDecorators() throws Exception { Object delegate = new Object(); globalDecorator.decorate(delegate, null, context); - verify(decorator, times(2)).decorate(anyObject(), captor.capture(), eq(context)); + verify(decorator, times(2)).decorate(any(), captor.capture(), eq(context)); // Verify that the JSonValues are the one we're expecting assertThat(captor.getAllValues().get(0).asString()).isEqualTo("value-1"); assertThat(captor.getAllValues().get(1).asString()).isEqualTo("value-2"); @@ -105,7 +106,7 @@ public void shouldIgnoreMissingDecorators() throws Exception { Object delegate = new Object(); globalDecorator.decorate(delegate, null, context); - verify(decorator).decorate(anyObject(), captor.capture(), eq(context)); + verify(decorator).decorate(any(), captor.capture(), eq(context)); // Verify that the JSonValues are the one we're expecting assertThat(captor.getAllValues().get(0).asString()).isEqualTo("value-2"); } @@ -115,7 +116,7 @@ public void shouldIgnoreIncompatibleDecorators() throws Exception { when(heap.get("deco-1", Decorator.class)).thenReturn(decorator); when(heap.get("deco-2", Decorator.class)).thenReturn(decorator); // deco-1 will not accept the given type (the incompatible one) - when(decorator.accepts(any(Class.class))).thenReturn(false, true); + when(decorator.accepts(nullable(Class.class))).thenReturn(false, true); JsonValue decorations = json(object(field("deco-1", "value-1"), field("deco-2", "value-2"))); @@ -123,7 +124,7 @@ public void shouldIgnoreIncompatibleDecorators() throws Exception { Object delegate = new Object(); globalDecorator.decorate(delegate, null, context); - verify(decorator).decorate(anyObject(), captor.capture(), eq(context)); + verify(decorator).decorate(any(), captor.capture(), eq(context)); // Verify that the JSonValues are the one we're expecting assertThat(captor.getAllValues().get(0).asString()).isEqualTo("value-2"); } diff --git a/openig-core/src/test/java/org/forgerock/openig/decoration/helper/LazyReferenceTest.java b/openig-core/src/test/java/org/forgerock/openig/decoration/helper/LazyReferenceTest.java index 817d79144..15d998456 100644 --- a/openig-core/src/test/java/org/forgerock/openig/decoration/helper/LazyReferenceTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/decoration/helper/LazyReferenceTest.java @@ -18,7 +18,8 @@ import static org.forgerock.json.JsonValue.*; import static org.forgerock.openig.decoration.helper.LazyReference.*; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import org.forgerock.json.JsonValue; import org.forgerock.openig.heap.Heap; diff --git a/openig-core/src/test/java/org/forgerock/openig/filter/ConditionEnforcementFilterTest.java b/openig-core/src/test/java/org/forgerock/openig/filter/ConditionEnforcementFilterTest.java index 213327e5d..8b5d530dd 100644 --- a/openig-core/src/test/java/org/forgerock/openig/filter/ConditionEnforcementFilterTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/filter/ConditionEnforcementFilterTest.java @@ -24,9 +24,9 @@ import static org.forgerock.openig.heap.Keys.CLIENT_HANDLER_HEAP_KEY; import static org.forgerock.openig.heap.Keys.TEMPORARY_STORAGE_HEAP_KEY; import static org.forgerock.util.Options.defaultOptions; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.MockitoAnnotations.initMocks; import org.forgerock.http.Handler; @@ -111,7 +111,7 @@ public void shouldContinueChainExecutionWhenConditionIsTrue() throws Exception { final ConditionEnforcementFilter filter = new ConditionEnforcementFilter(Expression.valueOf("${true}", Boolean.class)); filter.filter(context, null, next); - verify(next).handle(any(Context.class), any(Request.class)); + verify(next).handle(any(Context.class), any()); } @DataProvider @@ -134,7 +134,7 @@ public void shouldReturnForbiddenAndBreakChainExecutionWhenConditionIsFalse(fina // Then assertThat(response.getStatus()).isEqualTo(FORBIDDEN); assertThat(response.getCause()).isNull(); - verifyZeroInteractions(next); + verifyNoMoreInteractions(next); } @Test(dataProvider = "conditionsEvaluatingToFalse") @@ -147,7 +147,7 @@ public void shouldDelegateToFailureHandlerForInvalidOrEvaluatedToFalseConditions // When filter.filter(context, null, next); // Then - verify(failureHandler).handle(any(Context.class), any(Request.class)); + verify(failureHandler).handle(any(Context.class), any()); } private HeapImpl buildDefaultHeap() throws Exception { diff --git a/openig-core/src/test/java/org/forgerock/openig/filter/GroovyScriptableFilterTest.java b/openig-core/src/test/java/org/forgerock/openig/filter/GroovyScriptableFilterTest.java index f688ffbde..4f367cb33 100644 --- a/openig-core/src/test/java/org/forgerock/openig/filter/GroovyScriptableFilterTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/filter/GroovyScriptableFilterTest.java @@ -34,7 +34,7 @@ import static org.forgerock.util.Options.defaultOptions; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import java.io.File; import java.io.IOException; @@ -44,10 +44,8 @@ import java.sql.ResultSet; import java.sql.Statement; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Set; import javax.naming.InitialContext; import javax.script.ScriptException; @@ -61,11 +59,6 @@ import org.forgerock.http.session.Session; import org.forgerock.http.session.SessionContext; import org.forgerock.json.JsonValue; -import org.forgerock.opendj.ldap.Connections; -import org.forgerock.opendj.ldap.LDAPClientContext; -import org.forgerock.opendj.ldap.LDAPListener; -import org.forgerock.opendj.ldap.MemoryBackend; -import org.forgerock.opendj.ldif.LDIFEntryReader; import org.forgerock.openig.config.Environment; import org.forgerock.openig.config.env.DefaultEnvironment; import org.forgerock.openig.filter.ScriptableFilter.Heaplet; @@ -144,7 +137,7 @@ public void testBindingsArePresent() throws Exception { final Handler handler = mock(Handler.class); Response response = filter.filter(new RootContext(), new Request(), handler).get(); assertThat(response.getStatus()).isEqualTo(Status.OK); - verifyZeroInteractions(handler); + verifyNoMoreInteractions(handler); } @DataProvider @@ -175,7 +168,7 @@ public void testConstructFromFile() throws Exception { final Handler handler = mock(Handler.class); Response response = filter.filter(new RootContext(), null, handler).get(); assertThat(response.getStatus()).isEqualTo(Status.OK); - verifyZeroInteractions(handler); + verifyNoMoreInteractions(handler); } @Test @@ -253,7 +246,7 @@ public void testConstructFromString() throws Exception { final Handler handler = mock(Handler.class); Response response = filter.filter(new RootContext(), new Request(), handler).get(); - verifyZeroInteractions(handler); + verifyNoMoreInteractions(handler); assertThat(response.getStatus()).isEqualTo(Status.OK); } diff --git a/openig-core/src/test/java/org/forgerock/openig/filter/HttpAccessAuditFilterTest.java b/openig-core/src/test/java/org/forgerock/openig/filter/HttpAccessAuditFilterTest.java index d079fba3a..7f52ced7f 100644 --- a/openig-core/src/test/java/org/forgerock/openig/filter/HttpAccessAuditFilterTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/filter/HttpAccessAuditFilterTest.java @@ -22,9 +22,9 @@ import static org.forgerock.json.JsonValue.object; import static org.forgerock.json.resource.Responses.newResourceResponse; import static org.forgerock.services.context.ClientContext.buildExternalClientContext; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.util.Collections; @@ -94,7 +94,7 @@ public void shouldNotSendAnAccessEventOnNullResponse() throws Exception { request, new ResponseHandler((Response) null)).get(); - verifyZeroInteractions(reqHandler); + verifyNoMoreInteractions(reqHandler); } private void verifyAuditServiceCall(RequestHandler handler, Status status) { diff --git a/openig-core/src/test/java/org/forgerock/openig/filter/HttpBasicAuthFilterTest.java b/openig-core/src/test/java/org/forgerock/openig/filter/HttpBasicAuthFilterTest.java index 59183bec2..4ee67dd61 100644 --- a/openig-core/src/test/java/org/forgerock/openig/filter/HttpBasicAuthFilterTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/filter/HttpBasicAuthFilterTest.java @@ -17,9 +17,9 @@ package org.forgerock.openig.filter; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.endsWith; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.endsWith; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git a/openig-core/src/test/java/org/forgerock/openig/filter/MdcRouteIdFilterTest.java b/openig-core/src/test/java/org/forgerock/openig/filter/MdcRouteIdFilterTest.java index 782eaa2ba..498b907ce 100644 --- a/openig-core/src/test/java/org/forgerock/openig/filter/MdcRouteIdFilterTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/filter/MdcRouteIdFilterTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.http.protocol.Response.newResponsePromise; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.when; import org.forgerock.http.Handler; @@ -53,7 +53,7 @@ public void setUp() throws Exception { public void testDownstreamHandlerHasTheMessageDiagnosisContextCorrectlySet() throws Exception { MdcRouteIdFilter filter = new MdcRouteIdFilter(ROUTE_NAME); - when(handler.handle(any(Context.class), any(Request.class))) + when(handler.handle(nullable(Context.class), nullable(Request.class))) .then(new Answer>() { @Override public Promise answer(InvocationOnMock invocation) { diff --git a/openig-core/src/test/java/org/forgerock/openig/filter/SqlAttributesFilterTest.java b/openig-core/src/test/java/org/forgerock/openig/filter/SqlAttributesFilterTest.java index d52b5bf11..ef2b3a94d 100644 --- a/openig-core/src/test/java/org/forgerock/openig/filter/SqlAttributesFilterTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/filter/SqlAttributesFilterTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.when; @@ -76,7 +76,7 @@ public class SqlAttributesFilterTest { @BeforeMethod public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - when(terminalHandler.handle(any(Context.class), any(Request.class))) + when(terminalHandler.handle(nullable(Context.class), nullable(Request.class))) .thenReturn(Promises.newResultPromise(new Response(Status.OK))); } diff --git a/openig-core/src/test/java/org/forgerock/openig/filter/SwitchFilterTest.java b/openig-core/src/test/java/org/forgerock/openig/filter/SwitchFilterTest.java index 3782cdb16..ba81f609a 100644 --- a/openig-core/src/test/java/org/forgerock/openig/filter/SwitchFilterTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/filter/SwitchFilterTest.java @@ -16,10 +16,10 @@ package org.forgerock.openig.filter; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import org.forgerock.http.Handler; @@ -61,11 +61,11 @@ public class SwitchFilterTest { @BeforeMethod public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - when(terminalHandler.handle(any(Context.class), any(Request.class))) + when(terminalHandler.handle(any(Context.class), any())) .thenReturn(Promises.newResultPromise(new Response(Status.OK))); - when(handler1.handle(any(Context.class), any(Request.class))) + when(handler1.handle(any(Context.class), any())) .thenReturn(Promises.newResultPromise(new Response(Status.OK))); - when(handler2.handle(any(Context.class), any(Request.class))) + when(handler2.handle(any(Context.class), any())) .thenReturn(Promises.newResultPromise(new Response(Status.OK))); when(handler3.handle(any(Context.class), any(Request.class))) .thenReturn(Promises.newResultPromise(new Response(Status.OK))); @@ -81,7 +81,7 @@ public void testSwitchOnRequestOnly() throws Exception { filter.filter(context, null, terminalHandler); // Filter's handler should not be called because the stream has been diverted - verifyZeroInteractions(terminalHandler); + verifyNoMoreInteractions(terminalHandler); verify(handler1).handle(context, null); } @@ -106,7 +106,7 @@ public void testSwitchWithConditionOnResponseStatus() throws Exception { // Reset the terminalHandler as we want another result here. Mockito.reset(terminalHandler); - when(terminalHandler.handle(any(Context.class), any(Request.class))) + when(terminalHandler.handle(any(Context.class), any())) .thenReturn(Promises.newResultPromise(new Response(Status.TEAPOT))); filter.filter(context, null, terminalHandler); @@ -131,8 +131,8 @@ public void testResponseHandlerNotInvokedIfRequestHasBeenDiverted() throws Excep // As the request condition is fulfilled, the handler plugged onto // the response should not be called verify(handler1).handle(context, null); - verifyZeroInteractions(terminalHandler); - verifyZeroInteractions(handler2); + verifyNoMoreInteractions(terminalHandler); + verifyNoMoreInteractions(handler2); } @Test @@ -150,7 +150,7 @@ public void testThatOnlyFirstMatchingHandlerGetsInvoked() throws Exception { // Ensure that only the first handler with true condition gets invoked // Other cases in the chain will never be tested - verifyZeroInteractions(handler1, handler3, handler4); + verifyNoMoreInteractions(handler1, handler3, handler4); verify(handler2).handle(context, null); } } diff --git a/openig-core/src/test/java/org/forgerock/openig/handler/DispatchHandlerTest.java b/openig-core/src/test/java/org/forgerock/openig/handler/DispatchHandlerTest.java index c0172cb4e..ef5ed5d84 100644 --- a/openig-core/src/test/java/org/forgerock/openig/handler/DispatchHandlerTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/handler/DispatchHandlerTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.http.MutableUri.uri; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/openig-core/src/test/java/org/forgerock/openig/handler/SequenceHandlerTest.java b/openig-core/src/test/java/org/forgerock/openig/handler/SequenceHandlerTest.java index 3f02221b7..1bacb61b7 100644 --- a/openig-core/src/test/java/org/forgerock/openig/handler/SequenceHandlerTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/handler/SequenceHandlerTest.java @@ -17,8 +17,8 @@ package org.forgerock.openig.handler; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import org.forgerock.http.Handler; @@ -101,6 +101,6 @@ public void shouldExecuteMultiElementSequencePartially() throws Exception { Request request = new Request(); Promise result = sequence.handle(context, request); assertThat(result.get()).isSameAs(response1); - verifyZeroInteractions(handler2); + verifyNoMoreInteractions(handler2); } } diff --git a/openig-core/src/test/java/org/forgerock/openig/handler/resources/ResourceHandlerTest.java b/openig-core/src/test/java/org/forgerock/openig/handler/resources/ResourceHandlerTest.java index 0b2a6a25c..9e31e59bb 100644 --- a/openig-core/src/test/java/org/forgerock/openig/handler/resources/ResourceHandlerTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/handler/resources/ResourceHandlerTest.java @@ -25,7 +25,7 @@ import static org.forgerock.http.protocol.Status.NOT_FOUND; import static org.forgerock.http.protocol.Status.OK; import static org.forgerock.openig.handler.resources.ResourceHandler.NOT_MODIFIED; -import static org.mockito.Mockito.anyString; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.when; import java.util.Collections; @@ -80,7 +80,7 @@ public void shouldRejectNonGetMethod(String method) throws Exception { @Test public void shouldAcceptGetMethod() throws Exception { - when(resourceSet.find(anyString())).thenReturn(resource); + when(resourceSet.find(nullable(String.class))).thenReturn(resource); when(resource.getType()).thenReturn("text/html"); ResourceHandler handler = new ResourceHandler(singletonList(resourceSet)); @@ -114,7 +114,7 @@ public void shouldReturn404ForUnknownResources() throws Exception { @Test public void shouldNotDefineContentTypeWhenResourceIsMissingExtension() throws Exception { - when(resourceSet.find(anyString())).thenReturn(resource); + when(resourceSet.find(nullable(String.class))).thenReturn(resource); ResourceHandler handler = new ResourceHandler(singletonList(resourceSet)); UriRouterContext context = new UriRouterContext(new RootContext(), @@ -130,7 +130,7 @@ public void shouldNotDefineContentTypeWhenResourceIsMissingExtension() throws Ex @Test public void shouldServeNotModifiedResources() throws Exception { - when(resourceSet.find(anyString())).thenReturn(resource); + when(resourceSet.find(nullable(String.class))).thenReturn(resource); when(resource.getLastModified()).thenReturn(0L); ResourceHandler handler = new ResourceHandler(singletonList(resourceSet)); @@ -148,7 +148,7 @@ public void shouldServeNotModifiedResources() throws Exception { @Test public void shouldServeModifiedResources() throws Exception { - when(resourceSet.find(anyString())).thenReturn(resource); + when(resourceSet.find(nullable(String.class))).thenReturn(resource); when(resource.hasChangedSince(0L)).thenReturn(true); ResourceHandler handler = new ResourceHandler(singletonList(resourceSet)); diff --git a/openig-core/src/test/java/org/forgerock/openig/handler/router/DirectoryMonitorTest.java b/openig-core/src/test/java/org/forgerock/openig/handler/router/DirectoryMonitorTest.java index 4792fa5eb..210bcc17f 100644 --- a/openig-core/src/test/java/org/forgerock/openig/handler/router/DirectoryMonitorTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/handler/router/DirectoryMonitorTest.java @@ -25,10 +25,10 @@ import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; import static org.forgerock.openig.Files.getRelativeDirectory; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import static org.testng.reporters.Files.writeFile; @@ -120,7 +120,7 @@ public void testListenerIsNotNotifiedOnEmptyChangeSet() throws Exception { observer.monitor(listener); - verifyZeroInteractions(listener); + verifyNoMoreInteractions(listener); } @Test diff --git a/openig-core/src/test/java/org/forgerock/openig/handler/router/GatewayDependencyProviderTest.java b/openig-core/src/test/java/org/forgerock/openig/handler/router/GatewayDependencyProviderTest.java index cd5028de3..09bf7423d 100644 --- a/openig-core/src/test/java/org/forgerock/openig/handler/router/GatewayDependencyProviderTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/handler/router/GatewayDependencyProviderTest.java @@ -16,8 +16,8 @@ package org.forgerock.openig.handler.router; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openig-core/src/test/java/org/forgerock/openig/handler/router/RouteTest.java b/openig-core/src/test/java/org/forgerock/openig/handler/router/RouteTest.java index 4e846b1d7..cf9735db8 100644 --- a/openig-core/src/test/java/org/forgerock/openig/handler/router/RouteTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/handler/router/RouteTest.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import org.forgerock.http.Handler; diff --git a/openig-core/src/test/java/org/forgerock/openig/handler/router/RouterHandlerTest.java b/openig-core/src/test/java/org/forgerock/openig/handler/router/RouterHandlerTest.java index 71cf3fffa..3ffa3a88f 100644 --- a/openig-core/src/test/java/org/forgerock/openig/handler/router/RouterHandlerTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/handler/router/RouterHandlerTest.java @@ -25,11 +25,11 @@ import static org.forgerock.openig.heap.HeapUtilsTest.buildDefaultHeap; import static org.forgerock.openig.http.RunMode.EVALUATION; import static org.forgerock.openig.http.RunMode.PRODUCTION; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.io.File; @@ -292,7 +292,7 @@ public void testScheduleOnlyOnceDirectoryMonitoring() throws Exception { heap); heaplet.destroy(); - verifyZeroInteractions(scheduledExecutorService); + verifyNoMoreInteractions(scheduledExecutorService); } private void assertStatusOnUri(Handler router, String uri, Status expected) diff --git a/openig-core/src/test/java/org/forgerock/openig/handler/router/RoutesCollectionProviderTest.java b/openig-core/src/test/java/org/forgerock/openig/handler/router/RoutesCollectionProviderTest.java index adbe88859..aedf4063d 100644 --- a/openig-core/src/test/java/org/forgerock/openig/handler/router/RoutesCollectionProviderTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/handler/router/RoutesCollectionProviderTest.java @@ -20,10 +20,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.forgerock.json.resource.QueryResponse.NO_COUNT; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import org.forgerock.json.JsonPointer; @@ -73,7 +73,7 @@ public void shouldRejectQueriesWithQueryExpression() throws Exception { } catch (ResourceException e) { assertThat(e).isInstanceOf(NotSupportedException.class); } - verifyZeroInteractions(queryResourceHandler); + verifyNoMoreInteractions(queryResourceHandler); } @Test @@ -89,7 +89,7 @@ public void shouldRejectQueriesWithQueryId() throws Exception { } catch (ResourceException e) { assertThat(e).isInstanceOf(NotSupportedException.class); } - verifyZeroInteractions(queryResourceHandler); + verifyNoMoreInteractions(queryResourceHandler); } @Test @@ -105,7 +105,7 @@ public void shouldRejectQueriesWithoutTrueQueryFilter() throws Exception { } catch (ResourceException e) { assertThat(e).isInstanceOf(NotSupportedException.class); } - verifyZeroInteractions(queryResourceHandler); + verifyNoMoreInteractions(queryResourceHandler); } @Test @@ -120,6 +120,6 @@ public void shouldReturnJsonForTwoRoutes() throws Exception { QueryResponse response = provider.queryCollection(null, request, queryResourceHandler).get(); assertThat(response.getTotalPagedResults()).isEqualTo(NO_COUNT); - verify(queryResourceHandler, times(2)).handleResource(any(ResourceResponse.class)); + verify(queryResourceHandler, times(2)).handleResource(nullable(ResourceResponse.class)); } } diff --git a/openig-core/src/test/java/org/forgerock/openig/jwt/JwtSessionManagerTest.java b/openig-core/src/test/java/org/forgerock/openig/jwt/JwtSessionManagerTest.java index 221780777..4418b575f 100644 --- a/openig-core/src/test/java/org/forgerock/openig/jwt/JwtSessionManagerTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/jwt/JwtSessionManagerTest.java @@ -15,10 +15,10 @@ */ package org.forgerock.openig.jwt; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.MockitoAnnotations.initMocks; import java.nio.charset.StandardCharsets; @@ -59,6 +59,6 @@ public void shouldSaveSession() throws Exception { @Test public void shouldNotSaveSession() throws Exception { manager.save(session, null); - verifyZeroInteractions(session); + verifyNoMoreInteractions(session); } } diff --git a/openig-core/src/test/java/org/forgerock/openig/jwt/dirty/DirtyCollectionTest.java b/openig-core/src/test/java/org/forgerock/openig/jwt/dirty/DirtyCollectionTest.java index 2053b16e7..d0043e335 100644 --- a/openig-core/src/test/java/org/forgerock/openig/jwt/dirty/DirtyCollectionTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/jwt/dirty/DirtyCollectionTest.java @@ -18,7 +18,8 @@ import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.verify; import java.util.Arrays; import java.util.Collection; @@ -65,7 +66,7 @@ public void shouldNotifyListenerWhenRemoveAllIsCalled() throws Exception { public void shouldNotNotifyListenerWhenRemoveAllIsCalledWithNoActualChanges() throws Exception { collection.removeAll(Arrays.asList("four")); - verifyZeroInteractions(listener); + verifyNoMoreInteractions(listener); assertThat(collection).containsOnly("one", "two", "three"); } @@ -89,7 +90,7 @@ public void shouldNotifyListenerWhenRetainAllIsCalled() throws Exception { public void shouldNotNotifyListenerWhenRetainAllIsCalledWithNoChanges() throws Exception { collection.retainAll(Arrays.asList("one", "two", "three")); - verifyZeroInteractions(listener); + verifyNoMoreInteractions(listener); assertThat(collection).containsOnly("one", "two", "three"); } diff --git a/openig-core/src/test/java/org/forgerock/openig/jwt/dirty/DirtyIteratorTest.java b/openig-core/src/test/java/org/forgerock/openig/jwt/dirty/DirtyIteratorTest.java index 2dffd5bf2..184251e06 100644 --- a/openig-core/src/test/java/org/forgerock/openig/jwt/dirty/DirtyIteratorTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/jwt/dirty/DirtyIteratorTest.java @@ -18,7 +18,8 @@ import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import java.util.ArrayList; import java.util.List; diff --git a/openig-core/src/test/java/org/forgerock/openig/jwt/dirty/DirtySetTest.java b/openig-core/src/test/java/org/forgerock/openig/jwt/dirty/DirtySetTest.java index f10a15ce8..a9c617e77 100644 --- a/openig-core/src/test/java/org/forgerock/openig/jwt/dirty/DirtySetTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/jwt/dirty/DirtySetTest.java @@ -53,7 +53,7 @@ public void shouldNotifyListenerWhenRemoveIsCalled() throws Exception { public void shouldNotNotifyListenerWhenRemoveIsCalledWithNoActualChanges() throws Exception { dirtySet.remove("four"); - verifyZeroInteractions(listener); + verifyNoMoreInteractions(listener); assertThat(dirtySet).containsOnly("one", "two", "three"); } @@ -69,7 +69,7 @@ public void shouldNotifyListenerWhenRemoveAllIsCalled() throws Exception { public void shouldNotNotifyListenerWhenRemoveAllIsCalledWithNoActualChanges() throws Exception { dirtySet.removeAll(Arrays.asList("four")); - verifyZeroInteractions(listener); + verifyNoMoreInteractions(listener); assertThat(dirtySet).containsOnly("one", "two", "three"); } @@ -93,7 +93,7 @@ public void shouldNotifyListenerWhenRetainAllIsCalled() throws Exception { public void shouldNotNotifyListenerWhenRetainAllIsCalledWithNoChanges() throws Exception { dirtySet.retainAll(Arrays.asList("one", "two", "three")); - verifyZeroInteractions(listener); + verifyNoMoreInteractions(listener); assertThat(dirtySet).containsOnly("one", "two", "three"); } } diff --git a/openig-core/src/test/java/org/forgerock/openig/thread/MdcExecutorServiceDelegateTest.java b/openig-core/src/test/java/org/forgerock/openig/thread/MdcExecutorServiceDelegateTest.java index a0047a999..fcdea1e6d 100644 --- a/openig-core/src/test/java/org/forgerock/openig/thread/MdcExecutorServiceDelegateTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/thread/MdcExecutorServiceDelegateTest.java @@ -21,7 +21,7 @@ import static java.util.Collections.singletonMap; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.atIndex; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.anyCollection; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; @@ -132,7 +132,7 @@ public void shouldAwaitTermination() throws Exception { @SuppressWarnings("unchecked") public void shouldSubmitCallable() throws Exception { doReturn(future).when(delegate()) - .submit(any(Callable.class)); + .submit(nullable(Callable.class)); assertThat(executorService().submit(callable)).isSameAs(future); @@ -143,7 +143,7 @@ public void shouldSubmitCallable() throws Exception { @Test public void shouldSubmitRunnableAndT() throws Exception { doReturn(future).when(delegate()) - .submit(any(Runnable.class), eq("Hello")); + .submit(nullable(Runnable.class), eq("Hello")); assertThat(executorService().submit(runnable, "Hello")).isSameAs(future); @@ -154,7 +154,7 @@ public void shouldSubmitRunnableAndT() throws Exception { @Test public void shouldSubmitRunnable() throws Exception { doReturn(future).when(delegate()) - .submit(any(Runnable.class)); + .submit(nullable(Runnable.class)); assertThat(executorService().submit(runnable)).isSameAs(future); diff --git a/openig-core/src/test/java/org/forgerock/openig/thread/MdcScheduledExecutorServiceDelegateTest.java b/openig-core/src/test/java/org/forgerock/openig/thread/MdcScheduledExecutorServiceDelegateTest.java index 9cd36977b..0326edd6b 100644 --- a/openig-core/src/test/java/org/forgerock/openig/thread/MdcScheduledExecutorServiceDelegateTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/thread/MdcScheduledExecutorServiceDelegateTest.java @@ -17,7 +17,7 @@ package org.forgerock.openig.thread; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; @@ -82,7 +82,7 @@ public void shouldFailBecauseNoDelegateIsProvided() throws Exception { @Test public void shouldScheduleWithRunnableLongTimeUnit() throws Exception { doReturn(scheduledFuture).when(delegate()) - .schedule(any(Runnable.class), eq(1L), eq(TimeUnit.SECONDS)); + .schedule(nullable(Runnable.class), eq(1L), eq(TimeUnit.SECONDS)); assertThat(executorService().schedule(runnable, 1, TimeUnit.SECONDS)).isSameAs(scheduledFuture); @@ -94,7 +94,7 @@ public void shouldScheduleWithRunnableLongTimeUnit() throws Exception { @SuppressWarnings("unchecked") public void shouldScheduleWithCallableLongTimeUnit() throws Exception { doReturn(scheduledFuture).when(delegate()) - .schedule(any(Callable.class), eq(1L), eq(TimeUnit.SECONDS)); + .schedule(nullable(Callable.class), eq(1L), eq(TimeUnit.SECONDS)); assertThat(executorService().schedule(callable, 1, TimeUnit.SECONDS)).isSameAs(scheduledFuture); @@ -105,7 +105,7 @@ public void shouldScheduleWithCallableLongTimeUnit() throws Exception { @Test public void shouldScheduleAtFixedRateWithRunnableLongTimeUnit() throws Exception { doReturn(scheduledFuture).when(delegate()) - .scheduleAtFixedRate(any(Runnable.class), eq(1L), eq(2L), eq(TimeUnit.SECONDS)); + .scheduleAtFixedRate(nullable(Runnable.class), eq(1L), eq(2L), eq(TimeUnit.SECONDS)); assertThat(executorService().scheduleAtFixedRate(runnable, 1, 2, TimeUnit.SECONDS)).isSameAs(scheduledFuture); @@ -116,7 +116,7 @@ public void shouldScheduleAtFixedRateWithRunnableLongTimeUnit() throws Exception @Test public void shouldScheduleWithFixedDelayWithRunnableLongTimeUnit() throws Exception { doReturn(scheduledFuture).when(delegate()) - .scheduleWithFixedDelay(any(Runnable.class), eq(1L), eq(2L), eq(TimeUnit.SECONDS)); + .scheduleWithFixedDelay(nullable(Runnable.class), eq(1L), eq(2L), eq(TimeUnit.SECONDS)); assertThat(executorService().scheduleWithFixedDelay(runnable, 1, 2, TimeUnit.SECONDS)) .isSameAs(scheduledFuture); diff --git a/openig-core/src/test/java/org/forgerock/openig/thread/ScheduledExecutorServiceHeapletTest.java b/openig-core/src/test/java/org/forgerock/openig/thread/ScheduledExecutorServiceHeapletTest.java index 212a48392..f1d7fd3a2 100644 --- a/openig-core/src/test/java/org/forgerock/openig/thread/ScheduledExecutorServiceHeapletTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/thread/ScheduledExecutorServiceHeapletTest.java @@ -21,7 +21,7 @@ import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; import static org.forgerock.openig.heap.HeapUtilsTest.buildDefaultHeap; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import java.lang.reflect.Field; import java.util.concurrent.*; @@ -32,7 +32,6 @@ import org.forgerock.openig.heap.HeapException; import org.forgerock.openig.heap.Heaplet; import org.forgerock.openig.heap.Name; -import org.mockito.Mock; import org.mockito.Mockito; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -102,7 +101,7 @@ public void shouldNotWaitForTaskToComplete() throws Exception { service = Mockito.spy(service); Mockito.doAnswer(i -> { - Runnable runnable = i.getArgumentAt(0, Runnable.class); + Runnable runnable = i.getArgument(0); return scheduledExecutorService.schedule(runnable, 100, TimeUnit.MILLISECONDS); }).when(service).submit(any(Runnable.class)); diff --git a/openig-core/src/test/java/org/forgerock/openig/ui/record/RecordProviderTest.java b/openig-core/src/test/java/org/forgerock/openig/ui/record/RecordProviderTest.java index f1a965f54..f357fa96f 100644 --- a/openig-core/src/test/java/org/forgerock/openig/ui/record/RecordProviderTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/ui/record/RecordProviderTest.java @@ -27,11 +27,11 @@ import static org.forgerock.json.resource.Requests.newQueryRequest; import static org.forgerock.json.resource.Requests.newReadRequest; import static org.forgerock.json.resource.Requests.newUpdateRequest; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.io.IOException; @@ -179,7 +179,7 @@ public void shouldNotQueryCollectionWhenQueryIdIsUsed() throws Exception { provider.queryCollection(null, queryRequest, queryResourceHandler) .getOrThrow(); } finally { - verifyZeroInteractions(queryResourceHandler); + verifyNoMoreInteractions(queryResourceHandler); } } @@ -190,7 +190,7 @@ public void shouldNotQueryCollectionWhenQueryExpressionIsUsed() throws Exception provider.queryCollection(null, queryRequest, queryResourceHandler) .getOrThrow(); } finally { - verifyZeroInteractions(queryResourceHandler); + verifyNoMoreInteractions(queryResourceHandler); } } @@ -201,7 +201,7 @@ public void shouldNotQueryCollectionWhenNonTrueQueryFilterIsUsed() throws Except provider.queryCollection(null, queryRequest, queryResourceHandler) .getOrThrow(); } finally { - verifyZeroInteractions(queryResourceHandler); + verifyNoMoreInteractions(queryResourceHandler); } } @@ -212,7 +212,7 @@ public void shouldNotQueryCollectionWhenNoQueryIsSpecified() throws Exception { provider.queryCollection(null, queryRequest, queryResourceHandler) .getOrThrow(); } finally { - verifyZeroInteractions(queryResourceHandler); + verifyNoMoreInteractions(queryResourceHandler); } } @@ -225,7 +225,7 @@ public void shouldNotQueryCollectionWhenIoErrorOccurs() throws Exception { provider.queryCollection(null, queryRequest, queryResourceHandler) .getOrThrow(); } finally { - verifyZeroInteractions(queryResourceHandler); + verifyNoMoreInteractions(queryResourceHandler); } } @@ -276,7 +276,7 @@ public void shouldUpdateInstanceWithProvidedRevision() throws Exception { @Test public void shouldUpdateInstanceWithProvidedCatchAllRevision() throws Exception { - when(service.update(eq(ID), isNull(String.class), any(JsonValue.class))) + when(service.update(eq(ID), isNull(), any(JsonValue.class))) .thenReturn(UPDATED_RECORD); // HttpAdapter transform If-Match "*" in a null revision @@ -308,7 +308,7 @@ public void shouldNotUpdateInstanceWhenRevisionDoesNotMatch() throws Exception { @Test(expectedExceptions = InternalServerErrorException.class) public void shouldNotUpdateInstanceWhenIoErrorOccurs() throws Exception { - when(service.update(eq(ID), isNull(String.class), any(JsonValue.class))) + when(service.update(eq(ID), isNull(), any(JsonValue.class))) .thenThrow(new IOException()); UpdateRequest updateRequest = newUpdateRequest(PATH, json(object())); diff --git a/openig-core/src/test/java/org/forgerock/openig/util/JsonValuesTest.java b/openig-core/src/test/java/org/forgerock/openig/util/JsonValuesTest.java index 51b40bbb8..dce6985e4 100644 --- a/openig-core/src/test/java/org/forgerock/openig/util/JsonValuesTest.java +++ b/openig-core/src/test/java/org/forgerock/openig/util/JsonValuesTest.java @@ -27,13 +27,11 @@ import static org.forgerock.openig.util.JsonValues.getWithDeprecation; import static org.forgerock.openig.util.JsonValues.requiredHeapObject; import static org.forgerock.openig.util.JsonValues.slashEnded; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyString; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.argThat; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import org.forgerock.http.Handler; @@ -46,6 +44,7 @@ import org.hamcrest.Description; import org.hamcrest.Matcher; import org.mockito.ArgumentCaptor; +import org.mockito.ArgumentMatcher; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -167,7 +166,7 @@ public void shouldTransformListOfReferencesToListOfHeapObjectsWithSingleReferenc @Test public void shouldTransformListOfReferencesToListOfHeapObjectsWithMultipleReferences() throws Exception { - when(heap.resolve(any(JsonValue.class), eq(String.class))) + when(heap.resolve(nullable(JsonValue.class), eq(String.class))) .thenReturn("Resolved object #1", "Resolved object #2", "Resolved object #3"); JsonValue list = json(array("RefOne", "RefTwo", "RefThree")); @@ -179,35 +178,35 @@ public void shouldTransformListOfReferencesToListOfHeapObjectsWithMultipleRefere public void getWithDeprecationReturnsNonDeprecatedValue() { JsonValue config = json(object(field("new", "value"))); assertThat(getWithDeprecation(config, logger, "new", "old").asString()).isEqualTo("value"); - verifyZeroInteractions(logger); + verifyNoMoreInteractions(logger); } @Test public void getWithDeprecationReturnsNullValue() { JsonValue config = json(object(field("new", "value"))); assertThat(getWithDeprecation(config, logger, "missing", "old").asString()).isNull(); - verifyZeroInteractions(logger); + verifyNoMoreInteractions(logger); } @Test public void getWithDeprecationReturnsDeprecatedValue1() { JsonValue config = json(object(field("old", "value"))); assertThat(getWithDeprecation(config, logger, "new", "old").asString()).isEqualTo("value"); - verify(logger).warn(anyString(), any(JsonPointer.class), eq("old"), eq("new")); + verify(logger).warn(nullable(String.class), nullable(JsonPointer.class), eq("old"), eq("new")); } @Test public void getWithDeprecationReturnsDeprecatedValue2() { JsonValue config = json(object(field("older", "value"))); assertThat(getWithDeprecation(config, logger, "new", "old", "older").asString()).isEqualTo("value"); - verify(logger).warn(anyString(), any(JsonPointer.class), eq("older"), eq("new")); + verify(logger).warn(nullable(String.class), nullable(JsonPointer.class), eq("older"), eq("new")); } @Test public void getWithDeprecationReturnsMostRecentValue1() { JsonValue config = json(object(field("new", "value1"), field("old", "value2"))); assertThat(getWithDeprecation(config, logger, "new", "old", "older").asString()).isEqualTo("value1"); - verify(logger).warn(anyString(), any(JsonPointer.class), eq("old"), eq("new"), eq("new")); + verify(logger).warn(nullable(String.class), nullable(JsonPointer.class), eq("old"), eq("new"), eq("new")); } @Test @@ -251,8 +250,8 @@ public void shouldFirstOfReturnsNullWhenNoMatch() { public void getWithDeprecationReturnsMostRecentValue2() { JsonValue config = json(object(field("old", "value1"), field("older", "value2"))); assertThat(getWithDeprecation(config, logger, "new", "old", "older").asString()).isEqualTo("value1"); - verify(logger).warn(anyString(), any(JsonPointer.class), eq("older"), eq("old"), eq("old")); - verify(logger).warn(anyString(), any(JsonPointer.class), eq("old"), eq("new")); + verify(logger).warn(nullable(String.class), nullable(JsonPointer.class), eq("older"), eq("old"), eq("old")); + verify(logger).warn(nullable(String.class), nullable(JsonPointer.class), eq("old"), eq("new")); verifyNoMoreInteractions(logger); } @@ -268,18 +267,12 @@ public void shouldEndedSlashUriSucceed(final JsonValue value) throws Exception { assertThat(value.as(slashEnded()).asString()).isEqualTo("http://localhost:8090/openam/"); } - private static Matcher hasValue(final Object value) { - return new BaseMatcher() { + private static ArgumentMatcher hasValue(final Object value) { + return new ArgumentMatcher() { @Override - public boolean matches(final Object item) { - JsonValue json = (JsonValue) item; + public boolean matches(final JsonValue json) { return value.equals(json.getObject()); } - - @Override - public void describeTo(final Description description) { - description.appendText(value.toString()); - } }; } } diff --git a/openig-oauth2/pom.xml b/openig-oauth2/pom.xml index dc2e035e8..9dfa289ff 100644 --- a/openig-oauth2/pom.xml +++ b/openig-oauth2/pom.xml @@ -55,7 +55,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/ClientRegistrationFilterTest.java b/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/ClientRegistrationFilterTest.java index 548121808..121d386c9 100644 --- a/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/ClientRegistrationFilterTest.java +++ b/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/ClientRegistrationFilterTest.java @@ -27,8 +27,8 @@ import static org.forgerock.json.JsonValue.object; import static org.forgerock.openig.filter.oauth2.client.ClientRegistration.CLIENT_REG_KEY; import static org.forgerock.openig.filter.oauth2.client.Issuer.ISSUER_KEY; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/ClientRegistrationTest.java b/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/ClientRegistrationTest.java index 09f57d1fa..656df7319 100644 --- a/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/ClientRegistrationTest.java +++ b/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/ClientRegistrationTest.java @@ -25,8 +25,8 @@ import static org.forgerock.openig.filter.oauth2.client.OAuth2TestUtils.TOKEN_ENDPOINT; import static org.forgerock.openig.filter.oauth2.client.OAuth2TestUtils.USER_INFO_ENDPOINT; import static org.forgerock.openig.filter.oauth2.client.OAuth2TestUtils.buildIssuerWithoutWellKnownEndpoint; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/DiscoveryFilterTest.java b/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/DiscoveryFilterTest.java index 6fd18d250..1b913a2f5 100644 --- a/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/DiscoveryFilterTest.java +++ b/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/DiscoveryFilterTest.java @@ -22,8 +22,8 @@ import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; import static org.forgerock.openig.filter.oauth2.client.DiscoveryFilter.OPENID_SERVICE; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/IssuerTest.java b/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/IssuerTest.java index 2ac48a808..e8bde166d 100644 --- a/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/IssuerTest.java +++ b/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/IssuerTest.java @@ -30,7 +30,7 @@ import static org.forgerock.openig.filter.oauth2.client.OAuth2TestUtils.USER_INFO_ENDPOINT; import static org.forgerock.openig.filter.oauth2.client.OAuth2TestUtils.WELLKNOWN_ENDPOINT; import static org.forgerock.openig.filter.oauth2.client.OAuth2TestUtils.buildIssuer; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/OAuth2ClientFilterTest.java b/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/OAuth2ClientFilterTest.java index dc9ba62c9..01fdd816b 100644 --- a/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/OAuth2ClientFilterTest.java +++ b/openig-oauth2/src/test/java/org/forgerock/openig/filter/oauth2/client/OAuth2ClientFilterTest.java @@ -47,11 +47,11 @@ import static org.forgerock.openig.filter.oauth2.client.OAuth2TestUtils.buildClientRegistrationWithScopes; import static org.forgerock.openig.filter.oauth2.client.OAuth2TestUtils.newSession; import static org.forgerock.util.time.Duration.duration; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; @@ -209,7 +209,7 @@ public void shouldSucceedToHandleUserInitiatedDiscovery() throws Exception { // Then verify(discoveryAndDynamicRegistrationChain).handle(eq(context), eq(request)); assertThat(response.getStatus()).isEqualTo(TEAPOT); - verifyZeroInteractions(failureHandler, loginHandler, next, registrationHandler); + verifyNoMoreInteractions(failureHandler, loginHandler, next, registrationHandler); } /************************************************************************************************************/ @@ -248,7 +248,7 @@ public void shouldHandleUserInitiatedLoginFailsWithInvalidClientRegistration(fin verify(failureHandler).handle(eq(context), eq(request)); assertThatExceptionAttributeIsSet(); assertThat(response.getStatus()).isEqualTo(failureResponse.getStatus()); - verifyZeroInteractions(discoveryAndDynamicRegistrationChain, loginHandler, next, registrationHandler); + verifyNoMoreInteractions(discoveryAndDynamicRegistrationChain, loginHandler, next, registrationHandler); } @Test @@ -264,7 +264,7 @@ public void shouldHandleUserInitiatedLoginFailsWhenRequestIsNotSufficientlySecur assertThat(response.getStatus()).isEqualTo(failureResponse.getStatus()); verify(failureHandler).handle(eq(context), eq(request)); assertThatExceptionAttributeIsSet(); - verifyZeroInteractions(discoveryAndDynamicRegistrationChain, loginHandler, next, registrationHandler); + verifyNoMoreInteractions(discoveryAndDynamicRegistrationChain, loginHandler, next, registrationHandler); } @Test @@ -278,7 +278,7 @@ public void shouldHandleUserInitiatedLoginSucceedToAuthorizationRedirect() throw // Then assertThatAuthorizationRedirectHandlerProducesRedirect(response); - verifyZeroInteractions(discoveryAndDynamicRegistrationChain, failureHandler, loginHandler, next, + verifyNoMoreInteractions(discoveryAndDynamicRegistrationChain, failureHandler, loginHandler, next, registrationHandler); } @@ -309,7 +309,7 @@ public void shouldFailToHandleAuthorizationCallbackWhenRequestIsNotSufficientlyS verify(failureHandler).handle(eq(context), eq(request)); assertThatExceptionAttributeIsSet(); assertThat(response.getStatus()).isEqualTo(failureResponse.getStatus()); - verifyZeroInteractions(next, discoveryAndDynamicRegistrationChain, registrationHandler); + verifyNoMoreInteractions(next, discoveryAndDynamicRegistrationChain, registrationHandler); } @DataProvider @@ -337,7 +337,7 @@ public void shouldFailToHandleAuthorizationCallbackWhenRequestIsMethodNotGet(fin verify(failureHandler).handle(eq(context), eq(request)); assertThatExceptionAttributeIsSet(); assertThat(response.getStatus()).isEqualTo(failureResponse.getStatus()); - verifyZeroInteractions(next, discoveryAndDynamicRegistrationChain, registrationHandler); + verifyNoMoreInteractions(next, discoveryAndDynamicRegistrationChain, registrationHandler); } @Test @@ -353,7 +353,7 @@ public void shouldFailToHandleAuthorizationCallbackWhenSessionNotAuthorized() th verify(failureHandler).handle(eq(context), eq(request)); assertThatExceptionAttributeIsSet(); assertThat(response.getStatus()).isEqualTo(failureResponse.getStatus()); - verifyZeroInteractions(next, discoveryAndDynamicRegistrationChain, registrationHandler); + verifyNoMoreInteractions(next, discoveryAndDynamicRegistrationChain, registrationHandler); } @Test @@ -370,7 +370,7 @@ public void shouldFailToHandleAuthorizationCallbackWhenSessionStateIsNotAuthoriz verify(failureHandler).handle(eq(context), eq(request)); assertThatExceptionAttributeIsSet(); assertThat(response.getStatus()).isEqualTo(failureResponse.getStatus()); - verifyZeroInteractions(next, discoveryAndDynamicRegistrationChain, registrationHandler); + verifyNoMoreInteractions(next, discoveryAndDynamicRegistrationChain, registrationHandler); } @Test @@ -387,7 +387,7 @@ public void shouldFailToHandleAuthorizationCallbackWhenNoCodeProvided() throws E verify(failureHandler).handle(eq(context), eq(request)); assertThatExceptionAttributeIsSet(); assertThat(response.getStatus()).isEqualTo(failureResponse.getStatus()); - verifyZeroInteractions(next, discoveryAndDynamicRegistrationChain, registrationHandler); + verifyNoMoreInteractions(next, discoveryAndDynamicRegistrationChain, registrationHandler); } @Test @@ -404,7 +404,7 @@ public void shouldFailToHandleAuthorizationCallbackWhenNoClientRegistrationSpeci verify(failureHandler).handle(eq(context), eq(request)); assertThatExceptionAttributeIsSet(); assertThat(response.getStatus()).isEqualTo(failureResponse.getStatus()); - verifyZeroInteractions(next, discoveryAndDynamicRegistrationChain, registrationHandler); + verifyNoMoreInteractions(next, discoveryAndDynamicRegistrationChain, registrationHandler); } @Test @@ -428,7 +428,7 @@ public void shouldSucceedToHandleAuthorizationCallback() throws Exception { assertThat(response.getStatus()).isEqualTo(FOUND); assertThat(response.getHeaders().getFirst("Location")).isEqualTo("redirectUri"); verify(registrationHandler).handle(eq(context), any(Request.class)); - verifyZeroInteractions(next, failureHandler, discoveryAndDynamicRegistrationChain); + verifyNoMoreInteractions(next, failureHandler, discoveryAndDynamicRegistrationChain); } /************************************************************************************************************/ @@ -456,7 +456,7 @@ public void shouldSucceedToHandleUserInitiatedLogoutWithoutGoto() throws Excepti // Then assertThat(response.getStatus()).isEqualTo(OK); assertThatSessionIsEmpty(); - verifyZeroInteractions(discoveryAndDynamicRegistrationChain, failureHandler, loginHandler, next, + verifyNoMoreInteractions(discoveryAndDynamicRegistrationChain, failureHandler, loginHandler, next, registrationHandler); } @@ -473,7 +473,7 @@ public void shouldSucceedToHandleUserInitiatedLogoutWithGoto() throws Exception assertThat(response.getStatus()).isEqualTo(FOUND); assertThat(response.getHeaders().getFirst("Location")).isEqualTo("www.forgerock.com"); assertThatSessionIsEmpty(); - verifyZeroInteractions(discoveryAndDynamicRegistrationChain, failureHandler, loginHandler, next, + verifyNoMoreInteractions(discoveryAndDynamicRegistrationChain, failureHandler, loginHandler, next, registrationHandler); } @@ -495,7 +495,7 @@ public void shouldFailToHandleUserInitiatedLogoutWithInvalidDefaultLogoutUri() t assertThatExceptionAttributeIsSet(); assertThat(response.getStatus()).isEqualTo(failureResponse.getStatus()); assertThatSessionIsEmpty(); - verifyZeroInteractions(discoveryAndDynamicRegistrationChain, loginHandler, next, registrationHandler); + verifyNoMoreInteractions(discoveryAndDynamicRegistrationChain, loginHandler, next, registrationHandler); } /************************************************************************************************************/ @@ -523,7 +523,7 @@ public void shouldHandleProtectedResourceRedirectToAuthorizeEndpointWhenNotAutho // Then assertThatAuthorizationRedirectHandlerProducesRedirect(response); - verifyZeroInteractions(next, failureHandler, discoveryAndDynamicRegistrationChain, registrationHandler); + verifyNoMoreInteractions(next, failureHandler, discoveryAndDynamicRegistrationChain, registrationHandler); } @Test @@ -542,7 +542,7 @@ public void shouldSucceedToHandleProtectedResourceWhenAuthorized() throws Except assertThat(response.getStatus()).isEqualTo(OK); assertThatTargetAttributesAreSet(); verify(next).handle(eq(context), any(Request.class)); - verifyZeroInteractions(failureHandler, discoveryAndDynamicRegistrationChain, registrationHandler); + verifyNoMoreInteractions(failureHandler, discoveryAndDynamicRegistrationChain, registrationHandler); } @Test @@ -575,7 +575,7 @@ public void shouldSucceedToHandleProtectedResourceByRefreshingTheToken() throws assertThat(response.getStatus()).isEqualTo(OK); verify(next, times(2)).handle(eq(context), any(Request.class)); verify(registrationHandler).handle(eq(context), any(Request.class)); - verifyZeroInteractions(failureHandler, discoveryAndDynamicRegistrationChain); + verifyNoMoreInteractions(failureHandler, discoveryAndDynamicRegistrationChain); } @Test @@ -608,7 +608,7 @@ public void shouldHandleProtectedResourceTriesToRefreshTokenOnlyOnce() throws Ex assertThat(response.getStatus()).isEqualTo(UNAUTHORIZED); verify(next, times(2)).handle(eq(context), any(Request.class)); verify(registrationHandler).handle(eq(context), any(Request.class)); - verifyZeroInteractions(failureHandler, discoveryAndDynamicRegistrationChain); + verifyNoMoreInteractions(failureHandler, discoveryAndDynamicRegistrationChain); } @Test @@ -639,7 +639,7 @@ public void shouldFailToHandleProtectedResourceWhenRefreshingTokenFails() throws verify(next).handle(eq(context), any(Request.class)); verify(registrationHandler).handle(eq(context), any(Request.class)); assertThatTargetAttributesAreSet(); - verifyZeroInteractions(discoveryAndDynamicRegistrationChain); + verifyNoMoreInteractions(discoveryAndDynamicRegistrationChain); } /** @@ -682,7 +682,7 @@ public void shouldHandleProtectedResourceReturnProtectedResourceWithoutRefreshin assertThat(finalResponse.getStatus()).isEqualTo(response.getStatus()); verify(next).handle(eq(context), any(Request.class)); assertThatTargetAttributesAreSet(); - verifyZeroInteractions(failureHandler, discoveryAndDynamicRegistrationChain, registrationHandler); + verifyNoMoreInteractions(failureHandler, discoveryAndDynamicRegistrationChain, registrationHandler); } /** @@ -721,7 +721,7 @@ public void shouldHandleProtectedResourceOnErrorResponseShouldHandleError(final assertThat(finalResponse.getStatus()).isEqualTo(failureResponse.getStatus()); verify(next).handle(eq(context), any(Request.class)); assertThatTargetAttributesAreSet(); - verifyZeroInteractions(discoveryAndDynamicRegistrationChain, registrationHandler); + verifyNoMoreInteractions(discoveryAndDynamicRegistrationChain, registrationHandler); } /* @@ -772,7 +772,7 @@ public void shouldSucceedToHandleProtectedOpenIdResource() throws Exception { assertThatTargetAttributesAreSetAndContain(null, null, singletonMap("email", "janedoe@example.com")); verify(next).handle(eq(context), any(Request.class)); verify(registrationHandler).handle(eq(context), any(Request.class)); - verifyZeroInteractions(failureHandler, discoveryAndDynamicRegistrationChain); + verifyNoMoreInteractions(failureHandler, discoveryAndDynamicRegistrationChain); } @Test @@ -806,7 +806,7 @@ public void shouldSucceedToHandleProtectedOpenIdResourceByRefreshingToken() thro NEW_REFRESH_TOKEN, singletonMap("email", "janedoe@example.com")); verify(next).handle(eq(context), any(Request.class)); verify(registrationHandler, times(3)).handle(eq(context), any(Request.class)); - verifyZeroInteractions(failureHandler, discoveryAndDynamicRegistrationChain); + verifyNoMoreInteractions(failureHandler, discoveryAndDynamicRegistrationChain); } @Test @@ -833,7 +833,7 @@ public void shouldFailToHandleProtectedOpenIdResourceWhenRefreshingTokenFail() t assertThatExceptionAttributeIsSet(); assertThat(response.getStatus()).isEqualTo(failureResponse.getStatus()); verify(registrationHandler, times(2)).handle(eq(context), any(Request.class)); - verifyZeroInteractions(discoveryAndDynamicRegistrationChain, next); + verifyNoMoreInteractions(discoveryAndDynamicRegistrationChain, next); } diff --git a/openig-openam/pom.xml b/openig-openam/pom.xml index 9f1987072..1afd377d6 100644 --- a/openig-openam/pom.xml +++ b/openig-openam/pom.xml @@ -43,7 +43,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openig-openam/src/test/java/org/forgerock/openig/openam/ApiVersionProtocolHeaderFilterTest.java b/openig-openam/src/test/java/org/forgerock/openig/openam/ApiVersionProtocolHeaderFilterTest.java index 11018227d..948fac879 100644 --- a/openig-openam/src/test/java/org/forgerock/openig/openam/ApiVersionProtocolHeaderFilterTest.java +++ b/openig-openam/src/test/java/org/forgerock/openig/openam/ApiVersionProtocolHeaderFilterTest.java @@ -20,10 +20,11 @@ import static org.forgerock.http.protocol.Status.INTERNAL_SERVER_ERROR; import static org.forgerock.http.routing.Version.version; import static org.forgerock.json.resource.http.HttpUtils.PROTOCOL_VERSION_1; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.MockitoAnnotations.initMocks; import java.net.URI; @@ -73,7 +74,7 @@ public void shouldFailWithMalformedHeader() throws Exception { .filter(null, request, next) .get(); // then - verifyZeroInteractions(next); + verifyNoMoreInteractions(next); assertThat(response.getStatus()).isEqualTo(INTERNAL_SERVER_ERROR); assertThat(response.getCause()).isInstanceOf(MalformedHeaderException.class); } @@ -91,7 +92,7 @@ public void shouldAddHeader(final Version protocolVersion) throws Exception { new ApiVersionProtocolHeaderFilter(protocolVersion).filter(null, request, next); // then - verify(next).handle(any(Context.class), eq(request)); + verify(next).handle(nullable(Context.class), eq(request)); assertThat(request.getUri().asURI()).isEqualTo(RESOURCE_URI); final AcceptApiVersionHeader header = request.getHeaders().get(AcceptApiVersionHeader.class); assertThat(header.getProtocolVersion()).isEqualTo(protocolVersion); diff --git a/openig-openam/src/test/java/org/forgerock/openig/openam/AuthLevelConditionAdviceFilterTest.java b/openig-openam/src/test/java/org/forgerock/openig/openam/AuthLevelConditionAdviceFilterTest.java index 1b338f2dc..56b813052 100644 --- a/openig-openam/src/test/java/org/forgerock/openig/openam/AuthLevelConditionAdviceFilterTest.java +++ b/openig-openam/src/test/java/org/forgerock/openig/openam/AuthLevelConditionAdviceFilterTest.java @@ -22,9 +22,9 @@ import static org.forgerock.json.JsonValue.array; import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import java.net.URI; @@ -84,7 +84,7 @@ public void shouldReturnRedirectResponseIfAuthLevelCondAdvice() throws Exception "realm=" + urlEncodeQueryParameterNameOrValue(MY_REALM), "authIndexType=composite_advice", "authIndexValue=" + urlEncodeQueryParameterNameOrValue(expectedQueryParameterAdvice)); - verifyZeroInteractions(next); + verifyNoMoreInteractions(next); } private static Context contextWithPolicyDecisionAdvices(boolean withAdvice) { diff --git a/openig-openam/src/test/java/org/forgerock/openig/openam/HeadlessAuthenticationFilterTest.java b/openig-openam/src/test/java/org/forgerock/openig/openam/HeadlessAuthenticationFilterTest.java index 89f3e5ce6..a12602ffc 100644 --- a/openig-openam/src/test/java/org/forgerock/openig/openam/HeadlessAuthenticationFilterTest.java +++ b/openig-openam/src/test/java/org/forgerock/openig/openam/HeadlessAuthenticationFilterTest.java @@ -27,11 +27,11 @@ import static org.forgerock.json.JsonValue.field; import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.net.URI; @@ -168,7 +168,7 @@ public void shouldRequestForSSOTokenFails() throws Exception { final Response finalResponse = headlessAuthenticationFilter.filter(context, request, next).get(); // Then - verifyZeroInteractions(next); + verifyNoMoreInteractions(next); verify(authenticate).handle(same(context), any(Request.class)); assertThat(request.getHeaders().containsKey(DEFAULT_HEADER_NAME)).isFalse(); assertThat(finalResponse.getStatus()).isEqualTo(INTERNAL_SERVER_ERROR); diff --git a/openig-openam/src/test/java/org/forgerock/openig/openam/PolicyEnforcementFilterTest.java b/openig-openam/src/test/java/org/forgerock/openig/openam/PolicyEnforcementFilterTest.java index dbdd5dec4..99c897949 100644 --- a/openig-openam/src/test/java/org/forgerock/openig/openam/PolicyEnforcementFilterTest.java +++ b/openig-openam/src/test/java/org/forgerock/openig/openam/PolicyEnforcementFilterTest.java @@ -41,14 +41,15 @@ import static org.forgerock.openig.openam.PolicyEnforcementFilter.Heaplet.asFunction; import static org.forgerock.openig.openam.PolicyEnforcementFilter.Heaplet.normalizeToJsonEndpoint; import static org.forgerock.util.time.Duration.duration; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.nullable; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; @@ -278,7 +279,7 @@ public void shouldInvokeFailureHandlerWhenAccessDenied() throws Exception { PolicyDecisionContext decisionContext = contextCaptor.getValue().asContext(PolicyDecisionContext.class); assertThatAttributesAreInPolicyDecisionContext(decisionContext); assertThatAdvicesAreInPolicyDecisionContext(decisionContext); - verifyZeroInteractions(next); + verifyNoMoreInteractions(next); } @Test @@ -303,7 +304,7 @@ public void shouldNotAuthorizeAccessWhenRequestedResourceNotInPolicyDecision() t assertThat(decisionContext.getAttributes()).isEmpty(); assertThat(decisionContext.getAdvices()).isEmpty(); - verifyZeroInteractions(next); + verifyNoMoreInteractions(next); } @Test @@ -425,7 +426,7 @@ public void shouldSucceedToUseCacheForRequestedResourceAllowed() throws Exceptio resourceRequest, next).get(); // Then - verify(requestHandler).handleAction(any(PolicyDecisionContext.class), any(ActionRequest.class)); + verify(requestHandler).handleAction(any(AttributesContext.class), any(ActionRequest.class)); verify(next).handle(any(PolicyDecisionContext.class), same(resourceRequest)); verify(executorService).schedule(captor.capture(), anyLong(), any(TimeUnit.class)); @@ -478,8 +479,8 @@ public void shouldNotCachePolicyDecisionForRequestedResourceDeniedWithAdvices() next).get(); // Then verify(requestHandler).handleAction(any(Context.class), any(ActionRequest.class)); - verifyZeroInteractions(next); - verifyZeroInteractions(executorService); + verifyNoMoreInteractions(next); + verifyNoMoreInteractions(executorService); } } diff --git a/openig-openam/src/test/java/org/forgerock/openig/openam/SingleSignOnFilterTest.java b/openig-openam/src/test/java/org/forgerock/openig/openam/SingleSignOnFilterTest.java index c361e5baf..d8c593515 100644 --- a/openig-openam/src/test/java/org/forgerock/openig/openam/SingleSignOnFilterTest.java +++ b/openig-openam/src/test/java/org/forgerock/openig/openam/SingleSignOnFilterTest.java @@ -27,11 +27,11 @@ import static org.forgerock.json.resource.Responses.newActionResponse; import static org.forgerock.json.resource.http.CrestHttp.newRequestHandler; import static org.forgerock.openig.heap.Keys.FORGEROCK_CLIENT_HANDLER_HEAP_KEY; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; @@ -153,7 +153,7 @@ public void shouldRedirectToOpenAmWhenNoCookiePresent() throws Exception { final Response response = buildSingleSignOnFilter().filter(context, request, next).get(); // Then - verifyZeroInteractions(next, requestHandler); + verifyNoMoreInteractions(next, requestHandler); assertThat(response.getStatus()).isEqualTo(FOUND); assertThat(response.getHeaders().getFirst(LocationHeader.NAME)) .contains(OPENAM_URI.toASCIIString(), "?goto=" + context.getOriginalUri() + "&realm=" + MY_REALM); @@ -195,7 +195,7 @@ public void shouldSucceedToRetrieveSsoTokenAndRedirect() throws Exception { // Then verify(requestHandler).handleAction(eq(context), any(ActionRequest.class)); - verifyZeroInteractions(next); + verifyNoMoreInteractions(next); assertThat(response.getStatus()).isEqualTo(FOUND); assertThat(response.getHeaders().getFirst(LocationHeader.NAME)) .contains(OPENAM_URI.toASCIIString(), "?goto=" + context.getOriginalUri() + "&realm=" + MY_REALM); @@ -247,7 +247,7 @@ public void shouldFailWhenCallingForSessionValidationFails(final JsonValue conte // Then verify(requestHandler).handleAction(eq(context), any(ActionRequest.class)); - verifyZeroInteractions(next); + verifyNoMoreInteractions(next); assertThat(response.getStatus()).isEqualTo(INTERNAL_SERVER_ERROR); } diff --git a/openig-openam/src/test/java/org/forgerock/openig/openam/TokenTransformationFilterTest.java b/openig-openam/src/test/java/org/forgerock/openig/openam/TokenTransformationFilterTest.java index 384929d1f..d590deb4c 100644 --- a/openig-openam/src/test/java/org/forgerock/openig/openam/TokenTransformationFilterTest.java +++ b/openig-openam/src/test/java/org/forgerock/openig/openam/TokenTransformationFilterTest.java @@ -23,13 +23,12 @@ import static org.forgerock.json.JsonValue.field; import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import static org.testng.Assert.assertNull; diff --git a/openig-saml/pom.xml b/openig-saml/pom.xml index 29a6f402b..8f61ce1da 100644 --- a/openig-saml/pom.xml +++ b/openig-saml/pom.xml @@ -67,7 +67,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openig-uma/pom.xml b/openig-uma/pom.xml index c502214ae..441481391 100644 --- a/openig-uma/pom.xml +++ b/openig-uma/pom.xml @@ -59,7 +59,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openig-uma/src/test/java/org/forgerock/openig/uma/UmaResourceServerFilterTest.java b/openig-uma/src/test/java/org/forgerock/openig/uma/UmaResourceServerFilterTest.java index cc905b225..31efaf5e0 100644 --- a/openig-uma/src/test/java/org/forgerock/openig/uma/UmaResourceServerFilterTest.java +++ b/openig-uma/src/test/java/org/forgerock/openig/uma/UmaResourceServerFilterTest.java @@ -24,11 +24,13 @@ import static org.forgerock.json.JsonValue.field; import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; -import static org.hamcrest.CoreMatchers.allOf; -import static org.mockito.Mockito.any; +import static org.mockito.AdditionalMatchers.and; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.argThat; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.net.URI; @@ -43,9 +45,7 @@ import org.forgerock.openig.el.Expression; import org.forgerock.openig.el.ExpressionException; import org.forgerock.services.context.Context; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; +import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.BeforeMethod; @@ -101,7 +101,7 @@ public void shouldReturnTicketBecauseNoRptProvided() throws Exception { Response response = filter.filter(null, request, terminal).get(); assertThatTicketIsReturnedWithStatusForbidden(response); - verifyZeroInteractions(terminal); + verifyNoMoreInteractions(terminal); } @Test @@ -131,7 +131,7 @@ public void shouldReturnTicketWhenInactiveRpt() throws Exception { Response response = filter.filter(null, request, terminal).get(); assertThatTicketIsReturnedWithStatusForbidden(response); - verifyZeroInteractions(terminal); + verifyNoMoreInteractions(terminal); } @Test @@ -145,7 +145,7 @@ public void shouldReturnForbiddenWithWarningOnTicketError() throws Exception { assertThat(response.getStatus()).isEqualTo(Status.FORBIDDEN); assertThat(response.getHeaders().getFirst("Warning")) .isEqualTo("199 - \"UMA Authorization Server Unreachable\""); - verifyZeroInteractions(terminal); + verifyNoMoreInteractions(terminal); } private static Object inactiveToken() { @@ -163,7 +163,7 @@ public void shouldReturnTicketWhenRptDoesNotContainsEnoughScopes() throws Except assertThatTicketIsReturnedWithStatusForbidden(response); assertThat(response.getHeaders().getFirst("WWW-Authenticate")).contains("insufficient_scope"); - verifyZeroInteractions(terminal); + verifyNoMoreInteractions(terminal); } private void assertThatTicketIsReturnedWithStatusForbidden(final Response response) { @@ -182,7 +182,7 @@ private Object insufficientScopesToken() { private void mockTokenIntrospection(final Response response) throws URISyntaxException { URI introspectionUri = new URI("http://as.example.com/oauth2/introspect"); when(service.getIntrospectionEndpoint()).thenReturn(introspectionUri); - when(handler.handle(any(Context.class), argThat(hasUri(introspectionUri)))) + when(handler.handle(nullable(Context.class), argThat(hasUri(introspectionUri)))) .thenReturn(Response.newResponsePromise(response)); } @@ -194,42 +194,24 @@ private void mockTicketCreation() throws URISyntaxException { private void mockTicketCreation(Response response) throws URISyntaxException { URI ticketUri = new URI("http://as.example.com/uma/permission_request"); when(service.getTicketEndpoint()).thenReturn(ticketUri); - when(handler.handle(any(Context.class), argThat(allOf(hasUri(ticketUri), hasToken(PAT))))) + when(handler.handle(nullable(Context.class), and(argThat(hasUri(ticketUri)), argThat(hasToken(PAT))))) .thenReturn(Response.newResponsePromise(response)); } - private static Matcher hasToken(final String token) { - return new BaseMatcher() { + private static ArgumentMatcher hasToken(final String token) { + return new ArgumentMatcher() { @Override - public boolean matches(final Object o) { - if (o instanceof Request) { - Request request = (Request) o; - return format("Bearer %s", token).equals(request.getHeaders().getFirst("Authorization")); - } - return false; - } - - @Override - public void describeTo(final Description description) { - description.appendText(token); + public boolean matches(final Request request) { + return format("Bearer %s", token).equals(request.getHeaders().getFirst("Authorization")); } }; } - private static Matcher hasUri(final URI uri) { - return new BaseMatcher() { + private static ArgumentMatcher hasUri(final URI uri) { + return new ArgumentMatcher() { @Override - public boolean matches(final Object o) { - if (o instanceof Request) { - Request request = (Request) o; - return uri.equals(request.getUri().asURI()); - } - return false; - } - - @Override - public void describeTo(final Description description) { - description.appendText(uri.toString()); + public boolean matches(final Request request) { + return request != null && uri.equals(request.getUri().asURI()); } }; } @@ -239,5 +221,4 @@ private static JsonValue resourceSet() { field("user_access_policy_uri", "https://openam.example.com:8443/openam/XUI/?realm=/#uma/share/" + RS_ID))); } - } diff --git a/openig-uma/src/test/java/org/forgerock/openig/uma/UmaSharingServiceTest.java b/openig-uma/src/test/java/org/forgerock/openig/uma/UmaSharingServiceTest.java index 01aad16d9..c36af20d4 100644 --- a/openig-uma/src/test/java/org/forgerock/openig/uma/UmaSharingServiceTest.java +++ b/openig-uma/src/test/java/org/forgerock/openig/uma/UmaSharingServiceTest.java @@ -25,7 +25,7 @@ import static org.forgerock.json.JsonValue.field; import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import java.net.URI; diff --git a/pom.xml b/pom.xml index 030b8a8a2..97fbe1469 100644 --- a/pom.xml +++ b/pom.xml @@ -1093,8 +1093,8 @@ org.mockito - mockito-all - 1.10.19 + mockito-core + 4.11.0 test