#860 switch to using assertj instead of FEST assertions

core-common/pom.xml

@@ -44,8 +44,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

core-common/src/test/java/org/mapstruct/factory/MappersTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.factory;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.mapstruct.test.model.Foo;

core-jdk8/pom.xml

@@ -50,8 +50,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

core/pom.xml

@@ -49,8 +49,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

integrationtest/pom.xml

@@ -45,8 +45,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

integrationtest/src/test/resources/cdiTest/src/test/java/org/mapstruct/itest/cdi/CdiBasedMapperTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.itest.cdi;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import javax.inject.Inject;
 

integrationtest/src/test/resources/fullFeatureTest/src/test/java/org/mapstruct/itest/simple/AnimalTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.ignore;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 

integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/ap/test/bugs/_603/Issue603Test.java

@@ -21,7 +21,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class Issue603Test {
 

integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/ap/test/bugs/_636/Issue636Test.java

@@ -20,7 +20,7 @@
 
 import org.junit.Test;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class Issue636Test {
 

integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/itest/java8/Java8MapperTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.itest.java8;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 

integrationtest/src/test/resources/jaxbTest/src/test/java/org/mapstruct/itest/jaxb/JaxbBasedMapperTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.itest.jaxb;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.ByteArrayOutputStream;
 import java.text.ParseException;

integrationtest/src/test/resources/jsr330Test/src/test/java/org/mapstruct/itest/jsr330/Jsr330BasedMapperTest.java

@@ -29,7 +29,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test for generation of JSR-330-based Mapper implementations

integrationtest/src/test/resources/namingStrategyTest/usage/src/test/java/org/mapstruct/itest/naming/NamingTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.itest.naming;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.mapstruct.itest.naming.GolfPlayer;

integrationtest/src/test/resources/pom.xml

@@ -42,6 +42,8 @@
         <toolchain-jdk-vendor></toolchain-jdk-vendor>
         <compiler-id></compiler-id>
         <compiler-source-target-version></compiler-source-target-version>
+        <!-- As Mapstruct has java 6 requirement we need to use AssertJ 1.x which is compatible with java 6 -->
+        <assertj.version>1.7.1</assertj.version>
     </properties>
 
     <profiles>
@@ -160,8 +162,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

integrationtest/src/test/resources/simpleTest/src/test/java/org/mapstruct/itest/simple/ConversionTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.itest.simple;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.mapstruct.itest.simple.Source;

integrationtest/src/test/resources/springTest/src/test/java/org/mapstruct/itest/spring/SpringBasedMapperTest.java

@@ -27,7 +27,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test for generation of Spring-based Mapper implementations

parent/pom.xml

@@ -50,6 +50,7 @@
         <com.puppycrawl.tools.checkstyle.version>6.14.1</com.puppycrawl.tools.checkstyle.version>
         <add.release.arguments />
         <forkCount>1</forkCount>
+        <assertj.version>3.5.2</assertj.version>
     </properties>
 
     <licenses>
@@ -105,9 +106,9 @@
                 <version>2.3.21</version>
             </dependency>
             <dependency>
-                <groupId>org.easytesting</groupId>
-                <artifactId>fest-assert</artifactId>
-                <version>1.4</version>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>${assertj.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>

processor/pom.xml

@@ -70,8 +70,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.easytesting</groupId>
-            <artifactId>fest-assert</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

processor/src/test/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactoryTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.internal.model.common;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.lang.annotation.Annotation;
 import java.util.List;

processor/src/test/java/org/mapstruct/ap/internal/model/common/DefaultConversionContextTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.internal.model.common;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.lang.annotation.Annotation;
 import java.util.List;

processor/src/test/java/org/mapstruct/ap/internal/model/common/TypeFactoryTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.internal.model.common;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 

processor/src/test/java/org/mapstruct/ap/test/abstractclass/AbstractClassTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.abstractclass;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

processor/src/test/java/org/mapstruct/ap/test/abstractclass/generics/GenericsHierarchyTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.abstractclass.generics;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

processor/src/test/java/org/mapstruct/ap/test/array/ArrayMappingTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.array;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
 import java.util.List;
@@ -68,7 +68,7 @@ public void shouldMapArrayToArray() {
             .scientistsToDtos( new Scientist[]{ new Scientist( "Bob" ), new Scientist( "Larry" ) } );
 
         assertThat( dtos ).isNotNull();
-        assertThat( dtos ).onProperty( "name" ).containsOnly( "Bob", "Larry" );
+        assertThat( dtos ).extracting( "name" ).containsOnly( "Bob", "Larry" );
     }
 
     @Test
@@ -77,7 +77,7 @@ public void shouldMapListToArray() {
             .scientistsToDtos( Arrays.asList( new Scientist( "Bob" ), new Scientist( "Larry" ) ) );
 
         assertThat( dtos ).isNotNull();
-        assertThat( dtos ).onProperty( "name" ).containsOnly( "Bob", "Larry" );
+        assertThat( dtos ).extracting( "name" ).containsOnly( "Bob", "Larry" );
     }
 
     @Test
@@ -86,7 +86,7 @@ public void shouldMapArrayToList() {
             .scientistsToDtosAsList( new Scientist[]{ new Scientist( "Bob" ), new Scientist( "Larry" ) } );
 
         assertThat( dtos ).isNotNull();
-        assertThat( dtos ).onProperty( "name" ).containsOnly( "Bob", "Larry" );
+        assertThat( dtos ).extracting( "name" ).containsOnly( "Bob", "Larry" );
     }
 
     @Test
@@ -99,7 +99,7 @@ public void shouldMapArrayToArrayExistingSmallerSizedTarget() {
 
         assertThat( target ).isNotNull();
         assertThat( target ).isEqualTo( existingTarget );
-        assertThat( target ).onProperty( "name" ).containsOnly( "Bob" );
+        assertThat( target ).extracting( "name" ).containsOnly( "Bob" );
     }
 
     @Test
@@ -112,7 +112,7 @@ public void shouldMapArrayToArrayExistingEqualSizedTarget() {
 
         assertThat( target ).isNotNull();
         assertThat( target ).isEqualTo( existingTarget );
-        assertThat( target ).onProperty( "name" ).containsOnly( "Bob", "Larry"  );
+        assertThat( target ).extracting( "name" ).containsOnly( "Bob", "Larry"  );
     }
 
     @Test
@@ -126,7 +126,7 @@ public void shouldMapArrayToArrayExistingLargerSizedTarget() {
 
         assertThat( target ).isNotNull();
         assertThat( target ).isEqualTo( existingTarget );
-        assertThat( target ).onProperty( "name" ).containsOnly( "Bob", "Larry", "John"  );
+        assertThat( target ).extracting( "name" ).containsOnly( "Bob", "Larry", "John"  );
     }
 
     @Test
@@ -139,7 +139,7 @@ public void shouldMapTargetToNullWhenNullSource() {
         ScientistDto[] target = ScienceMapper.INSTANCE.scientistsToDtos( null, existingTarget );
 
         assertThat( target ).isNull();
-        assertThat( existingTarget ).onProperty( "name" ).containsOnly( "Jim" );
+        assertThat( existingTarget ).extracting( "name" ).containsOnly( "Jim" );
     }
 
     @IssueKey("534")

processor/src/test/java/org/mapstruct/ap/test/bool/BooleanMappingTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.bool;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

processor/src/test/java/org/mapstruct/ap/test/bugs/_289/Issue289Test.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.bugs._289;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374Test.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.bugs._374;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
 import java.util.HashMap;

processor/src/test/java/org/mapstruct/ap/test/bugs/_394/SameClassNameInDifferentPackageTest.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.bugs._394;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.HashMap;
 import java.util.Map;

processor/src/test/java/org/mapstruct/ap/test/bugs/_516/Issue516Test.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.bugs._516;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

processor/src/test/java/org/mapstruct/ap/test/bugs/_577/Issue577Test.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.bugs._577;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

processor/src/test/java/org/mapstruct/ap/test/bugs/_580/Issue580Test.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.bugs._580;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.LocalDate;
 

processor/src/test/java/org/mapstruct/ap/test/bugs/_581/Issue581Test.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.bugs._581;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

processor/src/test/java/org/mapstruct/ap/test/bugs/_625/Issue625Test.java

@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.bugs._625;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;