diff --git a/openam-audit/openam-audit-context/pom.xml b/openam-audit/openam-audit-context/pom.xml index dab87963b2..cefdad67f1 100644 --- a/openam-audit/openam-audit-context/pom.xml +++ b/openam-audit/openam-audit-context/pom.xml @@ -53,10 +53,6 @@ org.openidentityplatform.commons.guice core - - org.easytesting - fest-assert - org.mockito mockito-core diff --git a/openam-audit/openam-audit-context/src/test/java/org/forgerock/openam/audit/AuditContextFilterTest.java b/openam-audit/openam-audit-context/src/test/java/org/forgerock/openam/audit/AuditContextFilterTest.java index d6acd3aec3..f9db417e04 100644 --- a/openam-audit/openam-audit-context/src/test/java/org/forgerock/openam/audit/AuditContextFilterTest.java +++ b/openam-audit/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 index b6dd107761..89133d7e0e 100755 --- a/openam-authentication/openam-auth-oidc/pom.xml +++ b/openam-authentication/openam-auth-oidc/pom.xml @@ -53,11 +53,6 @@ testng test - - org.easytesting - fest-assert - test - org.mockito mockito-all diff --git a/openam-authentication/openam-auth-oidc/src/test/java/org/forgerock/openam/authentication/modules/oidc/JwtAttributeMapperTest.java b/openam-authentication/openam-auth-oidc/src/test/java/org/forgerock/openam/authentication/modules/oidc/JwtAttributeMapperTest.java index 4e435710c8..dd8eb94ee6 100644 --- a/openam-authentication/openam-auth-oidc/src/test/java/org/forgerock/openam/authentication/modules/oidc/JwtAttributeMapperTest.java +++ b/openam-authentication/openam-auth-oidc/src/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/openam-authentication/openam-auth-oidc/src/test/java/org/forgerock/openam/authentication/modules/oidc/OpenIdConnectConfigTest.java b/openam-authentication/openam-auth-oidc/src/test/java/org/forgerock/openam/authentication/modules/oidc/OpenIdConnectConfigTest.java index 7e6be152c1..0c437bcb4a 100644 --- a/openam-authentication/openam-auth-oidc/src/test/java/org/forgerock/openam/authentication/modules/oidc/OpenIdConnectConfigTest.java +++ b/openam-authentication/openam-auth-oidc/src/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 index 060674b186..74a4206683 100644 --- a/openam-authentication/openam-auth-scripted/pom.xml +++ b/openam-authentication/openam-auth-scripted/pom.xml @@ -56,11 +56,6 @@ mockito-all test - - org.easytesting - fest-assert - test - diff --git a/openam-console/pom.xml b/openam-console/pom.xml index 8c4b4f457d..0a21a93205 100644 --- a/openam-console/pom.xml +++ b/openam-console/pom.xml @@ -181,11 +181,6 @@ org.openidentityplatform.openam openam-oauth2 - - org.easytesting - fest-assert - test - org.mockito mockito-core 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 index e157a1346c..e6de86df36 100644 --- 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 index c985fbc7f1..b06876c2c6 100644 --- 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 index 7ec26e882c..f00b26f52c 100755 --- a/openam-core/pom.xml +++ b/openam-core/pom.xml @@ -395,10 +395,6 @@ testng test - - org.easytesting - fest-assert - org.mockito mockito-all diff --git a/openam-core/src/test/java/com/iplanet/dpro/session/operations/ClientSdkSessionOperationStrategyTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/operations/ClientSdkSessionOperationStrategyTest.java index 1010f6e2e5..4853c068ac 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/operations/ClientSdkSessionOperationStrategyTest.java +++ b/openam-core/src/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/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 13c2d3c9e4..f685cb6a4c 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 @@ -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/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 c3b9d20c8f..2917e3d065 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 @@ -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 index 85981cb7de..4bca2e9944 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 @@ -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 index 754375e0f6..f17368d22e 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 @@ -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/openam-core/src/test/java/com/iplanet/dpro/session/service/cluster/MultiServerClusterMonitorTest.java b/openam-core/src/test/java/com/iplanet/dpro/session/service/cluster/MultiServerClusterMonitorTest.java index 10401ea12e..34e7c0cf02 100644 --- a/openam-core/src/test/java/com/iplanet/dpro/session/service/cluster/MultiServerClusterMonitorTest.java +++ b/openam-core/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 index cd7e6eff92..096f530b2d 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 @@ -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 index 104d4c1d2e..48f9347aeb 100644 --- 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 index 2db71a8006..de789c6bf6 100644 --- 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 index aebe55dc4c..4842952b4f 100644 --- 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 index d31d55ffc4..b5d8f0d678 100644 --- 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 index 341c2b4f7f..8e4e0f56d4 100644 --- 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 index 2d6f3118b0..4ca649d1dc 100644 --- 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 index ad5f0be877..51ceb44671 100644 --- 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 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 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 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 index d12047f379..c2eefbff7d 100644 --- 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 index 2a542abf2a..48419f0e25 100644 --- 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 index 1b85d71870..5a97a53417 100644 --- 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 index 33c9574407..de3501188a 100644 --- 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/openam-core/src/test/java/org/forgerock/openam/authentication/callbacks/helpers/PollingWaitSpamCheckerTest.java b/openam-core/src/test/java/org/forgerock/openam/authentication/callbacks/helpers/PollingWaitSpamCheckerTest.java index ef5f130953..707b978c30 100644 --- a/openam-core/src/test/java/org/forgerock/openam/authentication/callbacks/helpers/PollingWaitSpamCheckerTest.java +++ b/openam-core/src/test/java/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 index 34b52b0108..674c441a99 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 @@ -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 index ac5182744c..a6331a3a8a 100644 --- 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.*; /** diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/adapters/JavaBeanAdapterTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/adapters/JavaBeanAdapterTest.java index 3f492f1aa1..ffc0792179 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/adapters/JavaBeanAdapterTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/adapters/JavaBeanAdapterTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.cts.adapters; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import java.nio.charset.Charset; import java.util.Arrays; 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 526268a414..cf10303b57 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 @@ -15,7 +15,7 @@ */ package org.forgerock.openam.cts.adapters; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.forgerock.openam.utils.Time.*; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/adapters/SessionAdapterTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/adapters/SessionAdapterTest.java index b640c9f81e..438a8d709c 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/adapters/SessionAdapterTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/adapters/SessionAdapterTest.java @@ -17,7 +17,7 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.utils.Time.currentTimeMillis; import static org.forgerock.openam.utils.Time.getCalendarInstance; import static org.mockito.BDDMockito.given; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/api/fields/CoreTokenFieldTypesTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/api/fields/CoreTokenFieldTypesTest.java index 644946c4c9..731402a240 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/api/fields/CoreTokenFieldTypesTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/api/fields/CoreTokenFieldTypesTest.java @@ -18,8 +18,9 @@ import static org.forgerock.openam.utils.Time.*; -import org.fest.assertions.Assertions; -import org.fest.assertions.Condition; +import org.assertj.core.api.Assertions; +import org.assertj.core.api.Condition; + import org.forgerock.openam.cts.api.tokens.Token; import org.forgerock.openam.cts.exceptions.CoreTokenException; import org.forgerock.openam.tokens.CoreTokenField; @@ -86,10 +87,9 @@ public void shouldEnsureAllFieldTypesHaveAValidationType() { continue; } - Assertions.assertThat(field).satisfies(new Condition("has valid type") { + Assertions.assertThat(field).is(new Condition("has valid type") { @Override - public boolean matches(Object t) { - CoreTokenField obj = (CoreTokenField) t; + public boolean matches(CoreTokenField obj) { return CoreTokenFieldTypes.isByteArray(obj) || CoreTokenFieldTypes.isCalendar(obj) || CoreTokenFieldTypes.isInteger(obj) || CoreTokenFieldTypes.isString(obj); } diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/exceptions/CoreTokenExceptionTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/exceptions/CoreTokenExceptionTest.java index c6582cc0c6..f8b5a19830 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/exceptions/CoreTokenExceptionTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/exceptions/CoreTokenExceptionTest.java @@ -17,7 +17,7 @@ import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class CoreTokenExceptionTest { @Test 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 ceda424ac2..fa3ccf58fa 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 @@ -15,7 +15,7 @@ */ package org.forgerock.openam.cts.impl; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.*; import java.util.ArrayList; 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 19690cbacd..023fdd3334 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 @@ -24,7 +24,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.*; import static org.testng.Assert.assertEquals; 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 7c932be598..0ea5decf67 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 @@ -16,7 +16,7 @@ package org.forgerock.openam.cts.impl; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; 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.forgerock.openam.utils.CollectionUtils.asSet; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/PartialTokenTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/PartialTokenTest.java index 9fa7a4cb76..50f6a90b39 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/PartialTokenTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/PartialTokenTest.java @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.Map; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; public class PartialTokenTest { diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerBaseQueryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerBaseQueryTest.java index 55edefb138..da12ef7e2d 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerBaseQueryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/query/worker/queries/CTSWorkerBaseQueryTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.cts.impl.query.worker.queries; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.*; import java.util.Arrays; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/AsyncResultHandlerTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/AsyncResultHandlerTest.java index 595ebfec27..745805b87c 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/AsyncResultHandlerTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/AsyncResultHandlerTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.cts.impl.queue; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; import java.util.concurrent.ArrayBlockingQueue; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/QueueSelectorTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/QueueSelectorTest.java index a8820ef081..d167556577 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/QueueSelectorTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/queue/QueueSelectorTest.java @@ -18,7 +18,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; public class QueueSelectorTest { 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 28c6633011..3b65cf87eb 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 @@ -15,7 +15,7 @@ */ package org.forgerock.openam.cts.impl.queue.config; -import static org.fest.assertions.Assertions.assertThat; +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; 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 0a13b43320..b623245836 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 @@ -22,7 +22,7 @@ import java.util.ArrayList; -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/org/forgerock/openam/cts/utils/blob/TokenBlobStrategyTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenBlobStrategyTest.java index 8dd7d32678..6318c45ee4 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 @@ -22,8 +22,7 @@ import java.util.Arrays; -import static org.fest.assertions.Assertions.assertThat; -import static org.fest.assertions.Fail.fail; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.*; @@ -114,9 +113,7 @@ public void shouldNotModifyProvidedByteArray() throws TokenStrategyFailedExcepti // Then Object dataRef = data; Object captorRef = captor.getValue(); - if (dataRef == captorRef) { // Verify the references are different (the contents will be the same) - fail(); - } + assertThat(dataRef).isNotSameAs(captorRef); } @Test 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 fa541123f2..84ab45b73e 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 @@ -23,7 +23,7 @@ import java.io.UnsupportedEncodingException; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.verify; import static org.mockito.BDDMockito.mock; import static org.mockito.BDDMockito.given; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenStrategyFactoryTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenStrategyFactoryTest.java index ece8facc1d..9259b095e3 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenStrategyFactoryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/TokenStrategyFactoryTest.java @@ -27,7 +27,7 @@ import java.util.Collection; import java.util.List; -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.BDDMockito.mock; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/strategies/AttributeCompressionStrategyTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/strategies/AttributeCompressionStrategyTest.java index af0fcf5a6c..30015efcb3 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/strategies/AttributeCompressionStrategyTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/strategies/AttributeCompressionStrategyTest.java @@ -22,7 +22,7 @@ import java.io.UnsupportedEncodingException; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; public class AttributeCompressionStrategyTest { diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/strategies/CompressionStrategyTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/strategies/CompressionStrategyTest.java index 17de5ef927..b26fb5bb7a 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/strategies/CompressionStrategyTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/strategies/CompressionStrategyTest.java @@ -33,7 +33,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.utils.Time.*; public class CompressionStrategyTest { diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/strategies/encryption/EncryptDecryptActionTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/strategies/encryption/EncryptDecryptActionTest.java index 0d94752e7b..0ce590aa29 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/strategies/encryption/EncryptDecryptActionTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/utils/blob/strategies/encryption/EncryptDecryptActionTest.java @@ -17,7 +17,7 @@ import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class EncryptDecryptActionTest { @Test 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 88d9fc7030..d364e18cc0 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 @@ -15,7 +15,7 @@ */ package org.forgerock.openam.cts.worker.process; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.*; import java.util.Arrays; diff --git a/openam-core/src/test/java/org/forgerock/openam/entitlement/service/ApplicationQueryFilterVisitorTest.java b/openam-core/src/test/java/org/forgerock/openam/entitlement/service/ApplicationQueryFilterVisitorTest.java index 81949f4e85..06fb42a35b 100644 --- a/openam-core/src/test/java/org/forgerock/openam/entitlement/service/ApplicationQueryFilterVisitorTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/entitlement/service/ApplicationQueryFilterVisitorTest.java @@ -25,8 +25,8 @@ import java.util.Map; import java.util.Set; -import org.fest.assertions.Assertions; import org.forgerock.util.query.QueryFilter; +import org.assertj.core.api.Assertions; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/openam-core/src/test/java/org/forgerock/openam/services/baseurl/ExtensionBaseURLProviderTest.java b/openam-core/src/test/java/org/forgerock/openam/services/baseurl/ExtensionBaseURLProviderTest.java index a8e84bbb26..1c8dcf959e 100644 --- a/openam-core/src/test/java/org/forgerock/openam/services/baseurl/ExtensionBaseURLProviderTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/services/baseurl/ExtensionBaseURLProviderTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.services.baseurl; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import javax.servlet.http.HttpServletRequest; diff --git a/openam-core/src/test/java/org/forgerock/openam/services/baseurl/FixedBaseURLProviderTest.java b/openam-core/src/test/java/org/forgerock/openam/services/baseurl/FixedBaseURLProviderTest.java index 8db51d3344..2b777e8876 100644 --- a/openam-core/src/test/java/org/forgerock/openam/services/baseurl/FixedBaseURLProviderTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/services/baseurl/FixedBaseURLProviderTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.services.baseurl; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import javax.servlet.http.HttpServletRequest; diff --git a/openam-core/src/test/java/org/forgerock/openam/services/baseurl/ForwardedHeaderBaseURLProviderTest.java b/openam-core/src/test/java/org/forgerock/openam/services/baseurl/ForwardedHeaderBaseURLProviderTest.java index 0491b31e3d..641537bbff 100644 --- a/openam-core/src/test/java/org/forgerock/openam/services/baseurl/ForwardedHeaderBaseURLProviderTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/services/baseurl/ForwardedHeaderBaseURLProviderTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.services.baseurl; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.forgerock.json.JsonValue.field; import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; diff --git a/openam-core/src/test/java/org/forgerock/openam/services/baseurl/RequestValuesBaseURLProviderTest.java b/openam-core/src/test/java/org/forgerock/openam/services/baseurl/RequestValuesBaseURLProviderTest.java index 09e6bda50c..282ea0b0ee 100644 --- a/openam-core/src/test/java/org/forgerock/openam/services/baseurl/RequestValuesBaseURLProviderTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/services/baseurl/RequestValuesBaseURLProviderTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.services.baseurl; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.forgerock.json.JsonValue.field; import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; diff --git a/openam-core/src/test/java/org/forgerock/openam/services/baseurl/XForwardedHeadersBaseURLProviderTest.java b/openam-core/src/test/java/org/forgerock/openam/services/baseurl/XForwardedHeadersBaseURLProviderTest.java index 348bae1a6d..d19482a535 100644 --- a/openam-core/src/test/java/org/forgerock/openam/services/baseurl/XForwardedHeadersBaseURLProviderTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/services/baseurl/XForwardedHeadersBaseURLProviderTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.services.baseurl; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.forgerock.json.JsonValue.field; import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; diff --git a/openam-core/src/test/java/org/forgerock/openam/session/SessionCacheTest.java b/openam-core/src/test/java/org/forgerock/openam/session/SessionCacheTest.java index e1ad573c9e..aefbc05c89 100644 --- a/openam-core/src/test/java/org/forgerock/openam/session/SessionCacheTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/session/SessionCacheTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.session; -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.BDDMockito.mock; import static org.mockito.Mockito.*; diff --git a/openam-core/src/test/java/org/forgerock/openam/session/service/access/SessionPersistenceStoreTest.java b/openam-core/src/test/java/org/forgerock/openam/session/service/access/SessionPersistenceStoreTest.java index d1fb948cd4..bb2fd97941 100644 --- a/openam-core/src/test/java/org/forgerock/openam/session/service/access/SessionPersistenceStoreTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/session/service/access/SessionPersistenceStoreTest.java @@ -19,7 +19,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.*; -import org.fest.util.Collections; import org.forgerock.guice.core.GuiceModules; import org.forgerock.guice.core.GuiceTestCase; import org.forgerock.openam.cts.CTSPersistentStore; @@ -28,6 +27,7 @@ import org.forgerock.openam.cts.api.tokens.Token; import org.forgerock.openam.cts.api.tokens.TokenIdFactory; import org.forgerock.openam.session.service.access.persistence.SessionPersistenceStore; +import org.forgerock.openam.utils.CollectionUtils; import org.forgerock.openam.dpro.session.PartialSessionFactory; import org.forgerock.openam.identity.idm.IdentityUtils; import org.mockito.Mock; @@ -100,14 +100,14 @@ public void recoversSession() throws Exception { @Test public void recoversSessionByHandle() throws Exception { - given(mockCoreTokenService.query(any(TokenFilter.class))).willReturn(Collections.list(mockToken)); + given(mockCoreTokenService.query(any(TokenFilter.class))).willReturn(CollectionUtils.asList(mockToken)); assertThat(sessionPersistenceStore.recoverSessionByHandle(HANDLE)).isEqualTo(mockSession); } @Test public void failsRecoverSessionByHandleWithNonUniqueMatch() throws Exception { - given(mockCoreTokenService.query(any(TokenFilter.class))).willReturn(Collections.list(mock(Token.class), mockToken)); + given(mockCoreTokenService.query(any(TokenFilter.class))).willReturn(CollectionUtils.asList(mock(Token.class), mockToken)); assertThat(sessionPersistenceStore.recoverSessionByHandle(HANDLE)).isNull(); } 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 312cfc26bd..7ac400dd8d 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 @@ -20,7 +20,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.anyInt; import static org.mockito.Matchers.anyString; diff --git a/openam-core/src/test/java/org/forgerock/openam/session/stateless/cache/StatelessJWTCacheTest.java b/openam-core/src/test/java/org/forgerock/openam/session/stateless/cache/StatelessJWTCacheTest.java index e2b94206c1..60d3af077e 100644 --- a/openam-core/src/test/java/org/forgerock/openam/session/stateless/cache/StatelessJWTCacheTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/session/stateless/cache/StatelessJWTCacheTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.session.stateless.cache; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.any; import static org.mockito.BDDMockito.anyString; import static org.mockito.BDDMockito.*; 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 e479afea13..bdc01661c8 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 @@ -22,7 +22,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.BDDMockito.mock; import static org.mockito.Matchers.any; diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/ServerGroupConfigurationTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/ServerGroupConfigurationTest.java index dd1920b374..e0622dfee9 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/ServerGroupConfigurationTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/ServerGroupConfigurationTest.java @@ -20,7 +20,7 @@ import com.iplanet.services.ldap.ServerInstance; import java.util.Arrays; import java.util.Set; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import org.forgerock.openam.ldap.LDAPURL; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/ServiceConfigQueryFilterVisitorTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/ServiceConfigQueryFilterVisitorTest.java index 0715711cd7..caa4021342 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/ServiceConfigQueryFilterVisitorTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/ServiceConfigQueryFilterVisitorTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.sm; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.util.query.QueryFilter.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/CTSDJLDAPv3PersistentSearchTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/CTSDJLDAPv3PersistentSearchTest.java index ce2fb2f624..0655ff0418 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/CTSDJLDAPv3PersistentSearchTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/CTSDJLDAPv3PersistentSearchTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.sm.datalayer.impl.ldap; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.HashSet; 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 00d7bfe5a8..a58a5ac146 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 @@ -15,7 +15,7 @@ */ package org.forgerock.openam.sm.datalayer.impl.ldap; -import static org.fest.assertions.Assertions.*; +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; diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/LdapQueryBuilderTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/LdapQueryBuilderTest.java index 388adc1b6a..2f40bee2c1 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/LdapQueryBuilderTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/ldap/LdapQueryBuilderTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.sm.datalayer.impl.ldap; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.forgerock.openam.utils.Time.*; import static org.mockito.BDDMockito.*; diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/ContinuousQueryTaskTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/ContinuousQueryTaskTest.java index 48d2c47dc9..849d3106dc 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/ContinuousQueryTaskTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/impl/tasks/ContinuousQueryTaskTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.sm.datalayer.impl.tasks; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/providers/DataLayerConnectionFactoryCacheTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/providers/DataLayerConnectionFactoryCacheTest.java index f2a61888aa..e9052753d1 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/providers/DataLayerConnectionFactoryCacheTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/providers/DataLayerConnectionFactoryCacheTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.sm.datalayer.providers; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/store/TokenDataStoreTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/store/TokenDataStoreTest.java index 2b6a7b6035..e8398bf271 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/store/TokenDataStoreTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/store/TokenDataStoreTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.sm.datalayer.store; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.utils.CollectionUtils.asSet; import static org.mockito.Mockito.*; diff --git a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/utils/ConnectionConfigFactoryTest.java b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/utils/ConnectionConfigFactoryTest.java index aacf72e28e..2e4898085d 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/utils/ConnectionConfigFactoryTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sm/datalayer/utils/ConnectionConfigFactoryTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.sm.datalayer.utils; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; import org.forgerock.openam.sm.ConnectionConfig; diff --git a/openam-core/src/test/java/org/forgerock/openam/sso/providers/stateless/StatelessAdminRestrictionTest.java b/openam-core/src/test/java/org/forgerock/openam/sso/providers/stateless/StatelessAdminRestrictionTest.java index 819c92c0eb..bd3909b29b 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sso/providers/stateless/StatelessAdminRestrictionTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sso/providers/stateless/StatelessAdminRestrictionTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.sso.providers.stateless; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.*; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; diff --git a/openam-core/src/test/java/org/forgerock/openam/sso/providers/stateless/StatelessSessionManagerTest.java b/openam-core/src/test/java/org/forgerock/openam/sso/providers/stateless/StatelessSessionManagerTest.java index 3a666f8bb9..d4bc03a016 100644 --- a/openam-core/src/test/java/org/forgerock/openam/sso/providers/stateless/StatelessSessionManagerTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/sso/providers/stateless/StatelessSessionManagerTest.java @@ -22,7 +22,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.BDDMockito.mock; diff --git a/openam-core/src/test/java/org/forgerock/openam/utils/ForwardedHeaderTest.java b/openam-core/src/test/java/org/forgerock/openam/utils/ForwardedHeaderTest.java index 892bf51f21..fe84e7a775 100644 --- a/openam-core/src/test/java/org/forgerock/openam/utils/ForwardedHeaderTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/utils/ForwardedHeaderTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.utils; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Arrays; diff --git a/openam-core/src/test/java/org/forgerock/openam/utils/ModifiedPropertyTest.java b/openam-core/src/test/java/org/forgerock/openam/utils/ModifiedPropertyTest.java index 1bcb76d33b..2446d1ca19 100644 --- a/openam-core/src/test/java/org/forgerock/openam/utils/ModifiedPropertyTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/utils/ModifiedPropertyTest.java @@ -17,7 +17,7 @@ import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * @author robert.wapshott@forgerock.com diff --git a/openam-core/src/test/java/org/forgerock/openam/utils/ShutdownMonitorTest.java b/openam-core/src/test/java/org/forgerock/openam/utils/ShutdownMonitorTest.java index a2062ed2c0..e580c8ff4c 100644 --- a/openam-core/src/test/java/org/forgerock/openam/utils/ShutdownMonitorTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/utils/ShutdownMonitorTest.java @@ -21,7 +21,7 @@ import org.testng.annotations.BeforeTest; 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.mock; import static org.mockito.BDDMockito.verify; import static org.mockito.Mockito.when; diff --git a/openam-core/src/test/java/org/forgerock/openam/xui/XUIFilterTest.java b/openam-core/src/test/java/org/forgerock/openam/xui/XUIFilterTest.java index 88db49a0b8..6957989c2a 100644 --- a/openam-core/src/test/java/org/forgerock/openam/xui/XUIFilterTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/xui/XUIFilterTest.java @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletContext; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import org.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; diff --git a/openam-datastore/pom.xml b/openam-datastore/pom.xml index fef8e40e9a..6e0b12ce75 100755 --- a/openam-datastore/pom.xml +++ b/openam-datastore/pom.xml @@ -52,10 +52,5 @@ org.powermock powermock-module-testng - - org.easytesting - fest-assert - test - diff --git a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/ADBasicRepoTest.java b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/ADBasicRepoTest.java index 4d0c815732..2e7c56063d 100644 --- a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/ADBasicRepoTest.java +++ b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/ADBasicRepoTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.idrepo.ldap; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.fail; import org.forgerock.openam.utils.MapHelper; diff --git a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/ADMailBasedRepoTest.java b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/ADMailBasedRepoTest.java index 6664fa6692..ebc0281ee2 100644 --- a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/ADMailBasedRepoTest.java +++ b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/ADMailBasedRepoTest.java @@ -19,7 +19,7 @@ import com.sun.identity.idm.IdRepo; import com.sun.identity.idm.IdType; import com.sun.identity.idm.RepoSearchResults; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import org.forgerock.openam.utils.CrestQuery; import org.forgerock.openam.utils.MapHelper; diff --git a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/DSEERepoTest.java b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/DSEERepoTest.java index 8539195caf..85a28c6c68 100644 --- a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/DSEERepoTest.java +++ b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/DSEERepoTest.java @@ -22,7 +22,7 @@ import com.sun.identity.idm.IdType; 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.ldap.LDAPConstants.*; import static org.forgerock.openam.utils.CollectionUtils.*; import static org.testng.Assert.fail; diff --git a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/GenericRepoTest.java b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/GenericRepoTest.java index 7fccd6dc7c..9b26a51814 100644 --- a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/GenericRepoTest.java +++ b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/GenericRepoTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.idrepo.ldap; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.utils.CollectionUtils.asOrderedSet; import static org.forgerock.openam.utils.CollectionUtils.asSet; import static org.mockito.Mockito.*; diff --git a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/PSearchRepoTest.java b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/PSearchRepoTest.java index 43116c3440..3c13b74576 100644 --- a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/PSearchRepoTest.java +++ b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/PSearchRepoTest.java @@ -21,7 +21,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.fail; diff --git a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/helpers/ADAMHelperTest.java b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/helpers/ADAMHelperTest.java index ab908bed85..8db35af407 100644 --- a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/helpers/ADAMHelperTest.java +++ b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/helpers/ADAMHelperTest.java @@ -18,7 +18,7 @@ import com.sun.identity.idm.IdType; import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import org.forgerock.openam.utils.CollectionUtils; import static org.forgerock.openam.utils.CollectionUtils.*; diff --git a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/helpers/DirectoryHelperTest.java b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/helpers/DirectoryHelperTest.java index 1bec361aab..9a7c7e01e7 100644 --- a/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/helpers/DirectoryHelperTest.java +++ b/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/helpers/DirectoryHelperTest.java @@ -18,7 +18,7 @@ import com.sun.identity.idm.IdType; import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import org.forgerock.openam.utils.CollectionUtils; import static org.forgerock.openam.utils.CollectionUtils.*; diff --git a/openam-entitlements/pom.xml b/openam-entitlements/pom.xml index 81a6a66c50..87b5b5f13b 100755 --- a/openam-entitlements/pom.xml +++ b/openam-entitlements/pom.xml @@ -106,13 +106,7 @@ org.powermock powermock-api-mockito2 test - - - - org.easytesting - fest-assert - test - + org.openidentityplatform.commons.guice diff --git a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/Assertions.java b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/Assertions.java index 3aa9388100..d7d5366959 100644 --- a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/Assertions.java +++ b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/Assertions.java @@ -30,7 +30,7 @@ import java.util.Set; import java.util.TreeSet; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Collection of assertion methods for unit tests. 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 572c0d12c5..d4c3230685 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 @@ -19,7 +19,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.sun.identity.entitlement.EntitlementException; import com.sun.identity.entitlement.ResourceAttribute; -import org.fest.util.Collections; + +import org.forgerock.openam.utils.CollectionUtils; import org.testng.annotations.Test; import javax.security.auth.Subject; @@ -27,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.BDDMockito.mock; import static org.mockito.Matchers.any; @@ -94,7 +95,7 @@ public String getPropertyName() { @Override public Set getPropertyValues() { - return Collections.set("Weasel", "Ferret"); + return CollectionUtils.asSet("Weasel", "Ferret"); } @Override diff --git a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/SearchFilterFactoryTest.java b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/SearchFilterFactoryTest.java index 8e86069430..d6b47c3330 100644 --- a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/SearchFilterFactoryTest.java +++ b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/SearchFilterFactoryTest.java @@ -21,7 +21,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.testng.AssertJUnit.fail; public class SearchFilterFactoryTest { diff --git a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtilsTest.java b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtilsTest.java index 1cd33da75c..c2ff2837f6 100644 --- a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtilsTest.java +++ b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtilsTest.java @@ -35,7 +35,7 @@ import static com.sun.identity.entitlement.xacml3.Assertions.*; import static com.sun.identity.entitlement.xacml3.FactoryMethods.*; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.utils.Time.*; import static org.testng.Assert.*; diff --git a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLReaderWriterTest.java b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLReaderWriterTest.java index 99c08c8d89..538e2b1930 100644 --- a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLReaderWriterTest.java +++ b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLReaderWriterTest.java @@ -18,7 +18,7 @@ import static com.sun.identity.entitlement.xacml3.Assertions.*; import static com.sun.identity.entitlement.xacml3.FactoryMethods.*; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.utils.Time.getCalendarInstance; import org.testng.annotations.Test; diff --git a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLSchemaFactoryTest.java b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLSchemaFactoryTest.java index 1d03a0b56f..a9573de258 100644 --- a/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLSchemaFactoryTest.java +++ b/openam-entitlements/src/test/java/com/sun/identity/entitlement/xacml3/XACMLSchemaFactoryTest.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Set; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link com.sun.identity.entitlement.xacml3.XACMLSchemaFactory}. diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/IPvXConditionTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/IPvXConditionTest.java index acd3bc8db8..918d43c59a 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/IPvXConditionTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/IPvXConditionTest.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; import javax.security.auth.Subject; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.JsonValue.array; import static org.forgerock.json.JsonValue.field; import static org.forgerock.json.JsonValue.json; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/LDAPFilterConditionTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/LDAPFilterConditionTest.java index 1e20775dfb..3eb425fdc6 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/LDAPFilterConditionTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/LDAPFilterConditionTest.java @@ -7,7 +7,7 @@ import javax.security.auth.Subject; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; public class LDAPFilterConditionTest { diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/ScriptConditionTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/ScriptConditionTest.java index 6b61291ec8..1261040abe 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/ScriptConditionTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/conditions/environment/ScriptConditionTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.entitlement.conditions.environment; -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.BDDMockito.verify; import static org.mockito.Mockito.mock; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/constraints/ConstraintValidatorImplTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/constraints/ConstraintValidatorImplTest.java index af07fcffc1..dfd8c9e58a 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/constraints/ConstraintValidatorImplTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/constraints/ConstraintValidatorImplTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.entitlement.constraints; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import com.sun.identity.entitlement.URLResourceName; import org.forgerock.openam.entitlement.ResourceType; 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 45b4b93ca3..142a261f82 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 @@ -16,7 +16,7 @@ package org.forgerock.openam.entitlement.rest; -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/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 b457986980..fcbb04388f 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 @@ -16,7 +16,7 @@ package org.forgerock.openam.entitlement.rest; -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/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/EntitlementTestUtils.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/EntitlementTestUtils.java index 76194c4392..54d8522575 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/EntitlementTestUtils.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/EntitlementTestUtils.java @@ -15,12 +15,13 @@ */ package org.forgerock.openam.entitlement.rest; -import static org.fest.assertions.Fail.fail; +import static org.assertj.core.api.Assertions.fail; import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.assertThat; import com.sun.identity.entitlement.EntitlementException; + +import org.assertj.core.api.Assertions; import org.assertj.core.api.Condition; -import org.fest.assertions.Assertions; import org.forgerock.json.resource.QueryResponse; import org.forgerock.json.resource.ResourceException; import org.forgerock.json.resource.ResourceResponse; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/EntitlementsExceptionMappingHandlerTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/EntitlementsExceptionMappingHandlerTest.java index 83fac5f115..9b37e61ecb 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/EntitlementsExceptionMappingHandlerTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/EntitlementsExceptionMappingHandlerTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.entitlement.rest; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.forgerock.json.JsonValue.*; import static org.mockito.BDDMockito.*; import static org.mockito.Mockito.mock; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/JsonPolicyParserTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/JsonPolicyParserTest.java index 5615f48b92..5509ebc09e 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/JsonPolicyParserTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/JsonPolicyParserTest.java @@ -51,8 +51,8 @@ import java.util.Map; import java.util.Set; -import static org.fest.assertions.Assertions.assertThat; -import static org.fest.assertions.MapAssert.entry; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.entry; import static org.forgerock.json.JsonValue.*; public class JsonPolicyParserTest { @@ -208,7 +208,7 @@ public void shouldParseResources() throws Exception { Privilege result = parser.parsePolicy(POLICY_NAME, content); // Then - assertThat(result.getEntitlement().getResourceNames()).containsOnly(included.toArray()); + assertThat(result.getEntitlement().getResourceNames()).containsOnlyElementsOf(included); } @Test @@ -450,7 +450,7 @@ public void shouldParseResourceAttributes() throws Exception { ResourceAttribute attr = result.getResourceAttributes().iterator().next(); assertThat(attr).isInstanceOf(StaticAttributes.class); assertThat(attr.getPropertyName()).isEqualTo("test"); - assertThat(attr.getPropertyValues()).containsOnly(values.toArray()); + assertThat(attr.getPropertyValues()).containsOnlyElementsOf(values); } @Test @@ -673,7 +673,7 @@ public void shouldPrintComplexConditions() throws Exception { assertThat(result.get(new JsonPointer("condition/conditions/0/condition/className")).asString()) .isEqualTo(AuthenticateToRealmCondition.class.getName()); assertThat(result.get(new JsonPointer("condition/conditions/0/condition/properties")).asMapOfList(String.class)) - .includes(entry("AuthenticateToRealm", Arrays.asList("REALM"))); + .contains(entry("AuthenticateToRealm", Arrays.asList("REALM"))); } @Test @@ -714,7 +714,7 @@ public void shouldPrintResourceAttributes() throws Exception { assertThat(result.get(new JsonPointer("resourceAttributes/1/propertyName")).asString()) .isEqualTo(staticAttrName); assertThat(result.get(new JsonPointer("resourceAttributes/1/propertyValues")).asList(String.class)) - .containsOnly(staticAttrValue.toArray()); + .containsOnlyElementsOf(staticAttrValue); } private JsonValue buildJson(Map.Entry fieldValue) { diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PolicyRequestFactoryTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PolicyRequestFactoryTest.java index 78757e421e..18340bef60 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PolicyRequestFactoryTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PolicyRequestFactoryTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.entitlement.rest; -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.*; 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 9e299cb0eb..57676ff239 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 @@ -16,7 +16,7 @@ */ package org.forgerock.openam.entitlement.rest; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.JsonValue.*; import static org.forgerock.json.resource.Responses.*; import static org.forgerock.json.resource.test.assertj.AssertJActionResponseAssert.assertThat; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PrivilegePolicyStoreProviderTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PrivilegePolicyStoreProviderTest.java index e6cd2dc2d3..5bae14cd58 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PrivilegePolicyStoreProviderTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/PrivilegePolicyStoreProviderTest.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.Map; -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.verify; 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 01ad8d6905..050b303d16 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 @@ -41,7 +41,7 @@ import java.util.Map; import static java.util.Collections.singleton; -import static org.fest.assertions.Assertions.assertThat; +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; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ResourceTypesResourceTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ResourceTypesResourceTest.java index f7bc853361..c36c87464a 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ResourceTypesResourceTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/ResourceTypesResourceTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.entitlement.rest; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.JsonValue.*; import static org.forgerock.json.resource.test.assertj.AssertJQueryResponseAssert.assertThat; import static org.forgerock.json.resource.test.assertj.AssertJResourceResponseAssert.assertThat; 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 a773d3a5a1..5ab817bade 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 @@ -16,7 +16,7 @@ package org.forgerock.openam.entitlement.rest; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; 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; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/model/json/BatchPolicyRequestTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/model/json/BatchPolicyRequestTest.java index c20f38d76f..f95860f993 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/model/json/BatchPolicyRequestTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/model/json/BatchPolicyRequestTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.entitlement.rest.model.json; -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.*; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/model/json/PolicyRequestTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/model/json/PolicyRequestTest.java index b8491ceba1..93f08e8d11 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/model/json/PolicyRequestTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/model/json/PolicyRequestTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.entitlement.rest.model.json; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.JsonValue.*; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.*; @@ -38,7 +38,7 @@ import com.sun.identity.entitlement.JwtPrincipal; import com.sun.identity.shared.Constants; -import org.fest.assertions.Condition; +import org.assertj.core.api.Condition; import org.forgerock.openam.core.realms.Realm; import org.forgerock.openam.core.realms.RealmTestHelper; import org.forgerock.services.context.Context; diff --git a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/model/json/TreePolicyRequestTest.java b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/model/json/TreePolicyRequestTest.java index be2f1e3f64..b110a3bfb3 100644 --- a/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/model/json/TreePolicyRequestTest.java +++ b/openam-entitlements/src/test/java/org/forgerock/openam/entitlement/rest/model/json/TreePolicyRequestTest.java @@ -37,7 +37,7 @@ import java.util.HashMap; import java.util.Map; -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.*; diff --git a/openam-federation/OpenFM/pom.xml b/openam-federation/OpenFM/pom.xml index c8de8cf229..12e5613b1c 100644 --- a/openam-federation/OpenFM/pom.xml +++ b/openam-federation/OpenFM/pom.xml @@ -167,12 +167,6 @@ testng test - - - org.easytesting - fest-assert - test - org.mockito mockito-core diff --git a/openam-federation/OpenFM/src/test/java/com/sun/identity/entitlement/EntitlementTest.java b/openam-federation/OpenFM/src/test/java/com/sun/identity/entitlement/EntitlementTest.java index ce9469843f..0314efef27 100644 --- a/openam-federation/OpenFM/src/test/java/com/sun/identity/entitlement/EntitlementTest.java +++ b/openam-federation/OpenFM/src/test/java/com/sun/identity/entitlement/EntitlementTest.java @@ -37,7 +37,7 @@ import java.util.Map; import java.util.Set; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * @author dillidorai diff --git a/openam-federation/openam-federation-library/pom.xml b/openam-federation/openam-federation-library/pom.xml index 2788dccaba..d31c0c2321 100644 --- a/openam-federation/openam-federation-library/pom.xml +++ b/openam-federation/openam-federation-library/pom.xml @@ -195,11 +195,6 @@ org.openidentityplatform.openam openam-idpdiscovery - - - org.easytesting - fest-assert - com.google.inject diff --git a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/IDPRequestValidatorTest.java b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/IDPRequestValidatorTest.java index b6be35a45b..9d5e629f7e 100644 --- a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/IDPRequestValidatorTest.java +++ b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/IDPRequestValidatorTest.java @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest; -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.BDDMockito.mock; diff --git a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/SLOLocationTest.java b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/SLOLocationTest.java index b948bc2b64..872080cea3 100644 --- a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/SLOLocationTest.java +++ b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/profile/SLOLocationTest.java @@ -20,7 +20,7 @@ import com.sun.identity.saml2.jaxb.metadata.impl.SingleLogoutServiceElementImpl; import java.util.ArrayList; import java.util.List; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import org.testng.annotations.Test; @Test diff --git a/openam-ldap-utils/pom.xml b/openam-ldap-utils/pom.xml index 73585af508..5febd4121a 100755 --- a/openam-ldap-utils/pom.xml +++ b/openam-ldap-utils/pom.xml @@ -51,9 +51,5 @@ testng test - - org.easytesting - fest-assert - diff --git a/openam-ldap-utils/src/test/java/org/forgerock/openam/ldap/LDAPPriorityListingTest.java b/openam-ldap-utils/src/test/java/org/forgerock/openam/ldap/LDAPPriorityListingTest.java index be63d23cde..98c5e60eb8 100644 --- a/openam-ldap-utils/src/test/java/org/forgerock/openam/ldap/LDAPPriorityListingTest.java +++ b/openam-ldap-utils/src/test/java/org/forgerock/openam/ldap/LDAPPriorityListingTest.java @@ -18,7 +18,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.forgerock.openam.utils.CollectionUtils.*; import static org.testng.Assert.assertEquals; diff --git a/openam-ldap-utils/src/test/java/org/forgerock/openam/ldap/LDAPURLParsingTest.java b/openam-ldap-utils/src/test/java/org/forgerock/openam/ldap/LDAPURLParsingTest.java index 6c9c75befa..2eeecefdee 100644 --- a/openam-ldap-utils/src/test/java/org/forgerock/openam/ldap/LDAPURLParsingTest.java +++ b/openam-ldap-utils/src/test/java/org/forgerock/openam/ldap/LDAPURLParsingTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.ldap; import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; @Test public class LDAPURLParsingTest { diff --git a/openam-oauth2/pom.xml b/openam-oauth2/pom.xml index 8b6694321e..1936e8628c 100644 --- a/openam-oauth2/pom.xml +++ b/openam-oauth2/pom.xml @@ -142,15 +142,6 @@ org.openidentityplatform.openam openam-restlet - - - - - - org.easytesting - fest-assert - test - org.mockito mockito-all diff --git a/openam-oauth2/src/test/java/org/forgerock/oauth2/core/OAuth2ProviderSettingsFactoryTest.java b/openam-oauth2/src/test/java/org/forgerock/oauth2/core/OAuth2ProviderSettingsFactoryTest.java index b146d49caa..30edebd8e3 100644 --- a/openam-oauth2/src/test/java/org/forgerock/oauth2/core/OAuth2ProviderSettingsFactoryTest.java +++ b/openam-oauth2/src/test/java/org/forgerock/oauth2/core/OAuth2ProviderSettingsFactoryTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.oauth2.core; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; 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 2cd2ba8a02..3817f86e72 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 @@ -15,7 +15,7 @@ */ package org.forgerock.oauth2.core; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.*; diff --git a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/AgentClientRegistrationTest.java b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/AgentClientRegistrationTest.java index d446cf58d7..d47449b1a9 100644 --- a/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/AgentClientRegistrationTest.java +++ b/openam-oauth2/src/test/java/org/forgerock/openam/oauth2/AgentClientRegistrationTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.oauth2; -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.when; 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 3ffa8c73ea..e6067ddfdc 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 @@ -15,7 +15,7 @@ */ package org.forgerock.openam.oauth2; -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-rest/pom.xml b/openam-rest/pom.xml index a215d8df32..e50abb8abc 100755 --- a/openam-rest/pom.xml +++ b/openam-rest/pom.xml @@ -130,13 +130,6 @@ org.jgrapht jgrapht-core - - - - org.easytesting - fest-assert - test - org.easymock easymock diff --git a/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/MailServerLoaderTest.java b/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/MailServerLoaderTest.java index 40107a3f0d..eb563021ba 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/MailServerLoaderTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/MailServerLoaderTest.java @@ -19,7 +19,7 @@ import org.forgerock.openam.services.email.MailServerImpl; import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class MailServerLoaderTest { @Test diff --git a/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/XMLResourceExceptionHandlerTest.java b/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/XMLResourceExceptionHandlerTest.java index 2bbd4aa8ed..76c8dbce3b 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/XMLResourceExceptionHandlerTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/XMLResourceExceptionHandlerTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.forgerockrest.utils; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/openam-rest/src/test/java/org/forgerock/openam/notifications/NotificationsWebSocketFilterTest.java b/openam-rest/src/test/java/org/forgerock/openam/notifications/NotificationsWebSocketFilterTest.java index 00d691a390..ba841a70fb 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/notifications/NotificationsWebSocketFilterTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/notifications/NotificationsWebSocketFilterTest.java @@ -19,7 +19,7 @@ import static com.sun.identity.common.configuration.AgentConfiguration.*; import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*; import java.security.PrivilegedAction; 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 8cd9c11854..0dbe72aea3 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 @@ -16,7 +16,7 @@ package org.forgerock.openam.rest.authz; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.JsonValue.field; import static org.forgerock.json.JsonValue.json; import static org.forgerock.json.JsonValue.object; 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 8601967412..b990459b95 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 @@ -16,7 +16,7 @@ package org.forgerock.openam.rest.query; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.json.resource.Responses.newResourceResponse; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; 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 0784088c99..984468b7c5 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 @@ -15,7 +15,7 @@ */ package org.forgerock.openam.rest.query; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.util.query.QueryFilter.*; import static org.mockito.Mockito.*; diff --git a/openam-rest/src/test/java/org/forgerock/openam/rest/query/QueryExceptionTest.java b/openam-rest/src/test/java/org/forgerock/openam/rest/query/QueryExceptionTest.java index 32e117e9d2..ee86dca69d 100644 --- a/openam-rest/src/test/java/org/forgerock/openam/rest/query/QueryExceptionTest.java +++ b/openam-rest/src/test/java/org/forgerock/openam/rest/query/QueryExceptionTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.rest.query; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.rest.query.QueryException.QueryErrorCode.*; import org.testng.annotations.Test; diff --git a/openam-restlet/pom.xml b/openam-restlet/pom.xml index 8b95f3801d..4b5b878672 100755 --- a/openam-restlet/pom.xml +++ b/openam-restlet/pom.xml @@ -97,13 +97,6 @@ org.openidentityplatform.commons.authn-filter jaspi-runtime - - - - org.easytesting - fest-assert - test - org.easymock easymock diff --git a/openam-restlet/src/test/java/org/forgerock/openam/rest/representations/JacksonRepresentationFactoryTest.java b/openam-restlet/src/test/java/org/forgerock/openam/rest/representations/JacksonRepresentationFactoryTest.java index 7221c7faa3..6eca8b0795 100644 --- a/openam-restlet/src/test/java/org/forgerock/openam/rest/representations/JacksonRepresentationFactoryTest.java +++ b/openam-restlet/src/test/java/org/forgerock/openam/rest/representations/JacksonRepresentationFactoryTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.rest.representations; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.HashMap; diff --git a/openam-scripting/pom.xml b/openam-scripting/pom.xml index 1b58144527..3d8ec94423 100644 --- a/openam-scripting/pom.xml +++ b/openam-scripting/pom.xml @@ -116,11 +116,6 @@ mockito-all test - - org.easytesting - fest-assert - test - javax.servlet diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/AbstractSandboxTests.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/AbstractSandboxTests.java index b66ba3a996..b53ffd6498 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/AbstractSandboxTests.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/AbstractSandboxTests.java @@ -28,7 +28,7 @@ import java.util.Arrays; import java.util.regex.Pattern; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.fail; /** diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/ChainedBindingsTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/ChainedBindingsTest.java index 94911c6a0a..0ee991729e 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/ChainedBindingsTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/ChainedBindingsTest.java @@ -6,7 +6,7 @@ import javax.script.Bindings; import javax.script.SimpleBindings; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ChainedBindingsTest { diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/GroovyValidatorTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/GroovyValidatorTest.java index f71ab872b4..24fa355514 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/GroovyValidatorTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/GroovyValidatorTest.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Set; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Groovy validation tests. diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/JavaScriptValidatorTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/JavaScriptValidatorTest.java index 10e2429210..cbfbb792c7 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/JavaScriptValidatorTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/JavaScriptValidatorTest.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Set; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; @GuiceModules({SharedGuiceModule.class, ScriptingGuiceModule.class}) public class JavaScriptValidatorTest extends GuiceTestCase { diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/StandardScriptEngineManagerTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/StandardScriptEngineManagerTest.java index e29f772caf..9b0879d990 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/StandardScriptEngineManagerTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/StandardScriptEngineManagerTest.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class StandardScriptEngineManagerTest { diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/StandardScriptEvaluatorTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/StandardScriptEvaluatorTest.java index bc872dc98c..df1e4e0398 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/StandardScriptEvaluatorTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/StandardScriptEvaluatorTest.java @@ -27,7 +27,7 @@ import java.util.Arrays; import java.util.regex.Pattern; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class StandardScriptEvaluatorTest { diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/ThreadPoolScriptEvaluatorTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/ThreadPoolScriptEvaluatorTest.java index 26734c404c..5115be49ee 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/ThreadPoolScriptEvaluatorTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/ThreadPoolScriptEvaluatorTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.scripting; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.openam.scripting.StandardScriptEvaluatorTest.getGroovyScript; import static org.forgerock.openam.scripting.StandardScriptEvaluatorTest.getJavascript; import static org.mockito.BDDMockito.given; diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/GroovyEngineFactoryTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/GroovyEngineFactoryTest.java index 33e4801594..53320c990d 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/GroovyEngineFactoryTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/GroovyEngineFactoryTest.java @@ -22,7 +22,7 @@ import javax.script.ScriptEngine; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; public class GroovyEngineFactoryTest { diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/RhinoCompiledScriptTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/RhinoCompiledScriptTest.java index 26e4f998ce..9c192ab178 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/RhinoCompiledScriptTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/RhinoCompiledScriptTest.java @@ -23,7 +23,7 @@ import javax.script.ScriptContext; import javax.script.ScriptException; -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.verify; diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/RhinoScriptEngineTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/RhinoScriptEngineTest.java index 015ed63296..5340d2a7b5 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/RhinoScriptEngineTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/RhinoScriptEngineTest.java @@ -22,7 +22,7 @@ import javax.script.ScriptEngine; import javax.script.ScriptException; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Basic tests of the rhino script engine. The engine is more fully tested by the diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/SandboxedGroovyScriptEngineTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/SandboxedGroovyScriptEngineTest.java index 2716cec151..c54af3c972 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/SandboxedGroovyScriptEngineTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/factories/SandboxedGroovyScriptEngineTest.java @@ -30,7 +30,7 @@ import java.io.Reader; import java.io.StringReader; -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.verify; diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/sandbox/GroovySandboxValueFilterTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/sandbox/GroovySandboxValueFilterTest.java index df10192146..fe4e68335d 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/sandbox/GroovySandboxValueFilterTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/sandbox/GroovySandboxValueFilterTest.java @@ -20,7 +20,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.Mockito.mock; diff --git a/openam-scripting/src/test/java/org/forgerock/openam/scripting/sandbox/RhinoSandboxClassShutterTest.java b/openam-scripting/src/test/java/org/forgerock/openam/scripting/sandbox/RhinoSandboxClassShutterTest.java index 62b95614c0..1cd42ef2a1 100644 --- a/openam-scripting/src/test/java/org/forgerock/openam/scripting/sandbox/RhinoSandboxClassShutterTest.java +++ b/openam-scripting/src/test/java/org/forgerock/openam/scripting/sandbox/RhinoSandboxClassShutterTest.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.regex.Pattern; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doThrow; public class RhinoSandboxClassShutterTest { diff --git a/openam-shared/pom.xml b/openam-shared/pom.xml index 40f3e9ff27..7582d68a82 100755 --- a/openam-shared/pom.xml +++ b/openam-shared/pom.xml @@ -134,11 +134,6 @@ java-ipv6 - - org.easytesting - fest-assert - - joda-time joda-time diff --git a/openam-shared/src/test/java/com/iplanet/security/x509/CertUtilsTest.java b/openam-shared/src/test/java/com/iplanet/security/x509/CertUtilsTest.java index 6f91d4217d..a62ba65666 100644 --- a/openam-shared/src/test/java/com/iplanet/security/x509/CertUtilsTest.java +++ b/openam-shared/src/test/java/com/iplanet/security/x509/CertUtilsTest.java @@ -21,7 +21,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; public class CertUtilsTest { diff --git a/openam-shared/src/test/java/com/sun/identity/common/CaseInsensitiveHashSetTest.java b/openam-shared/src/test/java/com/sun/identity/common/CaseInsensitiveHashSetTest.java index b28f8a3be3..ad3142003f 100644 --- a/openam-shared/src/test/java/com/sun/identity/common/CaseInsensitiveHashSetTest.java +++ b/openam-shared/src/test/java/com/sun/identity/common/CaseInsensitiveHashSetTest.java @@ -20,7 +20,7 @@ import org.forgerock.openam.utils.CollectionUtils; import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; public class CaseInsensitiveHashSetTest { diff --git a/openam-shared/src/test/java/com/sun/identity/shared/DateUtilsTest.java b/openam-shared/src/test/java/com/sun/identity/shared/DateUtilsTest.java index efdd7d409c..a06a4d838b 100644 --- a/openam-shared/src/test/java/com/sun/identity/shared/DateUtilsTest.java +++ b/openam-shared/src/test/java/com/sun/identity/shared/DateUtilsTest.java @@ -25,7 +25,7 @@ import java.util.GregorianCalendar; import java.util.TimeZone; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; public class DateUtilsTest { diff --git a/openam-shared/src/test/java/com/sun/identity/shared/StringUtilsTest.java b/openam-shared/src/test/java/com/sun/identity/shared/StringUtilsTest.java index 70f83cbf22..7d60823256 100644 --- a/openam-shared/src/test/java/com/sun/identity/shared/StringUtilsTest.java +++ b/openam-shared/src/test/java/com/sun/identity/shared/StringUtilsTest.java @@ -17,7 +17,7 @@ import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; public class StringUtilsTest { diff --git a/openam-shared/src/test/java/com/sun/identity/shared/whitelist/PrefixResourceNameTest.java b/openam-shared/src/test/java/com/sun/identity/shared/whitelist/PrefixResourceNameTest.java index 8edcebea24..96ced0095f 100644 --- a/openam-shared/src/test/java/com/sun/identity/shared/whitelist/PrefixResourceNameTest.java +++ b/openam-shared/src/test/java/com/sun/identity/shared/whitelist/PrefixResourceNameTest.java @@ -21,7 +21,7 @@ import java.net.MalformedURLException; 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-shared/src/test/java/com/sun/identity/shared/whitelist/URLResourceNameTest.java b/openam-shared/src/test/java/com/sun/identity/shared/whitelist/URLResourceNameTest.java index 95bd529729..89a3a1ffa6 100644 --- a/openam-shared/src/test/java/com/sun/identity/shared/whitelist/URLResourceNameTest.java +++ b/openam-shared/src/test/java/com/sun/identity/shared/whitelist/URLResourceNameTest.java @@ -15,11 +15,10 @@ */ package com.sun.identity.shared.whitelist; -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-shared/src/test/java/com/sun/identity/shared/xml/XMLUtilsTest.java b/openam-shared/src/test/java/com/sun/identity/shared/xml/XMLUtilsTest.java index 897307f92e..5683aeaad5 100644 --- a/openam-shared/src/test/java/com/sun/identity/shared/xml/XMLUtilsTest.java +++ b/openam-shared/src/test/java/com/sun/identity/shared/xml/XMLUtilsTest.java @@ -18,7 +18,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; public class XMLUtilsTest { diff --git a/openam-shared/src/test/java/org/forgerock/openam/monitoring/RateWindowTest.java b/openam-shared/src/test/java/org/forgerock/openam/monitoring/RateWindowTest.java index db62e346da..1684332d71 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/monitoring/RateWindowTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/monitoring/RateWindowTest.java @@ -24,7 +24,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class RateWindowTest { diff --git a/openam-shared/src/test/java/org/forgerock/openam/shared/concurrency/LockFactoryTest.java b/openam-shared/src/test/java/org/forgerock/openam/shared/concurrency/LockFactoryTest.java index dfe6a33d79..89a9302ccd 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/shared/concurrency/LockFactoryTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/shared/concurrency/LockFactoryTest.java @@ -18,7 +18,7 @@ import java.util.concurrent.locks.Lock; import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Test exercises the functionality of {@link LockFactory}. diff --git a/openam-shared/src/test/java/org/forgerock/openam/shared/security/whitelist/RedirectUrlValidatorTest.java b/openam-shared/src/test/java/org/forgerock/openam/shared/security/whitelist/RedirectUrlValidatorTest.java index 5b0ccdfe9c..13f7f8f0c7 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/shared/security/whitelist/RedirectUrlValidatorTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/shared/security/whitelist/RedirectUrlValidatorTest.java @@ -20,7 +20,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.forgerock.openam.utils.CollectionUtils.*; public class RedirectUrlValidatorTest { diff --git a/openam-shared/src/test/java/org/forgerock/openam/utils/CollectionUtilsTest.java b/openam-shared/src/test/java/org/forgerock/openam/utils/CollectionUtilsTest.java index 89503ed4e9..02bd4b0836 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/utils/CollectionUtilsTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/utils/CollectionUtilsTest.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit test for {@link CollectionUtils}. diff --git a/openam-shared/src/test/java/org/forgerock/openam/utils/JCECipherProviderTest.java b/openam-shared/src/test/java/org/forgerock/openam/utils/JCECipherProviderTest.java index c1786effe0..25ffbfc683 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/utils/JCECipherProviderTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/utils/JCECipherProviderTest.java @@ -24,7 +24,7 @@ import java.security.Provider; import java.security.Security; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/openam-shared/src/test/java/org/forgerock/openam/utils/PerThreadCipherProviderTest.java b/openam-shared/src/test/java/org/forgerock/openam/utils/PerThreadCipherProviderTest.java index 40e5c7b2a8..b3ed1f353b 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/utils/PerThreadCipherProviderTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/utils/PerThreadCipherProviderTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; /** diff --git a/openam-shared/src/test/java/org/forgerock/openam/utils/PerThreadDocumentBuilderProviderTest.java b/openam-shared/src/test/java/org/forgerock/openam/utils/PerThreadDocumentBuilderProviderTest.java index cf8d357714..c259c46a56 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/utils/PerThreadDocumentBuilderProviderTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/utils/PerThreadDocumentBuilderProviderTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; /** diff --git a/openam-shared/src/test/java/org/forgerock/openam/utils/PerThreadSAXParserProviderTest.java b/openam-shared/src/test/java/org/forgerock/openam/utils/PerThreadSAXParserProviderTest.java index 74d964d345..f465483dad 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/utils/PerThreadSAXParserProviderTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/utils/PerThreadSAXParserProviderTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; /** diff --git a/openam-shared/src/test/java/org/forgerock/openam/utils/SafeDocumentBuilderProviderTest.java b/openam-shared/src/test/java/org/forgerock/openam/utils/SafeDocumentBuilderProviderTest.java index ab780a44cb..8eb7bef5fe 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/utils/SafeDocumentBuilderProviderTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/utils/SafeDocumentBuilderProviderTest.java @@ -21,7 +21,7 @@ import javax.xml.parsers.DocumentBuilder; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link SafeDocumentBuilderProvider}. Assumes that the underlying diff --git a/openam-shared/src/test/java/org/forgerock/openam/utils/SafeSAXParserProviderTest.java b/openam-shared/src/test/java/org/forgerock/openam/utils/SafeSAXParserProviderTest.java index fd5b254e5f..be916c6da5 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/utils/SafeSAXParserProviderTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/utils/SafeSAXParserProviderTest.java @@ -21,7 +21,7 @@ import javax.xml.parsers.SAXParser; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** * Basic unit tests for {@link SafeSAXParserProvider}. Assumes the underlying {@link org.forgerock.util.xml.XMLUtils} diff --git a/openam-shared/src/test/java/org/forgerock/openam/utils/SingleValueMapperTest.java b/openam-shared/src/test/java/org/forgerock/openam/utils/SingleValueMapperTest.java index 44242e3e4c..1de52d02c6 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/utils/SingleValueMapperTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/utils/SingleValueMapperTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.utils; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/openam-shared/src/test/java/org/forgerock/openam/utils/StringUtilsTest.java b/openam-shared/src/test/java/org/forgerock/openam/utils/StringUtilsTest.java index aca43ff27e..241f05b7d3 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/utils/StringUtilsTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/utils/StringUtilsTest.java @@ -19,7 +19,7 @@ package org.forgerock.openam.utils; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.UnsupportedEncodingException; import java.util.regex.Pattern; diff --git a/openam-shared/src/test/java/org/forgerock/openam/utils/collections/LeastRecentlyUsedTest.java b/openam-shared/src/test/java/org/forgerock/openam/utils/collections/LeastRecentlyUsedTest.java index 2852f99bce..87589bd57c 100644 --- a/openam-shared/src/test/java/org/forgerock/openam/utils/collections/LeastRecentlyUsedTest.java +++ b/openam-shared/src/test/java/org/forgerock/openam/utils/collections/LeastRecentlyUsedTest.java @@ -16,7 +16,7 @@ package org.forgerock.openam.utils.collections; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.UUID; diff --git a/openam-sts/openam-client-sts/pom.xml b/openam-sts/openam-client-sts/pom.xml index 8720cb39d4..7e63099173 100644 --- a/openam-sts/openam-client-sts/pom.xml +++ b/openam-sts/openam-client-sts/pom.xml @@ -56,12 +56,6 @@ com.fasterxml.jackson.core jackson-databind - - - - org.easytesting - fest-assert - org.testng testng diff --git a/openam-sts/openam-client-sts/src/test/java/org/forgerock/openam/sts/config/user/AuthTargetMappingTest.java b/openam-sts/openam-client-sts/src/test/java/org/forgerock/openam/sts/config/user/AuthTargetMappingTest.java index 6d43c89a4c..0f6942b557 100644 --- a/openam-sts/openam-client-sts/src/test/java/org/forgerock/openam/sts/config/user/AuthTargetMappingTest.java +++ b/openam-sts/openam-client-sts/src/test/java/org/forgerock/openam/sts/config/user/AuthTargetMappingTest.java @@ -33,7 +33,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; import static org.testng.Assert.assertNull; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class AuthTargetMappingTest { private static final String USERNAME = "username"; diff --git a/openam-sts/openam-common-sts/pom.xml b/openam-sts/openam-common-sts/pom.xml index 019e4ba4e8..418584ed65 100644 --- a/openam-sts/openam-common-sts/pom.xml +++ b/openam-sts/openam-common-sts/pom.xml @@ -79,10 +79,5 @@ mockito-all test - - org.easytesting - fest-assert - test - diff --git a/openam-upgrade/pom.xml b/openam-upgrade/pom.xml index f45a32cd78..ede0d09b7d 100644 --- a/openam-upgrade/pom.xml +++ b/openam-upgrade/pom.xml @@ -80,12 +80,6 @@ javax.servlet.jsp jsp-api - - - org.easytesting - fest-assert - test - org.mockito mockito-all 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 e7d27fbd5c..09a2a54d3b 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 @@ -16,7 +16,7 @@ package org.forgerock.openam.upgrade.steps; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; 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 4e47521b31..98bf1db871 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 @@ -16,7 +16,7 @@ package org.forgerock.openam.upgrade.steps; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import java.security.PrivilegedAction; diff --git a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeExternalCTSConfigurationStepTest.java b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeExternalCTSConfigurationStepTest.java index 90f6552bdf..bd1aa87f4b 100644 --- a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeExternalCTSConfigurationStepTest.java +++ b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeExternalCTSConfigurationStepTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.upgrade.steps; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import java.security.PrivilegedAction; diff --git a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeServerDefaultsStepTest.java b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeServerDefaultsStepTest.java index eaeb69f620..e00f3e0fe8 100644 --- a/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeServerDefaultsStepTest.java +++ b/openam-upgrade/src/test/java/org/forgerock/openam/upgrade/steps/UpgradeServerDefaultsStepTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.openam.upgrade.steps; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.*; import static org.forgerock.openam.utils.CollectionUtils.*; import static org.mockito.Mockito.*; 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 36aaa9844e..470970634d 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 @@ -30,7 +30,7 @@ import com.sun.identity.entitlement.opensso.PolicySubject; import java.util.HashSet; import java.util.Set; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.forgerock.openam.upgrade.UpgradeException; import org.mockito.ArgumentCaptor; import static org.mockito.BDDMockito.given; diff --git a/pom.xml b/pom.xml index 566e8f4316..72b0326137 100644 --- a/pom.xml +++ b/pom.xml @@ -1575,12 +1575,6 @@ 1.0.1 test - - org.easytesting - fest-assert - 1.4 - test - org.easymock easymock