diff --git a/legal/THIRDPARTYREADME.txt b/legal/THIRDPARTYREADME.txt index db57984804..2b70416ca2 100644 --- a/legal/THIRDPARTYREADME.txt +++ b/legal/THIRDPARTYREADME.txt @@ -498,7 +498,7 @@ Copyright: Copyright (c) 2007 - The OWASP Foundation Version: freemarker-2.3.19.jar Copyright: Copyright (c) 2003 The Visigoth Software Society. All rights reserved. -Version: ognl-2.6.9.jar +Version: ognl-3.0.21.jar Copyright: Copyright (c) 1998-2004, Drew Davidson and Luke Blanshard Version: relaxngDatatype-20020414.jar diff --git a/openam-authentication/openam-auth-common/pom.xml b/openam-authentication/openam-auth-common/pom.xml index 201ba5a959..72fc363fc8 100755 --- a/openam-authentication/openam-auth-common/pom.xml +++ b/openam-authentication/openam-auth-common/pom.xml @@ -52,7 +52,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModulePAPTest.java b/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModulePAPTest.java index 6854f6b5ab..715763b810 100644 --- a/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModulePAPTest.java +++ b/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModulePAPTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.common; @@ -38,7 +38,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -106,8 +106,8 @@ public void shouldCallOnLoginSuccessAndThrowAuthenticationExceptionWhenAuthExcep } //Then - verify(jaspiAuthWrapper).initialize(any(CallbackHandler.class), eq(config)); - verify(jaspiAuthWrapper, never()).secureResponse(Matchers.anyObject()); + verify(jaspiAuthWrapper).initialize(ArgumentMatchers.nullable(CallbackHandler.class), eq(config)); + verify(jaspiAuthWrapper, never()).secureResponse(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); assertEquals(exception.getErrorCode(), "authFailed"); } @@ -121,16 +121,16 @@ public void shouldCallOnLoginSuccessWhenSecureResponseReturnsSendSuccess() throw HttpServletResponse response = mock(HttpServletResponse.class); SSOToken ssoToken = mock(SSOToken.class); - given(jaspiAuthWrapper.secureResponse(Matchers.anyObject())) + given(jaspiAuthWrapper.secureResponse(ArgumentMatchers.anyObject())) .willReturn(AuthStatus.SEND_SUCCESS); //When jaspiPostAuthPlugin.onLoginSuccess(requestParamsMap, request, response, ssoToken); //Then - verify(jaspiAuthWrapper).initialize(any(CallbackHandler.class), eq(config)); + verify(jaspiAuthWrapper).initialize(ArgumentMatchers.nullable(CallbackHandler.class), eq(config)); assertTrue(onLoginSuccessMethodCalled); - verify(jaspiAuthWrapper).secureResponse(Matchers.anyObject()); + verify(jaspiAuthWrapper).secureResponse(ArgumentMatchers.anyObject()); } @Test @@ -143,7 +143,7 @@ public void shouldCallOnLoginSuccessWhenSecureResponseReturnsSendFailure() throw HttpServletResponse response = mock(HttpServletResponse.class); SSOToken ssoToken = mock(SSOToken.class); - given(jaspiAuthWrapper.secureResponse(Matchers.anyObject())) + given(jaspiAuthWrapper.secureResponse(ArgumentMatchers.anyObject())) .willReturn(AuthStatus.SEND_FAILURE); //When @@ -157,9 +157,9 @@ public void shouldCallOnLoginSuccessWhenSecureResponseReturnsSendFailure() throw } //Then - verify(jaspiAuthWrapper).initialize(any(CallbackHandler.class), eq(config)); + verify(jaspiAuthWrapper).initialize(ArgumentMatchers.nullable(CallbackHandler.class), eq(config)); assertTrue(onLoginSuccessMethodCalled); - verify(jaspiAuthWrapper).secureResponse(Matchers.anyObject()); + verify(jaspiAuthWrapper).secureResponse(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); assertEquals(exception.getErrorCode(), "authFailed"); } @@ -174,7 +174,7 @@ public void shouldCallOnLoginSuccessWhenSecureResponseReturnsSendContinue() thro HttpServletResponse response = mock(HttpServletResponse.class); SSOToken ssoToken = mock(SSOToken.class); - given(jaspiAuthWrapper.secureResponse(Matchers.anyObject())) + given(jaspiAuthWrapper.secureResponse(ArgumentMatchers.anyObject())) .willReturn(AuthStatus.SEND_CONTINUE); //When @@ -188,9 +188,9 @@ public void shouldCallOnLoginSuccessWhenSecureResponseReturnsSendContinue() thro } //Then - verify(jaspiAuthWrapper).initialize(any(CallbackHandler.class), eq(config)); + verify(jaspiAuthWrapper).initialize(ArgumentMatchers.nullable(CallbackHandler.class), eq(config)); assertTrue(onLoginSuccessMethodCalled); - verify(jaspiAuthWrapper).secureResponse(Matchers.anyObject()); + verify(jaspiAuthWrapper).secureResponse(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); assertEquals(exception.getErrorCode(), "authFailed"); } @@ -204,7 +204,7 @@ public void shouldCallOnLoginSuccessWhenSecureResponseReturnsElse() throws Authe HttpServletResponse response = mock(HttpServletResponse.class); SSOToken ssoToken = mock(SSOToken.class); - given(jaspiAuthWrapper.secureResponse(Matchers.anyObject())) + given(jaspiAuthWrapper.secureResponse(ArgumentMatchers.anyObject())) .willReturn(AuthStatus.SUCCESS); //When @@ -218,9 +218,9 @@ public void shouldCallOnLoginSuccessWhenSecureResponseReturnsElse() throws Authe } //Then - verify(jaspiAuthWrapper).initialize(any(CallbackHandler.class), eq(config)); + verify(jaspiAuthWrapper).initialize(ArgumentMatchers.nullable(CallbackHandler.class), eq(config)); assertTrue(onLoginSuccessMethodCalled); - verify(jaspiAuthWrapper).secureResponse(Matchers.anyObject()); + verify(jaspiAuthWrapper).secureResponse(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); assertEquals(exception.getErrorCode(), "authFailed"); } diff --git a/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModuleTest.java b/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModuleTest.java index 4f717ad9e5..69232f0d37 100644 --- a/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModuleTest.java +++ b/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthLoginModuleTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.common; @@ -37,7 +37,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -99,7 +99,7 @@ public void shouldInitialiseAuthenticationModuleWrapper() throws Exception { jaspiAuthLoginModule.init(subject, sharedState, options); //Then - verify(jaspiAuthWrapper).initialize(any(CallbackHandler.class), eq(config)); + verify(jaspiAuthWrapper).initialize(ArgumentMatchers.nullable(CallbackHandler.class), eq(config)); } @Test @@ -131,7 +131,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSuccess() throws Log Callback[] callbacks = new Callback[0]; int state = ISAuthConstants.LOGIN_START; - given(jaspiAuthWrapper.validateRequest(Matchers.anyObject(), Matchers.anyObject())) + given(jaspiAuthWrapper.validateRequest(ArgumentMatchers.anyObject(), ArgumentMatchers.anyObject())) .willReturn(AuthStatus.SUCCESS); //When @@ -139,7 +139,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSuccess() throws Log //Then assertTrue(processMethodCalled); - verify(jaspiAuthWrapper).validateRequest(Matchers.anyObject(), Matchers.anyObject()); + verify(jaspiAuthWrapper).validateRequest(ArgumentMatchers.anyObject(), ArgumentMatchers.anyObject()); assertEquals(returnedState, ISAuthConstants.LOGIN_SUCCEED); } @@ -150,7 +150,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSendSuccess() throws Callback[] callbacks = new Callback[0]; int state = ISAuthConstants.LOGIN_START; - given(jaspiAuthWrapper.validateRequest(Matchers.anyObject(), Matchers.anyObject())) + given(jaspiAuthWrapper.validateRequest(ArgumentMatchers.anyObject(), ArgumentMatchers.anyObject())) .willReturn(AuthStatus.SEND_SUCCESS); //When @@ -158,7 +158,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSendSuccess() throws //Then assertTrue(processMethodCalled); - verify(jaspiAuthWrapper).validateRequest(Matchers.anyObject(), Matchers.anyObject()); + verify(jaspiAuthWrapper).validateRequest(ArgumentMatchers.anyObject(), ArgumentMatchers.anyObject()); assertEquals(returnedState, ISAuthConstants.LOGIN_SUCCEED); } @@ -169,7 +169,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSendFailure() throws Callback[] callbacks = new Callback[0]; int state = ISAuthConstants.LOGIN_START; - given(jaspiAuthWrapper.validateRequest(Matchers.anyObject(), Matchers.anyObject())) + given(jaspiAuthWrapper.validateRequest(ArgumentMatchers.anyObject(), ArgumentMatchers.anyObject())) .willReturn(AuthStatus.SEND_FAILURE); //When @@ -184,7 +184,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSendFailure() throws //Then assertTrue(processMethodCalled); - verify(jaspiAuthWrapper).validateRequest(Matchers.anyObject(), Matchers.anyObject()); + verify(jaspiAuthWrapper).validateRequest(ArgumentMatchers.anyObject(), ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); assertEquals(exception.getErrorCode(), "authFailed"); } @@ -196,7 +196,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSendContinue() throw Callback[] callbacks = new Callback[0]; int state = ISAuthConstants.LOGIN_START; - given(jaspiAuthWrapper.validateRequest(Matchers.anyObject(), Matchers.anyObject())) + given(jaspiAuthWrapper.validateRequest(ArgumentMatchers.anyObject(), ArgumentMatchers.anyObject())) .willReturn(AuthStatus.SEND_CONTINUE); //When @@ -204,7 +204,7 @@ public void shouldProcessCallbacksWhenValidateRequestReturnsSendContinue() throw //Then assertTrue(processMethodCalled); - verify(jaspiAuthWrapper).validateRequest(Matchers.anyObject(), Matchers.anyObject()); + verify(jaspiAuthWrapper).validateRequest(ArgumentMatchers.anyObject(), ArgumentMatchers.anyObject()); assertEquals(returnedState, ISAuthConstants.LOGIN_IGNORE); } diff --git a/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthModuleWrapperTest.java b/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthModuleWrapperTest.java index 524193b756..be21a6eb88 100644 --- a/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthModuleWrapperTest.java +++ b/openam-authentication/openam-auth-common/src/test/java/org/forgerock/openam/authentication/modules/common/JaspiAuthModuleWrapperTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.common; @@ -32,7 +32,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -66,7 +66,7 @@ public void shouldInitialiseAuthenticationModule() throws Exception { jaspiAuthWrapper.initialize(callbackHandler, config); //Then - verify(serverAuthModule).initialize(Matchers.anyObject(), (MessagePolicy) isNull(), + verify(serverAuthModule).initialize(ArgumentMatchers.anyObject(), (MessagePolicy) isNull(), eq(callbackHandler), eq(config)); } } diff --git a/openam-authentication/openam-auth-device-id/pom.xml b/openam-authentication/openam-auth-device-id/pom.xml index 2200e0c7ed..70d0798772 100644 --- a/openam-authentication/openam-auth-device-id/pom.xml +++ b/openam-authentication/openam-auth-device-id/pom.xml @@ -43,7 +43,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-authentication/openam-auth-device-id/src/test/java/org/forgerock/openam/authentication/modules/deviceprint/ProfilePersisterTest.java b/openam-authentication/openam-auth-device-id/src/test/java/org/forgerock/openam/authentication/modules/deviceprint/ProfilePersisterTest.java index 7acb71ef6f..e7f99fb1c1 100644 --- a/openam-authentication/openam-auth-device-id/src/test/java/org/forgerock/openam/authentication/modules/deviceprint/ProfilePersisterTest.java +++ b/openam-authentication/openam-auth-device-id/src/test/java/org/forgerock/openam/authentication/modules/deviceprint/ProfilePersisterTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.deviceprint; @@ -32,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.utils.Time.*; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-authentication/openam-auth-fr-oath/src/test/java/org/forgerock/openam/authentication/modules/fr/oath/OathMakerTest.java b/openam-authentication/openam-auth-fr-oath/src/test/java/org/forgerock/openam/authentication/modules/fr/oath/OathMakerTest.java index 77d58e7938..fbeadbb58b 100644 --- a/openam-authentication/openam-auth-fr-oath/src/test/java/org/forgerock/openam/authentication/modules/fr/oath/OathMakerTest.java +++ b/openam-authentication/openam-auth-fr-oath/src/test/java/org/forgerock/openam/authentication/modules/fr/oath/OathMakerTest.java @@ -12,12 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.fr.oath; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import com.sun.identity.shared.debug.Debug; diff --git a/openam-authentication/openam-auth-nt/pom.xml b/openam-authentication/openam-auth-nt/pom.xml index 9de9fbb22f..6ecc7bc412 100755 --- a/openam-authentication/openam-auth-nt/pom.xml +++ b/openam-authentication/openam-auth-nt/pom.xml @@ -38,7 +38,7 @@ org.mockito - mockito-all + mockito-core test @@ -53,7 +53,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 test diff --git a/openam-authentication/openam-auth-oauth2/pom.xml b/openam-authentication/openam-auth-oauth2/pom.xml index 0c22b8e592..312d2bc20c 100755 --- a/openam-authentication/openam-auth-oauth2/pom.xml +++ b/openam-authentication/openam-auth-oauth2/pom.xml @@ -61,25 +61,25 @@ org.mockito - mockito-all + mockito-core test org.powermock powermock-module-testng - 1.7.4 + 2.0.9 test org.powermock powermock-core - 1.7.4 + 2.0.9 test org.powermock - powermock-api-mockito - 1.7.4 + powermock-api-mockito2 + 2.0.9 test diff --git a/openam-authentication/openam-auth-oauth2/src/test/java/org/forgerock/openam/authentication/modules/oauth2/ESIATest.java b/openam-authentication/openam-auth-oauth2/src/test/java/org/forgerock/openam/authentication/modules/oauth2/ESIATest.java index 9de4d4875a..5bd11a660f 100644 --- a/openam-authentication/openam-auth-oauth2/src/test/java/org/forgerock/openam/authentication/modules/oauth2/ESIATest.java +++ b/openam-authentication/openam-auth-oauth2/src/test/java/org/forgerock/openam/authentication/modules/oauth2/ESIATest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". * - * Copyright 2018-2025 3A Systems LLC. + * Copyright 2018-2026 3A Systems LLC. */ package org.forgerock.openam.authentication.modules.oauth2; @@ -19,7 +19,7 @@ import org.openidentityplatform.bouncycastle.openssl.jcajce.JcaPEMWriter; import org.forgerock.openam.authentication.modules.oauth2.service.ESIAServiceUrlProvider; import org.forgerock.openam.authentication.modules.oauth2.service.esia.Signer; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; @@ -53,7 +53,7 @@ public class ESIATest extends PowerMockTestCase { public void syncOffsetTest() throws Exception { HttpRequestContent httpRequestContent = mock(HttpRequestContent.class); Map> headers = Collections.singletonMap("Date", Collections.singletonList("Mon, 11 Mar 2019 07:07:25 GMT")); - when(httpRequestContent.getHeadersUsingHEAD(Matchers.anyString())).thenReturn(headers); + when(httpRequestContent.getHeadersUsingHEAD(ArgumentMatchers.anyString())).thenReturn(headers); PowerMockito.mockStatic(HttpRequestContent.class); PowerMockito.when(HttpRequestContent.getInstance()).thenReturn(httpRequestContent); ESIAServiceUrlProvider.getSyncOffset(); diff --git a/openam-authentication/openam-auth-oidc/pom.xml b/openam-authentication/openam-auth-oidc/pom.xml index 1ae66612e8..59239ff0af 100755 --- a/openam-authentication/openam-auth-oidc/pom.xml +++ b/openam-authentication/openam-auth-oidc/pom.xml @@ -56,7 +56,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-authentication/openam-auth-persistentcookie/pom.xml b/openam-authentication/openam-auth-persistentcookie/pom.xml index f342367b1f..4da310db84 100755 --- a/openam-authentication/openam-auth-persistentcookie/pom.xml +++ b/openam-authentication/openam-auth-persistentcookie/pom.xml @@ -52,7 +52,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModuleTest.java b/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModuleTest.java index 3b33899ea2..74d7b5e923 100644 --- a/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModuleTest.java +++ b/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModuleTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.persistentcookie; @@ -20,6 +20,7 @@ import static org.mockito.BDDMockito.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import static org.mockito.ArgumentMatchers.nullable; import static org.testng.AssertJUnit.*; import java.util.Collections; @@ -41,7 +42,7 @@ import org.forgerock.json.jose.jwt.JwtClaimsSet; import org.forgerock.openam.authentication.modules.common.AMLoginModuleBinder; import org.forgerock.openam.core.CoreWrapper; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -65,7 +66,7 @@ public void setUp() throws Exception { persistentCookieWrapper = mock(PersistentCookieModuleWrapper.class); given(persistentCookieWrapper.generateConfig(anyString(), anyString(), anyBoolean(), anyString(), anyBoolean(), - anyBoolean(), anyString(), anySetOf(String.class), anyString())) + anyBoolean(), nullable(String.class), anyCollection(), nullable(String.class))) .willReturn(GENERATED_CONFIG); persistentCookieAuthModule = new PersistentCookieAuthModule(coreWrapper, persistentCookieWrapper); @@ -97,7 +98,7 @@ public void shouldInitialiseAuthModuleWithIdleTimeoutSetAsNull() throws Exceptio //Then assertSame(GENERATED_CONFIG, config); verify(persistentCookieWrapper).generateConfig(eq("0"), eq("300"), anyBoolean(), anyString(), - anyBoolean(), anyBoolean(), anyString(), anySetOf(String.class), anyString()); + anyBoolean(), anyBoolean(), nullable(String.class), anyCollection(), nullable(String.class)); } @Test @@ -119,7 +120,7 @@ public void shouldInitialiseAuthModuleWithMaxLifeSetAsNull() throws Exception { //Then assertSame(GENERATED_CONFIG, config); verify(persistentCookieWrapper).generateConfig(eq("60"), eq("0"), anyBoolean(), anyString(), - anyBoolean(), anyBoolean(), anyString(), anySetOf(String.class), anyString()); + anyBoolean(), anyBoolean(), nullable(String.class), anyCollection(), nullable(String.class)); } @Test @@ -143,7 +144,7 @@ public void shouldInitialiseAuthModule() throws Exception { //Then assertSame(GENERATED_CONFIG, config); verify(persistentCookieWrapper).generateConfig(eq("60"), eq("300"), anyBoolean(), anyString(), - anyBoolean(), anyBoolean(), anyString(), anySetOf(String.class), anyString()); + anyBoolean(), anyBoolean(), nullable(String.class), anyCollection(), nullable(String.class)); } @@ -163,7 +164,7 @@ public void shouldInitialiseAuthModuleWithClientIPEnforced() throws Exception { //Then assertSame(GENERATED_CONFIG, config); verify(persistentCookieWrapper).generateConfig(anyString(), anyString(), eq(true), anyString(), - anyBoolean(), anyBoolean(), anyString(), anySetOf(String.class), anyString()); + anyBoolean(), anyBoolean(), nullable(String.class), anyCollection(), nullable(String.class)); } @Test @@ -195,7 +196,7 @@ public void shouldProcessCallbacksWhenJwtNotPresentOrValid() throws Exception { Callback[] callbacks = new Callback[0]; int state = ISAuthConstants.LOGIN_START; - given(persistentCookieWrapper.validateJwtSessionCookie(Matchers.anyObject())).willReturn(null); + given(persistentCookieWrapper.validateJwtSessionCookie(ArgumentMatchers.anyObject())).willReturn(null); shouldInitialiseAuthModule(); //When @@ -211,7 +212,7 @@ public void shouldProcessCallbacksWhenJwtNotPresentOrValid() throws Exception { //Then verify(amLoginModuleBinder).setUserSessionProperty(JwtSessionModule.TOKEN_IDLE_TIME_IN_MINUTES_CLAIM_KEY, "60"); verify(amLoginModuleBinder).setUserSessionProperty(JwtSessionModule.MAX_TOKEN_LIFE_IN_MINUTES_KEY, "300"); - verify(persistentCookieWrapper).validateJwtSessionCookie(Matchers.anyObject()); + verify(persistentCookieWrapper).validateJwtSessionCookie(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); assertEquals(exception.getErrorCode(), "cookieNotValid"); } @@ -225,7 +226,7 @@ public void shouldProcessCallbacksWhenJASPIContextNotFound() throws Exception { Jwt jwt = mock(Jwt.class); JwtClaimsSet claimsSet = mock(JwtClaimsSet.class); - given(persistentCookieWrapper.validateJwtSessionCookie(Matchers.anyObject())).willReturn(jwt); + given(persistentCookieWrapper.validateJwtSessionCookie(ArgumentMatchers.anyObject())).willReturn(jwt); given(jwt.getClaimsSet()).willReturn(claimsSet); given(claimsSet.getClaim("org.forgerock.authentication.context", Map.class)).willReturn(null); @@ -244,7 +245,7 @@ public void shouldProcessCallbacksWhenJASPIContextNotFound() throws Exception { //Then verify(amLoginModuleBinder).setUserSessionProperty(JwtSessionModule.TOKEN_IDLE_TIME_IN_MINUTES_CLAIM_KEY, "60"); verify(amLoginModuleBinder).setUserSessionProperty(JwtSessionModule.MAX_TOKEN_LIFE_IN_MINUTES_KEY, "300"); - verify(persistentCookieWrapper).validateJwtSessionCookie(Matchers.anyObject()); + verify(persistentCookieWrapper).validateJwtSessionCookie(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); assertEquals(exception.getErrorCode(), "jaspiContextNotFound"); } @@ -259,7 +260,7 @@ public void shouldProcessCallbacksWhenJwtRealmIsDifferent() throws Exception { JwtClaimsSet claimsSet = mock(JwtClaimsSet.class); Map internalMap = mock(HashMap.class); - given(persistentCookieWrapper.validateJwtSessionCookie(Matchers.anyObject())).willReturn(jwt); + given(persistentCookieWrapper.validateJwtSessionCookie(ArgumentMatchers.anyObject())).willReturn(jwt); given(jwt.getClaimsSet()).willReturn(claimsSet); given(claimsSet.getClaim("org.forgerock.authentication.context", Map.class)).willReturn(internalMap); @@ -280,7 +281,7 @@ public void shouldProcessCallbacksWhenJwtRealmIsDifferent() throws Exception { //Then verify(amLoginModuleBinder).setUserSessionProperty(JwtSessionModule.TOKEN_IDLE_TIME_IN_MINUTES_CLAIM_KEY, "60"); verify(amLoginModuleBinder).setUserSessionProperty(JwtSessionModule.MAX_TOKEN_LIFE_IN_MINUTES_KEY, "300"); - verify(persistentCookieWrapper).validateJwtSessionCookie(Matchers.anyObject()); + verify(persistentCookieWrapper).validateJwtSessionCookie(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); assertEquals(exception.getErrorCode(), "authFailedDiffRealm"); } @@ -296,7 +297,7 @@ public void shouldProcessCallbacksWhenJwtValid() throws Exception { Map internalMap = mock(HashMap.class); - given(persistentCookieWrapper.validateJwtSessionCookie(Matchers.anyObject())).willReturn(jwt); + given(persistentCookieWrapper.validateJwtSessionCookie(ArgumentMatchers.anyObject())).willReturn(jwt); given(jwt.getClaimsSet()).willReturn(claimsSet); given(claimsSet.getClaim("org.forgerock.authentication.context", Map.class)).willReturn(internalMap); @@ -311,7 +312,7 @@ public void shouldProcessCallbacksWhenJwtValid() throws Exception { //Then verify(amLoginModuleBinder).setUserSessionProperty(JwtSessionModule.TOKEN_IDLE_TIME_IN_MINUTES_CLAIM_KEY, "60"); verify(amLoginModuleBinder).setUserSessionProperty(JwtSessionModule.MAX_TOKEN_LIFE_IN_MINUTES_KEY, "300"); - verify(persistentCookieWrapper).validateJwtSessionCookie(Matchers.anyObject()); + verify(persistentCookieWrapper).validateJwtSessionCookie(ArgumentMatchers.anyObject()); verify(amLoginModuleBinder).setUserSessionProperty("jwtValidated", "true"); assertEquals(returnedState, ISAuthConstants.LOGIN_SUCCEED); } diff --git a/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookiePAPTest.java b/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookiePAPTest.java index 14221a1da9..27f1b8bff2 100644 --- a/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookiePAPTest.java +++ b/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookiePAPTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.persistentcookie; @@ -20,6 +20,7 @@ import static org.mockito.BDDMockito.anyString; import static org.mockito.BDDMockito.*; import static org.mockito.Mockito.mock; +import static org.mockito.ArgumentMatchers.nullable; import static org.testng.AssertJUnit.*; import java.security.Principal; @@ -59,7 +60,7 @@ protected ServiceConfigManager getServiceConfigManager() throws SSOException, SM ServiceConfig serviceConfig = mock(ServiceConfig.class); given(serviceConfig.getAttributes()).willReturn(Collections.singletonMap("iplanet-am-auth-key-alias", (Set) Sets.newHashSet("str"))); - given(serviceConfigManager.getOrganizationConfig(anyString(), anyString())).willReturn(serviceConfig); + given(serviceConfigManager.getOrganizationConfig(nullable(String.class), isNull())).willReturn(serviceConfig); return serviceConfigManager; } }; diff --git a/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieWrapperTest.java b/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieWrapperTest.java index 52b3461d78..f643fb10ad 100644 --- a/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieWrapperTest.java +++ b/openam-authentication/openam-auth-persistentcookie/src/test/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieWrapperTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.persistentcookie; @@ -61,7 +62,7 @@ protected ServiceConfigManager getServiceConfigManager() throws SSOException, SM ServiceConfig serviceConfig = mock(ServiceConfig.class); given(serviceConfig.getAttributes()).willReturn(Collections.singletonMap("iplanet-am-auth-key-alias", (Set)Sets.newHashSet(KEY_ALIAS))); - given(serviceConfigManager.getOrganizationConfig(anyString(), anyString())).willReturn(serviceConfig); + given(serviceConfigManager.getOrganizationConfig(anyString(), isNull())).willReturn(serviceConfig); return serviceConfigManager; } }; diff --git a/openam-authentication/openam-auth-qr/pom.xml b/openam-authentication/openam-auth-qr/pom.xml index ae1a160dd5..e0ae3b0327 100755 --- a/openam-authentication/openam-auth-qr/pom.xml +++ b/openam-authentication/openam-auth-qr/pom.xml @@ -52,7 +52,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-authentication/openam-auth-recaptcha/pom.xml b/openam-authentication/openam-auth-recaptcha/pom.xml index be3a4a5063..0eb9d6994b 100644 --- a/openam-authentication/openam-auth-recaptcha/pom.xml +++ b/openam-authentication/openam-auth-recaptcha/pom.xml @@ -54,7 +54,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-authentication/openam-auth-scripted/pom.xml b/openam-authentication/openam-auth-scripted/pom.xml index 8a9b44be07..bf2665aad2 100644 --- a/openam-authentication/openam-auth-scripted/pom.xml +++ b/openam-authentication/openam-auth-scripted/pom.xml @@ -54,7 +54,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-authentication/openam-auth-webauthn/pom.xml b/openam-authentication/openam-auth-webauthn/pom.xml index 6e8139a7f0..eeb1056c84 100755 --- a/openam-authentication/openam-auth-webauthn/pom.xml +++ b/openam-authentication/openam-auth-webauthn/pom.xml @@ -51,7 +51,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-authentication/openam-auth-webauthn/src/test/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthenticationTest.java b/openam-authentication/openam-auth-webauthn/src/test/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthenticationTest.java index bc0b3e5740..da3fd205c2 100644 --- a/openam-authentication/openam-auth-webauthn/src/test/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthenticationTest.java +++ b/openam-authentication/openam-auth-webauthn/src/test/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthenticationTest.java @@ -12,12 +12,13 @@ * information: "Portions Copyrighted [year] [name of copyright owner]". * * Copyright 2024-2025 3A-Systems LLC. All rights reserved. + * Portions copyright 2026 3A Systems, LLC. */ package org.openidentityplatform.openam.authentication.modules.webauthn; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/openam-authentication/openam-auth-webauthn/src/test/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnRegistrationTest.java b/openam-authentication/openam-auth-webauthn/src/test/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnRegistrationTest.java index beafa73477..baf3382945 100644 --- a/openam-authentication/openam-auth-webauthn/src/test/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnRegistrationTest.java +++ b/openam-authentication/openam-auth-webauthn/src/test/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnRegistrationTest.java @@ -12,12 +12,13 @@ * information: "Portions Copyrighted [year] [name of copyright owner]". * * Copyright 2024-2025 3A-Systems LLC. All rights reserved. + * Portions copyright 2026 3A Systems, LLC. */ package org.openidentityplatform.openam.authentication.modules.webauthn; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/openam-authentication/openam-auth-windowsdesktopsso/pom.xml b/openam-authentication/openam-auth-windowsdesktopsso/pom.xml index a47dc53695..640a90f306 100755 --- a/openam-authentication/openam-auth-windowsdesktopsso/pom.xml +++ b/openam-authentication/openam-auth-windowsdesktopsso/pom.xml @@ -41,7 +41,7 @@ org.mockito - mockito-all + mockito-core test @@ -57,7 +57,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 test diff --git a/openam-authentication/pom.xml b/openam-authentication/pom.xml index 0a432927ff..b15d406a24 100755 --- a/openam-authentication/pom.xml +++ b/openam-authentication/pom.xml @@ -77,19 +77,19 @@ org.powermock powermock-module-testng - 1.7.4 + 2.0.9 test org.powermock powermock-core - 1.7.4 + 2.0.9 test org.powermock - powermock-api-mockito - 1.7.4 + powermock-api-mockito2 + 2.0.9 test diff --git a/openam-core-rest/pom.xml b/openam-core-rest/pom.xml index fe1d0557df..a25f519041 100755 --- a/openam-core-rest/pom.xml +++ b/openam-core-rest/pom.xml @@ -82,7 +82,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/AuthIdHelperTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/AuthIdHelperTest.java index 871fdf0f1f..84d094352b 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/AuthIdHelperTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/AuthIdHelperTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.authn; @@ -53,7 +54,7 @@ import org.forgerock.openam.core.rest.authn.exceptions.RestAuthException; import org.forgerock.openam.utils.AMKeyProvider; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -90,9 +91,9 @@ public void setUp() { given(claimsSetBuilder.build()).willReturn(claimsSet); - given(jwtBuilderFactory.jws(Matchers.anyObject())).willReturn(signedJwtBuilder); + given(jwtBuilderFactory.jws(ArgumentMatchers.anyObject())).willReturn(signedJwtBuilder); given(signedJwtBuilder.headers()).willReturn(jwsHeaderBuilder); - given(jwsHeaderBuilder.alg(Matchers.anyObject())).willReturn(jwsHeaderBuilder); + given(jwsHeaderBuilder.alg(ArgumentMatchers.anyObject())).willReturn(jwsHeaderBuilder); given(jwsHeaderBuilder.done()).willReturn(signedJwtBuilder); given(signedJwtBuilder.claims(claimsSet)).willReturn(signedJwtBuilder); @@ -305,7 +306,7 @@ public void shouldVerifyAuthId() throws SignatureException, SSOException, SMSExc PublicKey publicKey = mock(PublicKey.class); given(jwtBuilderFactory.reconstruct("AUTH_ID", SignedJwt.class)).willReturn(signedJwt); - given(signedJwt.verify(Matchers.anyObject())).willReturn(true); + given(signedJwt.verify(ArgumentMatchers.anyObject())).willReturn(true); mockGetSigningKey("REALM_DN", false); @@ -314,7 +315,7 @@ public void shouldVerifyAuthId() throws SignatureException, SSOException, SMSExc //Then verify(jwtBuilderFactory).reconstruct("AUTH_ID", SignedJwt.class); - verify(signedJwt).verify(Matchers.anyObject()); + verify(signedJwt).verify(ArgumentMatchers.anyObject()); } @Test @@ -341,7 +342,7 @@ public void shouldVerifyAuthIdAndFail() throws SignatureException, SSOException, //Then verify(jwtBuilderFactory).reconstruct("AUTH_ID", SignedJwt.class); - verify(signedJwt).verify(Matchers.anyObject()); + verify(signedJwt).verify(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); } diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/RestAuthCallbackHandlerManagerTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/RestAuthCallbackHandlerManagerTest.java index 070ef3f52d..ab8179e120 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/RestAuthCallbackHandlerManagerTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/RestAuthCallbackHandlerManagerTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.authn; @@ -21,7 +21,7 @@ import org.forgerock.openam.core.rest.authn.callbackhandlers.RestAuthCallbackHandler; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthResponseException; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthException; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -69,7 +69,7 @@ public void shouldHandleCallbacksIntoJson() throws RestAuthResponseException, Re jsonCallback2.put("KEY2", "VALUE2"); given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler( - Matchers.>anyObject())) + ArgumentMatchers.>anyObject())) .willReturn(restAuthCallbackHandler1) .willReturn(restAuthCallbackHandler1).willReturn(restAuthCallbackHandler2); given(restAuthCallbackHandler1.updateCallbackFromRequest(request, response, callback1)) @@ -106,7 +106,7 @@ public void shouldHandleCallbacksInternally() throws RestAuthResponseException, RestAuthCallbackHandler restAuthCallbackHandler2 = mock(RestAuthCallbackHandler.class); given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler( - Matchers.>anyObject())).willReturn( + ArgumentMatchers.>anyObject())).willReturn( restAuthCallbackHandler1).willReturn(restAuthCallbackHandler2); given(restAuthCallbackHandler1.updateCallbackFromRequest(request, response, callback1)) .willReturn(true); @@ -143,7 +143,7 @@ public void shouldHandleCallbacksIntoJsonIfAtLeastOneCannotBeDoneInternally() jsonCallback2.put("KEY2", "VALUE2"); given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler( - Matchers.>anyObject())) + ArgumentMatchers.>anyObject())) .willReturn(restAuthCallbackHandler1).willReturn(restAuthCallbackHandler2) .willReturn(restAuthCallbackHandler1).willReturn(restAuthCallbackHandler2); given(restAuthCallbackHandler1.updateCallbackFromRequest(request, response, callback1)) @@ -186,7 +186,7 @@ public void shouldHandleJsonCallbacks() throws RestAuthException { given(jsonCallbacks.get(0)).willReturn(jsonCallback1); given(jsonCallbacks.get(1)).willReturn(jsonCallback2); given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler( - Matchers.>anyObject())) + ArgumentMatchers.>anyObject())) .willReturn(restAuthCallbackHandler1) .willReturn(restAuthCallbackHandler2); given(restAuthCallbackHandler1.getCallbackClassName()).willReturn("CALLBACK1"); @@ -226,7 +226,7 @@ public void shouldHandleJsonCallbacksMixedUp() throws RestAuthException { given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler( - Matchers.>anyObject())) + ArgumentMatchers.>anyObject())) .willReturn(restAuthCallbackHandler1) .willReturn(restAuthCallbackHandler2); given(restAuthCallbackHandler1.getCallbackClassName()).willReturn("CALLBACK1"); @@ -271,7 +271,7 @@ public void shouldFailToHandleJsonCallbacksWithMissingJSONCallback() throws Rest given(restAuthCallbackHandlerFactory.getRestAuthCallbackHandler( - Matchers.>anyObject())) + ArgumentMatchers.>anyObject())) .willReturn(restAuthCallbackHandler1) .willReturn(restAuthCallbackHandler2) .willReturn(restAuthCallbackHandler3); diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/RestAuthenticationHandlerTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/RestAuthenticationHandlerTest.java index 7158c54a19..f50a5b5e18 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/RestAuthenticationHandlerTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/RestAuthenticationHandlerTest.java @@ -17,7 +17,7 @@ * Copyright 2013-2015 ForgeRock AS. * Portions copyright 2019 Open Source Solution Technology Corporation >>>>>>> cafd23ed69... Remove an input parameter included in exception message (#123) - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.authn; @@ -59,7 +59,7 @@ >>>>>>> cafd23ed69... Remove an input parameter included in exception message (# import org.forgerock.openam.utils.JsonValueBuilder; import org.json.JSONException; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -114,7 +114,7 @@ public void shouldInitiateAuthenticationViaGET() throws AuthLoginException, L10N given(loginProcess.isSuccessful()).willReturn(true); given(loginProcess.getAuthContext()).willReturn(authContextLocalWrapper); - given(loginAuthenticator.getLoginProcess(Matchers.anyObject())).willReturn(loginProcess); + given(loginAuthenticator.getLoginProcess(ArgumentMatchers.anyObject())).willReturn(loginProcess); //When JsonValue response = restAuthenticationHandler.initiateAuthentication(request, httpResponse, @@ -154,7 +154,7 @@ public void shouldInitiateAuthenticationViaGET1() throws AuthLoginException, L10 given(loginProcess.isSuccessful()).willReturn(false); given(loginProcess.getAuthContext()).willReturn(authContextLocalWrapper); - given(loginAuthenticator.getLoginProcess(Matchers.anyObject())).willReturn(loginProcess); + given(loginAuthenticator.getLoginProcess(ArgumentMatchers.anyObject())).willReturn(loginProcess); //When try { @@ -210,10 +210,10 @@ public void shouldInitiateAuthenticationViaGET2() throws AuthLoginException, L10 JsonValue jsonCallbacks = new JsonValue(new HashMap()); jsonCallbacks.add("KEY", "VALUE"); - given(loginAuthenticator.getLoginProcess(Matchers.anyObject())).willReturn(loginProcess); + given(loginAuthenticator.getLoginProcess(ArgumentMatchers.anyObject())).willReturn(loginProcess); given(restAuthCallbackHandlerManager.handleCallbacks(request, httpResponse, callbacks)) .willReturn(jsonCallbacks); - given(authIdHelper.createAuthId(Matchers.anyObject(), eq(authContextLocalWrapper))) + given(authIdHelper.createAuthId(ArgumentMatchers.anyObject(), eq(authContextLocalWrapper))) .willReturn("AUTH_ID"); //When @@ -267,10 +267,10 @@ public void shouldInitiateAuthenticationViaGET3() throws AuthLoginException, L10 JsonValue jsonCallbacks = new JsonValue(new HashMap()); - given(loginAuthenticator.getLoginProcess(Matchers.anyObject())).willReturn(loginProcess); + given(loginAuthenticator.getLoginProcess(ArgumentMatchers.anyObject())).willReturn(loginProcess); given(restAuthCallbackHandlerManager.handleCallbacks(request, httpResponse, callbacks)) .willReturn(jsonCallbacks); - given(authIdHelper.createAuthId(Matchers.anyObject(), eq(authContextLocalWrapper))) + given(authIdHelper.createAuthId(ArgumentMatchers.anyObject(), eq(authContextLocalWrapper))) .willReturn("AUTH_ID"); //When @@ -318,10 +318,10 @@ public void shouldInitiateAuthenticationViaGET4() throws AuthLoginException, L10 RestAuthResponseException restAuthResponseException = new RestAuthResponseException(999, responseHeaders, jsonResponse); - given(loginAuthenticator.getLoginProcess(Matchers.anyObject())).willReturn(loginProcess); + given(loginAuthenticator.getLoginProcess(ArgumentMatchers.anyObject())).willReturn(loginProcess); given(restAuthCallbackHandlerManager.handleCallbacks(request, httpResponse, callbacks)) .willThrow(restAuthResponseException); - given(authIdHelper.createAuthId(Matchers.anyObject(), eq(authContextLocalWrapper))) + given(authIdHelper.createAuthId(ArgumentMatchers.anyObject(), eq(authContextLocalWrapper))) .willReturn("AUTH_ID"); //When @@ -393,7 +393,7 @@ public void shouldInitiateAuthenticationViaPOST() throws AuthLoginException, L10 given(loginProcess.isSuccessful()).willReturn(true); given(loginProcess.getAuthContext()).willReturn(authContextLocalWrapper); - given(loginAuthenticator.getLoginProcess(Matchers.anyObject())).willReturn(loginProcess); + given(loginAuthenticator.getLoginProcess(ArgumentMatchers.anyObject())).willReturn(loginProcess); SignedJwt signedJwt = mock(SignedJwt.class); JwtClaimsSet claimsSet = mock(JwtClaimsSet.class); @@ -443,7 +443,7 @@ public void shouldCleanupAfterAuthenticationComplete() throws Exception { given(loginProcess.isSuccessful()).willReturn(true); given(loginProcess.getAuthContext()).willReturn(authContextLocalWrapper); - given(loginAuthenticator.getLoginProcess(Matchers.anyObject())).willReturn(loginProcess); + given(loginAuthenticator.getLoginProcess(ArgumentMatchers.anyObject())).willReturn(loginProcess); // When restAuthenticationHandler.initiateAuthentication(request, response, "module", module, existingSessionId); @@ -476,9 +476,10 @@ private JsonValue performSuccessfulAuthentication() throws Exception { given(loginProcess.isSuccessful()).willReturn(true); given(loginProcess.getAuthContext()).willReturn(authContextLocalWrapper); - given(loginAuthenticator.getLoginProcess(Matchers.anyObject())).willReturn(loginProcess); + given(loginAuthenticator.getLoginProcess(ArgumentMatchers.anyObject())).willReturn(loginProcess); given(coreWrapper.convertOrgNameToRealmName(anyString())).willReturn("REALM"); + given(loginProcess.getOrgDN()).willReturn("/realm"); return restAuthenticationHandler.initiateAuthentication(request, httpResponse, null, null, null); } diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameCallbackHandlerTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameCallbackHandlerTest.java index 6654c454c6..7ef02b3b17 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameCallbackHandlerTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameCallbackHandlerTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.authn.callbackhandlers; @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.test.assertj.AssertJJsonValueAssert.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthPasswordCallbackHandlerTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthPasswordCallbackHandlerTest.java index 802269a0c6..2bb625ea62 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthPasswordCallbackHandlerTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthPasswordCallbackHandlerTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.authn.callbackhandlers; @@ -32,7 +32,7 @@ import org.forgerock.openam.core.rest.authn.exceptions.RestAuthException; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthResponseException; import org.forgerock.openam.utils.JsonValueBuilder; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -93,7 +93,7 @@ public void shouldFailToUpdateCallbackFromRequestWhenPasswordIsNull() passwordCallback); //Then - verify(passwordCallback, never()).setPassword(Matchers.anyObject()); + verify(passwordCallback, never()).setPassword(ArgumentMatchers.anyObject()); assertThat(updated).isFalse(); } @@ -113,7 +113,7 @@ public void shouldFailToUpdateCallbackFromRequestWhenPasswordIsEmptyString() passwordCallback); //Then - verify(passwordCallback, never()).setPassword(Matchers.anyObject()); + verify(passwordCallback, never()).setPassword(ArgumentMatchers.anyObject()); assertThat(updated).isFalse(); } diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthX509CallbackHandlerTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthX509CallbackHandlerTest.java index 5290092a08..da2b5aabef 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthX509CallbackHandlerTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthX509CallbackHandlerTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.authn.callbackhandlers; @@ -32,7 +32,7 @@ import org.forgerock.json.JsonValue; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthException; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthResponseException; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -121,7 +121,7 @@ public void shouldNotUpdateCallbackFromRequestWithNoX509Certificate() x509CertificateCallback); //Then - verify(x509CertificateCallback, never()).setCertificate(Matchers.anyObject()); + verify(x509CertificateCallback, never()).setCertificate(ArgumentMatchers.anyObject()); assertTrue(updated); } diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/core/LoginAuthenticatorTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/core/LoginAuthenticatorTest.java index 856cb57b1d..67ec8e0c1b 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/core/LoginAuthenticatorTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/authn/core/LoginAuthenticatorTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.authn.core; @@ -40,7 +40,7 @@ import org.forgerock.openam.core.rest.authn.core.wrappers.AuthContextLocalWrapper; import org.forgerock.openam.core.rest.authn.core.wrappers.CoreServicesWrapper; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthException; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -187,7 +187,7 @@ public void shouldGetLoginProcessForSubsequentRequest() throws Exception { verify(coreServicesWrapper).isNewRequest(authContextLocalWrapper); verify(coreServicesWrapper).getDomainNameByRequest(request); verify(coreServicesWrapper).isOrganizationActive("/ORG_DN"); - verify(coreServicesWrapper).getExistingValidSSOToken(Matchers.anyObject()); + verify(coreServicesWrapper).getExistingValidSSOToken(ArgumentMatchers.anyObject()); verifyNoMoreInteractions(coreServicesWrapper); } @@ -622,7 +622,7 @@ public void shouldGetLoginProcessForInitialRequestWithAuthIndexTypeCompositeWith .indexValue(authIndexValue) .sessionUpgrade(ssoTokenId); - given(coreServicesWrapper.getDomainNameByRequest(Matchers.anyObject())) + given(coreServicesWrapper.getDomainNameByRequest(ArgumentMatchers.anyObject())) .willReturn("ORG_DN"); given(coreServicesWrapper.getAuthContext((HttpServletRequest) anyObject(), eq((HttpServletResponse) null), (SessionID) anyObject(), eq(true), eq(false))).willReturn(authContextLocalWrapper); @@ -658,7 +658,7 @@ public void shouldGetLoginProcessForSubsequentRequestWithAuthIndexTypeCompositeA .indexValue(authIndexValue) .sessionUpgrade(ssoTokenId); - given(coreServicesWrapper.getDomainNameByRequest(Matchers.anyObject())) + given(coreServicesWrapper.getDomainNameByRequest(ArgumentMatchers.anyObject())) .willReturn("ORG_DN"); given(coreServicesWrapper.getAuthContext((HttpServletRequest) anyObject(), eq((HttpServletResponse) null), (SessionID) anyObject(), eq(false), eq(false))).willReturn(authContextLocalWrapper); diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/cts/CoreTokenResourceTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/cts/CoreTokenResourceTest.java index bd27dc1495..a6534a8008 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/cts/CoreTokenResourceTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/cts/CoreTokenResourceTest.java @@ -12,14 +12,15 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.cts; import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.*; import static org.mockito.BDDMockito.*; import static org.mockito.BDDMockito.mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; import static org.testng.Assert.*; @@ -38,7 +39,7 @@ import org.forgerock.openam.cts.utils.JSONSerialisation; import org.forgerock.openam.test.apidescriptor.ApiAnnotationAssert; import org.forgerock.util.promise.Promise; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -71,7 +72,7 @@ public void shouldCreateTokenInCTS() throws CoreTokenException { // Given CreateRequest request = mock(CreateRequest.class); given(request.getContent()).willReturn(new JsonValue("")); - given(mockSerialisation.deserialise(anyString(), Matchers.>any())).willReturn(mockToken); + given(mockSerialisation.deserialise(anyString(), ArgumentMatchers.>any())).willReturn(mockToken); // When resource.createInstance(null, request); @@ -85,6 +86,7 @@ public void shouldGetBadRequestForMissingTokenId() throws CoreTokenException { // Given CreateRequest request = mock(CreateRequest.class); given(request.getContent()).willReturn(new JsonValue("")); + given(mockSerialisation.deserialise(anyString(), ArgumentMatchers.>any())).willReturn(mockToken); doThrow(IllegalArgumentException.class).when(mockStore).create(any(Token.class)); // When @@ -159,7 +161,7 @@ public void shouldUpdateUsingTokenInUpdateRequest() throws CoreTokenException { JsonValue value = mock(JsonValue.class); given(value.toString()).willReturn("{ \"value\": \"test\" }"); given(updateRequest.getContent()).willReturn(value); - given(mockSerialisation.deserialise(anyString(), Matchers.>any())).willReturn(mockToken); + given(mockSerialisation.deserialise(anyString(), ArgumentMatchers.>any())).willReturn(mockToken); // When resource.updateInstance(null, "badger", updateRequest); diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/deviceprint/TrustedDevicesResourceTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/deviceprint/TrustedDevicesResourceTest.java index b8588befaf..9e9d333082 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/deviceprint/TrustedDevicesResourceTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/deviceprint/TrustedDevicesResourceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.devices.deviceprint; @@ -48,7 +49,7 @@ import org.forgerock.services.context.ClientContext; import org.forgerock.services.context.Context; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -103,7 +104,7 @@ public void shouldQueryDevices() throws ResourceException { connection.query(ctx(), request, handler); //Then - verify(handler, times(2)).handleResource(Matchers.anyObject()); + verify(handler, times(2)).handleResource(ArgumentMatchers.anyObject()); } @Test diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/oath/OathDevicesResourceTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/oath/OathDevicesResourceTest.java index 1161ce2f6d..0d9857eac9 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/oath/OathDevicesResourceTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/oath/OathDevicesResourceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.devices.oath; @@ -23,9 +24,9 @@ import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.assertThat; import static org.forgerock.openam.utils.Time.newDate; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; import java.util.ArrayList; @@ -255,7 +256,7 @@ protected AMIdentity getUserIdFromUri(Context context) throws InternalServerErro AMIdentity mockId = mock(AMIdentity.class); try { - given(mockId.getAttribute(anyString())).willReturn(attribute); // makes them + given(mockId.getAttribute(any())).willReturn(attribute); // makes them } catch (IdRepoException | SSOException e) { e.printStackTrace(); } diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/push/PushDevicesResourceTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/push/PushDevicesResourceTest.java index 21c697b546..045b686ec1 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/push/PushDevicesResourceTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/push/PushDevicesResourceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.devices.push; @@ -23,9 +24,9 @@ import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.assertThat; import static org.forgerock.openam.utils.Time.newDate; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; import java.util.ArrayList; diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceTest.java index cb48628ca6..4e8c3d05f1 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.session; @@ -667,8 +667,8 @@ public void shouldDeleteWhitelistedProperty() throws SSOException, ExecutionExce given(ssoTokenManager.isValidToken(ssoToken, false)).willReturn(true); given(request.getAction()).willReturn(DELETE_PROPERTY_ACTION_ID); given(request.getContent()).willReturn(content); - given(propertyWhitelist.isPropertyListed(any(SSOToken.class), any(String.class), anySetOf(String.class))).willReturn(true); - given(propertyWhitelist.isPropertySetSettable(any(SSOToken.class), anySetOf(String.class))).willReturn(true); + given(propertyWhitelist.isPropertyListed(any(SSOToken.class), any(String.class), any(Collection.class))).willReturn(true); + given(propertyWhitelist.isPropertySetSettable(any(SSOToken.class), any(Collection.class))).willReturn(true); //when Promise promise = sessionResource.actionInstance(realmContext, resourceId, request); @@ -763,7 +763,7 @@ public void shouldReturnFailureWhenDeletePropertySessionException() throws SSOEx given(ssoTokenManager.isValidToken(ssoToken, false)).willReturn(true); given(request.getAction()).willReturn(DELETE_PROPERTY_ACTION_ID); given(request.getContent()).willReturn(content); - given(propertyWhitelist.isPropertyListed(any(SSOToken.class), any(String.class), anySetOf(String.class))) + given(propertyWhitelist.isPropertyListed(any(SSOToken.class), any(String.class), any(Collection.class))) .willThrow(new SSOException("Error")); //when @@ -787,7 +787,7 @@ public void shouldReturnInternalErrorWhenDeletePropertyFailsWithDelegationExcept given(ssoTokenManager.isValidToken(ssoToken, false)).willReturn(true); given(request.getAction()).willReturn(DELETE_PROPERTY_ACTION_ID); given(request.getContent()).willReturn(content); - given(propertyWhitelist.isPropertyListed(any(SSOToken.class), any(String.class), anySetOf(String.class))) + given(propertyWhitelist.isPropertyListed(any(SSOToken.class), any(String.class), any(Collection.class))) .willThrow(new DelegationException("Error")); //when diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceV2Test.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceV2Test.java index 0107a441aa..9d02daca7b 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceV2Test.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceV2Test.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.session; @@ -24,7 +25,7 @@ import static org.forgerock.openam.core.rest.session.SessionResourceV2.REFRESH_ACTION_ID; import static org.forgerock.openam.session.SessionConstants.*; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/TokenOwnerAuthzModuleTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/TokenOwnerAuthzModuleTest.java index 173232011d..847aec25a6 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/TokenOwnerAuthzModuleTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/TokenOwnerAuthzModuleTest.java @@ -12,12 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. +* Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.session; import static org.forgerock.util.test.assertj.AssertJPromiseAssert.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.testng.AssertJUnit.*; diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/query/SessionQueryManagerTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/query/SessionQueryManagerTest.java index 805bd75791..9974c545cd 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/query/SessionQueryManagerTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/query/SessionQueryManagerTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.session.query; @@ -27,7 +28,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.testng.Assert.assertEquals; diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsJsonConverterTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsJsonConverterTest.java index 2f6c6ea211..ae182893f1 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsJsonConverterTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsJsonConverterTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.sms; @@ -34,7 +35,7 @@ import org.forgerock.json.JsonValue; import org.forgerock.json.resource.BadRequestException; import org.forgerock.json.test.assertj.AssertJJsonValueAssert; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -173,7 +174,7 @@ private HashSet getHashSet(String... strings) { @Test public void convertFromJson() throws Exception { //Given - given(serviceSchema.validateAttributes(Matchers.anyObject())).willReturn(true); + given(serviceSchema.validateAttributes(ArgumentMatchers.anyObject())).willReturn(true); //When Map> result = converter.fromJson(jsonRepresentation); @@ -186,7 +187,7 @@ public void convertFromJson() throws Exception { @Test public void convertToJson() throws SMSException { //Given - given(serviceSchema.validateAttributes(Matchers.anyObject())).willReturn(true); + given(serviceSchema.validateAttributes(ArgumentMatchers.anyObject())).willReturn(true); //When JsonValue result = converter.toJson(mapRepresentation, true); @@ -229,7 +230,7 @@ public void convertToJson() throws SMSException { @Test(expectedExceptions = JsonException.class) public void invalidValuesToJson() throws SMSException { //Given - given(serviceSchema.validateAttributes(Matchers.anyObject())).willReturn(false); + given(serviceSchema.validateAttributes(ArgumentMatchers.anyObject())).willReturn(false); //When converter.toJson(mapRepresentation, true); @@ -238,7 +239,7 @@ public void invalidValuesToJson() throws SMSException { @Test(expectedExceptions = JsonException.class) public void invalidValuesToMap() throws Exception { //Given - given(serviceSchema.validateAttributes(Matchers.anyObject())).willReturn(false); + given(serviceSchema.validateAttributes(ArgumentMatchers.anyObject())).willReturn(false); //When converter.fromJson(jsonRepresentation); diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsRealmProviderTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsRealmProviderTest.java index 195ec43bcd..ce16139005 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsRealmProviderTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/SmsRealmProviderTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.sms; @@ -19,7 +20,7 @@ import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.assertThat; import static org.forgerock.openam.core.rest.sms.SmsRealmProvider.*; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/tree/SmsRouteTreeTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/tree/SmsRouteTreeTest.java index 2b2036d60f..a1ce7936d3 100644 --- a/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/tree/SmsRouteTreeTest.java +++ b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/sms/tree/SmsRouteTreeTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. - * Portions copyright 2026 3A Systems,LLC + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.core.rest.sms.tree; @@ -26,7 +26,7 @@ import static org.forgerock.json.test.assertj.AssertJJsonValueAssert.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; -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.verifyNoMoreInteractions; diff --git a/openam-core/pom.xml b/openam-core/pom.xml index b85b30036d..0dc0cadee7 100755 --- a/openam-core/pom.xml +++ b/openam-core/pom.xml @@ -260,12 +260,36 @@ org.apache.click click-nodeps ${click.version} + + + + javassist + javassist + + org.apache.click click-extras ${click.version} + + + javassist + javassist + + + + + + ognl + ognl + + + javassist + javassist + + @@ -409,31 +433,31 @@ org.mockito - mockito-all + mockito-core test org.powermock powermock-module-testng - 1.7.4 + 2.0.9 test org.powermock powermock-core - 1.7.4 + 2.0.9 test org.powermock powermock-module-junit4 - 1.7.4 + 2.0.9 test org.powermock - powermock-api-mockito - 1.7.4 + powermock-api-mockito2 + 2.0.9 test diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/DynamicSessionIDExtensionsTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/DynamicSessionIDExtensionsTest.java index 8a4cc94b58..c86de1cf9f 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/DynamicSessionIDExtensionsTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/DynamicSessionIDExtensionsTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.iplanet.dpro.session; @@ -35,6 +36,8 @@ public void setup() { given(mockQuery.getSessionIDCorrector()).willReturn(mockCorrector); mockDelegate = mock(SessionIDExtensions.class); + given(mockDelegate.getPrimaryID()).willReturn("primaryId"); + given(mockDelegate.getSiteID()).willReturn("siteId"); dynamic = new DynamicSessionIDExtensions(mockQuery, mockDelegate); } diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/SessionTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/SessionTest.java index 49a70392b2..24c1646c7c 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/SessionTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/SessionTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.iplanet.dpro.session; @@ -22,7 +23,7 @@ import java.util.List; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/MonitoredOperationsTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/MonitoredOperationsTest.java index cab6219341..a7e0fe34c6 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/MonitoredOperationsTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/MonitoredOperationsTest.java @@ -12,14 +12,15 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014 ForgeRock AS. +* Portions copyright 2026 3A Systems, LLC. */ package com.iplanet.dpro.session.monitoring; import com.iplanet.dpro.session.Session; import com.iplanet.dpro.session.SessionException; import com.iplanet.dpro.session.operations.SessionOperations; -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.times; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/SessionMonitoringStoreTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/SessionMonitoringStoreTest.java index 57368eaad6..3dee69439f 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/SessionMonitoringStoreTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/monitoring/SessionMonitoringStoreTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014 ForgeRock AS. +* Portions copyright 2026 3A Systems, LLC. */ package com.iplanet.dpro.session.monitoring; @@ -21,7 +22,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/operations/ServerSessionOperationStrategyTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/operations/ServerSessionOperationStrategyTest.java index f685cb6a4c..47a1a3da46 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/operations/ServerSessionOperationStrategyTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/operations/ServerSessionOperationStrategyTest.java @@ -12,12 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.iplanet.dpro.session.operations; import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import org.forgerock.openam.sso.providers.stateless.StatelessSessionManager; diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/operations/strategies/ClientSdkOperationsTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/operations/strategies/ClientSdkOperationsTest.java index 2917e3d065..9a869511f5 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/operations/strategies/ClientSdkOperationsTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/operations/strategies/ClientSdkOperationsTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.iplanet.dpro.session.operations.strategies; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -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; @@ -66,10 +67,11 @@ public class ClientSdkOperationsTest { private SessionServerConfig mockServerConfig; @BeforeMethod - public void setup() throws SessionException { + public void setup() throws Exception { MockitoAnnotations.initMocks(this); given(mockRequester.getID()).willReturn(mockRequesterId); given(mockSession.getID()).willReturn(mockSessionId); + given(mockSession.getSessionServiceURL()).willReturn(new java.net.URL("http://openam.example.com")); given(mockClientSdkSessionRequests.sendRequest( any(URL.class), any(SessionRequest.class), diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/service/InternalSessionTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/service/InternalSessionTest.java index a252b550ad..7cf7d66349 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/service/InternalSessionTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/service/InternalSessionTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.iplanet.dpro.session.service; @@ -19,8 +20,8 @@ import static java.util.concurrent.TimeUnit.*; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionServerConfigTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionServerConfigTest.java index 4bca2e9944..841ac7c441 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionServerConfigTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/service/SessionServerConfigTest.java @@ -1,3 +1,18 @@ +/* + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. + * + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. + * + * When distributing Covered Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions copyright [year] [name of copyright owner]". + * + * Portions copyright 2026 3A Systems, LLC. + */ package com.iplanet.dpro.session.service; import com.iplanet.am.util.SystemProperties; @@ -13,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @PrepareForTest({ SystemProperties.class, WebtopNaming.class }) diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/service/WebtopNamingSiteUtilsTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/service/WebtopNamingSiteUtilsTest.java index f17368d22e..2eaa4691b5 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/service/WebtopNamingSiteUtilsTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/service/WebtopNamingSiteUtilsTest.java @@ -1,6 +1,6 @@ /** * Copyright 2014 ForgeRock AS. - * + * Portions copyright 2026 3A Systems, LLC. * * The contents of this file are subject to the terms of the Common Development and * Distribution License (the License). You may not use this file except in compliance with the * License. @@ -28,8 +28,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/utils/SessionInfoFactoryTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/utils/SessionInfoFactoryTest.java index 096f530b2d..c4c42db7be 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/utils/SessionInfoFactoryTest.java +++ b/openam-core/src/test/java/com/iplanet/dpro/session/utils/SessionInfoFactoryTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.iplanet.dpro.session.utils; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import java.util.Hashtable; diff --git a/openam-core/src/test/java/com/sun/identity/authentication/audit/AuthenticationModuleEventAuditorTest.java b/openam-core/src/test/java/com/sun/identity/authentication/audit/AuthenticationModuleEventAuditorTest.java index a5acb8bf17..15b71b92d7 100644 --- a/openam-core/src/test/java/com/sun/identity/authentication/audit/AuthenticationModuleEventAuditorTest.java +++ b/openam-core/src/test/java/com/sun/identity/authentication/audit/AuthenticationModuleEventAuditorTest.java @@ -12,10 +12,12 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.sun.identity.authentication.audit; import static org.mockito.Mockito.*; +import static org.mockito.ArgumentMatchers.nullable; import org.forgerock.openam.audit.AuditConstants.*; import com.sun.identity.authentication.service.LoginState; @@ -53,8 +55,8 @@ public class AuthenticationModuleEventAuditorTest { public void setupMocks() { MockitoAnnotations.initMocks(this); - when(eventPublisher.isAuditing(anyString(), anyString(), any(EventName.class))).thenReturn(true); - when(eventFactory.authenticationEvent(anyString())).thenCallRealMethod(); + when(eventPublisher.isAuditing(nullable(String.class), anyString(), any(EventName.class))).thenReturn(true); + when(eventFactory.authenticationEvent(nullable(String.class))).thenCallRealMethod(); auditor = new AuthenticationModuleEventAuditor(eventPublisher, eventFactory); } diff --git a/openam-core/src/test/java/com/sun/identity/authentication/audit/AuthenticationProcessEventAuditorTest.java b/openam-core/src/test/java/com/sun/identity/authentication/audit/AuthenticationProcessEventAuditorTest.java index 131a6d8f59..d885aa21e7 100644 --- a/openam-core/src/test/java/com/sun/identity/authentication/audit/AuthenticationProcessEventAuditorTest.java +++ b/openam-core/src/test/java/com/sun/identity/authentication/audit/AuthenticationProcessEventAuditorTest.java @@ -12,11 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.sun.identity.authentication.audit; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.*; import static org.forgerock.openam.audit.AuditConstants.EventName; @@ -51,8 +53,8 @@ public class AuthenticationProcessEventAuditorTest { public void setupMocks() { MockitoAnnotations.initMocks(this); - when(eventPublisher.isAuditing(anyString(), anyString(), any(EventName.class))).thenReturn(true); - when(eventFactory.authenticationEvent(anyString())).thenCallRealMethod(); + when(eventPublisher.isAuditing(nullable(String.class), anyString(), any(EventName.class))).thenReturn(true); + when(eventFactory.authenticationEvent(nullable(String.class))).thenCallRealMethod(); auditor = new AuthenticationProcessEventAuditor(eventPublisher, eventFactory); } diff --git a/openam-core/src/test/java/com/sun/identity/authentication/jaas/LoginContextTest.java b/openam-core/src/test/java/com/sun/identity/authentication/jaas/LoginContextTest.java index 9d036b51e5..d2936220bc 100644 --- a/openam-core/src/test/java/com/sun/identity/authentication/jaas/LoginContextTest.java +++ b/openam-core/src/test/java/com/sun/identity/authentication/jaas/LoginContextTest.java @@ -12,8 +12,9 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013 ForgeRock Inc. - * + * Portions copyright 2026 3A Systems, LLC. * * Copyright 2019 Open Identity Platform Community. + * Portions copyright 2026 3A Systems, LLC. */ package com.sun.identity.authentication.jaas; @@ -32,9 +33,9 @@ import java.util.HashMap; import java.util.Map; -import static org.mockito.Matchers.anyMap; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/openam-core/src/test/java/com/sun/identity/authentication/service/DefaultSessionActivatorTest.java b/openam-core/src/test/java/com/sun/identity/authentication/service/DefaultSessionActivatorTest.java index 77d4ed3f65..6e850a1a18 100644 --- a/openam-core/src/test/java/com/sun/identity/authentication/service/DefaultSessionActivatorTest.java +++ b/openam-core/src/test/java/com/sun/identity/authentication/service/DefaultSessionActivatorTest.java @@ -12,14 +12,15 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.sun.identity.authentication.service; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import java.util.Arrays; diff --git a/openam-core/src/test/java/org/forgerock/openam/agent/TokenRestrictionResolverTest.java b/openam-core/src/test/java/org/forgerock/openam/agent/TokenRestrictionResolverTest.java index fbe342e2d4..0931dabb75 100644 --- a/openam-core/src/test/java/org/forgerock/openam/agent/TokenRestrictionResolverTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/agent/TokenRestrictionResolverTest.java @@ -12,12 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.agent; import static org.assertj.core.api.Assertions.assertThat; -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.when; diff --git a/openam-core/src/test/java/org/forgerock/openam/blacklist/BloomFilterBlacklistTest.java b/openam-core/src/test/java/org/forgerock/openam/blacklist/BloomFilterBlacklistTest.java index db3bc264e3..0449b5b0d4 100644 --- a/openam-core/src/test/java/org/forgerock/openam/blacklist/BloomFilterBlacklistTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/blacklist/BloomFilterBlacklistTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.blacklist; @@ -19,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.willDoNothing; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import com.iplanet.dpro.session.Session; diff --git a/openam-core/src/test/java/org/forgerock/openam/blacklist/CTSBlacklistTest.java b/openam-core/src/test/java/org/forgerock/openam/blacklist/CTSBlacklistTest.java index b185b92861..419d13a522 100644 --- a/openam-core/src/test/java/org/forgerock/openam/blacklist/CTSBlacklistTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/blacklist/CTSBlacklistTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.blacklist; @@ -20,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.willThrow; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import java.util.concurrent.ScheduledExecutorService; diff --git a/openam-core/src/test/java/org/forgerock/openam/core/realms/CachingRealmLookupTest.java b/openam-core/src/test/java/org/forgerock/openam/core/realms/CachingRealmLookupTest.java index fe5a7a3314..26c11cbf57 100644 --- a/openam-core/src/test/java/org/forgerock/openam/core/realms/CachingRealmLookupTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/core/realms/CachingRealmLookupTest.java @@ -12,13 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.core.realms; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import static org.testng.Assert.fail; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/CTSPersistentStoreImplTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/CTSPersistentStoreImplTest.java index 674c441a99..da8e2e8f86 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/CTSPersistentStoreImplTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/CTSPersistentStoreImplTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts; @@ -25,9 +26,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -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.verify; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/adapters/SAMLAdapterTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/adapters/SAMLAdapterTest.java index cf10303b57..2fbbc8d13f 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/adapters/SAMLAdapterTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/adapters/SAMLAdapterTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.adapters; @@ -19,7 +20,7 @@ import static org.forgerock.openam.utils.Time.*; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import org.forgerock.openam.cts.TokenTestUtils; import org.forgerock.openam.tokens.TokenType; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/CoreTokenAdapterTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/CoreTokenAdapterTest.java index fa3ccf58fa..62c2eab1fd 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/CoreTokenAdapterTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/CoreTokenAdapterTest.java @@ -12,11 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.impl; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.*; +import static org.mockito.ArgumentMatchers.nullable; import java.util.ArrayList; import java.util.Collection; @@ -72,7 +74,7 @@ public void shouldCreateToken() throws LdapException, CoreTokenException { adapter.create(token, options); // Then - verify(mockTaskDispatcher).create(eq(token), any(Options.class), any(ResultHandler.class)); + verify(mockTaskDispatcher).create(eq(token), any(Options.class), nullable(ResultHandler.class)); } @SuppressWarnings("unchecked") @@ -144,7 +146,7 @@ public void shouldUseTaskQueueForUpdate() throws CoreTokenException { adapter.updateOrCreate(token, options); // Then - verify(mockTaskDispatcher).update(eq(token), any(Options.class), any(ResultHandler.class)); + verify(mockTaskDispatcher).update(eq(token), any(Options.class), nullable(ResultHandler.class)); } @Test @@ -156,7 +158,7 @@ public void shouldPerformDelete() throws CoreTokenException { adapter.delete(tokenId, options); // Then - verify(mockTaskDispatcher).delete(eq(tokenId), any(Options.class), any(ResultHandler.class)); + verify(mockTaskDispatcher).delete(eq(tokenId), any(Options.class), nullable(ResultHandler.class)); } @Test @@ -169,7 +171,7 @@ public void shouldAddTokenIDAsReturnFieldForDeleteOnQuery() throws CoreTokenExce // Then ArgumentCaptor captor = ArgumentCaptor.forClass(TokenFilter.class); - verify(mockTaskDispatcher).partialQuery(captor.capture(), any(ResultHandler.class)); + verify(mockTaskDispatcher).partialQuery(captor.capture(), nullable(ResultHandler.class)); TokenFilter capturedFilter = captor.getValue(); assertThat(capturedFilter).isSameAs(filter); assertThat(capturedFilter.getReturnFields()).containsOnly(CoreTokenField.TOKEN_ID); diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/LDAPConfigTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/LDAPConfigTest.java index 023fdd3334..a47c351c05 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/LDAPConfigTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/LDAPConfigTest.java @@ -1,6 +1,6 @@ /** * Copyright 2013-2015 ForgeRock AS. - * + * Portions copyright 2026 3A Systems, LLC. * * The contents of this file are subject to the terms of the Common Development and * Distribution License (the License). You may not use this file except in compliance with the * License. @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java index 551302377f..baa9831c4e 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems, LLC. + * Portions Copyrighted 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.cts.impl; @@ -553,9 +553,7 @@ public void shouldQuery() throws Exception { given(mockBuilder.execute(any(Connection.class))) .willReturn(Arrays.asList((Collection) Arrays.asList(new Token("weasel", TokenType.OAUTH))).iterator()); given(mockQueryFactory.createInstance()).willReturn(mockBuilder); - QueryFilterVisitor visitor = mock(QueryFilterVisitor.class); - given(mockQueryFactory.createFilterConverter()).willReturn(visitor); - given(visitor.visitBooleanLiteralFilter(null, true)).willReturn(Filter.alwaysTrue()); + given(mockQueryVisitor.visitBooleanLiteralFilter(null, true)).willReturn(Filter.alwaysTrue()); // When TokenFilter filter = new TokenFilterBuilder().withQuery(QueryFilter.alwaysTrue()).build(); @@ -581,9 +579,7 @@ public void shouldPartialQuery() throws Exception { given(mockBuilder.executeAttributeQuery(any(Connection.class))) .willReturn(Arrays.asList((Collection) Arrays.asList(partialToken)).iterator()); given(mockQueryFactory.createInstance()).willReturn(mockBuilder); - QueryFilterVisitor visitor = mock(QueryFilterVisitor.class); - given(mockQueryFactory.createFilterConverter()).willReturn(visitor); - given(visitor.visitBooleanLiteralFilter(null, true)).willReturn(Filter.alwaysTrue()); + given(mockQueryVisitor.visitBooleanLiteralFilter(null, true)).willReturn(Filter.alwaysTrue()); // When TokenFilter filter = new TokenFilterBuilder() diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerPastExpiryDateQueryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerPastExpiryDateQueryTest.java index ad1fdd62ac..86ac22813b 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerPastExpiryDateQueryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerPastExpiryDateQueryTest.java @@ -12,12 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.impl.query.worker.queries; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import java.util.Calendar; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/MaxSessionTimeExpiredQueryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/MaxSessionTimeExpiredQueryTest.java index 4b9645253f..76aae7c054 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/MaxSessionTimeExpiredQueryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/MaxSessionTimeExpiredQueryTest.java @@ -12,12 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.impl.query.worker.queries; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.verify; import java.util.Calendar; @@ -46,7 +48,7 @@ public class MaxSessionTimeExpiredQueryTest { public void setup() { mockConnectionFactory = mock(ConnectionFactory.class); mockBuilder = mock(QueryBuilder.class); - given(mockBuilder.withFilter(any(Filter.class))).willReturn(mockBuilder); + given(mockBuilder.withFilter(nullable(Filter.class))).willReturn(mockBuilder); given(mockBuilder.pageResultsBy(anyInt())).willReturn(mockBuilder); given(mockBuilder.returnTheseAttributes( eq(CoreTokenField.TOKEN_ID), diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/SessionIdleTimeExpiredQueryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/SessionIdleTimeExpiredQueryTest.java index 3298ebc7c3..35e4bcc25b 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/SessionIdleTimeExpiredQueryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/SessionIdleTimeExpiredQueryTest.java @@ -12,12 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.impl.query.worker.queries; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.verify; import java.util.Calendar; @@ -46,7 +48,7 @@ public class SessionIdleTimeExpiredQueryTest { public void setup() { mockConnectionFactory = mock(ConnectionFactory.class); mockBuilder = mock(QueryBuilder.class); - given(mockBuilder.withFilter(any(Filter.class))).willReturn(mockBuilder); + given(mockBuilder.withFilter(nullable(Filter.class))).willReturn(mockBuilder); given(mockBuilder.pageResultsBy(anyInt())).willReturn(mockBuilder); given(mockBuilder.returnTheseAttributes( eq(CoreTokenField.TOKEN_ID), diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/DeleteOnQueryResultHandlerTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/DeleteOnQueryResultHandlerTest.java index 2329407fa2..bde3c2c724 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/DeleteOnQueryResultHandlerTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/DeleteOnQueryResultHandlerTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.impl.queue; @@ -41,6 +42,7 @@ public void setup() { mockTaskDispatcher = mock(TaskDispatcher.class); mockResultHandlerFactory = mock(ResultHandlerFactory.class); mockDebug = mock(Debug.class); + given(mockResultHandlerFactory.getDeleteHandler()).willReturn(mock(ResultHandler.class)); handler = new DeleteOnQueryResultHandler(mockTaskDispatcher, mockResultHandlerFactory, mockDebug); } diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/config/CTSQueueConfigurationTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/config/CTSQueueConfigurationTest.java index 3b65cf87eb..e919719d1c 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/config/CTSQueueConfigurationTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/config/CTSQueueConfigurationTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.impl.queue.config; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.anyObject; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import java.util.Map; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/CTSMonitoringStoreImplTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/CTSMonitoringStoreImplTest.java index 6555f04f31..9e91c00045 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/CTSMonitoringStoreImplTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/CTSMonitoringStoreImplTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.monitoring; @@ -24,7 +25,7 @@ import org.forgerock.openam.cts.monitoring.impl.connections.ConnectionStore; import org.forgerock.openam.cts.monitoring.impl.operations.TokenOperationsStore; import org.forgerock.openam.cts.monitoring.impl.reaper.ReaperMonitor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.testng.annotations.BeforeMethod; @@ -34,7 +35,7 @@ import java.util.concurrent.ExecutorService; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import static org.testng.Assert.assertEquals; @@ -85,7 +86,7 @@ public void shouldNotAddTokenOperationForSpecificTokenTypeIfTokenIsNull() throws ctsOperationsMonitoringStore.addTokenOperation(token, operation, successful); //Then - verify(tokenOperationsStore, never()).addTokenOperation(Matchers.anyObject(), eq(operation), eq(successful)); + verify(tokenOperationsStore, never()).addTokenOperation(ArgumentMatchers.anyObject(), eq(operation), eq(successful)); } @Test diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/connections/MonitoredCTSConnectionFactoryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/connections/MonitoredCTSConnectionFactoryTest.java index ef5265960c..e3c7d1d5df 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/connections/MonitoredCTSConnectionFactoryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/connections/MonitoredCTSConnectionFactoryTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. +* Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.monitoring.impl.connections; @@ -49,7 +50,7 @@ public void setUp() { @Test public void shouldAddToFailedConnectionOnError() throws Exception { //given - doThrow(Exception.class).when(connectionFactory).create(); + doThrow(DataLayerException.class).when(connectionFactory).create(); //when try { diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsMonitorTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsMonitorTest.java index b623245836..2f1ae49553 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsMonitorTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsMonitorTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.monitoring.impl.persistence; @@ -24,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.testng.AssertJUnit.assertEquals; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/DefaultMonitoringResultHandlerTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/DefaultMonitoringResultHandlerTest.java index 83a1b3b720..90d93b0756 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/DefaultMonitoringResultHandlerTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/DefaultMonitoringResultHandlerTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.monitoring.impl.queue; @@ -25,7 +26,7 @@ import static org.mockito.BDDMockito.mock; import static org.mockito.BDDMockito.verify; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; public class DefaultMonitoringResultHandlerTest { diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/TokenMonitoringResultHandlerTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/TokenMonitoringResultHandlerTest.java index 976d577545..5e7cd6a7ce 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/TokenMonitoringResultHandlerTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/queue/TokenMonitoringResultHandlerTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.monitoring.impl.queue; @@ -23,7 +24,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobStrategyTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobStrategyTest.java index 6318c45ee4..29b0b5ec85 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobStrategyTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobStrategyTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2014 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.utils.blob; @@ -46,6 +47,10 @@ public void shouldPerformAllStrategy() throws TokenStrategyFailedException { given(factory.getStrategies(any(CoreTokenConfig.class))) .willReturn(Arrays.asList(first, second, third)); + given(first.perform(any(byte[].class))).willReturn(new byte[0]); + given(second.perform(any(byte[].class))).willReturn(new byte[0]); + given(third.perform(any(byte[].class))).willReturn(new byte[0]); + byte[] data = new byte[0]; TokenBlobStrategy strategy = new TokenBlobStrategy(factory, config); @@ -69,6 +74,10 @@ public void shouldReverseAllStrategy() throws TokenStrategyFailedException { given(factory.getStrategies(any(CoreTokenConfig.class))) .willReturn(Arrays.asList(first, second, third)); + given(first.reverse(any(byte[].class))).willReturn(new byte[0]); + given(second.reverse(any(byte[].class))).willReturn(new byte[0]); + given(third.reverse(any(byte[].class))).willReturn(new byte[0]); + byte[] data = new byte[0]; TokenBlobStrategy strategy = new TokenBlobStrategy(factory, config); diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobUtilsTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobUtilsTest.java index 84ab45b73e..45defc398c 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobUtilsTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobUtilsTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.utils.blob; @@ -27,7 +28,7 @@ import static org.mockito.BDDMockito.verify; import static org.mockito.BDDMockito.mock; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; public class TokenBlobUtilsTest { diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/worker/CTSWorkerManagerTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/worker/CTSWorkerManagerTest.java index dccbf327ba..5c8883a5e1 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/worker/CTSWorkerManagerTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/worker/CTSWorkerManagerTest.java @@ -12,13 +12,16 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.worker; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.times; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.*; import java.util.Arrays; @@ -50,7 +53,7 @@ public void setup() { mockExecutorServiceFactory = mock(AMExecutorServiceFactory.class); CTSWorkerTaskProvider mockTaskProvider = mock(CTSWorkerTaskProvider.class); given(mockTaskProvider.getTasks()).willReturn(Collections.singletonList(mock(CTSWorkerTask.class))); - given(mockExecutorServiceFactory.createScheduledService(anyInt(), anyString())) + given(mockExecutorServiceFactory.createScheduledService(anyInt(), nullable(String.class))) .willReturn(mock(ScheduledExecutorService.class)); given(mockCoreTokenConfig.getRunPeriod()).willReturn(RUN_PERIOD); diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerBaseProcessTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerBaseProcessTest.java index 933653d8ec..018fdec9b8 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerBaseProcessTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerBaseProcessTest.java @@ -12,12 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.worker.process; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.verify; -import static org.mockito.Matchers.anyCollection; +import static org.mockito.ArgumentMatchers.anyCollection; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerDeleteProcessTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerDeleteProcessTest.java index c3258bed16..7f20ee604f 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerDeleteProcessTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/CTSWorkerDeleteProcessTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.worker.process; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.verify; -import static org.mockito.Matchers.anyCollection; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyCollection; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import java.util.Arrays; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/SessionExpiryBatchHandlerTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/SessionExpiryBatchHandlerTest.java index eda9810cb8..f669ccdb7c 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/SessionExpiryBatchHandlerTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/SessionExpiryBatchHandlerTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.worker.process; @@ -19,6 +20,7 @@ import static org.forgerock.openam.cts.api.CTSOptions.OPTIMISTIC_CONCURRENCY_CHECK_OPTION; import static org.forgerock.openam.cts.api.CTSOptions.PRE_DELETE_READ_OPTION; import static org.mockito.BDDMockito.*; +import static org.mockito.ArgumentMatchers.nullable; import java.util.Arrays; import java.util.Collections; @@ -69,6 +71,8 @@ public class SessionExpiryBatchHandlerTest { @BeforeMethod public void setUp() throws Exception { MockitoAnnotations.initMocks(this); + given(mockResultHandlerFactory.create(any(SessionEventType.class), any(CountDownLatch.class))) + .willReturn(mock(StateChangeResultHandler.class)); } @Test @@ -177,7 +181,7 @@ public void resultHandlerSkipsTimeoutIfTokenUpdatedByAnotherProcess(SessionEvent // Then verifyNoMoreInteractions(mockSessionAdapter, mockLocalOperations); - verify(mockDebug).message(eq("Failed to delete token with expired timeout. {}"), any(String.class), eq(exception)); + verify(mockDebug).message(eq("Failed to delete token with expired timeout. {}"), nullable(String.class), eq(exception)); assertThat(countDownLatch.getCount()).as("processError decrements CountDownLatch").isEqualTo(0); } @@ -198,7 +202,7 @@ public void resultHandlerSkipsTimeoutIfTokenDeletionFails(SessionEventType event // Then verifyNoMoreInteractions(mockSessionAdapter, mockLocalOperations); - verify(mockDebug).error(eq("Failed to delete token with expired timeout. {}"), any(String.class), eq(exception)); + verify(mockDebug).error(eq("Failed to delete token with expired timeout. {}"), nullable(String.class), eq(exception)); assertThat(countDownLatch.getCount()).as("processError decrements CountDownLatch").isEqualTo(0); } diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/TokenDeletionTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/TokenDeletionTest.java index d364e18cc0..221c83976d 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/TokenDeletionTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/TokenDeletionTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.cts.worker.process; @@ -26,6 +27,7 @@ import org.forgerock.openam.cts.worker.process.CTSWorkerDeleteProcess.TokenDeletion; import org.forgerock.openam.sm.datalayer.api.ResultHandler; import org.forgerock.openam.sm.datalayer.api.query.PartialToken; +import org.forgerock.openam.tokens.CoreTokenField; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -53,7 +55,11 @@ public void shouldReturnCountDownLatchThatCorrespondsToTokensProvided() throws C assertThat(deletion.deleteBatch(tokens).getCount()).isEqualTo(tokens.size()); } + private int partialTokenCounter = 0; + private PartialToken partialToken() { - return mock(PartialToken.class); + PartialToken token = mock(PartialToken.class); + given(token.getValue(CoreTokenField.TOKEN_ID)).willReturn("token-id-" + partialTokenCounter++); + return token; } } diff --git a/openam-core/src/test/java/org/forgerock/openam/services/email/MailServerImplTest.java b/openam-core/src/test/java/org/forgerock/openam/services/email/MailServerImplTest.java index aa0e0da8b2..33c5f8ccf7 100644 --- a/openam-core/src/test/java/org/forgerock/openam/services/email/MailServerImplTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/services/email/MailServerImplTest.java @@ -20,7 +20,7 @@ * "Portions copyright [year] [name of copyright owner]" * * Copyright 2013-2015 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.services.email; @@ -42,9 +42,9 @@ import java.util.Map; import java.util.Set; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/org/forgerock/openam/session/service/access/persistence/InternalSessionStoreChainTest.java b/openam-core/src/test/java/org/forgerock/openam/session/service/access/persistence/InternalSessionStoreChainTest.java index f22d63ff48..95ad4e241b 100644 --- a/openam-core/src/test/java/org/forgerock/openam/session/service/access/persistence/InternalSessionStoreChainTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/session/service/access/persistence/InternalSessionStoreChainTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.session.service.access.persistence; import static org.mockito.BDDMockito.*; import static org.mockito.BDDMockito.inOrder; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import java.util.Arrays; diff --git a/openam-core/src/test/java/org/forgerock/openam/session/service/access/persistence/caching/InMemoryInternalSessionCacheStepTest.java b/openam-core/src/test/java/org/forgerock/openam/session/service/access/persistence/caching/InMemoryInternalSessionCacheStepTest.java index d62ff585e2..9c08764c67 100644 --- a/openam-core/src/test/java/org/forgerock/openam/session/service/access/persistence/caching/InMemoryInternalSessionCacheStepTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/session/service/access/persistence/caching/InMemoryInternalSessionCacheStepTest.java @@ -12,15 +12,17 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. - * + * Portions copyright 2026 3A Systems, LLC. * * Portions Copyrighted 2020 Open Identity Platform Community. + + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.session.service.access.persistence.caching; import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/org/forgerock/openam/session/stateless/StatelessConfigTest.java b/openam-core/src/test/java/org/forgerock/openam/session/stateless/StatelessConfigTest.java index 7ac400dd8d..5ad606fb50 100644 --- a/openam-core/src/test/java/org/forgerock/openam/session/stateless/StatelessConfigTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/session/stateless/StatelessConfigTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.session.stateless; @@ -22,8 +23,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; public class StatelessConfigTest { diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/SMSConfigurationFactoryTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/SMSConfigurationFactoryTest.java index bdc01661c8..f981a569db 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/SMSConfigurationFactoryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/SMSConfigurationFactoryTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.sm; @@ -25,8 +26,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; public class SMSConfigurationFactoryTest { diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/ServerConfigurationFactoryTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/ServerConfigurationFactoryTest.java index 9f8adb1a62..0412fffb79 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/ServerConfigurationFactoryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/ServerConfigurationFactoryTest.java @@ -1,6 +1,6 @@ /** * Copyright 2013 ForgeRock, Inc. - * + * Portions copyright 2026 3A Systems, LLC. * * The contents of this file are subject to the terms of the Common Development and * Distribution License (the License). You may not use this file except in compliance with the * License. @@ -26,8 +26,8 @@ import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; /** diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/config/ConsoleConfigHandlerImplTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/config/ConsoleConfigHandlerImplTest.java index d5a7494523..8c5f587832 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/config/ConsoleConfigHandlerImplTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/config/ConsoleConfigHandlerImplTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.sm.config; @@ -21,7 +22,7 @@ import org.forgerock.openam.core.DNWrapper; import static org.forgerock.openam.utils.CollectionUtils.asSet; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfigTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfigTest.java index a58a5ac146..f0bfef7fa1 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfigTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfigTest.java @@ -12,15 +12,16 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.sm.datalayer.impl.ldap; import static org.assertj.core.api.Assertions.*; import static org.forgerock.openam.utils.CollectionUtils.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +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.times; @@ -62,13 +63,13 @@ public void shouldUseSystemPropertiesWrapperForNotifyChanges() throws Exception // When config.update(dataLayerConfiguration); // Then - PowerMockito.verifyStatic(times(3)); + PowerMockito.verifyStatic(SystemProperties.class, times(3)); SystemProperties.get(anyString()); - PowerMockito.verifyStatic(times(2)); + PowerMockito.verifyStatic(SystemProperties.class, times(2)); SystemProperties.getAsBoolean(anyString(), anyBoolean()); - PowerMockito.verifyStatic(); + PowerMockito.verifyStatic(SystemProperties.class); SystemProperties.getAsInt(anyString(), eq(-1)); } diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/CreateTaskTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/CreateTaskTest.java index 2786fa68ab..a797bc6ce7 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/CreateTaskTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/CreateTaskTest.java @@ -12,12 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.sm.datalayer.impl.tasks; import static org.mockito.BDDMockito.given; -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.*; import org.forgerock.openam.cts.api.tokens.Token; diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/ReadTaskTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/ReadTaskTest.java index 5f9a441783..70c8bf0719 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/ReadTaskTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/ReadTaskTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.sm.datalayer.impl.tasks; import static org.mockito.BDDMockito.*; -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.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -75,7 +76,7 @@ public void shouldUpdateHandlerOnError() throws Exception { try { task.execute(mockAdapter); } catch (DataLayerException e) {} - verify(mockResultHandler).processError(any(CoreTokenException.class)); + verify(mockResultHandler).processError(any(DataLayerException.class)); } private void adapterWillFailOnRead() throws Exception { diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/UpdateTaskTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/UpdateTaskTest.java index 8823eea1a9..495472e6ba 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/UpdateTaskTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/UpdateTaskTest.java @@ -12,21 +12,25 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.sm.datalayer.impl.tasks; import static org.forgerock.openam.cts.api.CTSOptions.OPTIMISTIC_CONCURRENCY_CHECK_OPTION; import static org.mockito.BDDMockito.*; -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.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import java.lang.reflect.Field; + import org.forgerock.openam.cts.api.tokens.Token; import org.forgerock.openam.cts.exceptions.CoreTokenException; import org.forgerock.openam.cts.impl.LdapAdapter; +import org.forgerock.openam.sm.datalayer.api.AbstractTask; import org.forgerock.openam.sm.datalayer.api.DataLayerException; import org.forgerock.openam.sm.datalayer.api.ResultHandler; import org.forgerock.util.Options; @@ -45,6 +49,11 @@ public class UpdateTaskTest { @BeforeMethod public void setup() throws Exception { + // Clear the static token cache to prevent cross-test pollution + Field cacheField = AbstractTask.class.getDeclaredField("sid2token"); + cacheField.setAccessible(true); + ((com.google.common.cache.Cache) cacheField.get(null)).invalidateAll(); + mockUpdated = mock(Token.class); mockPrevious = mock(Token.class); mockReturned = mock(Token.class); @@ -53,6 +62,7 @@ public void setup() throws Exception { mockHandler = mock(ResultHandler.class); task = new UpdateTask(mockUpdated, options, mockHandler); + given(mockUpdated.getTokenId()).willReturn("test-token-id"); given(mockAdapter.read(anyString(), eq(options))).willReturn(mockPrevious); given(mockAdapter.update(mockPrevious, mockUpdated, options)).willReturn(mockReturned); } diff --git a/openam-core/src/test/java/org/forgerock/openam/sso/providers/stateless/JwtSessionMapperBuilderTest.java b/openam-core/src/test/java/org/forgerock/openam/sso/providers/stateless/JwtSessionMapperBuilderTest.java index 4669cc56d5..4742444f55 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sso/providers/stateless/JwtSessionMapperBuilderTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sso/providers/stateless/JwtSessionMapperBuilderTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.sso.providers.stateless; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.nio.charset.StandardCharsets; diff --git a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/ResourceAttributeUtilTest.java b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/ResourceAttributeUtilTest.java index d4c3230685..c303a15add 100644 --- a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/ResourceAttributeUtilTest.java +++ b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/ResourceAttributeUtilTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.sun.identity.entitlement.xacml3; @@ -31,8 +32,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.testng.AssertJUnit.fail; public class ResourceAttributeUtilTest { diff --git a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLExportImportTest.java b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLExportImportTest.java index a0f3c81ace..32e92f4254 100644 --- a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLExportImportTest.java +++ b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLExportImportTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.sun.identity.entitlement.xacml3; @@ -22,10 +23,10 @@ import static org.forgerock.openam.utils.Time.getCalendarInstance; import static org.mockito.BDDMockito.*; import static org.mockito.BDDMockito.mock; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/SessionConditionTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/SessionConditionTest.java index b444f33cd9..558304bad8 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/SessionConditionTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/SessionConditionTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.entitlement.conditions.environment; @@ -24,7 +25,7 @@ import com.sun.identity.shared.debug.Debug; import org.forgerock.openam.core.CoreWrapper; import org.forgerock.util.time.TimeService; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -106,7 +107,7 @@ public void conditionShouldEvaluateToTrueWhenSubjectHasNoSSOToken() throws Entit assertThat(decision.isSatisfied()).isTrue(); assertThat(decision.getAdvice()).isEmpty(); assertThat(decision.getTimeToLive()).isEqualTo(Long.MAX_VALUE); - verify(coreWrapper, never()).destroyToken(Matchers.anyObject()); + verify(coreWrapper, never()).destroyToken(ArgumentMatchers.anyObject()); } @Test diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/configuration/ResourceTypeConfigurationTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/configuration/ResourceTypeConfigurationTest.java index e0a4e15884..41137fea8d 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/configuration/ResourceTypeConfigurationTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/configuration/ResourceTypeConfigurationTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.entitlement.configuration; @@ -28,8 +29,8 @@ import java.util.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ApplicationV1FilterTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ApplicationV1FilterTest.java index cdf914dd72..fa04e46732 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ApplicationV1FilterTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ApplicationV1FilterTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. +* Portions copyright 2026 3A Systems, LLC. * Portions Copyrighted 2015 Nomura Research Institute, Ltd. */ package org.forgerock.openam.entitlement.rest; @@ -22,7 +23,7 @@ import static org.mockito.BDDMockito.any; import static org.mockito.BDDMockito.anyCollectionOf; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ApplicationsResourceTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ApplicationsResourceTest.java index 18718567f4..aaf65a0799 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ApplicationsResourceTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ApplicationsResourceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.entitlement.rest; @@ -23,8 +24,8 @@ import static org.mockito.BDDMockito.*; import static org.mockito.BDDMockito.never; import static org.mockito.BDDMockito.times; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ConditionTypesResourceTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ConditionTypesResourceTest.java index 142a261f82..decea154d4 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ConditionTypesResourceTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ConditionTypesResourceTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. +* Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.entitlement.rest; import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/DecisionCombinersResourceTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/DecisionCombinersResourceTest.java index fcbb04388f..9774629fca 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/DecisionCombinersResourceTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/DecisionCombinersResourceTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. +* Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.entitlement.rest; import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PolicyResourceTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PolicyResourceTest.java index dc69d2ef5d..d762d04fb4 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PolicyResourceTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PolicyResourceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.entitlement.rest; @@ -20,7 +21,7 @@ import static org.forgerock.openam.entitlement.rest.EntitlementTestUtils.assertQueryPromiseFailedWithCodes; import static org.mockito.BDDMockito.*; import static org.mockito.BDDMockito.when; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PolicyV1FilterTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PolicyV1FilterTest.java index 57676ff239..afa9e517f9 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PolicyV1FilterTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PolicyV1FilterTest.java @@ -12,7 +12,9 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. - * Portions Copyrighted 2015 Nomura Research Institute, Ltd. + * Portions copyright 2026 3A Systems, LLC. * Portions Copyrighted 2015 Nomura Research Institute, Ltd. + + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.entitlement.rest; @@ -23,7 +25,7 @@ import static org.forgerock.json.resource.test.assertj.AssertJQueryResponseAssert.assertThat; import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import com.sun.identity.entitlement.Application; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PrivilegePolicyStoreTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PrivilegePolicyStoreTest.java index 050b303d16..c2001555fd 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PrivilegePolicyStoreTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PrivilegePolicyStoreTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.entitlement.rest; @@ -44,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.utils.CollectionUtils.asSet; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anySetOf; +import static org.mockito.ArgumentMatchers.anySetOf; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/SubjectAttributesResourceV1Test.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/SubjectAttributesResourceV1Test.java index b3827230bd..3c7ce69142 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/SubjectAttributesResourceV1Test.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/SubjectAttributesResourceV1Test.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.entitlement.rest; import static org.forgerock.json.resource.test.assertj.AssertJQueryResponseAssert.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; import javax.security.auth.Subject; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/SubjectTypesResourceTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/SubjectTypesResourceTest.java index 5ab817bade..eccb781512 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/SubjectTypesResourceTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/SubjectTypesResourceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. +* Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.entitlement.rest; @@ -20,7 +21,7 @@ import static org.forgerock.json.resource.test.assertj.AssertJQueryResponseAssert.assertThat; import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import javax.security.auth.Subject; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/xacml/v3/ImportStepGeneratorTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/xacml/v3/ImportStepGeneratorTest.java index 9016df446d..75a266fad1 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/xacml/v3/ImportStepGeneratorTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/xacml/v3/ImportStepGeneratorTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.xacml.v3; @@ -20,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.xacml.v3.XACMLApplicationUtils.ApplicationTypeService; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.mock; import java.util.ArrayList; diff --git a/openam-federation/OpenFM/src/main/deployable-war/fam-noconsole.list b/openam-federation/OpenFM/src/main/deployable-war/fam-noconsole.list index cefe54622c..1e84698733 100644 --- a/openam-federation/OpenFM/src/main/deployable-war/fam-noconsole.list +++ b/openam-federation/OpenFM/src/main/deployable-war/fam-noconsole.list @@ -1275,7 +1275,7 @@ ./WEB-INF/lib/oauth-server-1.1.5-ea-SNAPSHOT.jar ./WEB-INF/lib/oauth-signature-1.1.5-ea-SNAPSHOT.jar ./WEB-INF/lib/oauthservice.jar -./WEB-INF/lib/ognl-2.6.9.jar +./WEB-INF/lib/ognl-3.0.21.jar ./WEB-INF/lib/opendj-ldap-sdk-3.0.0-M2.jar ./WEB-INF/lib/openfedlib.jar ./WEB-INF/lib/opensso-sharedlib.jar diff --git a/openam-federation/openam-federation-library/pom.xml b/openam-federation/openam-federation-library/pom.xml index a65c42c15f..83948b58d5 100644 --- a/openam-federation/openam-federation-library/pom.xml +++ b/openam-federation/openam-federation-library/pom.xml @@ -156,7 +156,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/IDPSSOFederateTest.java b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/IDPSSOFederateTest.java index ae04b4f5d1..7ac97f5c05 100644 --- a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/IDPSSOFederateTest.java +++ b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/IDPSSOFederateTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package com.sun.identity.saml2.profile; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.when; import org.forgerock.openam.saml2.IDPRequestValidator; @@ -67,7 +68,7 @@ public class IDPSSOFederateTest { @BeforeMethod public void initMocks() throws ServerFaultException, ClientFaultException { MockitoAnnotations.initMocks(this); - when(actorFactory.getIDPRequestValidator(Mockito.anyString(), anyBoolean())).thenReturn(validator); + when(actorFactory.getIDPRequestValidator(nullable(String.class), anyBoolean())).thenReturn(validator); when(actorFactory.getSAMLAuthenticator( any(IDPSSOFederateRequest.class), any(HttpServletRequest.class), diff --git a/openam-notifications-integration/src/test/java/org/forgerock/openam/notifications/brokers/CTSNotificationBrokerTest.java b/openam-notifications-integration/src/test/java/org/forgerock/openam/notifications/brokers/CTSNotificationBrokerTest.java index 9caa694490..6753a55e0a 100644 --- a/openam-notifications-integration/src/test/java/org/forgerock/openam/notifications/brokers/CTSNotificationBrokerTest.java +++ b/openam-notifications-integration/src/test/java/org/forgerock/openam/notifications/brokers/CTSNotificationBrokerTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.notifications.brokers; @@ -20,9 +21,9 @@ import static org.forgerock.json.JsonValue.*; import static org.forgerock.openam.utils.JsonValueBuilder.toJsonArray; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import java.io.ByteArrayInputStream; diff --git a/openam-notifications-websocket/src/test/java/org/forgerock/openam/notifications/websocket/NotificationsWebSocketTest.java b/openam-notifications-websocket/src/test/java/org/forgerock/openam/notifications/websocket/NotificationsWebSocketTest.java index dd1cf43b59..3ac892e992 100644 --- a/openam-notifications-websocket/src/test/java/org/forgerock/openam/notifications/websocket/NotificationsWebSocketTest.java +++ b/openam-notifications-websocket/src/test/java/org/forgerock/openam/notifications/websocket/NotificationsWebSocketTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.notifications.websocket; @@ -22,8 +22,8 @@ import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; import static org.forgerock.json.test.assertj.AssertJJsonValueAssert.assertThat; -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.*; import jakarta.websocket.PongMessage; diff --git a/openam-notifications/src/test/java/org/forgerock/openam/notifications/InMemoryNotificationBrokerTest.java b/openam-notifications/src/test/java/org/forgerock/openam/notifications/InMemoryNotificationBrokerTest.java index b683ca9d6e..80be62c2d0 100644 --- a/openam-notifications/src/test/java/org/forgerock/openam/notifications/InMemoryNotificationBrokerTest.java +++ b/openam-notifications/src/test/java/org/forgerock/openam/notifications/InMemoryNotificationBrokerTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.notifications; @@ -19,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.JsonValue.*; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.ExecutorService; diff --git a/openam-oauth2/pom.xml b/openam-oauth2/pom.xml index 2d57456987..30e25043fa 100644 --- a/openam-oauth2/pom.xml +++ b/openam-oauth2/pom.xml @@ -146,7 +146,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-oauth2/src/test/java/org/forgerock/oauth2/core/AccessTokenServiceTest.java b/openam-oauth2/src/test/java/org/forgerock/oauth2/core/AccessTokenServiceTest.java index 034017bc75..b5ffb7df50 100644 --- a/openam-oauth2/src/test/java/org/forgerock/oauth2/core/AccessTokenServiceTest.java +++ b/openam-oauth2/src/test/java/org/forgerock/oauth2/core/AccessTokenServiceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.oauth2.core; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import static org.mockito.ArgumentMatchers.nullable; import static org.testng.Assert.assertEquals; import java.util.Collections; @@ -39,7 +41,7 @@ import org.forgerock.oauth2.core.exceptions.InvalidRequestException; import org.forgerock.openam.oauth2.OAuth2UrisFactory; import org.forgerock.openam.oauth2.validation.ConfirmationKeyValidator; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -71,7 +73,7 @@ public void setUp() throws Exception { providerSettingsFactory, urisFactory, mock(ConfirmationKeyValidator.class)); providerSettings = mock(RealmOAuth2ProviderSettings.class); - given(providerSettingsFactory.get(Matchers.anyObject())).willReturn(providerSettings); + given(providerSettingsFactory.get(ArgumentMatchers.anyObject())).willReturn(providerSettings); uris = mock(OAuth2Uris.class); given(urisFactory.get(any(OAuth2Request.class))).willReturn(uris); @@ -219,9 +221,9 @@ public void shouldRefreshToken() throws Exception { given(refreshToken.getExpiryTime()).willReturn(currentTimeMillis() + 100); given(providerSettings.validateRefreshTokenScope(eq(clientRegistration), anySetOf(String.class), anySetOf(String.class), eq(request))).willReturn(validatedScope); - given(tokenStore.createAccessToken(anyString(), anyString(), anyString(), anyString(), anyString(), - anyString(), anySetOf(String.class), eq(refreshToken), anyString(), anyString(), eq(request), - anyLong())).willReturn(accessToken); + given(tokenStore.createAccessToken(nullable(String.class), nullable(String.class), nullable(String.class), + nullable(String.class), anyString(), nullable(String.class), anySetOf(String.class), eq(refreshToken), + nullable(String.class), nullable(String.class), eq(request), anyLong())).willReturn(accessToken); //When AccessToken actualAccessToken = accessTokenService.refreshToken(request); @@ -251,8 +253,9 @@ public void shouldRefreshTokenAndIncludeScopeInAccessToken() throws Exception { given(refreshToken.getExpiryTime()).willReturn(currentTimeMillis() + 100); given(providerSettings.validateRefreshTokenScope(eq(clientRegistration), anySetOf(String.class), anySetOf(String.class), eq(request))).willReturn(validatedScope); - given(tokenStore.createAccessToken(anyString(), anyString(), anyString(), anyString(), anyString(), - anyString(), anySetOf(String.class), eq(refreshToken), anyString(), anyString(), eq(request), + given(tokenStore.createAccessToken(nullable(String.class), nullable(String.class), nullable(String.class), + nullable(String.class), anyString(), nullable(String.class), anySetOf(String.class), eq(refreshToken), + nullable(String.class), nullable(String.class), eq(request), anyLong())) .willReturn(accessToken); @@ -291,12 +294,14 @@ public void shouldReturnNewRefreshTokenIdWhenRefreshing() throws Exception { anySetOf(String.class), eq(request))).willReturn(validatedScope); given(providerSettings.issueRefreshTokensOnRefreshingToken()).willReturn(true); - given(tokenStore.createRefreshToken(anyString(), anyString(), anyString(), anyString(), anySetOf(String.class), - eq(request), isNull(String.class), anyString(), anyLong())).willReturn(newRefreshToken); + given(tokenStore.createRefreshToken(nullable(String.class), anyString(), nullable(String.class), + nullable(String.class), anySetOf(String.class), + eq(request), isNull(String.class), nullable(String.class), anyLong())).willReturn(newRefreshToken); given(newRefreshToken.toString()).willReturn(newRefreshTokenId); - given(tokenStore.createAccessToken(anyString(), anyString(), anyString(), anyString(), anyString(), - anyString(), anySetOf(String.class), eq(newRefreshToken), anyString(), anyString(), eq(request), + given(tokenStore.createAccessToken(nullable(String.class), nullable(String.class), nullable(String.class), + nullable(String.class), anyString(), nullable(String.class), anySetOf(String.class), + eq(newRefreshToken), nullable(String.class), nullable(String.class), eq(request), anyLong())).willReturn(accessToken); //When diff --git a/openam-oauth2/src/test/java/org/forgerock/oauth2/core/AuthorizationCodeGrantTypeHandlerTest.java b/openam-oauth2/src/test/java/org/forgerock/oauth2/core/AuthorizationCodeGrantTypeHandlerTest.java index f2c07a15cd..9d3725561a 100644 --- a/openam-oauth2/src/test/java/org/forgerock/oauth2/core/AuthorizationCodeGrantTypeHandlerTest.java +++ b/openam-oauth2/src/test/java/org/forgerock/oauth2/core/AuthorizationCodeGrantTypeHandlerTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.oauth2.core; @@ -19,6 +20,7 @@ import static org.assertj.core.api.Assertions.fail; import static org.forgerock.openam.utils.Time.currentTimeMillis; import static org.mockito.BDDMockito.given; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.*; import static org.testng.Assert.assertEquals; @@ -31,7 +33,7 @@ import org.forgerock.oauth2.core.exceptions.InvalidGrantException; import org.forgerock.oauth2.core.exceptions.InvalidRequestException; import org.forgerock.openam.oauth2.OAuth2UrisFactory; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -66,7 +68,7 @@ public void setUp() throws Exception { tokenInvalidator, providerSettingsFactory, urisFactory, accessTokenGenerator); providerSettings = mock(RealmOAuth2ProviderSettings.class); - given(providerSettingsFactory.get(Matchers.anyObject())).willReturn(providerSettings); + given(providerSettingsFactory.get(ArgumentMatchers.anyObject())).willReturn(providerSettings); uris = mock(OAuth2Uris.class); given(urisFactory.get(any(OAuth2Request.class))).willReturn(uris); @@ -114,7 +116,7 @@ public void handleShouldThrowInvalidGrantExceptionWhenAuthorizationCodeHasAlread } catch (InvalidGrantException e) { //Then verify(requestValidator).validateRequest(request, clientRegistration); - verify(tokenInvalidator).invalidateTokens(eq(request), anyString(), anyString(), anyString()); + verify(tokenInvalidator).invalidateTokens(eq(request), nullable(String.class), nullable(String.class), nullable(String.class)); } } @@ -214,11 +216,11 @@ public void shouldHandleAndIssueRefreshToken() throws Exception { given(clientRegistration.getClientId()).willReturn("CLIENT_ID"); given(authorizationCode.getExpiryTime()).willReturn(currentTimeMillis() + 100); given(providerSettings.issueRefreshTokens()).willReturn(true); - given(tokenStore.createRefreshToken(anyString(), anyString(), anyString(), anyString(), anySetOf(String.class), - eq(request), isNull(String.class), anyLong())).willReturn(refreshToken); - given(tokenStore.createAccessToken(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), - anySetOf(String.class), Matchers.anyObject(), anyString(), anyString(), eq(request))) - .willReturn(accessToken); + given(tokenStore.createRefreshToken(nullable(String.class), anyString(), nullable(String.class), + anyString(), anySetOf(String.class), eq(request), isNull(String.class), anyLong())).willReturn(refreshToken); + given(tokenStore.createAccessToken(nullable(String.class), anyString(), anyString(), nullable(String.class), + anyString(), anyString(), anySetOf(String.class), ArgumentMatchers.anyObject(), + nullable(String.class), nullable(String.class), eq(request))).willReturn(accessToken); given(providerSettings.validateAccessTokenScope(eq(clientRegistration), anySetOf(String.class), eq(request))) .willReturn(validatedScope); @@ -230,7 +232,7 @@ public void shouldHandleAndIssueRefreshToken() throws Exception { verify(authorizationCode).setIssued(); verify(tokenStore).updateAuthorizationCode(request, authorizationCode); verify(accessToken).addExtraData(eq("refresh_token"), anyString()); - verify(accessToken).addExtraData(eq("nonce"), anyString()); + verify(accessToken).addExtraData(eq("nonce"), nullable(String.class)); verify(providerSettings).additionalDataToReturnFromTokenEndpoint(accessToken, request); verify(accessToken, never()).addExtraData(eq("scope"), anyString()); assertEquals(actualAccessToken, accessToken); @@ -257,8 +259,9 @@ public void shouldHandle() throws Exception { given(clientRegistration.getClientId()).willReturn("CLIENT_ID"); given(authorizationCode.getExpiryTime()).willReturn(currentTimeMillis() + 100); given(providerSettings.issueRefreshTokens()).willReturn(false); - given(tokenStore.createAccessToken(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), - anySetOf(String.class), Matchers.anyObject(), anyString(), anyString(), eq(request))) + given(tokenStore.createAccessToken(nullable(String.class), anyString(), anyString(), nullable(String.class), + anyString(), anyString(), anySetOf(String.class), ArgumentMatchers.anyObject(), + nullable(String.class), nullable(String.class), eq(request))) .willReturn(accessToken); given(providerSettings.validateAccessTokenScope(eq(clientRegistration), anySetOf(String.class), eq(request))) .willReturn(validatedScope); @@ -271,7 +274,7 @@ public void shouldHandle() throws Exception { verify(authorizationCode).setIssued(); verify(tokenStore).updateAuthorizationCode(request, authorizationCode); verify(accessToken, never()).addExtraData(eq("refresh_token"), anyString()); - verify(accessToken).addExtraData(eq("nonce"), anyString()); + verify(accessToken).addExtraData(eq("nonce"), nullable(String.class)); verify(providerSettings).additionalDataToReturnFromTokenEndpoint(accessToken, request); verify(accessToken, never()).addExtraData(eq("scope"), anyString()); assertEquals(actualAccessToken, accessToken); @@ -298,8 +301,9 @@ public void shouldHandleAndIncludeScopeInAccessToken() throws Exception { given(clientRegistration.getClientId()).willReturn("CLIENT_ID"); given(authorizationCode.getExpiryTime()).willReturn(currentTimeMillis() + 100); given(providerSettings.issueRefreshTokens()).willReturn(false); - given(tokenStore.createAccessToken(anyString(), anyString(), anyString(), anyString(), anyString(), anyString(), - anySetOf(String.class), Matchers.anyObject(), anyString(), anyString(), eq(request))) + given(tokenStore.createAccessToken(nullable(String.class), anyString(), anyString(), nullable(String.class), + anyString(), anyString(), anySetOf(String.class), ArgumentMatchers.anyObject(), + nullable(String.class), nullable(String.class), eq(request))) .willReturn(accessToken); given(authorizationCode.getScope()).willReturn(validatedScope); @@ -311,7 +315,7 @@ public void shouldHandleAndIncludeScopeInAccessToken() throws Exception { verify(authorizationCode).setIssued(); verify(tokenStore).updateAuthorizationCode(request, authorizationCode); verify(accessToken, never()).addExtraData(eq("refresh_token"), anyString()); - verify(accessToken).addExtraData(eq("nonce"), anyString()); + verify(accessToken).addExtraData(eq("nonce"), nullable(String.class)); verify(providerSettings).additionalDataToReturnFromTokenEndpoint(accessToken, request); verify(accessToken).addExtraData(eq("scope"), anyString()); assertEquals(actualAccessToken, accessToken); diff --git a/openam-oauth2/src/test/java/org/forgerock/oauth2/core/OAuth2RequestFactoryTest.java b/openam-oauth2/src/test/java/org/forgerock/oauth2/core/OAuth2RequestFactoryTest.java index 0311503ace..9a142fa490 100644 --- a/openam-oauth2/src/test/java/org/forgerock/oauth2/core/OAuth2RequestFactoryTest.java +++ b/openam-oauth2/src/test/java/org/forgerock/oauth2/core/OAuth2RequestFactoryTest.java @@ -12,13 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.oauth2.core; import static org.assertj.core.api.Assertions.assertThat; -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.*; import jakarta.servlet.http.HttpServletRequest; diff --git a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/OpenAMClientRegistrationStoreTest.java b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/OpenAMClientRegistrationStoreTest.java index e6067ddfdc..a12cb83174 100644 --- a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/OpenAMClientRegistrationStoreTest.java +++ b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/OpenAMClientRegistrationStoreTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.oauth2; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -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.MockitoAnnotations.initMocks; diff --git a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/OpenAMScopeValidatorTest.java b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/OpenAMScopeValidatorTest.java index 7841d22d3c..58793e9f57 100644 --- a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/OpenAMScopeValidatorTest.java +++ b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/OpenAMScopeValidatorTest.java @@ -12,12 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.oauth2; import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.utils.CollectionUtils.asSet; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.*; import java.util.Arrays; @@ -56,7 +58,7 @@ public void setup() throws Exception { ScriptEvaluator scriptEvaluator = mock(ScriptEvaluator.class); IdentityManager identityManager = mock(IdentityManager.class); identity = mock(AMIdentity.class); - when(identityManager.getResourceOwnerIdentity(anyString(), anyString())).thenReturn(identity); + when(identityManager.getResourceOwnerIdentity(nullable(String.class), nullable(String.class))).thenReturn(identity); validator = new OpenAMScopeValidator(identityManager, null, factory, null, scriptEvaluator, null, null, null); } @@ -148,7 +150,7 @@ public void shouldReturnScopesWithValues() throws Exception { String scopeValue2 = "1234567890"; AccessToken accessToken = mock(AccessToken.class); when(accessToken.getScope()).thenReturn(new HashSet<>(Arrays.asList(scopeKey1, scopeKey2))); - when(accessToken.getResourceOwnerId()).thenReturn(anyString()); + when(accessToken.getResourceOwnerId()).thenReturn("RESOURCE_OWNER_ID"); when(identity.getAttribute(scopeKey1)).thenReturn(Collections.singleton(scopeValue1)); when(identity.getAttribute(scopeKey2)).thenReturn(Collections.singleton(scopeValue2)); @@ -169,7 +171,7 @@ public void shouldReturnScopesWithoutValues() throws Exception { String scopeKey2 = "phone"; AccessToken accessToken = mock(AccessToken.class); when(accessToken.getScope()).thenReturn(new HashSet<>(Arrays.asList(scopeKey1, scopeKey2))); - when(accessToken.getResourceOwnerId()).thenReturn(anyString()); + when(accessToken.getResourceOwnerId()).thenReturn("RESOURCE_OWNER_ID"); when(identity.getAttribute(scopeKey1)).thenReturn(Collections.emptySet()); when(identity.getAttribute(scopeKey2)).thenReturn(null); diff --git a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/OpenAMResourceSetStoreTest.java b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/OpenAMResourceSetStoreTest.java index e482dc272f..12ac0984a9 100644 --- a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/OpenAMResourceSetStoreTest.java +++ b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/OpenAMResourceSetStoreTest.java @@ -12,12 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.oauth2.resources; import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.utils.CollectionUtils.asSet; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.*; @@ -37,7 +39,7 @@ import org.forgerock.openam.sm.datalayer.store.TokenDataStore; import org.forgerock.util.query.QueryFilter; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -58,8 +60,8 @@ public void setup() throws Exception { store = new OpenAMResourceSetStore("REALM", oAuth2UrisFactory, idGenerator, dataStore); - given(oAuth2UrisFactory.get(Matchers.anyObject())).willReturn(oAuth2Uris); - given(oAuth2Uris.getResourceSetRegistrationPolicyEndpoint(anyString())).willReturn("POLICY_URI"); + given(oAuth2UrisFactory.get(ArgumentMatchers.anyObject())).willReturn(oAuth2Uris); + given(oAuth2Uris.getResourceSetRegistrationPolicyEndpoint(nullable(String.class))).willReturn("POLICY_URI"); } @Test(enabled = false, expectedExceptions = BadRequestException.class) @@ -72,7 +74,7 @@ public void shouldNotCreateDuplicateResourceSetWithSameId() throws Exception { Collections.singletonMap("name", "RESOURCE_SET_NAME")); resourceSetDescription.setRealm("REALM"); - given(dataStore.query(Matchers.>anyObject())) + given(dataStore.query(ArgumentMatchers.>anyObject())) .willReturn(Collections.singleton(resourceSetDescription)); //When @@ -95,7 +97,7 @@ public void shouldCreateResourceSetToken() throws Exception { new ResourceSetDescription("RESOURCE_SET_ID", "CLIENT_ID", "RESOURCE_OWNER_ID", Collections.singletonMap("name", "RESOURCE_SET_NAME")); - given(dataStore.query(Matchers.>anyObject())) + given(dataStore.query(ArgumentMatchers.>anyObject())) .willReturn(Collections.emptySet()); //When @@ -211,7 +213,7 @@ public void shouldQueryResourceSetToken() throws Exception { new ResourceSetDescription("456", "CLIENT_ID", "RESOURCE_OWNER_ID", Collections.emptyMap()); - given(dataStore.query(Matchers.>anyObject())) + given(dataStore.query(ArgumentMatchers.>anyObject())) .willReturn(asSet(resourceSet1, resourceSet2)); resourceSet1.setRealm("REALM"); resourceSet2.setRealm("REALM"); diff --git a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/ResourceSetLabelRegistrationTest.java b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/ResourceSetLabelRegistrationTest.java index 449098801d..24abcd1254 100644 --- a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/ResourceSetLabelRegistrationTest.java +++ b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/ResourceSetLabelRegistrationTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.oauth2.resources; @@ -19,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.JsonValue.*; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import static org.mockito.Mockito.eq; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/ResourceSetRegistrationEndpointTest.java b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/ResourceSetRegistrationEndpointTest.java index 95248cc2df..2bcc2c2c9c 100644 --- a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/ResourceSetRegistrationEndpointTest.java +++ b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/ResourceSetRegistrationEndpointTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.oauth2.resources; @@ -20,8 +21,9 @@ import static org.assertj.core.api.Assertions.entry; import static org.forgerock.json.JsonValue.*; import static org.forgerock.openam.utils.CollectionUtils.asSet; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyMapOf; +import static org.mockito.ArgumentMatchers.anyMapOf; import static org.mockito.Mockito.*; import java.net.URI; @@ -60,7 +62,7 @@ import org.json.JSONObject; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.restlet.Request; @@ -113,7 +115,7 @@ public void setup() throws Exception { OAuth2ProviderSettingsFactory providerSettingsFactory = mock(OAuth2ProviderSettingsFactory.class); OAuth2ProviderSettings providerSettings = mock(RealmOAuth2ProviderSettings.class); - given(providerSettingsFactory.get(Matchers.anyObject())).willReturn(providerSettings); + given(providerSettingsFactory.get(ArgumentMatchers.anyObject())).willReturn(providerSettings); given(providerSettings.getResourceSetStore()).willReturn(store); ExceptionHandler exceptionHandler = mock(ExceptionHandler.class); @@ -138,7 +140,7 @@ public void setup() throws Exception { given(endpoint.getResponse()).willReturn(response); OAuth2Request oAuth2Request = mock(OAuth2Request.class); - given(requestFactory.create(Matchers.anyObject())).willReturn(oAuth2Request); + given(requestFactory.create(ArgumentMatchers.anyObject())).willReturn(oAuth2Request); given(oAuth2Request.getToken(AccessToken.class)).willReturn(accessToken); } @@ -219,7 +221,7 @@ public Void answer(InvocationOnMock invocation) throws Throwable { ArgumentCaptor.forClass(ResourceSetDescription.class); InOrder inOrder = inOrder(resourceRegistrationFilter, store, resourceRegistrationFilter); inOrder.verify(resourceRegistrationFilter).beforeResourceRegistration(any(ResourceSetDescription.class)); - inOrder.verify(store).create(Matchers.anyObject(), resourceSetCaptor.capture()); + inOrder.verify(store).create(ArgumentMatchers.anyObject(), resourceSetCaptor.capture()); inOrder.verify(resourceRegistrationFilter).afterResourceRegistration(any(ResourceSetDescription.class)); assertThat(resourceSetCaptor.getValue().getId()).isNotNull().isNotEmpty(); assertThat(resourceSetCaptor.getValue().getClientId()).isEqualTo("CLIENT_ID"); @@ -232,7 +234,7 @@ public Void answer(InvocationOnMock invocation) throws Throwable { Map responseBody = (Map) new ObjectMapper() .readValue(response.getText(), Map.class); assertThat(responseBody).containsKey("_id"); - verify(hook).resourceSetCreated(anyString(), Matchers.anyObject()); + verify(hook).resourceSetCreated(nullable(String.class), ArgumentMatchers.anyObject()); verify(labelRegistration).updateLabelsForNewResourceSet(any(ResourceSetDescription.class)); } @@ -331,6 +333,9 @@ public void shouldDeleteResourceSetDescription() throws Exception { //Given setUriResourceSetId(); addCondition(); + ResourceSetDescription resourceSetDescription = new ResourceSetDescription("RESOURCE_SET_ID", "CLIENT_ID", + "RESOURCE_OWNER_ID", Collections.emptyMap()); + given(store.read("RESOURCE_SET_ID", "RESOURCE_OWNER_ID")).willReturn(resourceSetDescription); //When Representation responseRep = endpoint.deleteResourceSet(); diff --git a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/rest/ClientResourceTest.java b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/rest/ClientResourceTest.java index e88b918aa9..03a1ee334d 100644 --- a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/rest/ClientResourceTest.java +++ b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/rest/ClientResourceTest.java @@ -12,12 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2012-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.oauth2.rest; import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.assertThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/openam-radius/openam-radius-server/src/test/java/org/forgerock/openam/radius/server/RadiusRequestHandlerTest.java b/openam-radius/openam-radius-server/src/test/java/org/forgerock/openam/radius/server/RadiusRequestHandlerTest.java index 7753d65f23..d00149a166 100644 --- a/openam-radius/openam-radius-server/src/test/java/org/forgerock/openam/radius/server/RadiusRequestHandlerTest.java +++ b/openam-radius/openam-radius-server/src/test/java/org/forgerock/openam/radius/server/RadiusRequestHandlerTest.java @@ -12,9 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyrighted 2015 Intellectual Reserve, Inc (IRI) + + * Portions copyright 2026 3A Systems, LLC. */ /* * Portions copyright 2015 ForgeRock AS + + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.radius.server; @@ -34,7 +38,7 @@ import java.net.UnknownHostException; import java.nio.ByteBuffer; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git a/openam-radius/openam-radius-server/src/test/java/org/forgerock/openam/radius/server/spi/handlers/OpenAMAuthHandlerTest.java b/openam-radius/openam-radius-server/src/test/java/org/forgerock/openam/radius/server/spi/handlers/OpenAMAuthHandlerTest.java index bbd792820d..0b019d319b 100644 --- a/openam-radius/openam-radius-server/src/test/java/org/forgerock/openam/radius/server/spi/handlers/OpenAMAuthHandlerTest.java +++ b/openam-radius/openam-radius-server/src/test/java/org/forgerock/openam/radius/server/spi/handlers/OpenAMAuthHandlerTest.java @@ -12,11 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyrighted 2015 Intellectual Reserve, Inc (IRI) + + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.radius.server.spi.handlers; import static org.assertj.core.api.Assertions.*; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.io.IOException; @@ -96,7 +98,7 @@ public void handle() throws RadiusProcessingException, AuthLoginException, IOExc final ContextHolderCache ctxHolderCache = mock(ContextHolderCache.class); when(ctxHolderCache.createCachedContextHolder()).thenReturn(holder); - when(ctxHolderCache.get(org.mockito.Matchers.isA(String.class))).thenReturn(holder); + when(ctxHolderCache.get(org.mockito.ArgumentMatchers.isA(String.class))).thenReturn(holder); EventBus eventBus = new EventBus(); @@ -130,7 +132,7 @@ public void handle() throws RadiusProcessingException, AuthLoginException, IOExc UserNameAttribute userName = mock(UserNameAttribute.class); when(userName.getName()).thenReturn("Fred"); UserPasswordAttribute userPassword = mock(UserPasswordAttribute.class); - when(userPassword.extractPassword(org.mockito.Matchers.isA(Authenticator.class), org.mockito.Matchers.isA(String.class))).thenReturn("password"); + when(userPassword.extractPassword(org.mockito.ArgumentMatchers.isA(Authenticator.class), org.mockito.ArgumentMatchers.isA(String.class))).thenReturn("password"); when(request.getAttribute(UserPasswordAttribute.class)).thenReturn(userPassword); when(request.getAttribute(UserNameAttribute.class)).thenReturn(userName); diff --git a/openam-rest/pom.xml b/openam-rest/pom.xml index 58a6685dde..84c1c10638 100755 --- a/openam-rest/pom.xml +++ b/openam-rest/pom.xml @@ -119,7 +119,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-rest/src/test/java/org/forgerock/openam/cors/CORSServiceTest.java b/openam-rest/src/test/java/org/forgerock/openam/cors/CORSServiceTest.java index e83300edd5..d0a943db36 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/cors/CORSServiceTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/cors/CORSServiceTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014 ForgeRock AS. -* Portions Copyrighted 2024-2025 3A Systems LLC. +* Portions Copyrighted 2024-2026 3A Systems, LLC. */ package org.forgerock.openam.cors; @@ -22,9 +22,9 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/RestLogTest.java b/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/RestLogTest.java index 614497bdc0..d90618ac79 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/RestLogTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/RestLogTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.forgerockrest.utils; @@ -26,7 +27,7 @@ import org.forgerock.json.resource.ResourceException; import org.forgerock.services.context.Context; import org.forgerock.openam.rest.resource.SSOTokenContext; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/openam-rest/src/test/java/org/forgerock/openam/rest/ElevatedConnectionFactoryWrapperTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/ElevatedConnectionFactoryWrapperTest.java index 2c674b4239..8083a69323 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/rest/ElevatedConnectionFactoryWrapperTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/rest/ElevatedConnectionFactoryWrapperTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.rest; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; diff --git a/openam-rest/src/test/java/org/forgerock/openam/rest/RealmContextFilterTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/RealmContextFilterTest.java index 261c587f16..e55433a352 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/rest/RealmContextFilterTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/rest/RealmContextFilterTest.java @@ -12,14 +12,16 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.rest; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -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.*; import static org.mockito.MockitoAnnotations.initMocks; @@ -43,6 +45,7 @@ import org.forgerock.json.resource.FilterChain; import org.forgerock.json.resource.PatchRequest; import org.forgerock.json.resource.QueryRequest; +import org.forgerock.json.resource.QueryResourceHandler; import org.forgerock.json.resource.QueryResponse; import org.forgerock.json.resource.ReadRequest; import org.forgerock.json.resource.RequestHandler; @@ -53,7 +56,6 @@ import org.forgerock.openam.core.CoreWrapper; import org.forgerock.openam.core.realms.Realm; import org.forgerock.openam.core.realms.RealmTestHelper; -import org.forgerock.openam.rest.query.QueryResponseHandler; import org.forgerock.openam.rest.router.RestRealmValidator; import org.forgerock.services.context.AttributesContext; import org.forgerock.services.context.Context; @@ -99,7 +101,7 @@ public void setup() throws Exception { initMocks(this); filter = new RealmContextFilter(coreWrapper, realmValidator); - given(coreWrapper.getOrganization(any(SSOToken.class), eq(ENDPOINT_PATH_ELEMENT))) + given(coreWrapper.getOrganization(nullable(SSOToken.class), eq(ENDPOINT_PATH_ELEMENT))) .willThrow(IdRepoException.class); realmTestHelper = new RealmTestHelper(coreWrapper); @@ -540,13 +542,13 @@ private void mockInvalidDnsAlias(String alias) throws Exception { } private void mockRealmAlias(String alias, String realm) throws Exception { - given(coreWrapper.getOrganization(any(SSOToken.class), eq(alias))).willReturn(realm); + given(coreWrapper.getOrganization(nullable(SSOToken.class), eq(alias))).willReturn(realm); given(coreWrapper.convertOrgNameToRealmName(realm)).willReturn(realm); given(realmValidator.isRealm(realm)).willReturn(true); } private void mockInvalidRealmAlias(String alias) throws Exception { - doThrow(IdRepoException.class).when(coreWrapper).getOrganization(any(SSOToken.class), eq(alias)); + doThrow(IdRepoException.class).when(coreWrapper).getOrganization(nullable(SSOToken.class), eq(alias)); } private void verifyRealmContext(Context context, Realm expectedRealm) { @@ -587,7 +589,7 @@ private void collectCRUDPAQArguments(RequestHandler requestHandler, ArgumentCapt verify(requestHandler, atLeast(0)).handleDelete(contextCaptor.capture(), (DeleteRequest) requestCaptor.capture()); verify(requestHandler, atLeast(0)).handlePatch(contextCaptor.capture(), (PatchRequest) requestCaptor.capture()); verify(requestHandler, atLeast(0)).handleAction(contextCaptor.capture(), (ActionRequest) requestCaptor.capture()); - verify(requestHandler, atLeast(0)).handleQuery(contextCaptor.capture(), (QueryRequest) requestCaptor.capture(), any(QueryResponseHandler.class)); + verify(requestHandler, atLeast(0)).handleQuery(contextCaptor.capture(), (QueryRequest) requestCaptor.capture(), any(QueryResourceHandler.class)); } private Handler getHttpHandler(RequestHandler requestHandler) { @@ -601,7 +603,7 @@ private Handler getHttpHandler(RequestHandler requestHandler) { given(requestHandler.handlePatch(any(Context.class), any(PatchRequest.class))).willReturn(result); given(requestHandler.handleAction(any(Context.class), any(ActionRequest.class))) .willReturn(Promises.newResultPromise(mock(ActionResponse.class))); - given(requestHandler.handleQuery(any(Context.class), any(QueryRequest.class), any(QueryResponseHandler.class))) + given(requestHandler.handleQuery(any(Context.class), any(QueryRequest.class), any(QueryResourceHandler.class))) .willReturn(Promises.newResultPromise(mock(QueryResponse.class))); FilterChain filterChain = new FilterChain(requestHandler, filter); return CrestHttp.newHttpHandler(filterChain); diff --git a/openam-rest/src/test/java/org/forgerock/openam/rest/RealmRoutingFactoryTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/RealmRoutingFactoryTest.java index 784991c451..ae95f61942 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/rest/RealmRoutingFactoryTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/rest/RealmRoutingFactoryTest.java @@ -12,14 +12,15 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.rest; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -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.*; import java.net.URI; diff --git a/openam-rest/src/test/java/org/forgerock/openam/rest/RestEndpointServletTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/RestEndpointServletTest.java index 9c1189380f..5cdfd1c149 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/rest/RestEndpointServletTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/rest/RestEndpointServletTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.rest; @@ -30,7 +30,7 @@ import org.forgerock.http.Filter; import org.forgerock.openam.rest.service.RestletServiceServlet; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; @@ -105,7 +105,7 @@ public void shouldHandleRequestWithRestletServlet(String path, HttpServlet servl restEndpointServlet.service(request, response); //Then - verify(servlet).service(Matchers.anyObject(), eq(response)); + verify(servlet).service(ArgumentMatchers.anyObject(), eq(response)); for (HttpServlet s : Arrays.asList(restletXACMLHttpServlet, restletOAuth2ServiceServlet, restletUMAServiceServlet)) { if (s != servlet) { diff --git a/openam-rest/src/test/java/org/forgerock/openam/rest/RestRouterIT.java b/openam-rest/src/test/java/org/forgerock/openam/rest/RestRouterIT.java index 05e88ceae1..ce0db69d85 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/rest/RestRouterIT.java +++ b/openam-rest/src/test/java/org/forgerock/openam/rest/RestRouterIT.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.rest; @@ -34,8 +34,8 @@ import static org.forgerock.openam.rest.Routers.ssoToken; import static org.forgerock.util.promise.Promises.newResultPromise; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; diff --git a/openam-rest/src/test/java/org/forgerock/openam/rest/audit/AbstractRestletAccessAuditFilterTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/audit/AbstractRestletAccessAuditFilterTest.java index e1cc54c791..3d0916e5a8 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/rest/audit/AbstractRestletAccessAuditFilterTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/rest/audit/AbstractRestletAccessAuditFilterTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.rest.audit; @@ -76,7 +77,7 @@ public void shouldCallHandleOnRestlet() { when(request.getEntity()).thenReturn(representation); when(request.getAttributes()).thenReturn(new ConcurrentHashMap()); when(representation.isTransient()).thenReturn(false); - when(eventPublisher.isAuditing(anyString(), anyString(), any(EventName.class))).thenReturn(false); + when(eventPublisher.isAuditing(nullable(String.class), anyString(), any(EventName.class))).thenReturn(false); // When auditFilter.handle(request, response); @@ -94,7 +95,7 @@ public void shouldCaptureRequestBodyProperties() throws Exception { request.setDate(newDate()); Response response = new Response(request); request.setEntity(new JsonRepresentation((Map) object(field("fred", "v"), field("gary", 7)))); - when(eventPublisher.isAuditing(anyString(), anyString(), any(EventName.class))).thenReturn(true); + when(eventPublisher.isAuditing(nullable(String.class), anyString(), any(EventName.class))).thenReturn(true); // When auditFilter.beforeHandle(request, response); @@ -117,7 +118,7 @@ public void shouldCaptureResponseBodyProperties() throws Exception { request.setDate(newDate()); Response response = new Response(request); response.setEntity(new JsonRepresentation((Map) object(field("fred", "v"), field("gary", 7)))); - when(eventPublisher.isAuditing(anyString(), anyString(), any(EventName.class))).thenReturn(true); + when(eventPublisher.isAuditing(nullable(String.class), anyString(), any(EventName.class))).thenReturn(true); // When auditFilter.afterHandle(request, response); diff --git a/openam-rest/src/test/java/org/forgerock/openam/rest/authz/PrivilegeAuthzModuleTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/authz/PrivilegeAuthzModuleTest.java index 0dbe72aea3..b3b39ae5af 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/rest/authz/PrivilegeAuthzModuleTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/rest/authz/PrivilegeAuthzModuleTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.rest.authz; @@ -24,8 +25,8 @@ import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.assertThat; import static org.mockito.BDDMockito.eq; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.mock; import com.iplanet.dpro.session.Session; diff --git a/openam-rest/src/test/java/org/forgerock/openam/rest/fluent/AbstractAuditFilterTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/fluent/AbstractAuditFilterTest.java index cbffd034ac..2d391fee5f 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/rest/fluent/AbstractAuditFilterTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/rest/fluent/AbstractAuditFilterTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.rest.fluent; @@ -104,7 +105,7 @@ public void shouldAuditAttemptAndSuccessEventsForSuccessfulAuditedRequests(Runna // Then verify(auditor).auditAccessAttempt(); - verify(auditor).auditAccessSuccess(any(JsonValue.class)); + verify(auditor).auditAccessSuccess(nullable(JsonValue.class)); } @Test(dataProvider = "auditedCrudpaqOperations") diff --git a/openam-rest/src/test/java/org/forgerock/openam/rest/fluent/CrestAuditorTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/fluent/CrestAuditorTest.java index 061d5fd87d..8bd64195e9 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/rest/fluent/CrestAuditorTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/rest/fluent/CrestAuditorTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.rest.fluent; @@ -68,7 +69,7 @@ public Object[][] getRequests() { @Test(dataProvider = "CRESTRequests") public void auditAccessShouldPublishEvents(Request request) throws Exception { - given(auditEventPublisher.isAuditing(anyString(), anyString(), any(EventName.class))).willReturn(true); + given(auditEventPublisher.isAuditing(nullable(String.class), anyString(), any(EventName.class))).willReturn(true); auditor = new CrestAuditor(debug, auditEventPublisher, auditEventFactory, context, request); givenAccessAuditingEnabled(auditEventPublisher); @@ -81,7 +82,7 @@ public void auditAccessShouldPublishEvents(Request request) throws Exception { @Test(dataProvider = "CRESTRequests") public void auditSuccessShouldPublishEvents(Request request) throws Exception { - given(auditEventPublisher.isAuditing(anyString(), anyString(), any(EventName.class))).willReturn(true); + given(auditEventPublisher.isAuditing(nullable(String.class), anyString(), any(EventName.class))).willReturn(true); auditor = new CrestAuditor(debug, auditEventPublisher, auditEventFactory, context, request); givenAccessAuditingEnabled(auditEventPublisher); @@ -96,7 +97,7 @@ public void auditSuccessShouldPublishEvents(Request request) throws Exception { @Test(dataProvider = "CRESTRequests") public void auditFailureShouldPublishEvents(Request request) throws Exception { - given(auditEventPublisher.isAuditing(anyString(), anyString(), any(EventName.class))).willReturn(true); + given(auditEventPublisher.isAuditing(nullable(String.class), anyString(), any(EventName.class))).willReturn(true); auditor = new CrestAuditor(debug, auditEventPublisher, auditEventFactory, context, request); givenAccessAuditingEnabled(auditEventPublisher); diff --git a/openam-rest/src/test/java/org/forgerock/openam/rest/query/PagingQueryResponseHandlerTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/query/PagingQueryResponseHandlerTest.java index b990459b95..0b6e552434 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/rest/query/PagingQueryResponseHandlerTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/rest/query/PagingQueryResponseHandlerTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.rest.query; @@ -23,7 +24,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import org.forgerock.json.resource.ResourceResponse; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.BeforeMethod; @@ -65,7 +66,7 @@ public void shouldRejectNegativePageOffset() { public void shouldOnlyReadUntilPageIsRead() { // Given testHandler = new PagingQueryResponseHandler(mockHandler, 2, 0); - given(mockHandler.handleResource(Matchers.any(ResourceResponse.class))).willReturn(true); + given(mockHandler.handleResource(ArgumentMatchers.any(ResourceResponse.class))).willReturn(true); // When boolean firstHandle = testHandler.handleResource(newResourceResponse("a", null, null)); @@ -95,7 +96,7 @@ public void shouldRespectOffset() { public void shouldIgnoreExtraResources() { // Given testHandler = new PagingQueryResponseHandler(mockHandler, 1, 0); - given(mockHandler.handleResource(Matchers.any(ResourceResponse.class))).willReturn(true); + given(mockHandler.handleResource(ArgumentMatchers.any(ResourceResponse.class))).willReturn(true); ResourceResponse expected = newResourceResponse("expected", null, null); // When diff --git a/openam-rest/src/test/java/org/forgerock/openam/rest/query/QueryByStringFilterConverterTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/query/QueryByStringFilterConverterTest.java index 984468b7c5..22a52867d2 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/rest/query/QueryByStringFilterConverterTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/rest/query/QueryByStringFilterConverterTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.rest.query; @@ -53,17 +54,17 @@ public void shouldCreateAndFilter() { and(equalTo(new JsonPointer("param1"), "value1"), contains(new JsonPointer("param2"), "value2")); QueryByStringFilterConverter mockConverter = mock(QueryByStringFilterConverter.class); ArgumentCaptor captor = ArgumentCaptor.forClass(List.class); - when(mockConverter.visitAndFilter(any(Void.class), anyList())).thenCallRealMethod(); + when(mockConverter.visitAndFilter(nullable(Void.class), anyList())).thenCallRealMethod(); // when filter.accept(mockConverter, null); // then - verify(mockConverter, times(1)).visitAndFilter(any(Void.class), captor.capture()); + verify(mockConverter, times(1)).visitAndFilter(nullable(Void.class), captor.capture()); assertThat(captor.getValue().size()).isEqualTo(2); - verify(mockConverter, times(1)).visitEqualsFilter(any(Void.class), any(JsonPointer.class), anyObject()); - verify(mockConverter, times(1)).visitContainsFilter(any(Void.class), any(JsonPointer.class), anyObject()); + verify(mockConverter, times(1)).visitEqualsFilter(nullable(Void.class), any(JsonPointer.class), anyObject()); + verify(mockConverter, times(1)).visitContainsFilter(nullable(Void.class), any(JsonPointer.class), anyObject()); } @Test @@ -73,17 +74,17 @@ public void shouldCreateOrFilter() { or(equalTo(new JsonPointer("param1"), "value1"), contains(new JsonPointer("param2"), "value2")); QueryByStringFilterConverter mockConverter = mock(QueryByStringFilterConverter.class); ArgumentCaptor captor = ArgumentCaptor.forClass(List.class); - when(mockConverter.visitOrFilter(any(Void.class), anyList())).thenCallRealMethod(); + when(mockConverter.visitOrFilter(nullable(Void.class), anyList())).thenCallRealMethod(); // when filter.accept(mockConverter, null); // then - verify(mockConverter, times(1)).visitOrFilter(any(Void.class), captor.capture()); + verify(mockConverter, times(1)).visitOrFilter(nullable(Void.class), captor.capture()); assertThat(captor.getValue().size()).isEqualTo(2); - verify(mockConverter, times(1)).visitEqualsFilter(any(Void.class), any(JsonPointer.class), anyObject()); - verify(mockConverter, times(1)).visitContainsFilter(any(Void.class), any(JsonPointer.class), anyObject()); + verify(mockConverter, times(1)).visitEqualsFilter(nullable(Void.class), any(JsonPointer.class), anyObject()); + verify(mockConverter, times(1)).visitContainsFilter(nullable(Void.class), any(JsonPointer.class), anyObject()); } @Test @@ -95,21 +96,21 @@ public void shouldCreateCompoundFilter() { QueryByStringFilterConverter mockConverter = mock(QueryByStringFilterConverter.class); ArgumentCaptor andCaptor = ArgumentCaptor.forClass(List.class); ArgumentCaptor orCaptor = ArgumentCaptor.forClass(List.class); - when(mockConverter.visitAndFilter(any(Void.class), anyList())).thenCallRealMethod(); - when(mockConverter.visitOrFilter(any(Void.class), anyList())).thenCallRealMethod(); + when(mockConverter.visitAndFilter(nullable(Void.class), anyList())).thenCallRealMethod(); + when(mockConverter.visitOrFilter(nullable(Void.class), anyList())).thenCallRealMethod(); // when filter.accept(mockConverter, null); // then - verify(mockConverter, times(1)).visitAndFilter(any(Void.class), andCaptor.capture()); + verify(mockConverter, times(1)).visitAndFilter(nullable(Void.class), andCaptor.capture()); assertThat(andCaptor.getValue().size()).isEqualTo(2); - verify(mockConverter, times(2)).visitOrFilter(any(Void.class), orCaptor.capture()); + verify(mockConverter, times(2)).visitOrFilter(nullable(Void.class), orCaptor.capture()); assertThat(orCaptor.getAllValues().get(0).size()).isEqualTo(2); assertThat(orCaptor.getAllValues().get(1).size()).isEqualTo(2); - verify(mockConverter, times(2)).visitEqualsFilter(any(Void.class), any(JsonPointer.class), anyObject()); - verify(mockConverter, times(2)).visitContainsFilter(any(Void.class), any(JsonPointer.class), anyObject()); + verify(mockConverter, times(2)).visitEqualsFilter(nullable(Void.class), any(JsonPointer.class), anyObject()); + verify(mockConverter, times(2)).visitContainsFilter(nullable(Void.class), any(JsonPointer.class), anyObject()); } } diff --git a/openam-scripting/pom.xml b/openam-scripting/pom.xml index 5333528bba..4922450f92 100644 --- a/openam-scripting/pom.xml +++ b/openam-scripting/pom.xml @@ -113,7 +113,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/ScriptEngineConfiguratorTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/ScriptEngineConfiguratorTest.java index 1d720d2ae4..e35e7f2679 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/ScriptEngineConfiguratorTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/ScriptEngineConfiguratorTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.scripting; @@ -21,8 +22,8 @@ import static org.forgerock.openam.scripting.ScriptConstants.ScriptContext; import static org.forgerock.openam.scripting.ScriptConstants.ScriptContext.AUTHENTICATION_SERVER_SIDE; import static org.forgerock.openam.scripting.ScriptConstants.ScriptContext.POLICY_CONDITION; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; import org.mockito.ArgumentCaptor; diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/ScriptResourceTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/ScriptResourceTest.java index 1a98290362..2679e1431c 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/ScriptResourceTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/ScriptResourceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.scripting.rest; @@ -21,8 +22,8 @@ import static org.forgerock.openam.scripting.ScriptConstants.ScriptContext.*; import static org.forgerock.openam.scripting.SupportedScriptingLanguage.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -118,7 +119,7 @@ public void setUp() throws ResourceException { Logger logger = mock(Logger.class); ScriptingService scriptingService = new MockScriptingService(); ScriptingServiceFactory serviceFactory = mock(ScriptingServiceFactory.class); - when(serviceFactory.create(anyString())).thenReturn(scriptingService); + when(serviceFactory.create(nullable(String.class))).thenReturn(scriptingService); ExceptionMappingHandler errorHandler = new ScriptExceptionMappingHandler(); scriptResource = new ScriptResource(logger, serviceFactory, errorHandler, new StandardScriptValidator(new StandardScriptEngineManager())); diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/batch/BatchResourceTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/batch/BatchResourceTest.java index 2955551873..df7f8a7c11 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/batch/BatchResourceTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/batch/BatchResourceTest.java @@ -12,11 +12,12 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. +* Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.scripting.rest.batch; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/batch/helpers/RequesterTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/batch/helpers/RequesterTest.java index c4e1f711b2..06057d38ee 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/batch/helpers/RequesterTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/batch/helpers/RequesterTest.java @@ -12,13 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. -* Portions copyright 2025 3A Systems LLC. +* Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.scripting.rest.batch.helpers; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import jakarta.inject.Provider; diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/service/ScriptConfigurationServiceTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/service/ScriptConfigurationServiceTest.java index b0ecb299fa..ef5d42bd11 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/service/ScriptConfigurationServiceTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/service/ScriptConfigurationServiceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.scripting.service; @@ -19,8 +20,8 @@ import static org.forgerock.openam.scripting.ScriptConstants.ScriptErrorCode.*; import static org.forgerock.openam.scripting.SupportedScriptingLanguage.JAVASCRIPT; import static org.forgerock.openam.utils.CollectionUtils.asSet; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.*; diff --git a/openam-selfservice/pom.xml b/openam-selfservice/pom.xml index 55029865d8..52d4768a3c 100644 --- a/openam-selfservice/pom.xml +++ b/openam-selfservice/pom.xml @@ -86,7 +86,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-server/pom.xml b/openam-server/pom.xml index 1ea5df9f52..7603ea883b 100644 --- a/openam-server/pom.xml +++ b/openam-server/pom.xml @@ -13,7 +13,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions copyright 2017-2025 3A Systems LLC. + * Portions copyright 2017-2026 3A Systems LLC. --> 4.0.0 @@ -104,7 +104,7 @@ ${test.config.path} ${basedir}/src/test/resources/logback-test.xml false - message + warning on false @@ -166,13 +166,13 @@ org.seleniumhq.selenium selenium-java - 4.13.0 + 4.43.0 test org.testcontainers testcontainers - 1.20.6 + 2.0.4 test diff --git a/openam-server/src/test/java/org/openidentityplatform/openam/test/integration/BaseTest.java b/openam-server/src/test/java/org/openidentityplatform/openam/test/integration/BaseTest.java index 0e1386d724..41d4782485 100644 --- a/openam-server/src/test/java/org/openidentityplatform/openam/test/integration/BaseTest.java +++ b/openam-server/src/test/java/org/openidentityplatform/openam/test/integration/BaseTest.java @@ -11,26 +11,31 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". * - * Copyright 2025 3A Systems LLC. + * Copyright 2025-2026 3A Systems LLC. */ package org.openidentityplatform.openam.test.integration; +import org.apache.commons.io.FileUtils; import org.openqa.selenium.By; +import org.openqa.selenium.OutputType; import org.openqa.selenium.StaleElementReferenceException; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeOptions; +import org.openqa.selenium.io.FileHandler; import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; -import org.testcontainers.shaded.org.apache.commons.io.FileUtils; +import org.testng.ITestResult; import org.testng.annotations.AfterClass; +import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import java.io.BufferedReader; +import java.io.File; import java.io.FileReader; import java.io.IOException; import java.nio.file.Path; @@ -48,10 +53,11 @@ public abstract class BaseTest { @BeforeClass public void webdriverSetup() { ChromeOptions options = new ChromeOptions(); - options.addArguments("--remote-allow-origins=*","--headless", "--disable-dev-shm-usage", "--no-sandbox", "--verbose"); - //options.addArguments("--remote-allow-origins=*", "--verbose"); + options.addArguments("--remote-allow-origins=*","--headless", "--disable-dev-shm-usage", "--no-sandbox", + "--verbose", "--window-size=1920,1080", "--guest"); +// options.addArguments("--remote-allow-origins=*", "--verbose", "--guest"); driver = new ChromeDriver(options); - wait = new WebDriverWait(driver, Duration.ofSeconds(10)); + wait = new WebDriverWait(driver, Duration.ofSeconds(30)); } @AfterClass @@ -71,6 +77,15 @@ public void cleanup() throws IOException { } } + //@AfterMethod //uncomment to debug + public void tearDown(ITestResult result) throws IOException { + if (result.getStatus() == ITestResult.FAILURE) { + WebElement element = driver.findElement(By.tagName("html")); + File source = element.getScreenshotAs(OutputType.FILE); + FileHandler.copy(source, new File("/tmp/element_screenshot.png")); + } + } + protected void printInstallLogFile() { String testConfigPath = System.getProperty("test.config.path"); Path installLog = Paths.get(testConfigPath, "install.log"); diff --git a/openam-server/src/test/java/org/openidentityplatform/openam/test/integration/IT_SetupWithOpenDJ.java b/openam-server/src/test/java/org/openidentityplatform/openam/test/integration/IT_SetupWithOpenDJ.java index ded46cc689..3ca09ce98e 100644 --- a/openam-server/src/test/java/org/openidentityplatform/openam/test/integration/IT_SetupWithOpenDJ.java +++ b/openam-server/src/test/java/org/openidentityplatform/openam/test/integration/IT_SetupWithOpenDJ.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". * - * Copyright 2025 3A Systems LLC. + * Copyright 2025-2026 3A Systems LLC. */ package org.openidentityplatform.openam.test.integration; @@ -115,11 +115,16 @@ private void testOpenAmInstallation(String openamUrl, Integer opendjPort) throws wait.until(ExpectedConditions.elementToBeClickable(By.id("nextTabButton"))).click(); - waitForElement(By.id("loadBalancerDisable")); + waitForElementVisible(By.id("loadBalancerDisable")); + waitForElementVisible(By.id("loadBalancerHostName")); + + Thread.sleep(1000); + wait.until(ExpectedConditions.elementToBeClickable(By.id("nextTabButton"))).click(); waitForElement(By.id("agentPassword")).sendKeys(PA_PASSWORD); waitForElement(By.id("agentConfirm")).sendKeys(PA_PASSWORD); + wait.until(ExpectedConditions.elementToBeClickable(By.id("nextTabButton"))).click(); diff --git a/openam-server/src/test/resources/logback-test.xml b/openam-server/src/test/resources/logback-test.xml index 0e89885211..03edb42d1b 100644 --- a/openam-server/src/test/resources/logback-test.xml +++ b/openam-server/src/test/resources/logback-test.xml @@ -6,7 +6,7 @@ - + diff --git a/openam-shared/src/test/java/org/forgerock/openam/shared/guice/SharedGuiceModuleTest.java b/openam-shared/src/test/java/org/forgerock/openam/shared/guice/SharedGuiceModuleTest.java index 720946fe46..03c67e887f 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/shared/guice/SharedGuiceModuleTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/shared/guice/SharedGuiceModuleTest.java @@ -12,11 +12,12 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.shared.guice; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-sts/openam-common-sts/pom.xml b/openam-sts/openam-common-sts/pom.xml index 75c26fea11..0cc0eae434 100644 --- a/openam-sts/openam-common-sts/pom.xml +++ b/openam-sts/openam-common-sts/pom.xml @@ -76,7 +76,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-sts/openam-publish-sts/pom.xml b/openam-sts/openam-publish-sts/pom.xml index 63bb225da0..06ef6104c0 100644 --- a/openam-sts/openam-publish-sts/pom.xml +++ b/openam-sts/openam-publish-sts/pom.xml @@ -97,7 +97,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-sts/openam-rest-sts/pom.xml b/openam-sts/openam-rest-sts/pom.xml index 77c047dc53..a29eb1cdc4 100644 --- a/openam-sts/openam-rest-sts/pom.xml +++ b/openam-sts/openam-rest-sts/pom.xml @@ -101,7 +101,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-sts/openam-soap-sts/openam-soap-sts-server/pom.xml b/openam-sts/openam-soap-sts/openam-soap-sts-server/pom.xml index eaff0a421f..85da7f53c3 100644 --- a/openam-sts/openam-soap-sts/openam-soap-sts-server/pom.xml +++ b/openam-sts/openam-soap-sts/openam-soap-sts-server/pom.xml @@ -144,7 +144,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/test/java/org/forgerock/openam/sts/soap/publish/SoapSTSInstancePublisherImplTest.java b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/test/java/org/forgerock/openam/sts/soap/publish/SoapSTSInstancePublisherImplTest.java index bd50a34bf6..b21d078f91 100644 --- a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/test/java/org/forgerock/openam/sts/soap/publish/SoapSTSInstancePublisherImplTest.java +++ b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/test/java/org/forgerock/openam/sts/soap/publish/SoapSTSInstancePublisherImplTest.java @@ -12,7 +12,9 @@ * information: "Portions Copyrighted [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. - * Portions Copyrighted 2016 Agile Digital Engineering + * Portions copyright 2026 3A Systems, LLC. * Portions Copyrighted 2016 Agile Digital Engineering + + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.sts.soap.publish; @@ -36,7 +38,7 @@ import org.forgerock.openam.sts.soap.config.user.SoapSTSKeystoreConfig; import org.forgerock.openam.sts.soap.healthcheck.HealthCheck; import org.forgerock.openam.sts.soap.healthcheck.HealthCheckImpl; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.slf4j.Logger; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -46,7 +48,7 @@ import java.util.Map; import java.util.Set; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/test/java/org/forgerock/openam/sts/soap/token/config/TokenRenewOperationProviderTest.java b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/test/java/org/forgerock/openam/sts/soap/token/config/TokenRenewOperationProviderTest.java index 6dde9354fc..607a908d84 100644 --- a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/test/java/org/forgerock/openam/sts/soap/token/config/TokenRenewOperationProviderTest.java +++ b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/test/java/org/forgerock/openam/sts/soap/token/config/TokenRenewOperationProviderTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyrighted [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.sts.soap.token.config; @@ -37,7 +38,7 @@ import java.util.HashSet; import java.util.Set; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertTrue; diff --git a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/test/java/org/forgerock/openam/sts/soap/token/config/TokenValidateOperationProviderTest.java b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/test/java/org/forgerock/openam/sts/soap/token/config/TokenValidateOperationProviderTest.java index d3090c5635..b641490980 100644 --- a/openam-sts/openam-soap-sts/openam-soap-sts-server/src/test/java/org/forgerock/openam/sts/soap/token/config/TokenValidateOperationProviderTest.java +++ b/openam-sts/openam-soap-sts/openam-soap-sts-server/src/test/java/org/forgerock/openam/sts/soap/token/config/TokenValidateOperationProviderTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyrighted [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.sts.soap.token.config; @@ -41,7 +41,7 @@ import java.util.HashSet; import java.util.Set; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertTrue; diff --git a/openam-sts/openam-token-service-sts/pom.xml b/openam-sts/openam-token-service-sts/pom.xml index de71172cd2..ab3d8d287b 100644 --- a/openam-sts/openam-token-service-sts/pom.xml +++ b/openam-sts/openam-token-service-sts/pom.xml @@ -83,7 +83,7 @@ org.mockito - mockito-all + mockito-core diff --git a/openam-sts/openam-token-service-sts/src/test/java/org/forgerock/openam/sts/tokengeneration/oidc/OpenIdConnectTokenGenerationImplTest.java b/openam-sts/openam-token-service-sts/src/test/java/org/forgerock/openam/sts/tokengeneration/oidc/OpenIdConnectTokenGenerationImplTest.java index 01907ee692..e10b52a542 100644 --- a/openam-sts/openam-token-service-sts/src/test/java/org/forgerock/openam/sts/tokengeneration/oidc/OpenIdConnectTokenGenerationImplTest.java +++ b/openam-sts/openam-token-service-sts/src/test/java/org/forgerock/openam/sts/tokengeneration/oidc/OpenIdConnectTokenGenerationImplTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyrighted [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.sts.tokengeneration.oidc; @@ -43,7 +44,7 @@ import java.util.Map; import static org.forgerock.openam.utils.Time.*; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/openam-sts/openam-token-service-sts/src/test/java/org/forgerock/openam/sts/tokengeneration/saml2/SAML2TokenGenerationImplTest.java b/openam-sts/openam-token-service-sts/src/test/java/org/forgerock/openam/sts/tokengeneration/saml2/SAML2TokenGenerationImplTest.java index c4d8152e6b..b2314cacc6 100644 --- a/openam-sts/openam-token-service-sts/src/test/java/org/forgerock/openam/sts/tokengeneration/saml2/SAML2TokenGenerationImplTest.java +++ b/openam-sts/openam-token-service-sts/src/test/java/org/forgerock/openam/sts/tokengeneration/saml2/SAML2TokenGenerationImplTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyrighted [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. - * Portions Copyrighted 2025 3A Systems LLC. + * Portions Copyrighted 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.sts.tokengeneration.saml2; @@ -70,7 +70,7 @@ import java.util.HashMap; import java.util.Map; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertTrue; diff --git a/openam-tools/build-helper-plugin/pom.xml b/openam-tools/build-helper-plugin/pom.xml index ce68e61fca..b939cb0588 100644 --- a/openam-tools/build-helper-plugin/pom.xml +++ b/openam-tools/build-helper-plugin/pom.xml @@ -88,7 +88,7 @@ org.mockito - mockito-all + mockito-core org.assertj diff --git a/openam-tools/build-helper-plugin/src/test/java/org/forgerock/maven/plugins/inject/content/IOFactoryTest.java b/openam-tools/build-helper-plugin/src/test/java/org/forgerock/maven/plugins/inject/content/IOFactoryTest.java index fe91a36520..3d44186ce1 100644 --- a/openam-tools/build-helper-plugin/src/test/java/org/forgerock/maven/plugins/inject/content/IOFactoryTest.java +++ b/openam-tools/build-helper-plugin/src/test/java/org/forgerock/maven/plugins/inject/content/IOFactoryTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.maven.plugins.inject.content; @@ -26,7 +27,7 @@ import java.io.IOException; import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -71,6 +72,8 @@ public void shouldWriteContent() throws IOException { .willReturn("LINE2") .willReturn(null); + given(contentConverter.convert(anyString())).willReturn("CONVERTED"); + //When ioFactory.writeContent(writer, content, contentConverter); diff --git a/openam-tools/openam-installtools/src/test/java/com/sun/identity/install/tools/admin/LicenseCheckerTest.java b/openam-tools/openam-installtools/src/test/java/com/sun/identity/install/tools/admin/LicenseCheckerTest.java index 1044b36e9c..fced9fe8a7 100644 --- a/openam-tools/openam-installtools/src/test/java/com/sun/identity/install/tools/admin/LicenseCheckerTest.java +++ b/openam-tools/openam-installtools/src/test/java/com/sun/identity/install/tools/admin/LicenseCheckerTest.java @@ -1,6 +1,6 @@ /* * Copyright 2014 ForgeRock, AS. - * + * Portions copyright 2026 3A Systems, LLC. * * The contents of this file are subject to the terms of the Common Development and * Distribution License (the License). You may not use this file except in compliance with the * License. @@ -29,8 +29,8 @@ import java.util.Date; import static org.mockito.BDDMockito.given; -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; diff --git a/openam-tools/openam-license-core/src/test/java/org/forgerock/openam/license/PersistentLicenseLocatorTest.java b/openam-tools/openam-license-core/src/test/java/org/forgerock/openam/license/PersistentLicenseLocatorTest.java index a2f4591680..e9e5ebe69e 100644 --- a/openam-tools/openam-license-core/src/test/java/org/forgerock/openam/license/PersistentLicenseLocatorTest.java +++ b/openam-tools/openam-license-core/src/test/java/org/forgerock/openam/license/PersistentLicenseLocatorTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.license; @@ -23,8 +24,8 @@ import static java.util.Arrays.asList; import static org.mockito.BDDMockito.given; -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.testng.Assert.assertEquals; diff --git a/openam-tools/openam-license-manager-cli/pom.xml b/openam-tools/openam-license-manager-cli/pom.xml index bbfa9979fd..e155c72b08 100644 --- a/openam-tools/openam-license-manager-cli/pom.xml +++ b/openam-tools/openam-license-manager-cli/pom.xml @@ -88,7 +88,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-tools/openam-license-manager-cli/src/test/java/org/forgerock/openam/license/CLILicensePresenterTest.java b/openam-tools/openam-license-manager-cli/src/test/java/org/forgerock/openam/license/CLILicensePresenterTest.java index 4df601b99c..11a79b29c2 100644 --- a/openam-tools/openam-license-manager-cli/src/test/java/org/forgerock/openam/license/CLILicensePresenterTest.java +++ b/openam-tools/openam-license-manager-cli/src/test/java/org/forgerock/openam/license/CLILicensePresenterTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. +* Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.license; import java.util.Arrays; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertTrue; import static org.testng.AssertJUnit.assertFalse; diff --git a/openam-tools/openam-license-servlet/src/test/java/org/forgerock/openam/license/ServletContextLicenseLocatorTest.java b/openam-tools/openam-license-servlet/src/test/java/org/forgerock/openam/license/ServletContextLicenseLocatorTest.java index aaeef75e21..320cf9e6fc 100644 --- a/openam-tools/openam-license-servlet/src/test/java/org/forgerock/openam/license/ServletContextLicenseLocatorTest.java +++ b/openam-tools/openam-license-servlet/src/test/java/org/forgerock/openam/license/ServletContextLicenseLocatorTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.license; @@ -25,7 +25,7 @@ import java.nio.charset.Charset; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.testng.Assert.assertEquals; diff --git a/openam-uma/pom.xml b/openam-uma/pom.xml index b6e795ceef..735478fe97 100755 --- a/openam-uma/pom.xml +++ b/openam-uma/pom.xml @@ -68,7 +68,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/AuthorizationRequestEndpointTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/AuthorizationRequestEndpointTest.java index d2bf753af2..f52707cefb 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/AuthorizationRequestEndpointTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/AuthorizationRequestEndpointTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.uma; @@ -23,8 +23,9 @@ import static org.forgerock.openam.utils.Time.currentTimeMillis; import static org.mockito.BDDMockito.*; import static org.mockito.BDDMockito.eq; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -65,7 +66,7 @@ import org.forgerock.util.query.QueryFilter; import org.json.JSONObject; import org.mockito.InOrder; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.restlet.Request; import org.restlet.Response; @@ -146,7 +147,7 @@ public void setup() throws Exception { accessToken = mock(AccessToken.class); oauth2TokenStore = mock(TokenStore.class); - given(oauth2TokenStore.readAccessToken(Matchers.anyObject(), anyString())).willReturn(accessToken); + given(oauth2TokenStore.readAccessToken(ArgumentMatchers.anyObject(), anyString())).willReturn(accessToken); given(accessToken.getClientId()).willReturn(RS_CLIENT_ID); given(accessToken.getResourceOwnerId()).willReturn(REQUESTING_PARTY_ID); @@ -161,7 +162,7 @@ public void setup() throws Exception { given(permissionTicket.getResourceServerClientId()).willReturn(RS_CLIENT_ID); given(permissionTicket.getRealm()).willReturn("REALM"); given(umaTokenStore.readPermissionTicket(anyString())).willReturn(permissionTicket); - given(umaTokenStore.createRPT(Matchers.anyObject())).willReturn(rpt); + given(umaTokenStore.createRPT(ArgumentMatchers.anyObject())).willReturn(rpt); resourceSetStore = mock(ResourceSetStore.class); ResourceSetDescription resourceSet = new ResourceSetDescription(); @@ -176,7 +177,7 @@ public void setup() throws Exception { given(umaProviderSettings.getUmaTokenStore()).willReturn(umaTokenStore); umaProviderSettingsFactory = mock(UmaProviderSettingsFactory.class); - given(umaProviderSettingsFactory.get(Matchers.anyObject())).willReturn(umaProviderSettings); + given(umaProviderSettingsFactory.get(ArgumentMatchers.anyObject())).willReturn(umaProviderSettings); given(umaProviderSettings.getUmaTokenStore()).willReturn(umaTokenStore); OAuth2ProviderSettingsFactory oauth2ProviderSettingsFactory = mock(OAuth2ProviderSettingsFactory.class); @@ -225,7 +226,7 @@ public void shouldThrowRequestSubmittedErrorWhenScopeDoesNotExistInPermissionTic ArrayList entitlements = new ArrayList(); entitlements.add(createEntitlement("Read")); - given(policyEvaluator.evaluate(anyString(), Matchers.anyObject(), eq(RESOURCE_NAME), Matchers.anyObject(), eq(RESOURCE_NAME), ArgumentMatchers.>>anyObject(), anyBoolean())).willReturn(entitlements); Set requestedScopes = new HashSet(); @@ -240,7 +241,7 @@ public void shouldThrowRequestSubmittedErrorWhenScopeDoesNotExistInPermissionTic InOrder inOrder = inOrder(requestAuthorizationFilter, policyEvaluator, requestAuthorizationFilter); inOrder.verify(requestAuthorizationFilter).beforeAuthorization(eq(permissionTicket), any(Subject.class), any(Subject.class)); - inOrder.verify(policyEvaluator).evaluate(anyString(), any(Subject.class), anyString(), anyMap(), eq(false)); + inOrder.verify(policyEvaluator).evaluate(anyString(), any(Subject.class), anyString(), nullable(Map.class), eq(false)); inOrder.verify(requestAuthorizationFilter).afterFailedAuthorization(eq(permissionTicket), any(Subject.class), any(Subject.class)); assertThat(e.getStatusCode()).isEqualTo(403); @@ -255,7 +256,7 @@ public void shouldThrowRequestSubmittedErrorWhenScopeDoesNotExistInPermissionTic ArrayList entitlements = new ArrayList(); entitlements.add(createEntitlement("Read")); - given(policyEvaluator.evaluate(anyString(), Matchers.anyObject(), eq(RESOURCE_NAME), Matchers.anyObject(), eq(RESOURCE_NAME), ArgumentMatchers.>>anyObject(), anyBoolean())).willReturn(entitlements); Set requestedScopes = new HashSet(); @@ -269,7 +270,7 @@ public void shouldThrowRequestSubmittedErrorWhenScopeDoesNotExistInPermissionTic InOrder inOrder = inOrder(requestAuthorizationFilter, policyEvaluator, requestAuthorizationFilter); inOrder.verify(requestAuthorizationFilter).beforeAuthorization(eq(permissionTicket), any(Subject.class), any(Subject.class)); - inOrder.verify(policyEvaluator).evaluate(anyString(), any(Subject.class), anyString(), anyMap(), eq(false)); + inOrder.verify(policyEvaluator).evaluate(anyString(), any(Subject.class), anyString(), nullable(Map.class), eq(false)); inOrder.verify(requestAuthorizationFilter).afterFailedAuthorization(eq(permissionTicket), any(Subject.class), any(Subject.class)); assertThat(e.getStatusCode()).isEqualTo(403); @@ -284,7 +285,7 @@ public void shouldReturnTrueWhenRequestedScopesExactlyMatchesEntitlements() thro ArrayList entitlements = new ArrayList(); entitlements.add(createEntitlement("Read")); - given(policyEvaluator.evaluate(anyString(), Matchers.anyObject(), eq(RESOURCE_NAME), Matchers.anyObject(), eq(RESOURCE_NAME), ArgumentMatchers.>>anyObject(), anyBoolean())).willReturn(entitlements); Set requestedScopes = new HashSet(); @@ -296,7 +297,7 @@ public void shouldReturnTrueWhenRequestedScopesExactlyMatchesEntitlements() thro InOrder inOrder = inOrder(requestAuthorizationFilter, policyEvaluator, requestAuthorizationFilter); inOrder.verify(requestAuthorizationFilter).beforeAuthorization(eq(permissionTicket), any(Subject.class), any(Subject.class)); - inOrder.verify(policyEvaluator).evaluate(anyString(), any(Subject.class), anyString(), anyMap(), eq(false)); + inOrder.verify(policyEvaluator).evaluate(anyString(), any(Subject.class), anyString(), nullable(Map.class), eq(false)); inOrder.verify(requestAuthorizationFilter).afterSuccessfulAuthorization(eq(permissionTicket), any(Subject.class), any(Subject.class)); } @@ -308,7 +309,7 @@ public void shouldReturnTrueWhenRequestedScopesSubsetOfEntitlements() throws Exc entitlements.add(createEntitlement("Read")); entitlements.add(createEntitlement("Create")); - given(policyEvaluator.evaluate(anyString(), Matchers.anyObject(), eq(RESOURCE_NAME), Matchers.anyObject(), eq(RESOURCE_NAME), ArgumentMatchers.>>anyObject(), anyBoolean())).willReturn(entitlements); Set requestedScopes = new HashSet(); @@ -320,7 +321,7 @@ public void shouldReturnTrueWhenRequestedScopesSubsetOfEntitlements() throws Exc InOrder inOrder = inOrder(requestAuthorizationFilter, policyEvaluator, requestAuthorizationFilter); inOrder.verify(requestAuthorizationFilter).beforeAuthorization(eq(permissionTicket), any(Subject.class), any(Subject.class)); - inOrder.verify(policyEvaluator).evaluate(anyString(), any(Subject.class), anyString(), anyMap(), eq(false)); + inOrder.verify(policyEvaluator).evaluate(anyString(), any(Subject.class), anyString(), nullable(Map.class), eq(false)); inOrder.verify(requestAuthorizationFilter).afterSuccessfulAuthorization(eq(permissionTicket), any(Subject.class), any(Subject.class)); } @@ -331,8 +332,8 @@ public void shouldThrowNeedInfoExceptionWhenTrustElevationRequiredButClaimNotPre ArrayList entitlements = new ArrayList<>(); entitlements.add(createEntitlement("Read")); - given(policyEvaluator.evaluate(anyString(), Matchers.anyObject(), eq(RESOURCE_NAME), - Matchers.>>anyObject(), anyBoolean())).willReturn(entitlements); + given(policyEvaluator.evaluate(anyString(), ArgumentMatchers.anyObject(), eq(RESOURCE_NAME), + ArgumentMatchers.>>anyObject(), anyBoolean())).willReturn(entitlements); Set requestedScopes = new HashSet<>(); requestedScopes.add("Read"); @@ -359,8 +360,8 @@ public void shouldThrowNeedInfoExceptionWhenTrustElevationRequiredAndUnknownClai ArrayList entitlements = new ArrayList<>(); entitlements.add(createEntitlement("Read")); - given(policyEvaluator.evaluate(anyString(), Matchers.anyObject(), eq(RESOURCE_NAME), - Matchers.>>anyObject(), anyBoolean())).willReturn(entitlements); + given(policyEvaluator.evaluate(anyString(), ArgumentMatchers.anyObject(), eq(RESOURCE_NAME), + ArgumentMatchers.>>anyObject(), anyBoolean())).willReturn(entitlements); Set requestedScopes = new HashSet<>(); requestedScopes.add("Read"); @@ -387,8 +388,8 @@ public void shouldThrowNeedInfoExceptionWhenTrustElevationRequiredAndClaimGather ArrayList entitlements = new ArrayList<>(); entitlements.add(createEntitlement("Read")); - given(policyEvaluator.evaluate(anyString(), Matchers.anyObject(), eq(RESOURCE_NAME), - Matchers.>>anyObject(), anyBoolean())).willReturn(entitlements); + given(policyEvaluator.evaluate(anyString(), ArgumentMatchers.anyObject(), eq(RESOURCE_NAME), + ArgumentMatchers.>>anyObject(), anyBoolean())).willReturn(entitlements); Set requestedScopes = new HashSet<>(); requestedScopes.add("Read"); @@ -415,8 +416,8 @@ public void shouldReturnRptWhenTrustElevationRequiredAndIdTokenClaimPresent() th ArrayList entitlements = new ArrayList<>(); entitlements.add(createEntitlement("Read")); - given(policyEvaluator.evaluate(anyString(), Matchers.anyObject(), eq(RESOURCE_NAME), - Matchers.>>anyObject(), anyBoolean())).willReturn(entitlements); + given(policyEvaluator.evaluate(anyString(), ArgumentMatchers.anyObject(), eq(RESOURCE_NAME), + ArgumentMatchers.>>anyObject(), anyBoolean())).willReturn(entitlements); Set requestedScopes = new HashSet<>(); requestedScopes.add("Read"); @@ -435,7 +436,7 @@ public void shouldCreatePendingRequestAndThrowRequestSubmittedExceptionWhenNoEnt //Given ArrayList entitlements = new ArrayList<>(); - given(policyEvaluator.evaluate(anyString(), Matchers.anyObject(), eq(RESOURCE_NAME), Matchers.anyObject(), eq(RESOURCE_NAME), ArgumentMatchers.>>anyObject(), anyBoolean())).willReturn(entitlements); Set requestedScopes = new HashSet<>(); @@ -452,8 +453,8 @@ public void shouldCreatePendingRequestAndThrowRequestSubmittedExceptionWhenNoEnt try { endpoint.requestAuthorization(entity); } catch (UmaException e) { - verify(pendingRequestsService).createPendingRequest(any(HttpServletRequest.class), eq("RESOURCE_SET_ID"), - anyString(), anyString(), anyString(), eq("REALM"), eq(requestedScopes)); + verify(pendingRequestsService).createPendingRequest(nullable(HttpServletRequest.class), eq("RESOURCE_SET_ID"), + nullable(String.class), anyString(), anyString(), eq("REALM"), eq(requestedScopes)); verify(umaAuditLogger).log(eq("RESOURCE_SET_ID"), any(AMIdentity.class), eq(UmaAuditType.REQUEST_SUBMITTED), any(Request.class), anyString()); assertThat(e.getStatusCode()).isEqualTo(403); @@ -467,7 +468,7 @@ public void shouldCreatePendingRequestForAuthorizationRequestWithDifferentScopes //Given ArrayList entitlements = new ArrayList<>(); - given(policyEvaluator.evaluate(anyString(), Matchers.anyObject(), eq(RESOURCE_NAME), Matchers.anyObject(), eq(RESOURCE_NAME), ArgumentMatchers.>>anyObject(), anyBoolean())).willReturn(entitlements); Set requestedScopes = new HashSet<>(); @@ -484,8 +485,8 @@ public void shouldCreatePendingRequestForAuthorizationRequestWithDifferentScopes try { endpoint.requestAuthorization(entity); } catch (UmaException e) { - verify(pendingRequestsService).createPendingRequest(any(HttpServletRequest.class), eq("RESOURCE_SET_ID"), - anyString(), anyString(), anyString(), eq("REALM"), eq(requestedScopes)); + verify(pendingRequestsService).createPendingRequest(nullable(HttpServletRequest.class), eq("RESOURCE_SET_ID"), + nullable(String.class), anyString(), anyString(), eq("REALM"), eq(requestedScopes)); verify(umaAuditLogger).log(eq("RESOURCE_SET_ID"), any(AMIdentity.class), eq(UmaAuditType.REQUEST_SUBMITTED), any(Request.class), anyString()); assertThat(e.getStatusCode()).isEqualTo(403); @@ -499,7 +500,7 @@ public void shouldThrowRequestSubmittedExceptionWhenNoEntitlementsForRequestedSc //Given ArrayList entitlements = new ArrayList<>(); - given(policyEvaluator.evaluate(anyString(), Matchers.anyObject(), eq(RESOURCE_NAME), Matchers.anyObject(), eq(RESOURCE_NAME), ArgumentMatchers.>>anyObject(), anyBoolean())).willReturn(entitlements); Set requestedScopes = new HashSet<>(); diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/IdTokenClaimGathererTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/IdTokenClaimGathererTest.java index 095bf4e5a7..83d7e9a879 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/IdTokenClaimGathererTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/IdTokenClaimGathererTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.uma; @@ -19,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.JsonValue.json; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/PendingClientSdkSessionRequestsServiceTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/PendingClientSdkSessionRequestsServiceTest.java index eb51e85334..14acc6baa8 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/PendingClientSdkSessionRequestsServiceTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/PendingClientSdkSessionRequestsServiceTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. - * Portions copyright 2025 3A Systems LLC. + * Portions copyright 2025-2026 3A Systems, LLC. */ package org.forgerock.openam.uma; @@ -23,8 +23,8 @@ import static org.forgerock.openam.sm.datalayer.impl.uma.UmaPendingRequest.*; import static org.forgerock.openam.uma.UmaConstants.UmaPolicy.*; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.*; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/PermissionRequestEndpointTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/PermissionRequestEndpointTest.java index 1e8a7ad31d..a7d8d9dd36 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/PermissionRequestEndpointTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/PermissionRequestEndpointTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.uma; @@ -43,7 +44,7 @@ import org.forgerock.openam.uma.extensions.PermissionRequestFilter; import org.json.JSONObject; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.restlet.Request; import org.restlet.Response; import org.restlet.data.Status; @@ -73,7 +74,7 @@ public void setup() throws ServerException, InvalidGrantException, NotFoundExcep OAuth2ProviderSettingsFactory providerSettingFactory = mock(OAuth2ProviderSettingsFactory.class); OAuth2ProviderSettings providerSettings = mock(RealmOAuth2ProviderSettings.class); - given(providerSettingFactory.get(Matchers.anyObject())).willReturn(providerSettings); + given(providerSettingFactory.get(ArgumentMatchers.anyObject())).willReturn(providerSettings); given(providerSettings.getResourceSetStore()).willReturn(resourceSetStore); UmaProviderSettingsFactory umaProviderSettingsFactory = mock(UmaProviderSettingsFactory.class); diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/UmaWellKnownConfigurationEndpointTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/UmaWellKnownConfigurationEndpointTest.java index ce01433822..167704a6a0 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/UmaWellKnownConfigurationEndpointTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/UmaWellKnownConfigurationEndpointTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.uma; @@ -30,7 +31,7 @@ import org.forgerock.oauth2.core.exceptions.NotFoundException; import org.forgerock.oauth2.core.exceptions.ServerException; import org.forgerock.openam.rest.representations.JacksonRepresentationFactory; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.restlet.Request; @@ -68,8 +69,8 @@ public void setup() throws Exception { umaUris = mock(UmaUris.class); providerSettings = mock(UmaProviderSettings.class); - given(umaUrisFactory.get(Matchers.anyObject())).willReturn(umaUris); - given(providerSettingsFactory.get(Matchers.anyObject())).willReturn(providerSettings); + given(umaUrisFactory.get(ArgumentMatchers.anyObject())).willReturn(umaUris); + given(providerSettingsFactory.get(ArgumentMatchers.anyObject())).willReturn(providerSettings); } private UmaProviderSettings setupProviderSettings() throws NotFoundException, ServerException { @@ -92,7 +93,7 @@ private UmaProviderSettings setupProviderSettings() throws NotFoundException, Se private UmaProviderSettings setupProviderSettingsWithOptionalConfiguration() throws NotFoundException, ServerException { setupProviderSettings(); - given(umaUrisFactory.get(Matchers.anyObject())).willReturn(umaUris); + given(umaUrisFactory.get(ArgumentMatchers.anyObject())).willReturn(umaUris); given(providerSettings.getSupportedClaimTokenProfiles()) .willReturn(Collections.singleton("CLAIM_TOKEN_PROFILE")); given(providerSettings.getSupportedUmaProfiles()).willReturn(Collections.singleton(URI.create("UMA_PROFILE"))); @@ -166,7 +167,7 @@ public void shouldGetOptionalUmaConfiguration() throws Exception { public void shouldThrowNotFoundExceptionWhenUmaProviderNotConfigured() throws Exception { //Given - doThrow(NotFoundException.class).when(providerSettingsFactory).get(Matchers.anyObject()); + doThrow(NotFoundException.class).when(providerSettingsFactory).get(ArgumentMatchers.anyObject()); //When endpoint.getConfiguration(); diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/PendingRequestResourceTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/PendingRequestResourceTest.java index a2ada9355e..6506d75367 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/PendingRequestResourceTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/PendingRequestResourceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.uma.rest; @@ -20,8 +21,8 @@ import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.assertThat; import static org.forgerock.util.test.assertj.AssertJPromiseAssert.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.*; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/PolicyGraphTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/PolicyGraphTest.java index f5fe37c57c..6a3efe6e0d 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/PolicyGraphTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/PolicyGraphTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.uma.rest; @@ -22,7 +23,7 @@ import static org.forgerock.openam.uma.UmaConstants.BackendPolicy.*; import static org.forgerock.openam.uma.UmaConstants.UmaPolicy.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.isNull; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.anySet; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.verify; diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/PolicyResourceDelegateTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/PolicyResourceDelegateTest.java index 427855cc49..4fd88d9d27 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/PolicyResourceDelegateTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/PolicyResourceDelegateTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.uma.rest; @@ -20,7 +21,7 @@ import static org.forgerock.json.JsonValue.*; import static org.forgerock.json.resource.Responses.newResourceResponse; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import java.util.ArrayList; @@ -42,7 +43,7 @@ import org.forgerock.util.promise.Promise; import org.forgerock.util.promise.Promises; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -78,7 +79,7 @@ public void shouldCreatePolicies() throws ResourceException { Promise createPolicyOnePromise = Promises.newResultPromise(createdPolicyOne); Promise createPolicyTwoPromise = Promises.newResultPromise(createdPolicyTwo); - given(policyResource.handleCreate(eq(context), Matchers.anyObject())) + given(policyResource.handleCreate(eq(context), ArgumentMatchers.anyObject())) .willReturn(createPolicyOnePromise) .willReturn(createPolicyTwoPromise); @@ -86,7 +87,7 @@ public void shouldCreatePolicies() throws ResourceException { List returnedPolicies = delegate.createPolicies(context, policies).getOrThrowUninterruptibly(); //Then - verify(policyResource, never()).handleDelete(eq(context), Matchers.anyObject()); + verify(policyResource, never()).handleDelete(eq(context), ArgumentMatchers.anyObject()); assertThat(returnedPolicies).isEqualTo(createdPolicies); } @@ -107,10 +108,10 @@ public void shouldHandleFailureToCreatePoliciesByDeletingCreatedPolicies() throw Promise createPolicyTwoPromise = Promises.newExceptionPromise(exception); Promise deletePolicyOnePromise = Promises.newResultPromise(createdPolicyOne); - given(policyResource.handleCreate(eq(context), Matchers.anyObject())) + given(policyResource.handleCreate(eq(context), ArgumentMatchers.anyObject())) .willReturn(createPolicyOnePromise) .willReturn(createPolicyTwoPromise); - given(policyResource.handleDelete(eq(context), Matchers.anyObject())) + given(policyResource.handleDelete(eq(context), ArgumentMatchers.anyObject())) .willReturn(deletePolicyOnePromise); //When @@ -143,10 +144,10 @@ public void shouldHandleFailureToDeleteFailedCreationOfPolicies() throws Resourc Promise createPolicyTwoPromise = Promises.newExceptionPromise(createException); Promise deletePolicyOnePromise = Promises.newExceptionPromise(deleteException); - given(policyResource.handleCreate(eq(context), Matchers.anyObject())) + given(policyResource.handleCreate(eq(context), ArgumentMatchers.anyObject())) .willReturn(createPolicyOnePromise) .willReturn(createPolicyTwoPromise); - given(policyResource.handleDelete(eq(context), Matchers.anyObject())) + given(policyResource.handleDelete(eq(context), ArgumentMatchers.anyObject())) .willReturn(deletePolicyOnePromise); //When @@ -180,7 +181,7 @@ public void shouldUpdatePolicies() throws ResourceException { Promise updatePolicyOnePromise = Promises.newResultPromise(updatedPolicyOne); Promise updatePolicyTwoPromise = Promises.newResultPromise(updatedPolicyTwo); - given(policyResource.handleUpdate(eq(context), Matchers.anyObject())) + given(policyResource.handleUpdate(eq(context), ArgumentMatchers.anyObject())) .willReturn(updatePolicyOnePromise) .willReturn(updatePolicyTwoPromise); @@ -206,7 +207,7 @@ public void shouldHandleFailureToUpdatePolicies() throws ResourceException { Promise updatePolicyOnePromise = Promises.newResultPromise(updatedPolicyOne); Promise updatePolicyTwoPromise = Promises.newExceptionPromise(exception); - given(policyResource.handleUpdate(eq(context), Matchers.anyObject())) + given(policyResource.handleUpdate(eq(context), ArgumentMatchers.anyObject())) .willReturn(updatePolicyOnePromise) .willReturn(updatePolicyTwoPromise); @@ -263,7 +264,7 @@ public void shouldDeletePolicies() throws ResourceException { Promise deletePolicyOnePromise = Promises.newResultPromise(policyOne); Promise deletePolicyTwoPromise = Promises.newResultPromise(policyTwo); - given(policyResource.handleDelete(eq(context), Matchers.anyObject())) + given(policyResource.handleDelete(eq(context), ArgumentMatchers.anyObject())) .willReturn(deletePolicyOnePromise) .willReturn(deletePolicyTwoPromise); @@ -287,7 +288,7 @@ public void shouldHandleFailureToDeletePolicies() throws ResourceException { Promise deletePolicyOnePromise = Promises.newResultPromise(policyOne); Promise deletePolicyTwoPromise = Promises.newExceptionPromise(exception); - given(policyResource.handleDelete(eq(context), Matchers.anyObject())) + given(policyResource.handleDelete(eq(context), ArgumentMatchers.anyObject())) .willReturn(deletePolicyOnePromise) .willReturn(deletePolicyTwoPromise); diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/ResourceSetResourceTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/ResourceSetResourceTest.java index b1f3b18da5..aa9cbb4221 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/ResourceSetResourceTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/ResourceSetResourceTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. - * Portions copyright 2026 3A Systems, LLC + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.uma.rest; @@ -57,7 +57,7 @@ import org.forgerock.util.promise.Promises; import org.forgerock.util.query.QueryFilter; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -157,7 +157,7 @@ public void nameQueryShouldBeSupported() throws Exception { given(contextHelper.getUserId(context)).willReturn("RESOURCE_OWNER_ID"); given(request.getQueryFilter()).willReturn(queryFilter); given(resourceSetService.getResourceSets(eq(context), eq("REALM"), - Matchers.anyObject(), eq("RESOURCE_OWNER_ID"), eq(false))).willReturn(resourceSetsPromise); + ArgumentMatchers.anyObject(), eq("RESOURCE_OWNER_ID"), eq(false))).willReturn(resourceSetsPromise); //When Promise promise = resource.queryCollection(context, request, handler); diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/ResourceSetServiceTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/ResourceSetServiceTest.java index 70616b1e71..44113982cc 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/ResourceSetServiceTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/ResourceSetServiceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.uma.rest; @@ -62,7 +63,7 @@ import org.forgerock.util.promise.Promise; import org.forgerock.util.promise.Promises; import org.forgerock.util.query.QueryFilterVisitor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -120,7 +121,7 @@ public void shouldGetResourceSetWithoutPolicy() throws Exception { //Then assertThat(resourceSet).isEqualTo(resourceSetDescription); verifyZeroInteractions(policyService); - verify(resourceSet, never()).setPolicy(Matchers.anyObject()); + verify(resourceSet, never()).setPolicy(ArgumentMatchers.anyObject()); } @Test @@ -185,7 +186,7 @@ public void getResourceSetsShouldReturnEmptySetWhenNoResourceSetsExist() throws query.setResourceSetQuery(resourceSetQuery); query.setPolicyQuery(policyQuery); given(resourceSetStore.query(any(QueryFilter.class))).willReturn(queriedResourceSets); - given(policyService.queryPolicies(eq(context), Matchers.anyObject())) + given(policyService.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(queriedPoliciesPromise); mockResourceOwnerIdentity(resourceOwnerId, realm); @@ -233,7 +234,7 @@ public void getResourceSetsShouldReturnSetWhenResourceSetsExistWithNoPolicyQuery Pair> queriedPoliciesPair = Pair.of(newQueryResponse(), queriedPolicies); Promise>, ResourceException> queriedPoliciesPromise = Promises.newResultPromise(queriedPoliciesPair); - given(policyService.queryPolicies(eq(context), Matchers.anyObject())) + given(policyService.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(queriedPoliciesPromise); //When Collection resourceSets = service.getResourceSets(context, realm, query, resourceOwnerId, @@ -282,7 +283,7 @@ public void getResourceSetsShouldReturnSetWhenResourceSetsExistWithNoPolicyQuery given(policyService.readPolicy(context, "RS_ID_ONE")).willReturn(policyOnePromise); given(policyService.readPolicy(context, "RS_ID_TWO")).willReturn(policyTwoPromise); - given(policyService.queryPolicies(eq(context), Matchers.anyObject())) + given(policyService.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(Promises.>, ResourceException>newResultPromise( Pair.>of(newQueryResponse(), new HashSet()))); mockResourceOwnerIdentity(resourceOwnerId, realm); @@ -354,7 +355,7 @@ public void getResourceSetsShouldReturnSetWhenResourceSetsExistQueryingByOr() th given(policyTwo.getId()).willReturn("RS_ID_THREE"); given(policyTwo.getResourceSet()).willReturn(resourceSetTwo); given(resourceSetStore.query(resourceSetQuery)).willReturn(queriedResourceSets); - given(policyService.queryPolicies(eq(context), Matchers.anyObject())) + given(policyService.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(queriedPoliciesPromise); given(resourceSetStore.read("RS_ID_THREE", resourceOwnerId)).willReturn(resourceSetThree); @@ -415,7 +416,7 @@ public void getResourceSetsShouldReturnEmptySetWhenResourceSetsExistQueryingByAn mockPolicyEvaluator("RS_CLIENT_ID"); - given(policyService.queryPolicies(eq(context), Matchers.anyObject())) + given(policyService.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(queriedPoliciesPromise); given(resourceSetStore.read("RS_ID_THREE", resourceOwnerId)).willReturn(resourceSetThree); @@ -483,7 +484,7 @@ public void shouldGetResourceSetsWhenResourceSetsExistQueryingByOrWithPolicies() resourceSetQuery, equalTo(ResourceSetTokenField.RESOURCE_OWNER_ID, "RESOURCE_OWNER_ID")))) .willReturn(queriedResourceSets); - given(policyService.queryPolicies(eq(context), Matchers.anyObject())) + given(policyService.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(queriedPoliciesPromise); given(resourceSetStore.read("RS_ID_ONE", resourceOwnerId)).willReturn(resourceSetOne); given(resourceSetStore.read("RS_ID_THREE", resourceOwnerId)).willReturn(resourceSetThree); @@ -560,7 +561,7 @@ public void getResourceSetsShouldReturnEmptySetWhenResourceSetsExistQueryingByAn given(policyThree.asJson()).willReturn(policyThreeJson); given(policyThree.getResourceSet()).willReturn(resourceSetThree); given(resourceSetStore.query(resourceSetQuery)).willReturn(queriedResourceSets); - given(policyService.queryPolicies(eq(context), Matchers.anyObject())) + given(policyService.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(queriedPoliciesPromise); given(resourceSetStore.read("RS_ID_THREE", resourceOwnerId)).willReturn(resourceSetThree); @@ -604,9 +605,9 @@ public void shouldRevokeAllResourceSetPolicies() throws Exception { queriedResourceSets.add(resourceSetOne); queriedResourceSets.add(resourceSetTwo); - given(resourceSetStore.query(Matchers.>anyObject())) + given(resourceSetStore.query(ArgumentMatchers.>anyObject())) .willReturn(queriedResourceSets); - given(policyService.queryPolicies(eq(context), Matchers.anyObject())) + given(policyService.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(queriedPoliciesPromise); given(policyService.deletePolicy(context, "RS_ID_ONE")) .willReturn(Promises.newResultPromise(null)); diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaIdRepoCreationListenerTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaIdRepoCreationListenerTest.java index bb14d4435e..ca6f207aac 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaIdRepoCreationListenerTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaIdRepoCreationListenerTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.uma.rest; import static org.mockito.AdditionalMatchers.or; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaPolicyResourceTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaPolicyResourceTest.java index bbeeaeb5ac..04cd6cbc4c 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaPolicyResourceTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaPolicyResourceTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.uma.rest; @@ -51,7 +52,7 @@ import org.forgerock.util.Pair; import org.forgerock.util.promise.Promise; import org.forgerock.util.promise.Promises; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -264,7 +265,7 @@ public void shouldSuccessfullyQueryPolicies() { policyResource.queryCollection(context, request, handler); //Then - verify(handler, times(2)).handleResource(Matchers.anyObject()); + verify(handler, times(2)).handleResource(ArgumentMatchers.anyObject()); } @Test diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaPolicyServiceImplDelegationTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaPolicyServiceImplDelegationTest.java index e2d2f31311..f2c9600c5c 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaPolicyServiceImplDelegationTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaPolicyServiceImplDelegationTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.uma.rest; @@ -22,10 +23,10 @@ import static org.forgerock.util.promise.Promises.*; import static org.forgerock.util.test.assertj.AssertJPromiseAssert.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anySetOf; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anySetOf; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -80,7 +81,7 @@ import org.forgerock.util.promise.Promise; import org.forgerock.util.query.QueryFilter; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; @@ -150,7 +151,7 @@ public void setup() throws Exception { contextHelper, policyEvaluatorFactory, coreServicesWrapper, debug, umaSettingsFactory, extensionFilterManager); - given(contextHelper.getRealm(Matchers.anyObject())).willReturn("REALM"); + given(contextHelper.getRealm(ArgumentMatchers.anyObject())).willReturn("REALM"); realmTestHelper = new RealmTestHelper(); realmTestHelper.setupRealmClass(); @@ -338,8 +339,8 @@ private AMIdentity setupIdentityForUser(String username, String realm) { private void accessingUriForUser(String username) { userInUri = username; - given(contextHelper.getUserId(Matchers.anyObject())).willReturn(userInUri); - given(contextHelper.getUserUid(Matchers.anyObject())).willReturn("uid=" + userInUri + ",ou=" + given(contextHelper.getUserId(ArgumentMatchers.anyObject())).willReturn(userInUri); + given(contextHelper.getUserUid(ArgumentMatchers.anyObject())).willReturn("uid=" + userInUri + ",ou=" + loggedInRealm + ",dc=openidentityplatform,dc=org"); } @@ -436,7 +437,7 @@ private void mockPolicyResourceDelegateForUpdatedPolicy() { updatedPolicies.add(updatedPolicy1); updatedPolicies.add(updatedPolicy3); Promise, ResourceException> updatePolicyPromise = newResultPromise(updatedPolicies); - given(policyResourceDelegate.updatePolicies(any(Context.class), Matchers.>anyObject())) + given(policyResourceDelegate.updatePolicies(any(Context.class), ArgumentMatchers.>anyObject())) .willReturn(updatePolicyPromise); given(policyResourceDelegate.queryPolicies(any(Context.class), any(QueryRequest.class), any(QueryResourceHandler.class))).willAnswer(new Answer>() { diff --git a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaPolicyServiceImplTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaPolicyServiceImplTest.java index 2503836f9f..64f7c42ac8 100644 --- a/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaPolicyServiceImplTest.java +++ b/openam-uma/src/test/java/org/forgerock/openam/uma/rest/UmaPolicyServiceImplTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.uma.rest; @@ -21,9 +22,8 @@ import static org.forgerock.json.resource.Responses.*; import static org.forgerock.util.promise.Promises.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyListOf; import static org.mockito.Mockito.anySetOf; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.eq; @@ -82,7 +82,7 @@ import org.forgerock.util.promise.Promises; import org.forgerock.util.query.QueryFilter; import org.mockito.InOrder; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.testng.annotations.AfterMethod; @@ -137,9 +137,9 @@ public void setup() throws Exception { contextHelper, policyEvaluatorFactory, coreServicesWrapper, debug, umaSettingsFactory, extensionFilterManager); - given(contextHelper.getRealm(Matchers.anyObject())).willReturn("REALM"); - given(contextHelper.getUserId(Matchers.anyObject())).willReturn(RESOURCE_OWNER_ID); - given(contextHelper.getUserUid(Matchers.anyObject())).willReturn("RESOURCE_OWNER_UID"); + given(contextHelper.getRealm(ArgumentMatchers.anyObject())).willReturn("REALM"); + given(contextHelper.getUserId(ArgumentMatchers.anyObject())).willReturn(RESOURCE_OWNER_ID); + given(contextHelper.getUserUid(ArgumentMatchers.anyObject())).willReturn("RESOURCE_OWNER_UID"); resourceSetStore = mock(ResourceSetStore.class); resourceSet = new ResourceSetDescription("RESOURCE_SET_ID", @@ -277,7 +277,7 @@ public void shouldCreateUmaPolicy() throws Exception { setupQueries(queryPromise, createdPolicy1, createdPolicy2); Promise, ResourceException> createPolicyPromise = newResultPromise(createdPolicies); - given(policyResourceDelegate.createPolicies(eq(context), Matchers.>anyObject())) + given(policyResourceDelegate.createPolicies(eq(context), ArgumentMatchers.>anyObject())) .willReturn(createPolicyPromise); //When @@ -313,7 +313,7 @@ public void shouldNotCreateUmaPolicyIfAlreadyExists() throws Exception { newResultPromise( Pair.of(newQueryResponse(), Collections.singletonList(policyResource))); - given(policyResourceDelegate.queryPolicies(eq(context), Matchers.anyObject())) + given(policyResourceDelegate.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(queryPromise); //When @@ -337,9 +337,9 @@ public void shouldHandleFailureToCreateUnderlyingPolicies() throws Exception { Promises.newExceptionPromise((ResourceException) new NotFoundException()); Promise, ResourceException> createPoliciesPromise = Promises.newExceptionPromise(exception); - given(policyResourceDelegate.queryPolicies(eq(context), Matchers.anyObject())) + given(policyResourceDelegate.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(queryPromise); - given(policyResourceDelegate.createPolicies(eq(context), Matchers.>anyObject())) + given(policyResourceDelegate.createPolicies(eq(context), ArgumentMatchers.>anyObject())) .willReturn(createPoliciesPromise); //When @@ -412,7 +412,7 @@ public void shouldReadUmaPolicy() throws Exception { Promise>, ResourceException> queryPromise = newResultPromise(Pair.of(queryResult, policies)); - given(policyResourceDelegate.queryPolicies(eq(context), Matchers.anyObject())) + given(policyResourceDelegate.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(queryPromise); //When @@ -433,7 +433,7 @@ public void shouldHandleReadFailureToQueryUnderlyingPolicies() throws Exception Promise>, ResourceException> queryPromise = Promises.newExceptionPromise(exception); - given(policyResourceDelegate.queryPolicies(eq(context), Matchers.anyObject())) + given(policyResourceDelegate.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(queryPromise); //When @@ -468,7 +468,7 @@ public void shouldUpdateUmaPolicy() throws Exception { setupQueries(currentPolicyPromise, updatedPolicy1, updatedPolicy2); - given(policyResourceDelegate.updatePolicies(eq(context), Matchers.>anyObject())) + given(policyResourceDelegate.updatePolicies(eq(context), ArgumentMatchers.>anyObject())) .willReturn(updatePolicyPromise); //When @@ -499,9 +499,9 @@ public void shouldHandleFailureToUpdateUnderlyingPolicies() throws Exception { = newResultPromise(Pair.of((QueryResponse) null, Collections.emptyList())); Promise, ResourceException> updatePoliciesPromise = newExceptionPromise(exception); - given(policyResourceDelegate.queryPolicies(eq(context), Matchers.anyObject())) + given(policyResourceDelegate.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(currentPolicyPromise); - given(policyResourceDelegate.updatePolicies(eq(context), Matchers.>anyObject())) + given(policyResourceDelegate.updatePolicies(eq(context), ArgumentMatchers.>anyObject())) .willReturn(updatePoliciesPromise); //When @@ -574,7 +574,7 @@ public void shouldDeleteUmaPolicy() throws Exception { Promise, ResourceException> deletePoliciesPromise = newResultPromise(readPolicies); - given(policyResourceDelegate.deletePolicies(eq(context), anyListOf(String.class))) + given(policyResourceDelegate.deletePolicies(eq(context), any(Collection.class))) .willReturn(deletePoliciesPromise); //When @@ -583,7 +583,7 @@ public void shouldDeleteUmaPolicy() throws Exception { //Then InOrder inOrder = inOrder(resourceDelegationFilter, policyResourceDelegate); inOrder.verify(resourceDelegationFilter).onResourceSharedDeletion(any(UmaPolicy.class)); - inOrder.verify(policyResourceDelegate).deletePolicies(eq(context), anyListOf(String.class)); + inOrder.verify(policyResourceDelegate).deletePolicies(eq(context), any(Collection.class)); } @Test(expectedExceptions = ResourceException.class) @@ -596,7 +596,7 @@ public void shouldHandleDeleteFailureToQueryUnderlyingPolicies() throws Exceptio Promise>, ResourceException> readPoliciesPromise = Promises.newExceptionPromise(exception); - given(policyResourceDelegate.queryPolicies(eq(context), Matchers.anyObject())) + given(policyResourceDelegate.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(readPoliciesPromise); //When @@ -604,7 +604,7 @@ public void shouldHandleDeleteFailureToQueryUnderlyingPolicies() throws Exceptio policyService.deletePolicy(context, "RESOURCE_SET_ID").getOrThrowUninterruptibly(); } catch (ResourceException e) { //Then - verify(policyResourceDelegate, never()).deletePolicies(eq(context), anyListOf(String.class)); + verify(policyResourceDelegate, never()).deletePolicies(eq(context), any(Collection.class)); throw e; } } @@ -625,9 +625,9 @@ public void shouldHandleFailureToDeleteUnderlyingPolicies() throws Exception { = newResultPromise(Pair.of((QueryResponse) null, readPolicies)); Promise, ResourceException> deletePoliciesPromise = newExceptionPromise(exception); - given(policyResourceDelegate.queryPolicies(eq(context), Matchers.anyObject())) + given(policyResourceDelegate.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(currentPolicyPromise); - given(policyResourceDelegate.deletePolicies(eq(context), anyListOf(String.class))) + given(policyResourceDelegate.deletePolicies(eq(context), any(Collection.class))) .willReturn(deletePoliciesPromise); //When @@ -635,7 +635,7 @@ public void shouldHandleFailureToDeleteUnderlyingPolicies() throws Exception { policyService.deletePolicy(context, "RESOURCE_SET_ID").getOrThrowUninterruptibly(); } catch (ResourceException e) { //Then - verify(policyResourceDelegate).deletePolicies(eq(context), anyListOf(String.class)); + verify(policyResourceDelegate).deletePolicies(eq(context), any(Collection.class)); throw e; } } @@ -668,7 +668,7 @@ private void mockBackendQuery(Context context, JsonValue... policies) { Promise>, ResourceException> backendQueryPromise = newResultPromise(Pair.of(queryResult, policyResources)); - given(policyResourceDelegate.queryPolicies(eq(context), Matchers.anyObject())) + given(policyResourceDelegate.queryPolicies(eq(context), ArgumentMatchers.anyObject())) .willReturn(backendQueryPromise); } diff --git a/openam-upgrade/pom.xml b/openam-upgrade/pom.xml index 54fde036e7..b1768e9489 100644 --- a/openam-upgrade/pom.xml +++ b/openam-upgrade/pom.xml @@ -83,7 +83,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/DelegationConfigUpgradeStepTest.java b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/DelegationConfigUpgradeStepTest.java index 09a2a54d3b..77a6226acb 100644 --- a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/DelegationConfigUpgradeStepTest.java +++ b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/DelegationConfigUpgradeStepTest.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.upgrade.steps; import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/RemoveRedundantDefaultApplicationTest.java b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/RemoveRedundantDefaultApplicationTest.java index 241d3793b1..5af706a6e7 100644 --- a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/RemoveRedundantDefaultApplicationTest.java +++ b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/RemoveRedundantDefaultApplicationTest.java @@ -12,14 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. - * Portions copyright 2026 3A Systems, LLC + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.upgrade.steps; import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.utils.CollectionUtils.asSet; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/RemoveReferralsStepTest.java b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/RemoveReferralsStepTest.java index 5196099c6a..71e66a2b56 100644 --- a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/RemoveReferralsStepTest.java +++ b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/RemoveReferralsStepTest.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. - * Portions copyright 2026 3A Systems, LLC + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.upgrade.steps; @@ -25,7 +25,7 @@ import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeCTSMaxConnectionsConfigurationStepTest.java b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeCTSMaxConnectionsConfigurationStepTest.java index 5a4cac09e3..66b4b25b08 100644 --- a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeCTSMaxConnectionsConfigurationStepTest.java +++ b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeCTSMaxConnectionsConfigurationStepTest.java @@ -12,14 +12,16 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.upgrade.steps; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.*; import static org.mockito.MockitoAnnotations.initMocks; @@ -62,8 +64,8 @@ public void setup() throws Exception { upgradeStep = new UpgradeCTSMaxConnectionsConfigurationStep(adminTokenAction, connectionFactory, connectionCount, helper); - given(helper.getDefaultServerConfig(any(SSOToken.class))).willReturn(defaultServerInstanceConfig); - given(helper.getServerConfigs(any(SSOToken.class))).willReturn(serverInstanceConfigs); + given(helper.getDefaultServerConfig(nullable(SSOToken.class))).willReturn(defaultServerInstanceConfig); + given(helper.getServerConfigs(nullable(SSOToken.class))).willReturn(serverInstanceConfigs); given(connectionCount.getConnectionCount(anyInt(), any(ConnectionType.class))) .willAnswer(new Answer() { @Override diff --git a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeEntitlementSubConfigsStepTest.java b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeEntitlementSubConfigsStepTest.java index 98bf1db871..f6b257b738 100644 --- a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeEntitlementSubConfigsStepTest.java +++ b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeEntitlementSubConfigsStepTest.java @@ -12,11 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.upgrade.steps; import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.*; import java.security.PrivilegedAction; @@ -111,7 +113,7 @@ public void setUp() throws IllegalAccessException, InstantiationException { resourceTypeConfiguration = mock(ResourceTypeConfiguration.class); applicationServiceFactory = mock(ApplicationServiceFactory.class); applicationService = mock(ApplicationService.class); - when(applicationServiceFactory.create(any(Subject.class), anyString())).thenReturn(applicationService); + when(applicationServiceFactory.create(nullable(Subject.class), anyString())).thenReturn(applicationService); upgradeStep = new SafeUpgradeEntitlementSubConfigsStep(entitlementService, resourceTypeConfiguration, adminTokenAction, connectionFactory, applicationServiceFactory); @@ -271,12 +273,11 @@ public void newApplicationDescriptionNoNewTypesOrApplications() throws UpgradeEx } // Used to match the application as defined in the test xml. - private static final class ApplicationMatch extends ArgumentMatcher { + private static final class ApplicationMatch implements ArgumentMatcher { @Override - public boolean matches(Object argument) { + public boolean matches(Application application) { boolean matches = true; - final Application application = (Application)argument; matches &= "application4".equals(application.getName()); matches &= "type1".equals(application.getApplicationType().getName()); matches &= collectionMatch( @@ -290,12 +291,11 @@ public boolean matches(Object argument) { } // Used to match an application type as defined in the test xml. - private static final class TypeMatch extends ArgumentMatcher { + private static final class TypeMatch implements ArgumentMatcher { @Override - public boolean matches(Object argument) { + public boolean matches(ApplicationType type) { boolean matches = true; - final ApplicationType type = (ApplicationType)argument; matches &= "type4".equals(type.getName()); matches &= TYPE_ACTIONS.equals(type.getActions()); matches &= type.getSearchIndex() instanceof DumbSearchIndex; diff --git a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/policy/UpgradeResourceTypeStepTest.java b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/policy/UpgradeResourceTypeStepTest.java index 3816af0aea..fcda85eea5 100644 --- a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/policy/UpgradeResourceTypeStepTest.java +++ b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/policy/UpgradeResourceTypeStepTest.java @@ -12,10 +12,12 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.upgrade.steps.policy; import static org.forgerock.openam.entitlement.utils.EntitlementUtils.*; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.*; import static org.testng.Assert.assertEquals; @@ -100,7 +102,7 @@ public int getLength() { // Mock organisation and application service configuration ServiceConfig orgConfig = mock(ServiceConfig.class); - when(configManager.getOrganizationConfig(anyString(), anyString())).thenReturn(orgConfig); + when(configManager.getOrganizationConfig(anyString(), nullable(String.class))).thenReturn(orgConfig); ServiceConfig appsConfig = mock(ServiceConfig.class); when(orgConfig.getSubConfig(anyString())).thenReturn(appsConfig); diff --git a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/policy/conditions/PolicyConditionUpgraderTest.java b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/policy/conditions/PolicyConditionUpgraderTest.java index 470970634d..614dc79ea6 100644 --- a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/policy/conditions/PolicyConditionUpgraderTest.java +++ b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/policy/conditions/PolicyConditionUpgraderTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package org.forgerock.openam.upgrade.steps.policy.conditions; @@ -34,8 +35,8 @@ import org.forgerock.openam.upgrade.UpgradeException; import org.mockito.ArgumentCaptor; import static org.mockito.BDDMockito.given; -import org.mockito.Matchers; -import static org.mockito.Matchers.eq; +import org.mockito.ArgumentMatchers; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -374,9 +375,9 @@ public void shouldMigratePolicyWithSingleSubjectAndEnvironmentCondition() throws given(condition.getClassName()).willReturn("CONDITION_CLASS_NAME"); given(conditionUpgradeMap.migrateSubjectCondition(eq("SUBJECT_CLASS_NAME"), eq(subject), - Matchers.anyObject())).willReturn(migratedSubject); + ArgumentMatchers.anyObject())).willReturn(migratedSubject); given(conditionUpgradeMap.migrateEnvironmentCondition(eq("CONDITION_CLASS_NAME"), eq(condition), - Matchers.anyObject())).willReturn(migratedCondition); + ArgumentMatchers.anyObject())).willReturn(migratedCondition); //When conditionUpgrader.dryRunPolicyUpgrade(policy); @@ -410,9 +411,9 @@ public void shouldMigratePolicyWithOrSubjectCondition() throws EntitlementExcept given(subject1.getClassName()).willReturn("SUBJECT1_CLASS_NAME"); given(subject2.getClassName()).willReturn("SUBJECT2_CLASS_NAME"); given(conditionUpgradeMap.migrateSubjectCondition(eq("SUBJECT1_CLASS_NAME"), eq(subject1), - Matchers.anyObject())).willReturn(migratedSubject1); + ArgumentMatchers.anyObject())).willReturn(migratedSubject1); given(conditionUpgradeMap.migrateSubjectCondition(eq("SUBJECT2_CLASS_NAME"), eq(subject2), - Matchers.anyObject())).willReturn(migratedSubject2); + ArgumentMatchers.anyObject())).willReturn(migratedSubject2); //When @@ -422,8 +423,8 @@ public void shouldMigratePolicyWithOrSubjectCondition() throws EntitlementExcept ArgumentCaptor subjectCaptor = ArgumentCaptor.forClass(Set.class); verify(orSubject).setESubjects(subjectCaptor.capture()); assertThat(subjectCaptor.getValue()).hasSize(2).contains(migratedSubject1, migratedSubject2); - verify(policy, never()).setSubject(Matchers.anyObject()); - verify(policy, never()).setCondition(Matchers.anyObject()); + verify(policy, never()).setSubject(ArgumentMatchers.anyObject()); + verify(policy, never()).setCondition(ArgumentMatchers.anyObject()); } @SuppressWarnings("unchecked") @@ -446,9 +447,9 @@ public void shouldMigratePolicyWithAndSubjectCondition() throws EntitlementExcep given(subject1.getClassName()).willReturn("SUBJECT1_CLASS_NAME"); given(subject2.getClassName()).willReturn("SUBJECT2_CLASS_NAME"); given(conditionUpgradeMap.migrateSubjectCondition(eq("SUBJECT1_CLASS_NAME"), eq(subject1), - Matchers.anyObject())).willReturn(migratedSubject1); + ArgumentMatchers.anyObject())).willReturn(migratedSubject1); given(conditionUpgradeMap.migrateSubjectCondition(eq("SUBJECT2_CLASS_NAME"), eq(subject2), - Matchers.anyObject())).willReturn(migratedSubject2); + ArgumentMatchers.anyObject())).willReturn(migratedSubject2); //When @@ -458,8 +459,8 @@ public void shouldMigratePolicyWithAndSubjectCondition() throws EntitlementExcep ArgumentCaptor subjectCaptor = ArgumentCaptor.forClass(Set.class); verify(andSubject).setESubjects(subjectCaptor.capture()); assertThat(subjectCaptor.getValue()).hasSize(2).contains(migratedSubject1, migratedSubject2); - verify(policy, never()).setSubject(Matchers.anyObject()); - verify(policy, never()).setCondition(Matchers.anyObject()); + verify(policy, never()).setSubject(ArgumentMatchers.anyObject()); + verify(policy, never()).setCondition(ArgumentMatchers.anyObject()); } @Test @@ -477,7 +478,7 @@ public void shouldMigratePolicyWithNotSubjectCondition() throws EntitlementExcep given(notSubject.getESubjects()).willReturn(notSubjects); given(subject.getClassName()).willReturn("SUBJECT_CLASS_NAME"); given(conditionUpgradeMap.migrateSubjectCondition(eq("SUBJECT_CLASS_NAME"), eq(subject), - Matchers.anyObject())).willReturn(migratedSubject); + ArgumentMatchers.anyObject())).willReturn(migratedSubject); //When conditionUpgrader.dryRunPolicyUpgrade(policy); @@ -486,8 +487,8 @@ public void shouldMigratePolicyWithNotSubjectCondition() throws EntitlementExcep ArgumentCaptor subjectCaptor = ArgumentCaptor.forClass(Set.class); verify(notSubject).setESubjects(subjectCaptor.capture()); assertThat(subjectCaptor.getValue()).hasSize(1).contains(migratedSubject); - verify(policy, never()).setSubject(Matchers.anyObject()); - verify(policy, never()).setCondition(Matchers.anyObject()); + verify(policy, never()).setSubject(ArgumentMatchers.anyObject()); + verify(policy, never()).setCondition(ArgumentMatchers.anyObject()); } @SuppressWarnings("unchecked") @@ -510,9 +511,9 @@ public void shouldMigratePolicyWithOrEnvironmentCondition() throws EntitlementEx given(condition1.getClassName()).willReturn("CONDITION1_CLASS_NAME"); given(condition2.getClassName()).willReturn("CONDITION2_CLASS_NAME"); given(conditionUpgradeMap.migrateEnvironmentCondition(eq("CONDITION1_CLASS_NAME"), eq(condition1), - Matchers.anyObject())).willReturn(migratedCondition1); + ArgumentMatchers.anyObject())).willReturn(migratedCondition1); given(conditionUpgradeMap.migrateEnvironmentCondition(eq("CONDITION2_CLASS_NAME"), eq(condition2), - Matchers.anyObject())).willReturn(migratedCondition2); + ArgumentMatchers.anyObject())).willReturn(migratedCondition2); //When @@ -522,8 +523,8 @@ public void shouldMigratePolicyWithOrEnvironmentCondition() throws EntitlementEx ArgumentCaptor conditionsCaptor = ArgumentCaptor.forClass(Set.class); verify(orCondition).setEConditions(conditionsCaptor.capture()); assertThat(conditionsCaptor.getValue()).hasSize(2).contains(migratedCondition1, migratedCondition2); - verify(policy, never()).setSubject(Matchers.anyObject()); - verify(policy, never()).setCondition(Matchers.anyObject()); + verify(policy, never()).setSubject(ArgumentMatchers.anyObject()); + verify(policy, never()).setCondition(ArgumentMatchers.anyObject()); } @SuppressWarnings("unchecked") @@ -546,9 +547,9 @@ public void shouldMigratePolicyWithAndEnvironmentCondition() throws EntitlementE given(condition1.getClassName()).willReturn("CONDITION1_CLASS_NAME"); given(condition2.getClassName()).willReturn("CONDITION2_CLASS_NAME"); given(conditionUpgradeMap.migrateEnvironmentCondition(eq("CONDITION1_CLASS_NAME"), eq(condition1), - Matchers.anyObject())).willReturn(migratedCondition1); + ArgumentMatchers.anyObject())).willReturn(migratedCondition1); given(conditionUpgradeMap.migrateEnvironmentCondition(eq("CONDITION2_CLASS_NAME"), eq(condition2), - Matchers.anyObject())).willReturn(migratedCondition2); + ArgumentMatchers.anyObject())).willReturn(migratedCondition2); //When @@ -558,8 +559,8 @@ public void shouldMigratePolicyWithAndEnvironmentCondition() throws EntitlementE ArgumentCaptor conditionCaptor = ArgumentCaptor.forClass(Set.class); verify(andCondition).setEConditions(conditionCaptor.capture()); assertThat(conditionCaptor.getValue()).hasSize(2).contains(migratedCondition1, migratedCondition2); - verify(policy, never()).setSubject(Matchers.anyObject()); - verify(policy, never()).setCondition(Matchers.anyObject()); + verify(policy, never()).setSubject(ArgumentMatchers.anyObject()); + verify(policy, never()).setCondition(ArgumentMatchers.anyObject()); } @Test @@ -577,7 +578,7 @@ public void shouldMigratePolicyWithNotEnvironmentCondition() throws EntitlementE given(notCondition.getEConditions()).willReturn(notConditions); given(condition.getClassName()).willReturn("CONDITION_CLASS_NAME"); given(conditionUpgradeMap.migrateEnvironmentCondition(eq("CONDITION_CLASS_NAME"), eq(condition), - Matchers.anyObject())).willReturn(migratedCondition); + ArgumentMatchers.anyObject())).willReturn(migratedCondition); //When conditionUpgrader.dryRunPolicyUpgrade(policy); @@ -586,7 +587,7 @@ public void shouldMigratePolicyWithNotEnvironmentCondition() throws EntitlementE ArgumentCaptor conditionCaptor = ArgumentCaptor.forClass(Set.class); verify(notCondition).setEConditions(conditionCaptor.capture()); assertThat(conditionCaptor.getValue()).hasSize(1).contains(migratedCondition); - verify(policy, never()).setSubject(Matchers.anyObject()); - verify(policy, never()).setCondition(Matchers.anyObject()); + verify(policy, never()).setSubject(ArgumentMatchers.anyObject()); + verify(policy, never()).setCondition(ArgumentMatchers.anyObject()); } } diff --git a/pom.xml b/pom.xml index 81b4a5cea6..097f49b34a 100644 --- a/pom.xml +++ b/pom.xml @@ -161,6 +161,7 @@ --add-opens java.base/jdk.internal.math=ALL-UNNAMED --add-opens java.base/jdk.internal.module=ALL-UNNAMED --add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED + --add-opens java.base/jdk.internal.util=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED @@ -418,12 +419,25 @@ opendj-core ${opendj.version} - - org.mockito - mockito-all - 1.10.19 - test - + + + ognl + ognl + 3.0.21 + + + + javassist + javassist + + + + + + org.javassist + javassist + 3.27.0-GA + org.openidentityplatform.openam