From 4fdac28aeaf684358393e482d7b2587f54566864 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 16 Apr 2026 11:18:16 +0300 Subject: [PATCH 01/39] Update selenium to 4.43.0 & testcontainers to 1.21.4 --- openam-server/pom.xml | 6 +++--- .../openam/test/integration/BaseTest.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openam-server/pom.xml b/openam-server/pom.xml index 1ea5df9f52..e8d4d7736e 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 @@ -166,13 +166,13 @@ org.seleniumhq.selenium selenium-java - 4.13.0 + 4.43.0 test org.testcontainers testcontainers - 1.20.6 + 1.21.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..f724716c4d 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,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; @@ -51,7 +51,7 @@ public void webdriverSetup() { options.addArguments("--remote-allow-origins=*","--headless", "--disable-dev-shm-usage", "--no-sandbox", "--verbose"); //options.addArguments("--remote-allow-origins=*", "--verbose"); driver = new ChromeDriver(options); - wait = new WebDriverWait(driver, Duration.ofSeconds(10)); + wait = new WebDriverWait(driver, Duration.ofSeconds(20)); } @AfterClass From 4256497cc2a271fa20b368069002d92d28928199 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 16 Apr 2026 11:55:41 +0300 Subject: [PATCH 02/39] Make IT_SetupWithOpenDJ more stable --- .../openam/test/integration/IT_SetupWithOpenDJ.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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..237b890bf5 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; @@ -116,6 +116,8 @@ private void testOpenAmInstallation(String openamUrl, Integer opendjPort) throws wait.until(ExpectedConditions.elementToBeClickable(By.id("nextTabButton"))).click(); waitForElement(By.id("loadBalancerDisable")); + Thread.sleep(1000); + wait.until(ExpectedConditions.elementToBeClickable(By.id("nextTabButton"))).click(); waitForElement(By.id("agentPassword")).sendKeys(PA_PASSWORD); From 07c84d2e3fe4b7f3d0b0b71a47bcd4c9ba42ba2b Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 16 Apr 2026 15:03:55 +0300 Subject: [PATCH 03/39] Make IT_SetupWithOpenDJ more stable --- .../openam/test/integration/IT_SetupWithOpenDJ.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 237b890bf5..571c1acb2f 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 @@ -116,9 +116,10 @@ private void testOpenAmInstallation(String openamUrl, Integer opendjPort) throws wait.until(ExpectedConditions.elementToBeClickable(By.id("nextTabButton"))).click(); waitForElement(By.id("loadBalancerDisable")); - Thread.sleep(1000); - wait.until(ExpectedConditions.elementToBeClickable(By.id("nextTabButton"))).click(); + WebElement nextTabButton = wait.until(ExpectedConditions.elementToBeClickable(By.id("nextTabButton"))); + Thread.sleep(1000); + nextTabButton.click(); waitForElement(By.id("agentPassword")).sendKeys(PA_PASSWORD); waitForElement(By.id("agentConfirm")).sendKeys(PA_PASSWORD); From 6f8db145a431fc91137454952b816ba6aa5d5f39 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 13:39:33 +0000 Subject: [PATCH 04/39] Initial plan From e8de90c696cc7ab4a98f3c574f5d6cf385b35e6e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 13:46:08 +0000 Subject: [PATCH 05/39] Fix CVE-2016-3093: upgrade OGNL from 2.6.9 to 3.0.21 Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/f6edab35-20fa-446b-8036-d8c2223efb24 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- legal/THIRDPARTYREADME.txt | 2 +- openam-core/pom.xml | 5 +++++ .../OpenFM/src/main/deployable-war/fam-noconsole.list | 2 +- pom.xml | 6 ++++++ 4 files changed, 13 insertions(+), 2 deletions(-) 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-core/pom.xml b/openam-core/pom.xml index b85b30036d..2898264e60 100755 --- a/openam-core/pom.xml +++ b/openam-core/pom.xml @@ -268,6 +268,11 @@ ${click.version} + + ognl + ognl + + commons-codec commons-codec 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/pom.xml b/pom.xml index 81b4a5cea6..f4dfe6c0f6 100644 --- a/pom.xml +++ b/pom.xml @@ -424,6 +424,12 @@ 1.10.19 test + + + ognl + ognl + 3.0.21 + org.openidentityplatform.openam From fc3b6a83f1ef1637179d295ab3b230c38cee7c18 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 14:14:46 +0000 Subject: [PATCH 06/39] Initial plan From 4ec6ee2ce3149a584c023ed3c7bc0cf50009b030 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 16 Apr 2026 17:22:00 +0300 Subject: [PATCH 07/39] Make IT_SetupWithOpenDJ more stable --- .../openam/test/integration/BaseTest.java | 15 ++++++++++++++- .../test/integration/IT_SetupWithOpenDJ.java | 8 +++++--- 2 files changed, 19 insertions(+), 4 deletions(-) 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 f724716c4d..fa3dd8a5f5 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 @@ -17,20 +17,24 @@ package org.openidentityplatform.openam.test.integration; 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.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; @@ -51,7 +55,7 @@ public void webdriverSetup() { options.addArguments("--remote-allow-origins=*","--headless", "--disable-dev-shm-usage", "--no-sandbox", "--verbose"); //options.addArguments("--remote-allow-origins=*", "--verbose"); driver = new ChromeDriver(options); - wait = new WebDriverWait(driver, Duration.ofSeconds(20)); + wait = new WebDriverWait(driver, Duration.ofSeconds(10)); } @AfterClass @@ -71,6 +75,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 571c1acb2f..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 @@ -115,14 +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")); - WebElement nextTabButton = wait.until(ExpectedConditions.elementToBeClickable(By.id("nextTabButton"))); Thread.sleep(1000); - nextTabButton.click(); + + 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(); From cee98f64fd0a86c408a024f70aa38c20a1a18027 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 14:41:51 +0000 Subject: [PATCH 08/39] Upgrade PowerMock from 1.7.4 to 2.0.9, replace Matchers with ArgumentMatchers Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/6b8eb99d-3f76-42c6-9848-34782ea3487a Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../common/JaspiAuthLoginModulePAPTest.java | 20 +++---- .../common/JaspiAuthLoginModuleTest.java | 18 +++---- .../common/JaspiAuthModuleWrapperTest.java | 4 +- .../deviceprint/ProfilePersisterTest.java | 2 +- .../modules/fr/oath/OathMakerTest.java | 2 +- openam-authentication/openam-auth-nt/pom.xml | 2 +- .../openam-auth-oauth2/pom.xml | 8 +-- .../modules/oauth2/ESIATest.java | 4 +- .../PersistentCookieAuthModuleTest.java | 18 +++---- .../webauthn/WebAuthnAuthenticationTest.java | 4 +- .../webauthn/WebAuthnRegistrationTest.java | 4 +- .../openam-auth-windowsdesktopsso/pom.xml | 2 +- openam-authentication/pom.xml | 8 +-- .../core/rest/authn/AuthIdHelperTest.java | 12 ++--- .../RestAuthCallbackHandlerManagerTest.java | 14 ++--- .../authn/RestAuthenticationHandlerTest.java | 24 ++++----- .../RestAuthNameCallbackHandlerTest.java | 2 +- .../RestAuthPasswordCallbackHandlerTest.java | 6 +-- .../RestAuthX509CallbackHandlerTest.java | 4 +- .../authn/core/LoginAuthenticatorTest.java | 8 +-- .../core/rest/cts/CoreTokenResourceTest.java | 10 ++-- .../TrustedDevicesResourceTest.java | 4 +- .../devices/oath/OathDevicesResourceTest.java | 6 +-- .../devices/push/PushDevicesResourceTest.java | 6 +-- .../rest/session/SessionResourceV2Test.java | 2 +- .../session/TokenOwnerAuthzModuleTest.java | 2 +- .../query/SessionQueryManagerTest.java | 2 +- .../core/rest/sms/SmsJsonConverterTest.java | 10 ++-- .../core/rest/sms/SmsRealmProviderTest.java | 2 +- .../core/rest/sms/tree/SmsRouteTreeTest.java | 2 +- openam-core/pom.xml | 10 ++-- .../com/iplanet/dpro/session/SessionTest.java | 2 +- .../monitoring/MonitoredOperationsTest.java | 4 +- .../SessionMonitoringStoreTest.java | 2 +- .../ServerSessionOperationStrategyTest.java | 2 +- .../strategies/ClientSdkOperationsTest.java | 4 +- .../session/service/InternalSessionTest.java | 4 +- .../service/SessionServerConfigTest.java | 2 +- .../service/WebtopNamingSiteUtilsTest.java | 4 +- .../session/utils/SessionInfoFactoryTest.java | 2 +- ...AuthenticationProcessEventAuditorTest.java | 4 +- .../authentication/jaas/LoginContextTest.java | 6 +-- .../service/DefaultSessionActivatorTest.java | 4 +- .../agent/TokenRestrictionResolverTest.java | 4 +- .../blacklist/BloomFilterBlacklistTest.java | 2 +- .../openam/blacklist/CTSBlacklistTest.java | 2 +- .../core/realms/CachingRealmLookupTest.java | 2 +- .../cts/CTSPersistentStoreImplTest.java | 6 +-- .../openam/cts/adapters/SAMLAdapterTest.java | 2 +- .../openam/cts/impl/LDAPConfigTest.java | 2 +- .../CTSWorkerPastExpiryDateQueryTest.java | 4 +- .../MaxSessionTimeExpiredQueryTest.java | 4 +- .../SessionIdleTimeExpiredQueryTest.java | 4 +- .../config/CTSQueueConfigurationTest.java | 2 +- .../CTSMonitoringStoreImplTest.java | 6 +-- .../CtsPersistenceOperationsMonitorTest.java | 2 +- .../DefaultMonitoringResultHandlerTest.java | 2 +- .../TokenMonitoringResultHandlerTest.java | 2 +- .../cts/utils/blob/TokenBlobUtilsTest.java | 2 +- .../cts/worker/CTSWorkerManagerTest.java | 4 +- .../process/CTSWorkerBaseProcessTest.java | 2 +- .../process/CTSWorkerDeleteProcessTest.java | 4 +- .../services/email/MailServerImplTest.java | 6 +-- .../InternalSessionStoreChainTest.java | 2 +- .../InMemoryInternalSessionCacheStepTest.java | 2 +- .../stateless/StatelessConfigTest.java | 4 +- .../sm/SMSConfigurationFactoryTest.java | 4 +- .../sm/ServerConfigurationFactoryTest.java | 4 +- .../config/ConsoleConfigHandlerImplTest.java | 2 +- .../impl/ldap/ExternalLdapConfigTest.java | 6 +-- .../datalayer/impl/tasks/CreateTaskTest.java | 4 +- .../sm/datalayer/impl/tasks/ReadTaskTest.java | 6 +-- .../datalayer/impl/tasks/UpdateTaskTest.java | 6 +-- .../JwtSessionMapperBuilderTest.java | 2 +- .../xacml3/ResourceAttributeUtilTest.java | 4 +- .../xacml3/XACMLExportImportTest.java | 8 +-- .../environment/SessionConditionTest.java | 4 +- .../ResourceTypeConfigurationTest.java | 4 +- .../rest/ApplicationV1FilterTest.java | 2 +- .../rest/ApplicationsResourceTest.java | 4 +- .../rest/ConditionTypesResourceTest.java | 2 +- .../rest/DecisionCombinersResourceTest.java | 2 +- .../entitlement/rest/PolicyResourceTest.java | 2 +- .../entitlement/rest/PolicyV1FilterTest.java | 2 +- .../rest/PrivilegePolicyStoreTest.java | 2 +- .../rest/SubjectAttributesResourceV1Test.java | 2 +- .../rest/SubjectTypesResourceTest.java | 2 +- .../xacml/v3/ImportStepGeneratorTest.java | 2 +- .../saml2/profile/IDPSSOFederateTest.java | 4 +- .../brokers/CTSNotificationBrokerTest.java | 6 +-- .../websocket/NotificationsWebSocketTest.java | 4 +- .../InMemoryNotificationBrokerTest.java | 2 +- .../oauth2/core/AccessTokenServiceTest.java | 4 +- ...AuthorizationCodeGrantTypeHandlerTest.java | 10 ++-- .../oauth2/core/OAuth2RequestFactoryTest.java | 4 +- .../OpenAMClientRegistrationStoreTest.java | 4 +- .../resources/OpenAMResourceSetStoreTest.java | 10 ++-- .../ResourceSetLabelRegistrationTest.java | 2 +- .../ResourceSetRegistrationEndpointTest.java | 12 ++--- .../oauth2/rest/ClientResourceTest.java | 2 +- .../server/RadiusRequestHandlerTest.java | 2 +- .../spi/handlers/OpenAMAuthHandlerTest.java | 6 +-- .../openam/cors/CORSServiceTest.java | 6 +-- .../forgerockrest/utils/RestLogTest.java | 2 +- .../ElevatedConnectionFactoryWrapperTest.java | 2 +- .../openam/rest/RealmContextFilterTest.java | 4 +- .../openam/rest/RealmRoutingFactoryTest.java | 4 +- .../openam/rest/RestEndpointServletTest.java | 4 +- .../forgerock/openam/rest/RestRouterIT.java | 4 +- .../rest/authz/PrivilegeAuthzModuleTest.java | 4 +- .../query/PagingQueryResponseHandlerTest.java | 6 +-- .../ScriptEngineConfiguratorTest.java | 4 +- .../scripting/rest/ScriptResourceTest.java | 4 +- .../rest/batch/BatchResourceTest.java | 2 +- .../rest/batch/helpers/RequesterTest.java | 2 +- .../ScriptConfigurationServiceTest.java | 4 +- .../shared/guice/SharedGuiceModuleTest.java | 2 +- .../SoapSTSInstancePublisherImplTest.java | 4 +- .../TokenRenewOperationProviderTest.java | 2 +- .../TokenValidateOperationProviderTest.java | 2 +- .../OpenIdConnectTokenGenerationImplTest.java | 2 +- .../saml2/SAML2TokenGenerationImplTest.java | 2 +- .../tools/admin/LicenseCheckerTest.java | 4 +- .../license/PersistentLicenseLocatorTest.java | 4 +- .../license/CLILicensePresenterTest.java | 2 +- .../ServletContextLicenseLocatorTest.java | 2 +- .../uma/AuthorizationRequestEndpointTest.java | 42 +++++++-------- .../openam/uma/IdTokenClaimGathererTest.java | 2 +- ...ngClientSdkSessionRequestsServiceTest.java | 4 +- .../uma/PermissionRequestEndpointTest.java | 4 +- ...UmaWellKnownConfigurationEndpointTest.java | 10 ++-- .../uma/rest/PendingRequestResourceTest.java | 4 +- .../openam/uma/rest/PolicyGraphTest.java | 2 +- .../uma/rest/PolicyResourceDelegateTest.java | 24 ++++----- .../uma/rest/ResourceSetResourceTest.java | 4 +- .../uma/rest/ResourceSetServiceTest.java | 22 ++++---- .../rest/UmaIdRepoCreationListenerTest.java | 2 +- .../uma/rest/UmaPolicyResourceTest.java | 4 +- .../UmaPolicyServiceImplDelegationTest.java | 18 +++---- .../uma/rest/UmaPolicyServiceImplTest.java | 34 ++++++------ .../DelegationConfigUpgradeStepTest.java | 2 +- ...RemoveRedundantDefaultApplicationTest.java | 2 +- .../steps/RemoveReferralsStepTest.java | 2 +- ...TSMaxConnectionsConfigurationStepTest.java | 4 +- .../PolicyConditionUpgraderTest.java | 52 +++++++++---------- 145 files changed, 399 insertions(+), 399 deletions(-) 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..4a4c330aba 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 @@ -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; @@ -107,7 +107,7 @@ public void shouldCallOnLoginSuccessAndThrowAuthenticationExceptionWhenAuthExcep //Then verify(jaspiAuthWrapper).initialize(any(CallbackHandler.class), eq(config)); - verify(jaspiAuthWrapper, never()).secureResponse(Matchers.anyObject()); + verify(jaspiAuthWrapper, never()).secureResponse(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); assertEquals(exception.getErrorCode(), "authFailed"); } @@ -121,7 +121,7 @@ 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 @@ -130,7 +130,7 @@ public void shouldCallOnLoginSuccessWhenSecureResponseReturnsSendSuccess() throw //Then verify(jaspiAuthWrapper).initialize(any(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 @@ -159,7 +159,7 @@ public void shouldCallOnLoginSuccessWhenSecureResponseReturnsSendFailure() throw //Then verify(jaspiAuthWrapper).initialize(any(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 @@ -190,7 +190,7 @@ public void shouldCallOnLoginSuccessWhenSecureResponseReturnsSendContinue() thro //Then verify(jaspiAuthWrapper).initialize(any(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 @@ -220,7 +220,7 @@ public void shouldCallOnLoginSuccessWhenSecureResponseReturnsElse() throws Authe //Then verify(jaspiAuthWrapper).initialize(any(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..3fbe17d74a 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 @@ -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; @@ -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..2511b1da41 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 @@ -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/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..5ec8f09a7a 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 @@ -32,7 +32,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..f4e5e09429 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 @@ -17,7 +17,7 @@ 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..0eec82c882 100755 --- a/openam-authentication/openam-auth-nt/pom.xml +++ b/openam-authentication/openam-auth-nt/pom.xml @@ -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..72ec701285 100755 --- a/openam-authentication/openam-auth-oauth2/pom.xml +++ b/openam-authentication/openam-auth-oauth2/pom.xml @@ -67,19 +67,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-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..2ca403b70a 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 @@ -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-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..2c584dc031 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 @@ -41,7 +41,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; @@ -195,7 +195,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 +211,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 +225,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 +244,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 +259,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 +280,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 +296,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 +311,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-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..18ece6c71a 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 @@ -16,8 +16,8 @@ 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..616d4c99ed 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 @@ -16,8 +16,8 @@ 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..37fd81201c 100755 --- a/openam-authentication/openam-auth-windowsdesktopsso/pom.xml +++ b/openam-authentication/openam-auth-windowsdesktopsso/pom.xml @@ -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/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..65b418b994 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 @@ -53,7 +53,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 +90,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 +305,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 +314,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 +341,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..b41d3e3124 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 @@ -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..11002da4cd 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 @@ -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,7 +476,7 @@ 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"); 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..80b22459b2 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 @@ -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..49fa5f3138 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 @@ -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..7d152932ac 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 @@ -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..1056a8ac6f 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 @@ -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..a738616032 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 @@ -18,8 +18,8 @@ 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 +38,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 +71,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); @@ -159,7 +159,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..9b963aeaff 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 @@ -48,7 +48,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 +103,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..62845cf676 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 @@ -23,9 +23,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/devices/push/PushDevicesResourceTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/devices/push/PushDevicesResourceTest.java index 21c697b546..31c99b7433 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 @@ -23,9 +23,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/SessionResourceV2Test.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceV2Test.java index 0107a441aa..33d300a1de 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 @@ -24,7 +24,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..aba2dc1c72 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 @@ -17,7 +17,7 @@ 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..6164466e79 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 @@ -27,7 +27,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..af9e9aa17e 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 @@ -34,7 +34,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 +173,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 +186,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 +229,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 +238,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..cefd298418 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 @@ -19,7 +19,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..8c15cb3904 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 @@ -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..b0ab0c424b 100755 --- a/openam-core/pom.xml +++ b/openam-core/pom.xml @@ -415,25 +415,25 @@ 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/SessionTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/SessionTest.java index 49a70392b2..a34a1976ec 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 @@ -22,7 +22,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..ce1565e310 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 @@ -18,8 +18,8 @@ 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..e47a23254d 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 @@ -21,7 +21,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..35bbeec9b1 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 @@ -17,7 +17,7 @@ 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..204dd69cf0 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 @@ -17,8 +17,8 @@ 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; 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..a5258d74c2 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 @@ -19,8 +19,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..3c9f64f2a2 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 @@ -13,7 +13,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..0a95f04694 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 @@ -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..4148d4878b 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 @@ -18,7 +18,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 java.util.Hashtable; 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..730334055c 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 @@ -15,8 +15,8 @@ */ 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.Mockito.*; import static org.forgerock.openam.audit.AuditConstants.EventName; 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..9be8afa178 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 @@ -32,9 +32,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..8be01f9515 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 @@ -18,8 +18,8 @@ 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..c357afc005 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 @@ -16,8 +16,8 @@ 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..b03c3d609d 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 @@ -19,7 +19,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..4547e44005 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 @@ -20,7 +20,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..79c948bd97 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 @@ -18,7 +18,7 @@ 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..6616743f38 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 @@ -25,9 +25,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..340dff828d 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 @@ -19,7 +19,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/LDAPConfigTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/LDAPConfigTest.java index 023fdd3334..a9787a8bd0 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 @@ -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/query/worker/queries/CTSWorkerPastExpiryDateQueryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerPastExpiryDateQueryTest.java index ad1fdd62ac..706cf8a901 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 @@ -16,8 +16,8 @@ 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..7c6168ef2b 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 @@ -16,8 +16,8 @@ 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/SessionIdleTimeExpiredQueryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/SessionIdleTimeExpiredQueryTest.java index 3298ebc7c3..aaad799519 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 @@ -16,8 +16,8 @@ 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/queue/config/CTSQueueConfigurationTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/config/CTSQueueConfigurationTest.java index 3b65cf87eb..ca61b78669 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 @@ -18,7 +18,7 @@ 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..5c774ca020 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 @@ -24,7 +24,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 +34,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 +85,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/persistence/CtsPersistenceOperationsMonitorTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/persistence/CtsPersistenceOperationsMonitorTest.java index b623245836..9bb4ffad4c 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 @@ -24,7 +24,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..2550739fe8 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 @@ -25,7 +25,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..4af2a21d94 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 @@ -23,7 +23,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/TokenBlobUtilsTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobUtilsTest.java index 84ab45b73e..5c77c6afd6 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 @@ -27,7 +27,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..fbfc965d13 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 @@ -17,8 +17,8 @@ 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.anyLong; import static org.mockito.Mockito.*; import java.util.Arrays; 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..c4711c2994 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 @@ -17,7 +17,7 @@ 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..3a52b862d2 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 @@ -17,8 +17,8 @@ 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/services/email/MailServerImplTest.java b/openam-core/src/test/java/org/forgerock/openam/services/email/MailServerImplTest.java index aa0e0da8b2..51947fc0d1 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 @@ -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..683687dd89 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 @@ -18,7 +18,7 @@ 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..5d2213900a 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 @@ -20,7 +20,7 @@ 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..d354634bc3 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 @@ -22,8 +22,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..ba1a263f0e 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 @@ -25,8 +25,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..a2151d0623 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 @@ -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..18e0772fff 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 @@ -21,7 +21,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..ffc82dbf09 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 @@ -18,9 +18,9 @@ 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; 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..afa79885ad 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 @@ -16,8 +16,8 @@ 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..44c9ba52de 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 @@ -16,9 +16,9 @@ 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; 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..f5d187ed28 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 @@ -17,9 +17,9 @@ 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; 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..3717694bb4 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 @@ -18,7 +18,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.*; 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..0d3b315fab 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 @@ -31,8 +31,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..223838fa23 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 @@ -22,10 +22,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..e88ff27afa 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 @@ -24,7 +24,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 +106,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..bd4ad936b1 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 @@ -28,8 +28,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..ab178f3539 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 @@ -22,7 +22,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..a384d7c212 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 @@ -23,8 +23,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..923a30a06b 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 @@ -18,7 +18,7 @@ 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..c251195777 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 @@ -18,7 +18,7 @@ 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..5589f0aa97 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 @@ -20,7 +20,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..23e5e71260 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 @@ -23,7 +23,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..fb4a465cf4 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 @@ -44,7 +44,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..abab86ed29 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 @@ -18,7 +18,7 @@ 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..0d5f37093e 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 @@ -20,7 +20,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..ee881c8089 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 @@ -20,7 +20,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/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..7efb9b6e59 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 @@ -17,8 +17,8 @@ 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.Mockito.when; import org.forgerock.openam.saml2.IDPRequestValidator; 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..1237ad967e 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 @@ -20,9 +20,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..7b7cc7a200 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 @@ -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..e9a466a6bf 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 @@ -19,7 +19,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/src/test/java/org/forgerock/oauth2/core/AccessTokenServiceTest.java b/openam-oauth2/src/test/java/org/forgerock/oauth2/core/AccessTokenServiceTest.java index 034017bc75..a9159fd0cf 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 @@ -39,7 +39,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 +71,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); 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..6465bf8877 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 @@ -31,7 +31,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 +66,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); @@ -217,7 +217,7 @@ public void shouldHandleAndIssueRefreshToken() throws Exception { 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))) + anySetOf(String.class), ArgumentMatchers.anyObject(), anyString(), anyString(), eq(request))) .willReturn(accessToken); given(providerSettings.validateAccessTokenScope(eq(clientRegistration), anySetOf(String.class), eq(request))) .willReturn(validatedScope); @@ -258,7 +258,7 @@ public void shouldHandle() throws Exception { 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))) + anySetOf(String.class), ArgumentMatchers.anyObject(), anyString(), anyString(), eq(request))) .willReturn(accessToken); given(providerSettings.validateAccessTokenScope(eq(clientRegistration), anySetOf(String.class), eq(request))) .willReturn(validatedScope); @@ -299,7 +299,7 @@ public void shouldHandleAndIncludeScopeInAccessToken() throws Exception { 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))) + anySetOf(String.class), ArgumentMatchers.anyObject(), anyString(), anyString(), eq(request))) .willReturn(accessToken); given(authorizationCode.getScope()).willReturn(validatedScope); 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..88cd16e334 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 @@ -17,8 +17,8 @@ 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..ebe642033e 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 @@ -17,8 +17,8 @@ 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/resources/OpenAMResourceSetStoreTest.java b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/resources/OpenAMResourceSetStoreTest.java index e482dc272f..922419d1a9 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 @@ -37,7 +37,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,7 +58,7 @@ public void setup() throws Exception { store = new OpenAMResourceSetStore("REALM", oAuth2UrisFactory, idGenerator, dataStore); - given(oAuth2UrisFactory.get(Matchers.anyObject())).willReturn(oAuth2Uris); + given(oAuth2UrisFactory.get(ArgumentMatchers.anyObject())).willReturn(oAuth2Uris); given(oAuth2Uris.getResourceSetRegistrationPolicyEndpoint(anyString())).willReturn("POLICY_URI"); } @@ -72,7 +72,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 +95,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 +211,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..3d90b1e1e7 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 @@ -19,7 +19,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..a33353767b 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 @@ -21,7 +21,7 @@ import static org.forgerock.json.JsonValue.*; import static org.forgerock.openam.utils.CollectionUtils.asSet; 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 +60,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 +113,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 +138,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 +219,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 +232,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(anyString(), ArgumentMatchers.anyObject()); verify(labelRegistration).updateLabelsForNewResourceSet(any(ResourceSetDescription.class)); } 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..464604f0fc 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 @@ -17,7 +17,7 @@ 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..11549ef379 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 @@ -34,7 +34,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..1fb989c243 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 @@ -16,7 +16,7 @@ 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 +96,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 +130,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/src/test/java/org/forgerock/openam/cors/CORSServiceTest.java b/openam-rest/src/test/java/org/forgerock/openam/cors/CORSServiceTest.java index e83300edd5..8b754676fd 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 @@ -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..fcf0f13c8a 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 @@ -26,7 +26,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..ce5cb52910 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 @@ -18,7 +18,7 @@ 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..719d4e673b 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 @@ -18,8 +18,8 @@ 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 static org.mockito.MockitoAnnotations.initMocks; 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..427be1a099 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 @@ -18,8 +18,8 @@ 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..5e58040674 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 @@ -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..644ad09fb9 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 @@ -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/authz/PrivilegeAuthzModuleTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/authz/PrivilegeAuthzModuleTest.java index 0dbe72aea3..8ace30bed6 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 @@ -24,8 +24,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/query/PagingQueryResponseHandlerTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/query/PagingQueryResponseHandlerTest.java index b990459b95..d42892446d 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 @@ -23,7 +23,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 +65,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 +95,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-scripting/src/test/java/org/forgerock/openam/scripting/ScriptEngineConfiguratorTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/ScriptEngineConfiguratorTest.java index 1d720d2ae4..3824e08f52 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 @@ -21,8 +21,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..6390eb81b0 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 @@ -21,8 +21,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.anyString; 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/BatchResourceTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/rest/batch/BatchResourceTest.java index 2955551873..7c54426efa 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 @@ -16,7 +16,7 @@ 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..1aef6c170f 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 @@ -18,7 +18,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.*; 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..0abab67a73 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 @@ -19,8 +19,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-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..f01ba35ece 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 @@ -16,7 +16,7 @@ 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-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..9b8332f154 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 @@ -36,7 +36,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 +46,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..6b48a3ad41 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 @@ -37,7 +37,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..6a0ec02e4e 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 @@ -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/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..07dbe8caf8 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 @@ -43,7 +43,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..17a2718040 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 @@ -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/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..fb886e80a1 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 @@ -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..c3959a0521 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 @@ -23,8 +23,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/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..7fa1a28d64 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 @@ -18,7 +18,7 @@ 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..fdf0dead7a 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 @@ -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/src/test/java/org/forgerock/openam/uma/AuthorizationRequestEndpointTest.java b/openam-uma/src/test/java/org/forgerock/openam/uma/AuthorizationRequestEndpointTest.java index d2bf753af2..c6f1ab6c88 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 @@ -23,8 +23,8 @@ 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.Mockito.mock; import static org.mockito.Mockito.spy; @@ -65,7 +65,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 +146,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 +161,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 +176,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 +225,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(); @@ -255,7 +255,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(); @@ -284,7 +284,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(); @@ -308,7 +308,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(); @@ -331,8 +331,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 +359,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 +387,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 +415,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 +435,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<>(); @@ -467,7 +467,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<>(); @@ -499,7 +499,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..460db68ea8 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 @@ -19,7 +19,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..be3abde8fe 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 @@ -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..831ed2a476 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 @@ -43,7 +43,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 +73,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..3d9d1338a2 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 @@ -30,7 +30,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 +68,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 +92,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 +166,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..5ace788206 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 @@ -20,8 +20,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..1e344e7172 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 @@ -22,7 +22,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..e627e9011a 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 @@ -20,7 +20,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 +42,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 +78,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 +86,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 +107,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 +143,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 +180,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 +206,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 +263,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 +287,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..6c1072cfec 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 @@ -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..7ddc345acf 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 @@ -62,7 +62,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 +120,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 +185,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 +233,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 +282,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 +354,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 +415,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 +483,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 +560,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 +604,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..0b4383fe4a 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 @@ -18,7 +18,7 @@ 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..32c7a62d19 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 @@ -51,7 +51,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 +264,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..c71dc2982a 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 @@ -22,10 +22,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 +80,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 +150,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 +338,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 +436,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..9d76cda0b5 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 @@ -21,7 +21,7 @@ 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; @@ -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 @@ -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 @@ -625,7 +625,7 @@ 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))) .willReturn(deletePoliciesPromise); @@ -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/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..5c069f43d9 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 @@ -18,7 +18,7 @@ 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..0ce871cf0b 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 @@ -19,7 +19,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.*; +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..b7f8b74dee 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 @@ -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..0ba3d29001 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 @@ -18,8 +18,8 @@ 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.Mockito.*; import static org.mockito.MockitoAnnotations.initMocks; 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..b9663b4737 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 @@ -34,8 +34,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 +374,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 +410,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 +422,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 +446,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 +458,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 +477,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 +486,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 +510,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 +522,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 +546,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 +558,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 +577,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 +586,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()); } } From cca455f44eec4a0ff3aadd600000fd908aa6f25a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 16:01:43 +0000 Subject: [PATCH 09/39] Fix CLILicensePresenterTest: replace mockito-all with mockito-core in license-manager-cli pom Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/7cf6d7a0-2e60-423d-8d1e-6627556d89f7 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- openam-tools/openam-license-manager-cli/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From e27b2461a1f57b66e0ea848456ba86a08417f76e Mon Sep 17 00:00:00 2001 From: maximthomas Date: Thu, 16 Apr 2026 19:11:36 +0300 Subject: [PATCH 10/39] Set debug level to 'warning' in integration tests --- openam-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openam-server/pom.xml b/openam-server/pom.xml index e8d4d7736e..319dbafd3b 100644 --- a/openam-server/pom.xml +++ b/openam-server/pom.xml @@ -104,7 +104,7 @@ ${test.config.path} ${basedir}/src/test/resources/logback-test.xml false - message + warning on false From edc088955b8ff9cedf14075af6482187927340ea Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 16:30:42 +0000 Subject: [PATCH 11/39] Fix ExternalLdapConfigTest: update verifyStatic calls to PowerMock 2.x API Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/7a915422-19c9-4fbf-823f-edbbf6b07dfc Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../sm/datalayer/impl/ldap/ExternalLdapConfigTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ffc82dbf09..4bf753c974 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 @@ -62,13 +62,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)); } From 78278b7b5e9189aced7f4ebe0b1589d9d9e35ea9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 16:44:51 +0000 Subject: [PATCH 12/39] Fix openam-core: replace mockito-all with mockito-core for PowerMock 2.x compatibility Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/748d1cc8-2850-44df-abad-b056d6b32b5d Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- openam-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openam-core/pom.xml b/openam-core/pom.xml index b0ab0c424b..c783590417 100755 --- a/openam-core/pom.xml +++ b/openam-core/pom.xml @@ -409,7 +409,7 @@ org.mockito - mockito-all + mockito-core test From 4afbe074ed4873639618288899202837bfce82fc Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 17:26:40 +0000 Subject: [PATCH 13/39] fix: fix 46 test failures caused by Mockito 2.x null-matching behavior changes Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/ff049a3e-2689-453f-b840-f98cba9e5f3e Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../dpro/session/DynamicSessionIDExtensionsTest.java | 2 ++ .../operations/strategies/ClientSdkOperationsTest.java | 3 ++- .../audit/AuthenticationModuleEventAuditorTest.java | 3 ++- .../audit/AuthenticationProcessEventAuditorTest.java | 3 ++- .../forgerock/openam/cts/impl/CoreTokenAdapterTest.java | 9 +++++---- .../org/forgerock/openam/cts/impl/LdapAdapterTest.java | 8 ++------ .../worker/queries/MaxSessionTimeExpiredQueryTest.java | 3 ++- .../worker/queries/SessionIdleTimeExpiredQueryTest.java | 3 ++- .../cts/impl/queue/DeleteOnQueryResultHandlerTest.java | 1 + .../connections/MonitoredCTSConnectionFactoryTest.java | 2 +- .../openam/cts/utils/blob/TokenBlobStrategyTest.java | 8 ++++++++ .../openam/cts/worker/CTSWorkerManagerTest.java | 4 +++- .../worker/process/SessionExpiryBatchHandlerTest.java | 7 +++++-- .../openam/cts/worker/process/TokenDeletionTest.java | 7 ++++++- .../openam/sm/datalayer/impl/tasks/ReadTaskTest.java | 2 +- .../openam/sm/datalayer/impl/tasks/UpdateTaskTest.java | 1 + pom.xml | 1 + 17 files changed, 46 insertions(+), 21 deletions(-) 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..6286c7b56e 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 @@ -35,6 +35,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/operations/strategies/ClientSdkOperationsTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/operations/strategies/ClientSdkOperationsTest.java index 204dd69cf0..4d8ea38605 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 @@ -66,10 +66,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/sun/identity/authentication/audit/AuthenticationModuleEventAuditorTest.java b/openam-core/src/test/java/com/sun/identity/authentication/audit/AuthenticationModuleEventAuditorTest.java index a5acb8bf17..6ea9c77d58 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 @@ -16,6 +16,7 @@ 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,7 +54,7 @@ public class AuthenticationModuleEventAuditorTest { public void setupMocks() { MockitoAnnotations.initMocks(this); - when(eventPublisher.isAuditing(anyString(), anyString(), any(EventName.class))).thenReturn(true); + when(eventPublisher.isAuditing(nullable(String.class), anyString(), any(EventName.class))).thenReturn(true); when(eventFactory.authenticationEvent(anyString())).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 730334055c..21b57e24fd 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 @@ -17,6 +17,7 @@ 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,7 +52,7 @@ public class AuthenticationProcessEventAuditorTest { public void setupMocks() { MockitoAnnotations.initMocks(this); - when(eventPublisher.isAuditing(anyString(), anyString(), any(EventName.class))).thenReturn(true); + when(eventPublisher.isAuditing(nullable(String.class), anyString(), any(EventName.class))).thenReturn(true); when(eventFactory.authenticationEvent(anyString())).thenCallRealMethod(); auditor = new AuthenticationProcessEventAuditor(eventPublisher, eventFactory); } 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..3fab67e276 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 @@ -17,6 +17,7 @@ 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 +73,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 +145,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 +157,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 +170,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/LdapAdapterTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java index 551302377f..a60be7ac3e 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 @@ -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/MaxSessionTimeExpiredQueryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/MaxSessionTimeExpiredQueryTest.java index 7c6168ef2b..f416c6fcf4 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 @@ -18,6 +18,7 @@ import static org.mockito.BDDMockito.*; 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 +47,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 aaad799519..7f0af00c6f 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 @@ -18,6 +18,7 @@ import static org.mockito.BDDMockito.*; 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 +47,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..747497458d 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 @@ -41,6 +41,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/monitoring/impl/connections/MonitoredCTSConnectionFactoryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/monitoring/impl/connections/MonitoredCTSConnectionFactoryTest.java index ef5265960c..925c7560ee 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 @@ -49,7 +49,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/utils/blob/TokenBlobStrategyTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobStrategyTest.java index 6318c45ee4..574b2833d1 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 @@ -46,6 +46,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 +73,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/worker/CTSWorkerManagerTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/worker/CTSWorkerManagerTest.java index fbfc965d13..1c95ede12c 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 @@ -18,7 +18,9 @@ import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.times; 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 +52,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/SessionExpiryBatchHandlerTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/worker/process/SessionExpiryBatchHandlerTest.java index eda9810cb8..4faff6ce31 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 @@ -19,6 +19,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 +70,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 +180,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 +201,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..9ac576d99d 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 @@ -26,6 +26,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 +54,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/sm/datalayer/impl/tasks/ReadTaskTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/ReadTaskTest.java index 44c9ba52de..85e1d1a6ca 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 @@ -75,7 +75,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 f5d187ed28..18bc9d8482 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 @@ -53,6 +53,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/pom.xml b/pom.xml index 81b4a5cea6..34bc2e5d90 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 From 957f7138bc225f91c5ee32a53cc6eb3f459e6ce2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 17:43:56 +0000 Subject: [PATCH 14/39] fix: fix remaining 7 test failures - authenticationEvent nullable stub and UpdateTask static cache pollution Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/3a085e25-5d29-43ca-8208-06e3c81233ef Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../audit/AuthenticationModuleEventAuditorTest.java | 2 +- .../audit/AuthenticationProcessEventAuditorTest.java | 2 +- .../openam/sm/datalayer/impl/tasks/UpdateTaskTest.java | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) 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 6ea9c77d58..4f827a3d8c 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 @@ -55,7 +55,7 @@ public void setupMocks() { MockitoAnnotations.initMocks(this); when(eventPublisher.isAuditing(nullable(String.class), anyString(), any(EventName.class))).thenReturn(true); - when(eventFactory.authenticationEvent(anyString())).thenCallRealMethod(); + 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 21b57e24fd..127801ec76 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 @@ -53,7 +53,7 @@ public void setupMocks() { MockitoAnnotations.initMocks(this); when(eventPublisher.isAuditing(nullable(String.class), anyString(), any(EventName.class))).thenReturn(true); - when(eventFactory.authenticationEvent(anyString())).thenCallRealMethod(); + when(eventFactory.authenticationEvent(nullable(String.class))).thenCallRealMethod(); auditor = new AuthenticationProcessEventAuditor(eventPublisher, eventFactory); } 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 18bc9d8482..32f6c7aeec 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 @@ -24,9 +24,12 @@ 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 +48,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); From 0b97650b49881b912a2d56b45f2876030f6a129b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 17:59:28 +0000 Subject: [PATCH 15/39] fix: replace mockito-all with mockito-core in openam-rest pom.xml Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/0a6f4032-6f33-453e-aa94-0e3102246302 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- openam-rest/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 1fcff0f979f36367cff9359ccf626138015e2ff8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 18:23:23 +0000 Subject: [PATCH 16/39] fix: fix Mockito 2.x null matching issues in openam-rest tests Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/853d0ec3-377f-4084-b89c-39c9a12cd71d Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../openam/rest/RealmContextFilterTest.java | 13 +++++---- .../AbstractRestletAccessAuditFilterTest.java | 6 ++-- .../rest/fluent/AbstractAuditFilterTest.java | 2 +- .../openam/rest/fluent/CrestAuditorTest.java | 6 ++-- .../QueryByStringFilterConverterTest.java | 28 +++++++++---------- 5 files changed, 28 insertions(+), 27 deletions(-) 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 719d4e673b..d9a0131c39 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 @@ -20,6 +20,7 @@ import static org.mockito.BDDMockito.given; 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 +44,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 +55,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 +100,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 +541,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 +588,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 +602,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/audit/AbstractRestletAccessAuditFilterTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/audit/AbstractRestletAccessAuditFilterTest.java index e1cc54c791..8efe77979c 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 @@ -76,7 +76,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 +94,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 +117,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/fluent/AbstractAuditFilterTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/fluent/AbstractAuditFilterTest.java index cbffd034ac..732f9e6489 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 @@ -104,7 +104,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..37f4a8b683 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 @@ -68,7 +68,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 +81,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 +96,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/QueryByStringFilterConverterTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/query/QueryByStringFilterConverterTest.java index 984468b7c5..a164d43fd7 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 @@ -53,17 +53,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 +73,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 +95,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()); } } From af9c9bfcc03020c2d50b60d3a089afa915bc2f54 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 19:31:49 +0000 Subject: [PATCH 17/39] fix: replace mockito-all with mockito-core in openam-scripting pom Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/03a7a632-a24e-4e4f-9eff-895878946e7d Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- openam-scripting/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From aba20ce12c8d6664c181dc66200600ff20b56f8b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 19:48:08 +0000 Subject: [PATCH 18/39] fix: use nullable(String.class) in ScriptResourceTest for Mockito 2.x compatibility Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/4f563704-581a-4502-b57f-3585fd9e4206 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../forgerock/openam/scripting/rest/ScriptResourceTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6390eb81b0..45328cdbc7 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 @@ -22,7 +22,7 @@ import static org.forgerock.openam.scripting.SupportedScriptingLanguage.*; import static org.mockito.BDDMockito.*; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; +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 +118,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())); From c7746b85f38a174bd1ddd2ad077b39e0598e83d6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 20:12:05 +0000 Subject: [PATCH 19/39] fix: replace mockito-all with mockito-core in openam-auth-common pom Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/43693ebd-ad3e-4ac1-87e7-38f66bf124ea Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- openam-authentication/openam-auth-common/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From acd8c3d0ea394581dd1781babdd8a438a7d33019 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 20:36:08 +0000 Subject: [PATCH 20/39] fix: use nullable() matcher for null CallbackHandler in verify calls Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/e0ff8012-f01b-475c-ad48-209d8bbe4deb Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../modules/common/JaspiAuthLoginModulePAPTest.java | 10 +++++----- .../modules/common/JaspiAuthLoginModuleTest.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) 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 4a4c330aba..b989dbe236 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 @@ -106,7 +106,7 @@ public void shouldCallOnLoginSuccessAndThrowAuthenticationExceptionWhenAuthExcep } //Then - verify(jaspiAuthWrapper).initialize(any(CallbackHandler.class), eq(config)); + verify(jaspiAuthWrapper).initialize(ArgumentMatchers.nullable(CallbackHandler.class), eq(config)); verify(jaspiAuthWrapper, never()).secureResponse(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); assertEquals(exception.getErrorCode(), "authFailed"); @@ -128,7 +128,7 @@ public void shouldCallOnLoginSuccessWhenSecureResponseReturnsSendSuccess() throw 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(ArgumentMatchers.anyObject()); } @@ -157,7 +157,7 @@ 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(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); @@ -188,7 +188,7 @@ 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(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); @@ -218,7 +218,7 @@ 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(ArgumentMatchers.anyObject()); assertTrue(exceptionCaught); 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 3fbe17d74a..0cb8a6f72f 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 @@ -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 From e9b9fd546381edf7ba37c516a534fa768206418b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 20:58:42 +0000 Subject: [PATCH 21/39] fix: replace mockito-all with mockito-core in openam-auth-nt Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/c8aabc5f-a9b3-4a19-9bd0-23475f9219f3 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- openam-authentication/openam-auth-nt/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openam-authentication/openam-auth-nt/pom.xml b/openam-authentication/openam-auth-nt/pom.xml index 0eec82c882..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 From ac49757024b543665f4d1608ad46718e52787e39 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 21:16:11 +0000 Subject: [PATCH 22/39] fix: replace mockito-all with mockito-core in all pom.xml files Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/d8ef4b4e-e3d6-4239-b8e2-0458dfb51470 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- openam-authentication/openam-auth-device-id/pom.xml | 2 +- openam-authentication/openam-auth-oauth2/pom.xml | 2 +- openam-authentication/openam-auth-oidc/pom.xml | 2 +- openam-authentication/openam-auth-persistentcookie/pom.xml | 2 +- openam-authentication/openam-auth-qr/pom.xml | 2 +- openam-authentication/openam-auth-recaptcha/pom.xml | 2 +- openam-authentication/openam-auth-scripted/pom.xml | 2 +- openam-authentication/openam-auth-webauthn/pom.xml | 2 +- openam-authentication/openam-auth-windowsdesktopsso/pom.xml | 2 +- openam-core-rest/pom.xml | 2 +- openam-federation/openam-federation-library/pom.xml | 2 +- openam-oauth2/pom.xml | 2 +- openam-selfservice/pom.xml | 2 +- openam-sts/openam-common-sts/pom.xml | 2 +- openam-sts/openam-publish-sts/pom.xml | 2 +- openam-sts/openam-rest-sts/pom.xml | 2 +- openam-sts/openam-soap-sts/openam-soap-sts-server/pom.xml | 2 +- openam-sts/openam-token-service-sts/pom.xml | 2 +- openam-tools/build-helper-plugin/pom.xml | 2 +- openam-uma/pom.xml | 2 +- openam-upgrade/pom.xml | 2 +- pom.xml | 6 ------ 22 files changed, 21 insertions(+), 27 deletions(-) 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-oauth2/pom.xml b/openam-authentication/openam-auth-oauth2/pom.xml index 72ec701285..312d2bc20c 100755 --- a/openam-authentication/openam-auth-oauth2/pom.xml +++ b/openam-authentication/openam-auth-oauth2/pom.xml @@ -61,7 +61,7 @@ org.mockito - mockito-all + mockito-core test 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-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-windowsdesktopsso/pom.xml b/openam-authentication/openam-auth-windowsdesktopsso/pom.xml index 37fd81201c..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 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-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-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-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-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-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-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-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-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/pom.xml b/pom.xml index 34bc2e5d90..9d54095739 100644 --- a/pom.xml +++ b/pom.xml @@ -419,12 +419,6 @@ opendj-core ${opendj.version} - - org.mockito - mockito-all - 1.10.19 - test - org.openidentityplatform.openam From 6e3b5f9acd50f3fd3205fbcce4b21de85c4f233a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 16 Apr 2026 21:28:00 +0000 Subject: [PATCH 23/39] fix: fix IOFactoryTest for Mockito 2.x - stub contentConverter and fix anyString import Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/775aad80-a310-4ce4-973b-f1aa17f71108 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../forgerock/maven/plugins/inject/content/IOFactoryTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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..c3613e6071 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 @@ -26,7 +26,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 +71,8 @@ public void shouldWriteContent() throws IOException { .willReturn("LINE2") .willReturn(null); + given(contentConverter.convert(anyString())).willReturn("CONVERTED"); + //When ioFactory.writeContent(writer, content, contentConverter); From 850baf4ec53da34292d1ec338d5ddabc6d559dd5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 05:24:32 +0000 Subject: [PATCH 24/39] fix: fix 6 Mockito 2.x test failures in openam-core-rest Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/f029ecfc-f45c-413c-a17d-c11e9a9bb853 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../core/rest/authn/RestAuthenticationHandlerTest.java | 1 + .../openam/core/rest/cts/CoreTokenResourceTest.java | 1 + .../core/rest/devices/oath/OathDevicesResourceTest.java | 2 +- .../openam/core/rest/session/SessionResourceTest.java | 8 ++++---- 4 files changed, 7 insertions(+), 5 deletions(-) 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 11002da4cd..c3a6b12fc8 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 @@ -479,6 +479,7 @@ private JsonValue performSuccessfulAuthentication() throws Exception { 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/cts/CoreTokenResourceTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/cts/CoreTokenResourceTest.java index a738616032..3269420c22 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 @@ -85,6 +85,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 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 62845cf676..4443d645c3 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 @@ -255,7 +255,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/session/SessionResourceTest.java b/openam-core-rest/src/test/java/org/forgerock/openam/core/rest/session/SessionResourceTest.java index cb48628ca6..1fe4689e56 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 @@ -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 From fcb808dbfc3e1343746b57585061018abe90b5a7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 05:42:29 +0000 Subject: [PATCH 25/39] fix: fix 12 Mockito 2.x test failures in openam-auth-persistentcookie Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/4afa5502-7a25-4cd5-ac8d-a9873932d02d Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../PersistentCookieAuthModuleTest.java | 10 +++++----- .../persistentcookie/PersistentCookiePAPTest.java | 2 +- .../persistentcookie/PersistentCookieWrapperTest.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) 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 2c584dc031..5decd7108f 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 @@ -65,7 +65,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(), anyString(), anyCollection(), anyString())) .willReturn(GENERATED_CONFIG); persistentCookieAuthModule = new PersistentCookieAuthModule(coreWrapper, persistentCookieWrapper); @@ -97,7 +97,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(), anyString(), anyCollection(), anyString()); } @Test @@ -119,7 +119,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(), anyString(), anyCollection(), anyString()); } @Test @@ -143,7 +143,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(), anyString(), anyCollection(), anyString()); } @@ -163,7 +163,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(), anyString(), anyCollection(), anyString()); } @Test 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..75230dd4ab 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 @@ -59,7 +59,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(anyString(), 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..8ddf04cc22 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 @@ -61,7 +61,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; } }; From 86d6645bd7d4e65953d4d183299ededbf1813acd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 06:13:49 +0000 Subject: [PATCH 26/39] fix: fix 11 Mockito 2.x test failures in PersistentCookieAuthModuleTest and PersistentCookiePAPTest - Replace anyString() with nullable(String.class) for cookieName and hmacKey arguments in PersistentCookieAuthModuleTest given/verify calls, as these can be null when not present in options map (Mockito 2.x anyString() does not match null unlike Mockito 1.x) - Replace anyString() with nullable(String.class) for realm argument in PersistentCookiePAPTest getOrganizationConfig stub, as ssoToken.getProperty ("Organization") is not stubbed in those tests so it returns null Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/8dc2cb41-afd4-4374-9b12-b4cf1640e4af Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../PersistentCookieAuthModuleTest.java | 11 ++++++----- .../persistentcookie/PersistentCookiePAPTest.java | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) 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 5decd7108f..12022828ae 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 @@ -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; @@ -65,7 +66,7 @@ public void setUp() throws Exception { persistentCookieWrapper = mock(PersistentCookieModuleWrapper.class); given(persistentCookieWrapper.generateConfig(anyString(), anyString(), anyBoolean(), anyString(), anyBoolean(), - anyBoolean(), anyString(), anyCollection(), 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(), anyCollection(), 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(), anyCollection(), 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(), anyCollection(), 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(), anyCollection(), anyString()); + anyBoolean(), anyBoolean(), nullable(String.class), anyCollection(), nullable(String.class)); } @Test 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 75230dd4ab..68f012663c 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 @@ -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(), isNull())).willReturn(serviceConfig); + given(serviceConfigManager.getOrganizationConfig(nullable(String.class), isNull())).willReturn(serviceConfig); return serviceConfigManager; } }; From f14a8390649a948ad5d1425ff6a6d83b9442d00d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 06:29:33 +0000 Subject: [PATCH 27/39] fix: fix 3 Mockito 2.x null-matching failures in IDPSSOFederateTest Replace Mockito.anyString() with nullable(String.class) for the reqBinding argument in getIDPRequestValidator stub. In Mockito 2.x anyString() does not match null, but reqBinding is passed as null in the test cases, causing validator to remain null and NullPointerException at runtime. Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/41b7caa3-787a-4fa7-a69c-86ca5ea6fd4d Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../com/sun/identity/saml2/profile/IDPSSOFederateTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 7efb9b6e59..18814dd6e6 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 @@ -19,6 +19,7 @@ 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), From af5c9760e9e1e2faefc01ee6638bf21f5ff3315b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 07:37:16 +0000 Subject: [PATCH 28/39] fix: fix 12 Mockito 2.x null-matching failures in openam-oauth2 tests - OpenAMScopeValidatorTest: use nullable(String.class) in getResourceOwnerIdentity stub; use literal string in getResourceOwnerId thenReturn (anyString() used as return value was returning null) - OpenAMResourceSetStoreTest: use nullable(String.class) in getResourceSetRegistrationPolicyEndpoint stub (resource set ID is null before it gets generated) - ResourceSetRegistrationEndpointTest: use nullable(String.class) in resourceSetCreated verify (realm param is null); add store.read stub for delete test so updateLabelsForDeletedResourceSet gets non-null arg - AccessTokenServiceTest: use nullable(String.class) in createAccessToken and createRefreshToken stubs (several args are always null) - AuthorizationCodeGrantTypeHandlerTest: use nullable(String.class) in tokenInvalidator.invalidateTokens verify and in createAccessToken / createRefreshToken stubs (grantType, resourceOwnerId, nonce, etc are null from unstubbed mocks) Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/df2c22cb-937a-4145-8f42-5ec58a64639b Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../oauth2/core/AccessTokenServiceTest.java | 20 +++++++++------- ...AuthorizationCodeGrantTypeHandlerTest.java | 23 +++++++++++-------- .../oauth2/OpenAMScopeValidatorTest.java | 7 +++--- .../resources/OpenAMResourceSetStoreTest.java | 3 ++- .../ResourceSetRegistrationEndpointTest.java | 6 ++++- 5 files changed, 36 insertions(+), 23 deletions(-) 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 a9159fd0cf..25a7f1c43c 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 @@ -27,6 +27,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; @@ -219,9 +220,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 +252,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 +293,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), + given(tokenStore.createRefreshToken(nullable(String.class), anyString(), nullable(String.class), + nullable(String.class), anySetOf(String.class), eq(request), isNull(String.class), anyString(), 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 6465bf8877..a7fa86c122 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 @@ -19,6 +19,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; @@ -114,7 +115,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 +215,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), ArgumentMatchers.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); @@ -257,8 +258,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), ArgumentMatchers.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); @@ -298,8 +300,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), ArgumentMatchers.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); 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..173adf83f0 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 @@ -18,6 +18,7 @@ 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 +57,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 +149,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 +170,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 922419d1a9..c1039cd5ab 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 @@ -18,6 +18,7 @@ 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.*; @@ -59,7 +60,7 @@ public void setup() throws Exception { store = new OpenAMResourceSetStore("REALM", oAuth2UrisFactory, idGenerator, dataStore); given(oAuth2UrisFactory.get(ArgumentMatchers.anyObject())).willReturn(oAuth2Uris); - given(oAuth2Uris.getResourceSetRegistrationPolicyEndpoint(anyString())).willReturn("POLICY_URI"); + given(oAuth2Uris.getResourceSetRegistrationPolicyEndpoint(nullable(String.class))).willReturn("POLICY_URI"); } @Test(enabled = false, expectedExceptions = BadRequestException.class) 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 a33353767b..5f1446096d 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 @@ -20,6 +20,7 @@ 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.ArgumentMatchers.anyMapOf; import static org.mockito.Mockito.*; @@ -232,7 +233,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(), ArgumentMatchers.anyObject()); + verify(hook).resourceSetCreated(nullable(String.class), ArgumentMatchers.anyObject()); verify(labelRegistration).updateLabelsForNewResourceSet(any(ResourceSetDescription.class)); } @@ -331,6 +332,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(); From 51fc5dd2ab38273105d0403889b1dd9f5367023b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 08:17:01 +0000 Subject: [PATCH 29/39] fix: fix 4 remaining Mockito 2.x null-matching failures in openam-oauth2 - AuthorizationCodeGrantTypeHandlerTest: verify(accessToken).addExtraData( eq("nonce"), anyString()) fails because authorizationCode.getNonce() is null on an unstubbed mock; changed to nullable(String.class) in all three shouldHandle* tests - AccessTokenServiceTest.shouldReturnNewRefreshTokenIdWhenRefreshing: createRefreshToken stub had anyString() for authGrantId (position 8) but refreshToken.getAuthGrantId() returns null on an unstubbed mock; changed to nullable(String.class) Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/bf83acfc-2e36-4665-a516-c6383bcf0e7d Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../org/forgerock/oauth2/core/AccessTokenServiceTest.java | 2 +- .../oauth2/core/AuthorizationCodeGrantTypeHandlerTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 25a7f1c43c..2b10800fcc 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 @@ -295,7 +295,7 @@ public void shouldReturnNewRefreshTokenIdWhenRefreshing() throws Exception { given(providerSettings.issueRefreshTokensOnRefreshingToken()).willReturn(true); given(tokenStore.createRefreshToken(nullable(String.class), anyString(), nullable(String.class), nullable(String.class), anySetOf(String.class), - eq(request), isNull(String.class), anyString(), anyLong())).willReturn(newRefreshToken); + eq(request), isNull(String.class), nullable(String.class), anyLong())).willReturn(newRefreshToken); given(newRefreshToken.toString()).willReturn(newRefreshTokenId); given(tokenStore.createAccessToken(nullable(String.class), nullable(String.class), nullable(String.class), 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 a7fa86c122..81d0774aba 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 @@ -231,7 +231,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); @@ -273,7 +273,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); @@ -314,7 +314,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); From dac5c6275381196c9e9ca7b3a3c0bb0d496940fc Mon Sep 17 00:00:00 2001 From: maximthomas Date: Fri, 17 Apr 2026 12:06:47 +0300 Subject: [PATCH 30/39] set logback level to WARN in test --- openam-server/src/test/resources/logback-test.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ - + From c395a95291da2682382c791e9ae92ae049a5482c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 09:21:42 +0000 Subject: [PATCH 31/39] fix: fix 8 Mockito 2.x null-matching failures in openam-uma tests Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/43f8f22d-f1ee-4ba2-97e0-909821e51726 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../uma/AuthorizationRequestEndpointTest.java | 17 +++++++++-------- .../uma/rest/UmaPolicyServiceImplTest.java | 11 +++++------ 2 files changed, 14 insertions(+), 14 deletions(-) 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 c6f1ab6c88..4b07dda303 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 @@ -25,6 +25,7 @@ import static org.mockito.BDDMockito.eq; 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; @@ -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); @@ -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); @@ -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)); } @@ -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)); } @@ -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); @@ -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); 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 9d76cda0b5..c60f1ce74f 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 @@ -23,7 +23,6 @@ import static org.mockito.BDDMockito.*; 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; @@ -574,7 +573,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 +582,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) @@ -604,7 +603,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; } } @@ -627,7 +626,7 @@ public void shouldHandleFailureToDeleteUnderlyingPolicies() throws Exception { 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 +634,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; } } From 746332c80ece1c6b00e71809e082c115d06f7fd8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 10:08:19 +0000 Subject: [PATCH 32/39] =?UTF-8?q?fix:=20fix=20ArgumentMatcher=20extends?= =?UTF-8?q?=E2=86=92implements=20for=20Mockito=202.x=20in=20UpgradeEntitle?= =?UTF-8?q?mentSubConfigsStepTest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/3b5c1155-ad20-4a02-9d22-3ddc188c00a1 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../steps/UpgradeEntitlementSubConfigsStepTest.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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..cefb787a92 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 @@ -271,12 +271,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 +289,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; From 211ac6e43629b00d6906053ef2f9f675d0bcde8a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 10:45:12 +0000 Subject: [PATCH 33/39] fix: fix Mockito 2.x null-matching NPEs in 3 openam-upgrade test classes Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/eca7f47e-e313-4e13-8615-f20c5e741a81 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../steps/UpgradeCTSMaxConnectionsConfigurationStepTest.java | 5 +++-- .../upgrade/steps/UpgradeEntitlementSubConfigsStepTest.java | 3 ++- .../upgrade/steps/policy/UpgradeResourceTypeStepTest.java | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) 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 0ba3d29001..9e577d7543 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 @@ -20,6 +20,7 @@ import static org.mockito.BDDMockito.given; 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 +63,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 cefb787a92..4743ce55e8 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 @@ -17,6 +17,7 @@ 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 +112,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); 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..56b2f7b59b 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 @@ -16,6 +16,7 @@ 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 +101,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); From 54148375f57493ec9650be93c889f98b026a7903 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Fri, 17 Apr 2026 14:08:14 +0300 Subject: [PATCH 34/39] Make IT_SetupWithOpenDJ more stable --- openam-server/pom.xml | 2 +- .../openam/test/integration/BaseTest.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/openam-server/pom.xml b/openam-server/pom.xml index 319dbafd3b..7603ea883b 100644 --- a/openam-server/pom.xml +++ b/openam-server/pom.xml @@ -172,7 +172,7 @@ org.testcontainers testcontainers - 1.21.4 + 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 fa3dd8a5f5..2ddb8428da 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 @@ -16,6 +16,7 @@ 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; @@ -27,9 +28,9 @@ 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; @@ -52,8 +53,9 @@ 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)); } From 7cc00628f70d3f176328f69f4f2149993892c683 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 11:50:51 +0000 Subject: [PATCH 35/39] fix: increase Selenium wait timeout in BaseTest from 10s to 30s to avoid flaky IT test failures Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/4123b9ed-4e9c-45b6-be2f-0088d4b3f336 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../openidentityplatform/openam/test/integration/BaseTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..2fa7482bea 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 @@ -51,7 +51,7 @@ public void webdriverSetup() { options.addArguments("--remote-allow-origins=*","--headless", "--disable-dev-shm-usage", "--no-sandbox", "--verbose"); //options.addArguments("--remote-allow-origins=*", "--verbose"); driver = new ChromeDriver(options); - wait = new WebDriverWait(driver, Duration.ofSeconds(10)); + wait = new WebDriverWait(driver, Duration.ofSeconds(30)); } @AfterClass From 1d9d9ec1ddf9775408577660a166613d4eb3b407 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 12:12:53 +0000 Subject: [PATCH 36/39] chore: add/update 'Portions copyright 2026 3A Systems, LLC.' in all 161 PR-changed Java files Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/14b2ba10-f354-4f36-ae31-50898ca56a55 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- .../common/JaspiAuthLoginModulePAPTest.java | 2 +- .../modules/common/JaspiAuthLoginModuleTest.java | 2 +- .../common/JaspiAuthModuleWrapperTest.java | 2 +- .../modules/deviceprint/ProfilePersisterTest.java | 1 + .../modules/fr/oath/OathMakerTest.java | 1 + .../authentication/modules/oauth2/ESIATest.java | 2 +- .../PersistentCookieAuthModuleTest.java | 2 +- .../persistentcookie/PersistentCookiePAPTest.java | 2 +- .../PersistentCookieWrapperTest.java | 1 + .../webauthn/WebAuthnAuthenticationTest.java | 1 + .../webauthn/WebAuthnRegistrationTest.java | 1 + .../openam/core/rest/authn/AuthIdHelperTest.java | 1 + .../authn/RestAuthCallbackHandlerManagerTest.java | 2 +- .../rest/authn/RestAuthenticationHandlerTest.java | 2 +- .../RestAuthNameCallbackHandlerTest.java | 2 +- .../RestAuthPasswordCallbackHandlerTest.java | 2 +- .../RestAuthX509CallbackHandlerTest.java | 2 +- .../rest/authn/core/LoginAuthenticatorTest.java | 2 +- .../core/rest/cts/CoreTokenResourceTest.java | 1 + .../deviceprint/TrustedDevicesResourceTest.java | 1 + .../devices/oath/OathDevicesResourceTest.java | 1 + .../devices/push/PushDevicesResourceTest.java | 1 + .../core/rest/session/SessionResourceTest.java | 2 +- .../core/rest/session/SessionResourceV2Test.java | 1 + .../rest/session/TokenOwnerAuthzModuleTest.java | 1 + .../session/query/SessionQueryManagerTest.java | 1 + .../core/rest/sms/SmsJsonConverterTest.java | 1 + .../core/rest/sms/SmsRealmProviderTest.java | 1 + .../core/rest/sms/tree/SmsRouteTreeTest.java | 2 +- .../session/DynamicSessionIDExtensionsTest.java | 1 + .../com/iplanet/dpro/session/SessionTest.java | 1 + .../monitoring/MonitoredOperationsTest.java | 1 + .../monitoring/SessionMonitoringStoreTest.java | 1 + .../ServerSessionOperationStrategyTest.java | 1 + .../strategies/ClientSdkOperationsTest.java | 1 + .../dpro/session/service/InternalSessionTest.java | 1 + .../session/service/SessionServerConfigTest.java | 15 +++++++++++++++ .../service/WebtopNamingSiteUtilsTest.java | 2 +- .../session/utils/SessionInfoFactoryTest.java | 1 + .../AuthenticationModuleEventAuditorTest.java | 1 + .../AuthenticationProcessEventAuditorTest.java | 1 + .../authentication/jaas/LoginContextTest.java | 3 ++- .../service/DefaultSessionActivatorTest.java | 1 + .../agent/TokenRestrictionResolverTest.java | 1 + .../blacklist/BloomFilterBlacklistTest.java | 1 + .../openam/blacklist/CTSBlacklistTest.java | 1 + .../core/realms/CachingRealmLookupTest.java | 2 +- .../openam/cts/CTSPersistentStoreImplTest.java | 1 + .../openam/cts/adapters/SAMLAdapterTest.java | 1 + .../openam/cts/impl/CoreTokenAdapterTest.java | 1 + .../forgerock/openam/cts/impl/LDAPConfigTest.java | 2 +- .../openam/cts/impl/LdapAdapterTest.java | 2 +- .../queries/CTSWorkerPastExpiryDateQueryTest.java | 1 + .../queries/MaxSessionTimeExpiredQueryTest.java | 1 + .../queries/SessionIdleTimeExpiredQueryTest.java | 1 + .../queue/DeleteOnQueryResultHandlerTest.java | 1 + .../queue/config/CTSQueueConfigurationTest.java | 1 + .../monitoring/CTSMonitoringStoreImplTest.java | 1 + .../MonitoredCTSConnectionFactoryTest.java | 1 + .../CtsPersistenceOperationsMonitorTest.java | 1 + .../queue/DefaultMonitoringResultHandlerTest.java | 1 + .../queue/TokenMonitoringResultHandlerTest.java | 1 + .../cts/utils/blob/TokenBlobStrategyTest.java | 1 + .../openam/cts/utils/blob/TokenBlobUtilsTest.java | 1 + .../openam/cts/worker/CTSWorkerManagerTest.java | 1 + .../worker/process/CTSWorkerBaseProcessTest.java | 1 + .../process/CTSWorkerDeleteProcessTest.java | 1 + .../process/SessionExpiryBatchHandlerTest.java | 1 + .../cts/worker/process/TokenDeletionTest.java | 1 + .../openam/services/email/MailServerImplTest.java | 2 +- .../InternalSessionStoreChainTest.java | 1 + .../InMemoryInternalSessionCacheStepTest.java | 4 +++- .../session/stateless/StatelessConfigTest.java | 1 + .../openam/sm/SMSConfigurationFactoryTest.java | 1 + .../openam/sm/ServerConfigurationFactoryTest.java | 2 +- .../sm/config/ConsoleConfigHandlerImplTest.java | 1 + .../impl/ldap/ExternalLdapConfigTest.java | 1 + .../sm/datalayer/impl/tasks/CreateTaskTest.java | 1 + .../sm/datalayer/impl/tasks/ReadTaskTest.java | 1 + .../sm/datalayer/impl/tasks/UpdateTaskTest.java | 1 + .../stateless/JwtSessionMapperBuilderTest.java | 1 + .../xacml3/ResourceAttributeUtilTest.java | 1 + .../entitlement/xacml3/XACMLExportImportTest.java | 1 + .../environment/SessionConditionTest.java | 1 + .../ResourceTypeConfigurationTest.java | 1 + .../entitlement/rest/ApplicationV1FilterTest.java | 1 + .../rest/ApplicationsResourceTest.java | 1 + .../rest/ConditionTypesResourceTest.java | 1 + .../rest/DecisionCombinersResourceTest.java | 1 + .../entitlement/rest/PolicyResourceTest.java | 1 + .../entitlement/rest/PolicyV1FilterTest.java | 4 +++- .../rest/PrivilegePolicyStoreTest.java | 1 + .../rest/SubjectAttributesResourceV1Test.java | 1 + .../rest/SubjectTypesResourceTest.java | 1 + .../openam/xacml/v3/ImportStepGeneratorTest.java | 1 + .../saml2/profile/IDPSSOFederateTest.java | 2 +- .../brokers/CTSNotificationBrokerTest.java | 1 + .../websocket/NotificationsWebSocketTest.java | 2 +- .../InMemoryNotificationBrokerTest.java | 1 + .../oauth2/core/AccessTokenServiceTest.java | 1 + .../AuthorizationCodeGrantTypeHandlerTest.java | 1 + .../oauth2/core/OAuth2RequestFactoryTest.java | 2 +- .../oauth2/OpenAMClientRegistrationStoreTest.java | 1 + .../openam/oauth2/OpenAMScopeValidatorTest.java | 1 + .../resources/OpenAMResourceSetStoreTest.java | 1 + .../ResourceSetLabelRegistrationTest.java | 1 + .../ResourceSetRegistrationEndpointTest.java | 1 + .../openam/oauth2/rest/ClientResourceTest.java | 1 + .../radius/server/RadiusRequestHandlerTest.java | 4 ++++ .../spi/handlers/OpenAMAuthHandlerTest.java | 2 ++ .../forgerock/openam/cors/CORSServiceTest.java | 2 +- .../openam/forgerockrest/utils/RestLogTest.java | 1 + .../ElevatedConnectionFactoryWrapperTest.java | 1 + .../openam/rest/RealmContextFilterTest.java | 1 + .../openam/rest/RealmRoutingFactoryTest.java | 1 + .../openam/rest/RestEndpointServletTest.java | 2 +- .../org/forgerock/openam/rest/RestRouterIT.java | 2 +- .../AbstractRestletAccessAuditFilterTest.java | 1 + .../rest/authz/PrivilegeAuthzModuleTest.java | 1 + .../rest/fluent/AbstractAuditFilterTest.java | 1 + .../openam/rest/fluent/CrestAuditorTest.java | 1 + .../query/PagingQueryResponseHandlerTest.java | 1 + .../query/QueryByStringFilterConverterTest.java | 1 + .../scripting/ScriptEngineConfiguratorTest.java | 1 + .../openam/scripting/rest/ScriptResourceTest.java | 1 + .../scripting/rest/batch/BatchResourceTest.java | 1 + .../rest/batch/helpers/RequesterTest.java | 2 +- .../service/ScriptConfigurationServiceTest.java | 1 + .../openam/test/integration/BaseTest.java | 2 +- .../shared/guice/SharedGuiceModuleTest.java | 1 + .../publish/SoapSTSInstancePublisherImplTest.java | 4 +++- .../config/TokenRenewOperationProviderTest.java | 1 + .../TokenValidateOperationProviderTest.java | 2 +- .../OpenIdConnectTokenGenerationImplTest.java | 1 + .../saml2/SAML2TokenGenerationImplTest.java | 2 +- .../plugins/inject/content/IOFactoryTest.java | 1 + .../install/tools/admin/LicenseCheckerTest.java | 2 +- .../license/PersistentLicenseLocatorTest.java | 1 + .../openam/license/CLILicensePresenterTest.java | 1 + .../license/ServletContextLicenseLocatorTest.java | 2 +- .../uma/AuthorizationRequestEndpointTest.java | 2 +- .../openam/uma/IdTokenClaimGathererTest.java | 1 + ...endingClientSdkSessionRequestsServiceTest.java | 2 +- .../openam/uma/PermissionRequestEndpointTest.java | 1 + .../UmaWellKnownConfigurationEndpointTest.java | 1 + .../uma/rest/PendingRequestResourceTest.java | 1 + .../openam/uma/rest/PolicyGraphTest.java | 1 + .../uma/rest/PolicyResourceDelegateTest.java | 1 + .../openam/uma/rest/ResourceSetResourceTest.java | 2 +- .../openam/uma/rest/ResourceSetServiceTest.java | 1 + .../uma/rest/UmaIdRepoCreationListenerTest.java | 1 + .../openam/uma/rest/UmaPolicyResourceTest.java | 1 + .../rest/UmaPolicyServiceImplDelegationTest.java | 1 + .../openam/uma/rest/UmaPolicyServiceImplTest.java | 1 + .../steps/DelegationConfigUpgradeStepTest.java | 1 + .../RemoveRedundantDefaultApplicationTest.java | 2 +- .../upgrade/steps/RemoveReferralsStepTest.java | 2 +- ...adeCTSMaxConnectionsConfigurationStepTest.java | 1 + .../UpgradeEntitlementSubConfigsStepTest.java | 1 + .../steps/policy/UpgradeResourceTypeStepTest.java | 1 + .../conditions/PolicyConditionUpgraderTest.java | 1 + 161 files changed, 186 insertions(+), 41 deletions(-) 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 b989dbe236..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; 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 0cb8a6f72f..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; 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 2511b1da41..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; 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 5ec8f09a7a..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; 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 f4e5e09429..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,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.authentication.modules.fr.oath; 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 2ca403b70a..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; 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 12022828ae..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; 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 68f012663c..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; 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 8ddf04cc22..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; 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 18ece6c71a..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,6 +12,7 @@ * 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; 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 616d4c99ed..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,6 +12,7 @@ * 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; 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 65b418b994..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; 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 b41d3e3124..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; 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 c3a6b12fc8..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; 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 80b22459b2..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; 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 49fa5f3138..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; 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 7d152932ac..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; 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 1056a8ac6f..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; 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 3269420c22..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,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.cts; 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 9b963aeaff..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; 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 4443d645c3..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; 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 31c99b7433..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; 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 1fe4689e56..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; 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 33d300a1de..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; 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 aba2dc1c72..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,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.session; 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 6164466e79..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; 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 af9e9aa17e..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; 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 cefd298418..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; 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 8c15cb3904..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; 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 6286c7b56e..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; 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 a34a1976ec..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; 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 ce1565e310..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,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; 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 e47a23254d..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; 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 35bbeec9b1..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,6 +12,7 @@ * 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; 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 4d8ea38605..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,6 +12,7 @@ * 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; 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 a5258d74c2..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; 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 3c9f64f2a2..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; 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 0a95f04694..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. 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 4148d4878b..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,6 +12,7 @@ * 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; 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 4f827a3d8c..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,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.sun.identity.authentication.audit; 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 127801ec76..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,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions copyright 2026 3A Systems, LLC. */ package com.sun.identity.authentication.audit; 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 9be8afa178..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; 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 8be01f9515..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,6 +12,7 @@ * 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; 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 c357afc005..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,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.agent; 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 b03c3d609d..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; 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 4547e44005..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; 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 79c948bd97..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,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.core.realms; 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 6616743f38..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; 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 340dff828d..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; 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 3fab67e276..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,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.impl; 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 a9787a8bd0..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. 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 a60be7ac3e..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; 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 706cf8a901..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,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.cts.impl.query.worker.queries; 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 f416c6fcf4..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,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.cts.impl.query.worker.queries; 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 7f0af00c6f..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,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.cts.impl.query.worker.queries; 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 747497458d..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; 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 ca61b78669..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,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.config; 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 5c774ca020..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; 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 925c7560ee..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; 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 9bb4ffad4c..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; 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 2550739fe8..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; 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 4af2a21d94..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; 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 574b2833d1..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; 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 5c77c6afd6..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; 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 1c95ede12c..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,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.cts.worker; 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 c4711c2994..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,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; 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 3a52b862d2..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,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; 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 4faff6ce31..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; 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 9ac576d99d..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; 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 51947fc0d1..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; 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 683687dd89..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,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.session.service.access.persistence; 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 5d2213900a..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,8 +12,10 @@ * 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; 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 d354634bc3..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; 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 ba1a263f0e..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; 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 a2151d0623..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. 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 18e0772fff..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; 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 4bf753c974..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,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.sm.datalayer.impl.ldap; 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 afa79885ad..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,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.sm.datalayer.impl.tasks; 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 85e1d1a6ca..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,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.sm.datalayer.impl.tasks; 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 32f6c7aeec..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,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.sm.datalayer.impl.tasks; 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 3717694bb4..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,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.sso.providers.stateless; 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 0d3b315fab..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; 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 223838fa23..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; 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 e88ff27afa..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; 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 bd4ad936b1..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; 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 ab178f3539..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; 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 a384d7c212..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; 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 923a30a06b..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,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; 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 c251195777..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,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; 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 5589f0aa97..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; 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 23e5e71260..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; 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 fb4a465cf4..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; 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 abab86ed29..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,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; 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 0d5f37093e..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; 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 ee881c8089..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; 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 18814dd6e6..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,7 +12,7 @@ * 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; 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 1237ad967e..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; 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 7b7cc7a200..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; 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 e9a466a6bf..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; 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 2b10800fcc..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; 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 81d0774aba..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; 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 88cd16e334..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,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.oauth2.core; 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 ebe642033e..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,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.oauth2; 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 173adf83f0..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,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.oauth2; 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 c1039cd5ab..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,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; 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 3d90b1e1e7..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; 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 5f1446096d..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; 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 464604f0fc..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,6 +12,7 @@ * 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; 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 11549ef379..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; 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 1fb989c243..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,6 +12,8 @@ * 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; 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 8b754676fd..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; 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 fcf0f13c8a..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; 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 ce5cb52910..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,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; 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 d9a0131c39..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,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; 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 427be1a099..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,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.rest; 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 5e58040674..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; 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 644ad09fb9..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; 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 8efe77979c..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; 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 8ace30bed6..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; 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 732f9e6489..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; 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 37f4a8b683..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; 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 d42892446d..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; 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 a164d43fd7..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; 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 3824e08f52..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; 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 45328cdbc7..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; 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 7c54426efa..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,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.rest.batch; 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 1aef6c170f..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,7 +12,7 @@ * 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; 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 0abab67a73..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; 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 2fa7482bea..3a5f8a0f70 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,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; 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 f01ba35ece..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,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.shared.guice; 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 9b8332f154..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; 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 6b48a3ad41..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; 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 6a0ec02e4e..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; 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 07dbe8caf8..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; 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 17a2718040..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; 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 c3613e6071..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; 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 fb886e80a1..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. 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 c3959a0521..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; 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 7fa1a28d64..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,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; 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 fdf0dead7a..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; 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 4b07dda303..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; 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 460db68ea8..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; 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 be3abde8fe..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; 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 831ed2a476..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; 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 3d9d1338a2..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; 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 5ace788206..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; 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 1e344e7172..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; 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 e627e9011a..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; 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 6c1072cfec..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; 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 7ddc345acf..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; 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 0b4383fe4a..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,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; 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 32c7a62d19..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; 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 c71dc2982a..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; 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 c60f1ce74f..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; 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 5c069f43d9..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,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.upgrade.steps; 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 0ce871cf0b..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,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.upgrade.steps; 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 b7f8b74dee..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; 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 9e577d7543..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,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.upgrade.steps; 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 4743ce55e8..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,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.upgrade.steps; 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 56b2f7b59b..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,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.upgrade.steps.policy; 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 b9663b4737..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; From 9d542b8c9786524d9805ff06a649e6e30e6c7e27 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 14:15:12 +0000 Subject: [PATCH 37/39] Fix CI: pin org.javassist:javassist:3.27.0-GA to satisfy PowerMock 2.0.9 requirement Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/3d2f0d15-7629-4e90-a359-7608076c28f7 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 678577fb50..92111b6233 100644 --- a/pom.xml +++ b/pom.xml @@ -425,6 +425,12 @@ ognl 3.0.21 + + + org.javassist + javassist + 3.27.0-GA + org.openidentityplatform.openam From 671a0471e61c8acaec2bfd5f6bc155a2be88e9b3 Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Fri, 17 Apr 2026 17:52:49 +0300 Subject: [PATCH 38/39] Update pom.xml From 2246bed86dcbe77bca555e3e0d2c863dad406605 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 17 Apr 2026 15:18:16 +0000 Subject: [PATCH 39/39] Fix CI: exclude old-group javassist from click-nodeps, click-extras, and ognl deps in openam-core to fix PowerMock 2.x classpath conflict Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/8269faaa-c2d9-426a-9ab2-931c51a9cfc0 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com> --- openam-core/pom.xml | 19 +++++++++++++++++++ pom.xml | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/openam-core/pom.xml b/openam-core/pom.xml index b65b9e9d69..0dc0cadee7 100755 --- a/openam-core/pom.xml +++ b/openam-core/pom.xml @@ -260,17 +260,36 @@ org.apache.click click-nodeps ${click.version} + + + + javassist + javassist + + org.apache.click click-extras ${click.version} + + + javassist + javassist + + ognl ognl + + + javassist + javassist + + diff --git a/pom.xml b/pom.xml index 92111b6233..097f49b34a 100644 --- a/pom.xml +++ b/pom.xml @@ -424,6 +424,13 @@ ognl ognl 3.0.21 + + + + javassist + javassist + +