Migrate tests from using fest-assert to AssertJ (#876)

Author: aldaris

openam-audit/openam-audit-context/pom.xml

@@ -53,10 +53,6 @@
             <groupId>org.openidentityplatform.commons.guice</groupId>
             <artifactId>core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
-        </dependency>
         <dependency>
 		  <groupId>org.mockito</groupId>
 		  <artifactId>mockito-core</artifactId>

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;
 

openam-authentication/openam-auth-oidc/pom.xml

@@ -53,11 +53,6 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>

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";

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.*;
 
 

openam-authentication/openam-auth-scripted/pom.xml

@@ -56,11 +56,6 @@
             <artifactId>mockito-all</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
-            <scope>test</scope>
-        </dependency>
 
     </dependencies>
 </project>

openam-console/pom.xml

@@ -181,11 +181,6 @@
             <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-oauth2</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

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;
 

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

openam-core/pom.xml

@@ -395,10 +395,6 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-             <groupId>org.easytesting</groupId>
-             <artifactId>fest-assert</artifactId>
-         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>