OpenIdentityPlatform · vharseko · Jun 26, 2025 · Jun 26, 2025
diff --git a/openam-audit/openam-audit-context/pom.xml b/openam-audit/openam-audit-context/pom.xml
@@ -53,10 +53,6 @@
             <groupId>org.openidentityplatform.commons.guice</groupId>
             <artifactId>core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
-        </dependency>
         <dependency>
 		  <groupId>org.mockito</groupId>
 		  <artifactId>mockito-core</artifactId>

diff --git a/...openam-audit-context/src/test/java/org/forgerock/openam/audit/AuditContextFilterTest.java b/...openam-audit-context/src/test/java/org/forgerock/openam/audit/AuditContextFilterTest.java
@@ -16,7 +16,7 @@
 
 package org.forgerock.openam.audit;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 

diff --git a/openam-authentication/openam-auth-oidc/pom.xml b/openam-authentication/openam-auth-oidc/pom.xml
@@ -53,11 +53,6 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>

diff --git a/...rc/test/java/org/forgerock/openam/authentication/modules/oidc/JwtAttributeMapperTest.java b/...rc/test/java/org/forgerock/openam/authentication/modules/oidc/JwtAttributeMapperTest.java
@@ -24,7 +24,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class JwtAttributeMapperTest {
     private static final String EMAIL = "email";

diff --git a/...c/test/java/org/forgerock/openam/authentication/modules/oidc/OpenIdConnectConfigTest.java b/...c/test/java/org/forgerock/openam/authentication/modules/oidc/OpenIdConnectConfigTest.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.fest.assertions.Assertions.*;
+import static org.assertj.core.api.Assertions.*;
 import static org.forgerock.openam.utils.CollectionUtils.*;
 
 

diff --git a/openam-authentication/openam-auth-scripted/pom.xml b/openam-authentication/openam-auth-scripted/pom.xml
@@ -56,11 +56,6 @@
             <artifactId>mockito-all</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
-            <scope>test</scope>
-        </dependency>
 
     </dependencies>
 </project>
diff --git a/openam-console/pom.xml b/openam-console/pom.xml
@@ -181,11 +181,6 @@
             <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-oauth2</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

diff --git a/openam-console/src/test/java/com/sun/identity/console/base/AMPropertySheetTest.java b/openam-console/src/test/java/com/sun/identity/console/base/AMPropertySheetTest.java
@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 

diff --git a/openam-console/src/test/java/com/sun/identity/console/base/model/AMAdminUtilsToSetTest.java b/openam-console/src/test/java/com/sun/identity/console/base/model/AMAdminUtilsToSetTest.java
@@ -23,7 +23,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
 /**
@@ -83,7 +83,7 @@ public void shouldIgnoreEmptyStringsIfAsked() {
         assertThat(result).isNotNull()
                           .hasSize(2)
                           .contains("aaa", "ccc")
-                          .excludes("");
+                          .doesNotContain("");
     }
 
     @Test

diff --git a/openam-core/pom.xml b/openam-core/pom.xml
@@ -395,10 +395,6 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-             <groupId>org.easytesting</groupId>
-             <artifactId>fest-assert</artifactId>
-         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>

diff --git a/.../test/java/com/iplanet/dpro/session/operations/ClientSdkSessionOperationStrategyTest.java b/.../test/java/com/iplanet/dpro/session/operations/ClientSdkSessionOperationStrategyTest.java
@@ -15,7 +15,7 @@
  */
 package com.iplanet.dpro.session.operations;
 
-import static org.fest.assertions.Assertions.*;
+import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 import org.testng.annotations.Test;

diff --git a/...src/test/java/com/iplanet/dpro/session/operations/ServerSessionOperationStrategyTest.java b/...src/test/java/com/iplanet/dpro/session/operations/ServerSessionOperationStrategyTest.java
@@ -15,7 +15,7 @@
  */
 package com.iplanet.dpro.session.operations;
 
-import static org.fest.assertions.Assertions.*;
+import static org.assertj.core.api.Assertions.*;
 import static org.mockito.BDDMockito.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;

diff --git a/...src/test/java/com/iplanet/dpro/session/operations/strategies/ClientSdkOperationsTest.java b/...src/test/java/com/iplanet/dpro/session/operations/strategies/ClientSdkOperationsTest.java
@@ -15,7 +15,7 @@
  */
 package com.iplanet.dpro.session.operations.strategies;
 
-import static org.fest.assertions.Assertions.assertThat;
+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;

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
@@ -11,7 +11,7 @@
 import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.Test;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;

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
@@ -26,7 +26,7 @@
 import java.net.URL;
 import java.util.Set;
 
-import static org.fest.assertions.Assertions.assertThat;
+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;

diff --git a/...src/test/java/com/iplanet/dpro/session/service/cluster/MultiServerClusterMonitorTest.java b/...src/test/java/com/iplanet/dpro/session/service/cluster/MultiServerClusterMonitorTest.java
@@ -16,7 +16,7 @@
 
 package com.iplanet.dpro.session.service.cluster;
 
-import static org.fest.assertions.Assertions.*;
+import static org.assertj.core.api.Assertions.*;
 import static org.mockito.BDDMockito.*;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;

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
@@ -16,7 +16,7 @@
 
 package com.iplanet.dpro.session.utils;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;

diff --git a/openam-core/src/test/java/com/sun/identity/entitlement/EntitlementCombinerTest.java b/openam-core/src/test/java/com/sun/identity/entitlement/EntitlementCombinerTest.java
@@ -29,7 +29,7 @@
 
 import static java.util.Collections.EMPTY_MAP;
 import static java.util.Collections.EMPTY_SET;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

diff --git a/openam-core/src/test/java/com/sun/identity/entitlement/PrefixResourceNameTest.java b/openam-core/src/test/java/com/sun/identity/entitlement/PrefixResourceNameTest.java
@@ -21,7 +21,7 @@
 
 import java.util.HashMap;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Exercises the behaviour of {@link PrefixResourceName}.

diff --git a/openam-core/src/test/java/com/sun/identity/entitlement/SubtreeWildcardTest.java b/openam-core/src/test/java/com/sun/identity/entitlement/SubtreeWildcardTest.java
@@ -19,7 +19,7 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 
 /**

diff --git a/openam-core/src/test/java/com/sun/identity/entitlement/URLResourceNameTest.java b/openam-core/src/test/java/com/sun/identity/entitlement/URLResourceNameTest.java
@@ -15,11 +15,10 @@
  */
 package com.sun.identity.entitlement;
 
-import org.fest.assertions.ComparisonFailureFactory;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Unit test for URLResourceName.
@@ -39,7 +38,7 @@ public void setUp() {
      * Tests that the normalisation process adheres to the expected rules.
      */
     @Test
-    public void verifyPortHandling() {
+    public void verifyPortHandling() throws Exception {
         // Previous ports are maintained.
         assertNormalisation("http://www.example.com:80/hello", "http://www.example.com:80/hello");
         assertNormalisation("http://www.example.com:12345/hello", "http://www.example.com:12345/hello");
@@ -69,13 +68,7 @@ public void verifyPortHandling() {
      * @param treatedResource
      *         The expected resource after it's been normalised.
      */
-    private void assertNormalisation(String untreatedResource, String treatedResource) {
-        try {
-            assertThat(resourceName.canonicalize(untreatedResource)).isEqualTo(treatedResource);
-        } catch (Exception e) {
-            String message = "Normalisation failed: " + e.getMessage();
-            throw ComparisonFailureFactory.comparisonFailure(message, treatedResource, "");
-        }
+    private void assertNormalisation(String untreatedResource, String treatedResource) throws Exception {
+        assertThat(resourceName.canonicalize(untreatedResource)).isEqualTo(treatedResource);
     }
-
 }
diff --git a/openam-core/src/test/java/com/sun/identity/idm/AMIdentityTest.java b/openam-core/src/test/java/com/sun/identity/idm/AMIdentityTest.java
@@ -15,7 +15,7 @@
  */
 package com.sun.identity.idm;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.*;
 
 import com.iplanet.sso.SSOToken;

diff --git a/openam-core/src/test/java/com/sun/identity/idm/IdRepoExceptionTest.java b/openam-core/src/test/java/com/sun/identity/idm/IdRepoExceptionTest.java
@@ -15,7 +15,7 @@
 */
 package com.sun.identity.idm;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;

diff --git a/openam-core/src/test/java/com/sun/identity/idm/common/IdRepoUtilsTest.java b/openam-core/src/test/java/com/sun/identity/idm/common/IdRepoUtilsTest.java
@@ -18,8 +18,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import static org.fest.assertions.Assertions.*;
-import static org.forgerock.openam.utils.CollectionUtils.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.forgerock.openam.utils.CollectionUtils.asSet;
 import org.testng.annotations.Test;
 
 public class IdRepoUtilsTest {
@@ -33,7 +33,7 @@ public void filteringPasswordWorksWithDefaultSettings() {
         values.put("aunicodepwd", asSet("test4"));
         values.put("unicodepwd2", asSet("test5"));
         values.put("unicodepwd", asSet("test6"));
-        Map<String, ?> result = IdRepoUtils.getAttrMapWithoutPasswordAttrs(values, null);
+        Map result = IdRepoUtils.getAttrMapWithoutPasswordAttrs(values, null);
         assertThat(result.values()).containsOnly(asSet("test1"), asSet("test2"), asSet("test4"), asSet("test5"),
                 "xxx...");
     }
@@ -47,7 +47,7 @@ public void filteringPasswordWorksCaseInsensitively() {
         values.put("UnIcOdEpWd", asSet("test4"));
         values.put("unicodePwd", asSet("test5"));
         values.put("unicodepwd", asSet("test6"));
-        Map<String, ?> result = IdRepoUtils.getAttrMapWithoutPasswordAttrs(values, null);
+        Map result = IdRepoUtils.getAttrMapWithoutPasswordAttrs(values, null);
         assertThat(result.values()).containsOnly("xxx...");
     }
 
@@ -60,7 +60,7 @@ public void filteringPasswordWorksWithExtraPasswordParameters() {
         values.put("unicodepwd", asSet("test4"));
         values.put("hellp", asSet("test5"));
         values.put("worlt", asSet("test6"));
-        Map<String, ?> result = IdRepoUtils.getAttrMapWithoutPasswordAttrs(values, asSet("HELLO", "WORLD"));
+        Map result = IdRepoUtils.getAttrMapWithoutPasswordAttrs(values, asSet("HELLO", "WORLD"));
         assertThat(result.values()).containsOnly(asSet("test5"), asSet("test6"), "xxx...");
     }
 }
diff --git a/openam-core/src/test/java/com/sun/identity/log/service/AgentLogParserTest.java b/openam-core/src/test/java/com/sun/identity/log/service/AgentLogParserTest.java
@@ -15,7 +15,7 @@
  */
 package com.sun.identity.log.service;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.forgerock.audit.events.AccessAuditEventBuilder.ResponseStatus;
 import org.testng.annotations.BeforeMethod;

diff --git a/openam-core/src/test/java/com/sun/identity/policy/plugins/PrefixResourceNameTest.java b/openam-core/src/test/java/com/sun/identity/policy/plugins/PrefixResourceNameTest.java
@@ -23,7 +23,7 @@
 
 import java.util.HashMap;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Exercises the behaviour of {@link PrefixResourceName}.

diff --git a/openam-core/src/test/java/com/sun/identity/policy/plugins/URLResourceNameTest.java b/openam-core/src/test/java/com/sun/identity/policy/plugins/URLResourceNameTest.java
@@ -15,11 +15,10 @@
  */
 package com.sun.identity.policy.plugins;
 
-import org.fest.assertions.ComparisonFailureFactory;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Unit test for URLResourceName.
@@ -39,7 +38,7 @@ public void setUp() {
      * Tests that the normalisation process adheres to the expected rules.
      */
     @Test
-    public void verifyPortHandling() {
+    public void verifyPortHandling() throws Exception {
         // Previous ports are maintained.
         assertNormalisation("http://www.example.com:80/hello", "http://www.example.com:80/hello");
         assertNormalisation("http://www.example.com:12345/hello", "http://www.example.com:12345/hello");
@@ -69,13 +68,7 @@ public void verifyPortHandling() {
      * @param treatedResource
      *         The expected resource after it's been normalised.
      */
-    private void assertNormalisation(String untreatedResource, String treatedResource) {
-        try {
-            assertThat(resourceName.canonicalize(untreatedResource)).isEqualTo(treatedResource);
-        } catch (Exception e) {
-            String message = "Normalisation failed: " + e.getMessage();
-            throw ComparisonFailureFactory.comparisonFailure(message, treatedResource, "");
-        }
+    private void assertNormalisation(String untreatedResource, String treatedResource) throws Exception {
+        assertThat(resourceName.canonicalize(untreatedResource)).isEqualTo(treatedResource);
     }
-
 }
diff --git a/openam-core/src/test/java/org/forgerock/openam/auditors/SMSAuditorTest.java b/openam-core/src/test/java/org/forgerock/openam/auditors/SMSAuditorTest.java
@@ -16,7 +16,7 @@
 
 package org.forgerock.openam.auditors;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.testng.Reporter;
 import org.testng.annotations.DataProvider;

diff --git a/...ava/org/forgerock/openam/authentication/callbacks/helpers/PollingWaitSpamCheckerTest.java b/...ava/org/forgerock/openam/authentication/callbacks/helpers/PollingWaitSpamCheckerTest.java
@@ -17,10 +17,11 @@
 
 import java.util.concurrent.TimeUnit;
 
-import org.fest.assertions.Assertions;
 import org.forgerock.openam.utils.TimeTravelUtil;
 import org.forgerock.openam.utils.TimeTravelUtil.FastForwardTimeService;
 import org.forgerock.util.time.TimeService;
+
+import org.assertj.core.api.Assertions;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;

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
@@ -23,7 +23,7 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.fest.assertions.Assertions.assertThat;
+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;

diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/TokenTestUtils.java b/openam-core/src/test/java/org/forgerock/openam/cts/TokenTestUtils.java
@@ -26,7 +26,7 @@
 import java.util.Calendar;
 import java.util.TimeZone;
 
-import static org.fest.assertions.Assertions.*;
+import static org.assertj.core.api.Assertions.*;
 import static org.forgerock.openam.utils.Time.*;
 
 /**