diff --git a/core-common/pom.xml b/core-common/pom.xml
index afd3efbfb..10871b18d 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -44,8 +44,8 @@
test
- org.easytesting
- fest-assert
+ org.assertj
+ assertj-core
test
diff --git a/core-common/src/test/java/org/mapstruct/factory/MappersTest.java b/core-common/src/test/java/org/mapstruct/factory/MappersTest.java
index 4dee6d05d..a9758c9ce 100644
--- a/core-common/src/test/java/org/mapstruct/factory/MappersTest.java
+++ b/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;
diff --git a/core-jdk8/pom.xml b/core-jdk8/pom.xml
index 4f1e5255a..2dd509762 100644
--- a/core-jdk8/pom.xml
+++ b/core-jdk8/pom.xml
@@ -50,8 +50,8 @@
test
- org.easytesting
- fest-assert
+ org.assertj
+ assertj-core
test
diff --git a/core/pom.xml b/core/pom.xml
index e486d00ad..4d4498dc5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -49,8 +49,8 @@
test
- org.easytesting
- fest-assert
+ org.assertj
+ assertj-core
test
diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 3409659d9..9e06ed43f 100644
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -45,8 +45,8 @@
test
- org.easytesting
- fest-assert
+ org.assertj
+ assertj-core
test
diff --git a/integrationtest/src/test/resources/cdiTest/src/test/java/org/mapstruct/itest/cdi/CdiBasedMapperTest.java b/integrationtest/src/test/resources/cdiTest/src/test/java/org/mapstruct/itest/cdi/CdiBasedMapperTest.java
index 3dd2481f7..4484795e3 100644
--- a/integrationtest/src/test/resources/cdiTest/src/test/java/org/mapstruct/itest/cdi/CdiBasedMapperTest.java
+++ b/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;
diff --git a/integrationtest/src/test/resources/fullFeatureTest/src/test/java/org/mapstruct/itest/simple/AnimalTest.java b/integrationtest/src/test/resources/fullFeatureTest/src/test/java/org/mapstruct/itest/simple/AnimalTest.java
index e5a3e2f19..26bd96cae 100644
--- a/integrationtest/src/test/resources/fullFeatureTest/src/test/java/org/mapstruct/itest/simple/AnimalTest.java
+++ b/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;
diff --git a/integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/ap/test/bugs/_603/Issue603Test.java b/integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/ap/test/bugs/_603/Issue603Test.java
index 60f87c72c..431626aba 100644
--- a/integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/ap/test/bugs/_603/Issue603Test.java
+++ b/integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/ap/test/bugs/_603/Issue603Test.java
@@ -21,7 +21,7 @@ package org.mapstruct.ap.test.bugs._603;
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 {
diff --git a/integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/ap/test/bugs/_636/Issue636Test.java b/integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/ap/test/bugs/_636/Issue636Test.java
index 7279b30d8..82397d311 100644
--- a/integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/ap/test/bugs/_636/Issue636Test.java
+++ b/integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/ap/test/bugs/_636/Issue636Test.java
@@ -20,7 +20,7 @@ package org.mapstruct.ap.test.bugs._636;
import org.junit.Test;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class Issue636Test {
diff --git a/integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/itest/java8/Java8MapperTest.java b/integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/itest/java8/Java8MapperTest.java
index 389cdd11f..7b9b0aaa7 100644
--- a/integrationtest/src/test/resources/java8Test/src/test/java/org/mapstruct/itest/java8/Java8MapperTest.java
+++ b/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;
diff --git a/integrationtest/src/test/resources/jaxbTest/src/test/java/org/mapstruct/itest/jaxb/JaxbBasedMapperTest.java b/integrationtest/src/test/resources/jaxbTest/src/test/java/org/mapstruct/itest/jaxb/JaxbBasedMapperTest.java
index 231dfb078..40dba660f 100644
--- a/integrationtest/src/test/resources/jaxbTest/src/test/java/org/mapstruct/itest/jaxb/JaxbBasedMapperTest.java
+++ b/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;
diff --git a/integrationtest/src/test/resources/jsr330Test/src/test/java/org/mapstruct/itest/jsr330/Jsr330BasedMapperTest.java b/integrationtest/src/test/resources/jsr330Test/src/test/java/org/mapstruct/itest/jsr330/Jsr330BasedMapperTest.java
index c3d0be746..d6c0f75ca 100644
--- a/integrationtest/src/test/resources/jsr330Test/src/test/java/org/mapstruct/itest/jsr330/Jsr330BasedMapperTest.java
+++ b/integrationtest/src/test/resources/jsr330Test/src/test/java/org/mapstruct/itest/jsr330/Jsr330BasedMapperTest.java
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
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
diff --git a/integrationtest/src/test/resources/namingStrategyTest/usage/src/test/java/org/mapstruct/itest/naming/NamingTest.java b/integrationtest/src/test/resources/namingStrategyTest/usage/src/test/java/org/mapstruct/itest/naming/NamingTest.java
index b6cc06df2..515cb14df 100644
--- a/integrationtest/src/test/resources/namingStrategyTest/usage/src/test/java/org/mapstruct/itest/naming/NamingTest.java
+++ b/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;
diff --git a/integrationtest/src/test/resources/pom.xml b/integrationtest/src/test/resources/pom.xml
index e021bf6f8..bad5032cb 100644
--- a/integrationtest/src/test/resources/pom.xml
+++ b/integrationtest/src/test/resources/pom.xml
@@ -42,6 +42,8 @@
+
+ 1.7.1
@@ -160,8 +162,8 @@
test
- org.easytesting
- fest-assert
+ org.assertj
+ assertj-core
test
diff --git a/integrationtest/src/test/resources/simpleTest/src/test/java/org/mapstruct/itest/simple/ConversionTest.java b/integrationtest/src/test/resources/simpleTest/src/test/java/org/mapstruct/itest/simple/ConversionTest.java
index 128527811..7f759cb3b 100644
--- a/integrationtest/src/test/resources/simpleTest/src/test/java/org/mapstruct/itest/simple/ConversionTest.java
+++ b/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;
diff --git a/integrationtest/src/test/resources/springTest/src/test/java/org/mapstruct/itest/spring/SpringBasedMapperTest.java b/integrationtest/src/test/resources/springTest/src/test/java/org/mapstruct/itest/spring/SpringBasedMapperTest.java
index e97b16df7..99dbb925d 100644
--- a/integrationtest/src/test/resources/springTest/src/test/java/org/mapstruct/itest/spring/SpringBasedMapperTest.java
+++ b/integrationtest/src/test/resources/springTest/src/test/java/org/mapstruct/itest/spring/SpringBasedMapperTest.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration;
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
diff --git a/parent/pom.xml b/parent/pom.xml
index 5af958375..fef750f73 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -50,6 +50,7 @@
6.14.1
1
+ 3.5.2
@@ -105,9 +106,9 @@
2.3.21
- org.easytesting
- fest-assert
- 1.4
+ org.assertj
+ assertj-core
+ ${assertj.version}
com.google.guava
diff --git a/processor/pom.xml b/processor/pom.xml
index ed0b4493e..c8dc1f94f 100644
--- a/processor/pom.xml
+++ b/processor/pom.xml
@@ -70,8 +70,8 @@
test
- org.easytesting
- fest-assert
+ org.assertj
+ assertj-core
test
diff --git a/processor/src/test/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactoryTest.java b/processor/src/test/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactoryTest.java
index 247d2e089..373edb292 100755
--- a/processor/src/test/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactoryTest.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/internal/model/common/DefaultConversionContextTest.java b/processor/src/test/java/org/mapstruct/ap/internal/model/common/DefaultConversionContextTest.java
index 8c6523d89..e600e1675 100755
--- a/processor/src/test/java/org/mapstruct/ap/internal/model/common/DefaultConversionContextTest.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/internal/model/common/TypeFactoryTest.java b/processor/src/test/java/org/mapstruct/ap/internal/model/common/TypeFactoryTest.java
index 6a9c6c009..2e2ecd444 100644
--- a/processor/src/test/java/org/mapstruct/ap/internal/model/common/TypeFactoryTest.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/abstractclass/AbstractClassTest.java b/processor/src/test/java/org/mapstruct/ap/test/abstractclass/AbstractClassTest.java
index 5408c55a0..5f0f070ff 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/abstractclass/AbstractClassTest.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/abstractclass/generics/GenericsHierarchyTest.java b/processor/src/test/java/org/mapstruct/ap/test/abstractclass/generics/GenericsHierarchyTest.java
index 449ca1768..5b33439a7 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/abstractclass/generics/GenericsHierarchyTest.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/array/ArrayMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/array/ArrayMappingTest.java
index 69c8724e5..ea3d7e3f5 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/array/ArrayMappingTest.java
+++ b/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 class ArrayMappingTest {
.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 class ArrayMappingTest {
.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 class ArrayMappingTest {
.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 class ArrayMappingTest {
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 class ArrayMappingTest {
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 class ArrayMappingTest {
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 class ArrayMappingTest {
ScientistDto[] target = ScienceMapper.INSTANCE.scientistsToDtos( null, existingTarget );
assertThat( target ).isNull();
- assertThat( existingTarget ).onProperty( "name" ).containsOnly( "Jim" );
+ assertThat( existingTarget ).extracting( "name" ).containsOnly( "Jim" );
}
@IssueKey("534")
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bool/BooleanMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/bool/BooleanMappingTest.java
index 6be109732..6bb9534dc 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bool/BooleanMappingTest.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_289/Issue289Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_289/Issue289Test.java
index 9d26aa857..8938d372b 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_289/Issue289Test.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374Test.java
index ef0f08c9e..ef188ca5e 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374Test.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_394/SameClassNameInDifferentPackageTest.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_394/SameClassNameInDifferentPackageTest.java
index 68238f5f3..d8e6332d9 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_394/SameClassNameInDifferentPackageTest.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_516/Issue516Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_516/Issue516Test.java
index 1e6c0edfb..65b064a64 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_516/Issue516Test.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_577/Issue577Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_577/Issue577Test.java
index 86387aaa6..bdac1b3c9 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_577/Issue577Test.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_580/Issue580Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_580/Issue580Test.java
index 0e9f79d0f..74773a637 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_580/Issue580Test.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_581/Issue581Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_581/Issue581Test.java
index 90128e991..f4d89e451 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_581/Issue581Test.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_625/Issue625Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_625/Issue625Test.java
index 8c2a0f13d..66f9bca04 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_625/Issue625Test.java
+++ b/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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_634/GenericContainerTest.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_634/GenericContainerTest.java
index ae6c50f62..a323a6332 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_634/GenericContainerTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_634/GenericContainerTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.bugs._634;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.List;
@@ -50,6 +50,6 @@ public class GenericContainerTest {
Target target = SourceTargetMapper.INSTANCE.mapSourceToTarget( source );
- assertThat( target.getContent() ).onProperty( "value" ).containsExactly( 42L, 84L );
+ assertThat( target.getContent() ).extracting( "value" ).containsExactly( 42L, 84L );
}
}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_775/IterableWithBoundedElementTypeTest.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_775/IterableWithBoundedElementTypeTest.java
index 2fa0a01b9..b75d1dbf0 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_775/IterableWithBoundedElementTypeTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_775/IterableWithBoundedElementTypeTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.bugs._775;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_855/OrderingBug855Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_855/OrderingBug855Test.java
index 1904a9a08..148dc23b2 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_855/OrderingBug855Test.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_855/OrderingBug855Test.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.bugs._855;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/BuiltInTest.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/BuiltInTest.java
index 08aaa22d0..2c43a5c2a 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/BuiltInTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/BuiltInTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.builtin;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/callbacks/CallbackMethodTest.java b/processor/src/test/java/org/mapstruct/ap/test/callbacks/CallbackMethodTest.java
index 005140a11..81808b295 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/callbacks/CallbackMethodTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/callbacks/CallbackMethodTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.callbacks;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/callbacks/ongeneratedmethods/MappingResultPostprocessorTest.java b/processor/src/test/java/org/mapstruct/ap/test/callbacks/ongeneratedmethods/MappingResultPostprocessorTest.java
index 496ffb4a5..b4730e97b 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/callbacks/ongeneratedmethods/MappingResultPostprocessorTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/callbacks/ongeneratedmethods/MappingResultPostprocessorTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.callbacks.ongeneratedmethods;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/callbacks/typematching/CallbackMethodTypeMatchingTest.java b/processor/src/test/java/org/mapstruct/ap/test/callbacks/typematching/CallbackMethodTypeMatchingTest.java
index 2eac80907..a383fcedb 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/callbacks/typematching/CallbackMethodTypeMatchingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/callbacks/typematching/CallbackMethodTypeMatchingTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.callbacks.typematching;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/CollectionMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/CollectionMappingTest.java
index fc4ac4e03..5eea0a03d 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/CollectionMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/CollectionMappingTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.collection;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/adder/AdderTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/adder/AdderTest.java
index 97d195105..1f74d5ec0 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/adder/AdderTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/adder/AdderTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.collection.adder;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/DefaultCollectionImplementationTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/DefaultCollectionImplementationTest.java
index 85beb5c82..c01561f7b 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/DefaultCollectionImplementationTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/DefaultCollectionImplementationTest.java
@@ -18,8 +18,8 @@
*/
package org.mapstruct.ap.test.collection.defaultimplementation;
-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 java.util.ArrayList;
import java.util.Arrays;
@@ -192,7 +192,7 @@ public class DefaultCollectionImplementationTest {
private void assertResultMap(Map result) {
assertThat( result ).isNotNull();
assertThat( result ).hasSize( 2 );
- assertThat( result ).includes( entry( "1", new TargetFoo( "Bob" ) ), entry( "2", new TargetFoo( "Alice" ) ) );
+ assertThat( result ).contains( entry( "1", new TargetFoo( "Bob" ) ), entry( "2", new TargetFoo( "Alice" ) ) );
}
private Map createSourceFooMap() {
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/NoSetterCollectionMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/NoSetterCollectionMappingTest.java
index 71a513af8..c9c1b6512 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/NoSetterCollectionMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/NoSetterCollectionMappingTest.java
@@ -18,8 +18,8 @@
*/
package org.mapstruct.ap.test.collection.defaultimplementation;
-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 java.util.Arrays;
import java.util.HashMap;
@@ -53,7 +53,7 @@ public class NoSetterCollectionMappingTest {
NoSetterTarget target = NoSetterMapper.INSTANCE.toTarget( source );
assertThat( target.getListValues() ).containsExactly( "foo", "bar" );
- assertThat( target.getMapValues() ).includes( entry( "fooKey", "fooVal" ), entry( "barKey", "barVal" ) );
+ assertThat( target.getMapValues() ).contains( entry( "fooKey", "fooVal" ), entry( "barKey", "barVal" ) );
// now test existing instances
@@ -68,7 +68,7 @@ public class NoSetterCollectionMappingTest {
assertThat( target2.getListValues() ).containsExactly( "baz" );
assertThat( target2.getMapValues() ).isSameAs( originalMapInstance );
// source2 mapvalues is empty, so the map is not cleared
- assertThat( target2.getMapValues() ).includes( entry( "fooKey", "fooVal" ), entry( "barKey", "barVal" ) );
+ assertThat( target2.getMapValues() ).contains( entry( "fooKey", "fooVal" ), entry( "barKey", "barVal" ) );
}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/forged/CollectionMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/forged/CollectionMappingTest.java
index 76c062b9d..482f10603 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/forged/CollectionMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/forged/CollectionMappingTest.java
@@ -19,7 +19,7 @@
package org.mapstruct.ap.test.collection.forged;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Map;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/IterableToNonIterableMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/IterableToNonIterableMappingTest.java
index 722f527da..d43b27348 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/IterableToNonIterableMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/IterableToNonIterableMappingTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.collection.iterabletononiterable;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/map/MapMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/map/MapMappingTest.java
index aae040ce3..3e14cce4f 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/map/MapMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/map/MapMappingTest.java
@@ -18,8 +18,8 @@
*/
package org.mapstruct.ap.test.collection.map;
-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 java.util.Date;
import java.util.GregorianCalendar;
@@ -53,7 +53,7 @@ public class MapMappingTest {
assertThat( target ).isNotNull();
assertThat( target ).hasSize( 2 );
- assertThat( target ).includes(
+ assertThat( target ).contains(
entry( "42", "01.01.1980" ),
entry( "121", "20.07.2013" )
);
@@ -100,7 +100,7 @@ public class MapMappingTest {
private void assertResult(Map target) {
assertThat( target ).isNotNull();
assertThat( target ).hasSize( 2 );
- assertThat( target ).includes(
+ assertThat( target ).contains(
entry( 42L, new GregorianCalendar( 1980, 0, 1 ).getTime() ),
entry( 121L, new GregorianCalendar( 2013, 6, 20 ).getTime() )
);
@@ -127,7 +127,7 @@ public class MapMappingTest {
assertThat( target ).isNotNull();
assertThat( target.getValues() ).isNotNull();
assertThat( target.getValues() ).hasSize( 2 );
- assertThat( target.getValues() ).includes(
+ assertThat( target.getValues() ).contains(
entry( "42", "01.01.1980" ),
entry( "121", "20.07.2013" )
);
@@ -145,7 +145,7 @@ public class MapMappingTest {
assertThat( source ).isNotNull();
assertThat( source.getValues() ).isNotNull();
assertThat( source.getValues() ).hasSize( 2 );
- assertThat( source.getValues() ).includes(
+ assertThat( source.getValues() ).contains(
entry( 42L, new GregorianCalendar( 1980, 0, 1 ).getTime() ),
entry( 121L, new GregorianCalendar( 2013, 6, 20 ).getTime() )
);
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/WildCardTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/WildCardTest.java
index b4cbf4cf9..13964a31b 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/WildCardTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/WildCardTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.collection.wildcard;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigDecimal;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapperTest.java b/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapperTest.java
index f24cebb46..8ec810dd9 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapperTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapperTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.complex;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/ConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/ConversionTest.java
index f5c31a33a..2ec3a19ee 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/ConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/ConversionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.conversion;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/bignumbers/BigNumbersConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/bignumbers/BigNumbersConversionTest.java
index 899bdb5e1..9f18468a0 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/bignumbers/BigNumbersConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/bignumbers/BigNumbersConversionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.conversion.bignumbers;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/date/DateConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/date/DateConversionTest.java
index 9cf1d851d..7d4b42e83 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/date/DateConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/date/DateConversionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.conversion.date;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.Date;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java
index a15df6d8e..3e5e1c781 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.conversion.java8time;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.time.LocalDate;
import java.time.LocalDateTime;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java
index f73ac0833..26449127d 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.conversion.jodatime;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Calendar;
import java.util.Locale;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java
index 40a3d5142..a2b69bf12 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.conversion.nativetypes;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java
index ba3bcd351..a318db30c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.conversion.nativetypes;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java
index 13ff2007c..1b231a198 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.conversion.nativetypes;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/NumberFormatConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/NumberFormatConversionTest.java
index 0047c7c74..263aa26c3 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/NumberFormatConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/NumberFormatConversionTest.java
@@ -32,8 +32,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-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;
@WithClasses({
Source.class,
@@ -151,11 +151,11 @@ public class NumberFormatConversionTest {
Map target = SourceTargetMapper.INSTANCE.sourceToTarget( source1 );
assertThat( target ).hasSize( 1 );
- assertThat( target ).includes( entry( "1.00", "2" ) );
+ assertThat( target ).contains( entry( "1.00", "2" ) );
Map source2 = SourceTargetMapper.INSTANCE.targetToSource( target );
assertThat( source2 ).hasSize( 1 );
- assertThat( source2 ).includes( entry( 1.00f, 2f ) );
+ assertThat( source2 ).contains( entry( 1.00f, 2f ) );
}
}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/precedence/ConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/precedence/ConversionTest.java
index 65a5d5eb0..be0f66837 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/precedence/ConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/precedence/ConversionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.conversion.precedence;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/string/StringConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/string/StringConversionTest.java
index 926c8a2c6..4624e8a80 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/string/StringConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/string/StringConversionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.conversion.string;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/decorator/DecoratorTest.java b/processor/src/test/java/org/mapstruct/ap/test/decorator/DecoratorTest.java
index cc13d3538..572dc5b17 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/decorator/DecoratorTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/decorator/DecoratorTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.decorator;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Calendar;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/decorator/jsr330/Jsr330DecoratorTest.java b/processor/src/test/java/org/mapstruct/ap/test/decorator/jsr330/Jsr330DecoratorTest.java
index 51342fa7a..abbeb85dc 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/decorator/jsr330/Jsr330DecoratorTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/decorator/jsr330/Jsr330DecoratorTest.java
@@ -19,7 +19,7 @@
package org.mapstruct.ap.test.decorator.jsr330;
import static java.lang.System.lineSeparator;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Calendar;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/decorator/spring/SpringDecoratorTest.java b/processor/src/test/java/org/mapstruct/ap/test/decorator/spring/SpringDecoratorTest.java
index 5fe3bc382..6084b10db 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/decorator/spring/SpringDecoratorTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/decorator/spring/SpringDecoratorTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.decorator.spring;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Calendar;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/defaultvalue/DefaultValueTest.java b/processor/src/test/java/org/mapstruct/ap/test/defaultvalue/DefaultValueTest.java
index ed8d47efe..fb5319252 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/defaultvalue/DefaultValueTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/defaultvalue/DefaultValueTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.defaultvalue;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.text.ParseException;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/dependency/GraphAnalyzerTest.java b/processor/src/test/java/org/mapstruct/ap/test/dependency/GraphAnalyzerTest.java
index 3e57c1cc9..a9fa041c6 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/dependency/GraphAnalyzerTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/dependency/GraphAnalyzerTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.dependency;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.HashSet;
import java.util.List;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/dependency/OrderingTest.java b/processor/src/test/java/org/mapstruct/ap/test/dependency/OrderingTest.java
index 2591f63a2..8c4756c79 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/dependency/OrderingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/dependency/OrderingTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.dependency;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationClassNameTest.java b/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationClassNameTest.java
index a7b8a2920..779c537cd 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationClassNameTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationClassNameTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.destination;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Assert;
import org.junit.Test;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationPackageNameTest.java b/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationPackageNameTest.java
index 8dc2d3933..c938c15a1 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationPackageNameTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationPackageNameTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.destination;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/enums/EnumMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/enums/EnumMappingTest.java
index 2044bc264..e30b8c13e 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/enums/EnumMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/enums/EnumMappingTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.enums;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.tools.Diagnostic.Kind;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/factories/FactoryTest.java b/processor/src/test/java/org/mapstruct/ap/test/factories/FactoryTest.java
index c99f0d386..833700987 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/factories/FactoryTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/factories/FactoryTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.factories;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/generics/GenericsTest.java b/processor/src/test/java/org/mapstruct/ap/test/generics/GenericsTest.java
index 2cc0dae70..d85464477 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/generics/GenericsTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/generics/GenericsTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.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;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/generics/genericsupertype/MapperWithGenericSuperClassTest.java b/processor/src/test/java/org/mapstruct/ap/test/generics/genericsupertype/MapperWithGenericSuperClassTest.java
index cd33c8e62..545aa7adb 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/generics/genericsupertype/MapperWithGenericSuperClassTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/generics/genericsupertype/MapperWithGenericSuperClassTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.generics.genericsupertype;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
@@ -51,7 +51,7 @@ public class MapperWithGenericSuperClassTest {
SearchResult dtos = VesselSearchResultMapper.INSTANCE.vesselSearchResultToDto( vessels );
- assertThat( dtos.getValues() ).onProperty( "name" ).containsExactly( "Pacific Queen" );
+ assertThat( dtos.getValues() ).extracting( "name" ).containsExactly( "Pacific Queen" );
assertThat( dtos.getSize() ).isEqualTo( 1L );
}
}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/ignore/IgnorePropertyTest.java b/processor/src/test/java/org/mapstruct/ap/test/ignore/IgnorePropertyTest.java
index 5935a88c8..a92d79a74 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/ignore/IgnorePropertyTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/ignore/IgnorePropertyTest.java
@@ -19,7 +19,7 @@
package org.mapstruct.ap.test.ignore;
import javax.tools.Diagnostic.Kind;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/imports/ConflictingTypesNamesTest.java b/processor/src/test/java/org/mapstruct/ap/test/imports/ConflictingTypesNamesTest.java
index 31ac9d92b..4c7aa240e 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/imports/ConflictingTypesNamesTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/imports/ConflictingTypesNamesTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.imports;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Rule;
import org.junit.Test;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/imports/InnerClassesImportsTest.java b/processor/src/test/java/org/mapstruct/ap/test/imports/InnerClassesImportsTest.java
index 0c51e1cf0..6cbb12242 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/imports/InnerClassesImportsTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/imports/InnerClassesImportsTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.imports;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Rule;
import org.junit.Test;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/imports/decorator/DecoratorInAnotherPackageTest.java b/processor/src/test/java/org/mapstruct/ap/test/imports/decorator/DecoratorInAnotherPackageTest.java
index 437e3dc71..3bd00a246 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/imports/decorator/DecoratorInAnotherPackageTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/imports/decorator/DecoratorInAnotherPackageTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.imports.decorator;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/imports/sourcewithextendsbound/SourceTypeContainsCollectionWithExtendsBoundTest.java b/processor/src/test/java/org/mapstruct/ap/test/imports/sourcewithextendsbound/SourceTypeContainsCollectionWithExtendsBoundTest.java
index 3b2c485ac..6d6cde49b 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/imports/sourcewithextendsbound/SourceTypeContainsCollectionWithExtendsBoundTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/imports/sourcewithextendsbound/SourceTypeContainsCollectionWithExtendsBoundTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.imports.sourcewithextendsbound;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Collections;
@@ -66,7 +66,7 @@ public class SourceTypeContainsCollectionWithExtendsBoundTest {
SpaceshipDto spaceshipDto = SpaceshipMapper.INSTANCE.spaceshipToDto( spaceship );
assertThat( spaceshipDto ).isNotNull();
- assertThat( spaceshipDto.getAstronauts() ).onProperty( "name" ).containsOnly( "Bob" );
+ assertThat( spaceshipDto.getAstronauts() ).extracting( "name" ).containsOnly( "Bob" );
generatedSource.forMapper( SpaceshipMapper.class ).containsImportFor( Astronaut.class );
generatedSource.forMapper( SpaceshipMapper.class ).containsImportFor( Spaceship.class );
diff --git a/processor/src/test/java/org/mapstruct/ap/test/inheritance/InheritanceTest.java b/processor/src/test/java/org/mapstruct/ap/test/inheritance/InheritanceTest.java
index 72187a196..8cc266f7e 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/inheritance/InheritanceTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/inheritance/InheritanceTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.inheritance;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/AttributeInheritanceTest.java b/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/AttributeInheritanceTest.java
index 7766c6d04..20e93ed1a 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/AttributeInheritanceTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/AttributeInheritanceTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.inheritance.attribute;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.tools.Diagnostic.Kind;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/inheritance/complex/ComplexInheritanceTest.java b/processor/src/test/java/org/mapstruct/ap/test/inheritance/complex/ComplexInheritanceTest.java
index 0e5072d93..4a66b2287 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/inheritance/complex/ComplexInheritanceTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/inheritance/complex/ComplexInheritanceTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.inheritance.complex;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/inheritedmappingmethod/InheritedMappingMethodTest.java b/processor/src/test/java/org/mapstruct/ap/test/inheritedmappingmethod/InheritedMappingMethodTest.java
index 0e330900d..497b38743 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/inheritedmappingmethod/InheritedMappingMethodTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/inheritedmappingmethod/InheritedMappingMethodTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.inheritedmappingmethod;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/InheritFromConfigTest.java b/processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/InheritFromConfigTest.java
index 97ecbe3a8..00305e453 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/InheritFromConfigTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/inheritfromconfig/InheritFromConfigTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.inheritfromconfig;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.tools.Diagnostic.Kind;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/mapperconfig/ConfigTest.java b/processor/src/test/java/org/mapstruct/ap/test/mapperconfig/ConfigTest.java
index 904266439..5f69b9d0d 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/mapperconfig/ConfigTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/mapperconfig/ConfigTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.mapperconfig;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/naming/VariableNamingTest.java b/processor/src/test/java/org/mapstruct/ap/test/naming/VariableNamingTest.java
index a0498e056..8b069dfb1 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/naming/VariableNamingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/naming/VariableNamingTest.java
@@ -18,8 +18,8 @@
*/
package org.mapstruct.ap.test.naming;
-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 java.util.Arrays;
import java.util.Date;
@@ -62,7 +62,7 @@ public class VariableNamingTest {
assertThat( target.getValues() ).containsOnly( "42", "121" );
assertThat( target.getSomeNumber() ).isEqualTo( "42" );
assertThat( target.getMap() ).hasSize( 2 );
- assertThat( target.getMap() ).includes(
+ assertThat( target.getMap() ).contains(
entry( "42", "01.01.1980" ),
entry( "121", "20.07.2013" )
);
diff --git a/processor/src/test/java/org/mapstruct/ap/test/naming/spi/CustomNamingStrategyTest.java b/processor/src/test/java/org/mapstruct/ap/test/naming/spi/CustomNamingStrategyTest.java
index e9e7f5ee3..d041680d2 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/naming/spi/CustomNamingStrategyTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/naming/spi/CustomNamingStrategyTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.naming.spi;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedmethodcall/NestedMappingMethodInvocationTest.java b/processor/src/test/java/org/mapstruct/ap/test/nestedmethodcall/NestedMappingMethodInvocationTest.java
index 820237be7..17a7a6316 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nestedmethodcall/NestedMappingMethodInvocationTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nestedmethodcall/NestedMappingMethodInvocationTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.nestedmethodcall;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
import java.util.GregorianCalendar;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedsource/parameter/NormalizingTest.java b/processor/src/test/java/org/mapstruct/ap/test/nestedsource/parameter/NormalizingTest.java
index b2fa2586a..0c02ecacc 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nestedsource/parameter/NormalizingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nestedsource/parameter/NormalizingTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.nestedsource.parameter;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/NestedSourcePropertiesTest.java b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/NestedSourcePropertiesTest.java
index 70b79d11a..1f55ad2d5 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/NestedSourcePropertiesTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/NestedSourcePropertiesTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.nestedsourceproperties;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/ReversingNestedSourcePropertiesTest.java b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/ReversingNestedSourcePropertiesTest.java
index 64c79ac3a..1cc5c6571 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/ReversingNestedSourcePropertiesTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/ReversingNestedSourcePropertiesTest.java
@@ -31,7 +31,7 @@ import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.mapstruct.ap.test.nestedsourceproperties._target.BaseChartEntry;
import org.mapstruct.ap.test.nestedsourceproperties._target.ChartEntryComposed;
import org.mapstruct.ap.test.nestedsourceproperties._target.ChartEntryLabel;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedtargetproperties/NestedTargetPropertiesTest.java b/processor/src/test/java/org/mapstruct/ap/test/nestedtargetproperties/NestedTargetPropertiesTest.java
index f62c6185b..4c001e000 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nestedtargetproperties/NestedTargetPropertiesTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nestedtargetproperties/NestedTargetPropertiesTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.nestedtargetproperties;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.test.nestedsourceproperties._target.ChartEntry;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nonvoidsetter/NonVoidSettersTest.java b/processor/src/test/java/org/mapstruct/ap/test/nonvoidsetter/NonVoidSettersTest.java
index ab96ac861..33c6f9837 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nonvoidsetter/NonVoidSettersTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nonvoidsetter/NonVoidSettersTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.nonvoidsetter;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nullcheck/NullCheckTest.java b/processor/src/test/java/org/mapstruct/ap/test/nullcheck/NullCheckTest.java
index 9cc090a70..121dc1602 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nullcheck/NullCheckTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nullcheck/NullCheckTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.nullcheck;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/NullValueMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/NullValueMappingTest.java
index a77e3c795..601a8671d 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/NullValueMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/NullValueMappingTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.nullvaluemapping;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.HashMap;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/oneway/OnewayTest.java b/processor/src/test/java/org/mapstruct/ap/test/oneway/OnewayTest.java
index 9ed027b65..9386101a5 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/oneway/OnewayTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/oneway/OnewayTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.oneway;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/prism/ConstantTest.java b/processor/src/test/java/org/mapstruct/ap/test/prism/ConstantTest.java
index 404c41e5e..69d2de462 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/prism/ConstantTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/prism/ConstantTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.prism;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/prism/EnumPrismsTest.java b/processor/src/test/java/org/mapstruct/ap/test/prism/EnumPrismsTest.java
index 02a3a3fd3..8b4411a95 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/prism/EnumPrismsTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/prism/EnumPrismsTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.prism;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
import java.util.List;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/references/ReferencedMapperTest.java b/processor/src/test/java/org/mapstruct/ap/test/references/ReferencedMapperTest.java
index c7fc678ea..645f8ab2e 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/references/ReferencedMapperTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/references/ReferencedMapperTest.java
@@ -18,8 +18,8 @@
*/
package org.mapstruct.ap.test.references;
-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 java.util.Arrays;
import java.util.HashMap;
@@ -73,7 +73,7 @@ public class ReferencedMapperTest {
public void shouldUseGenericFactoryForIterable() {
List result = SourceTargetMapper.INSTANCE.fromStringList( Arrays.asList( "foo1", "foo2" ) );
- assertThat( result ).onProperty( "value" ).containsExactly( "foo1", "foo2" );
+ assertThat( result ).extracting( "value" ).containsExactly( "foo1", "foo2" );
}
@Test
@@ -85,7 +85,7 @@ public class ReferencedMapperTest {
Map result = SourceTargetMapper.INSTANCE.fromStringMap( source );
assertThat( result ).hasSize( 2 );
- assertThat( result ).includes(
+ assertThat( result ).contains(
entry( new SomeType( "foo1" ), new SomeOtherType( "bar1" ) ),
entry( new SomeType( "foo2" ), new SomeOtherType( "bar2" ) ) );
}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/references/samename/SeveralReferencedMappersWithSameSimpleNameTest.java b/processor/src/test/java/org/mapstruct/ap/test/references/samename/SeveralReferencedMappersWithSameSimpleNameTest.java
index 41b89bed1..3c1e775e6 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/references/samename/SeveralReferencedMappersWithSameSimpleNameTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/references/samename/SeveralReferencedMappersWithSameSimpleNameTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.references.samename;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/references/statics/StaticsTest.java b/processor/src/test/java/org/mapstruct/ap/test/references/statics/StaticsTest.java
index d8b6640c0..146b56dea 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/references/statics/StaticsTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/references/statics/StaticsTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.references.statics;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Rule;
import org.junit.Test;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/reverse/InheritInverseConfigurationTest.java b/processor/src/test/java/org/mapstruct/ap/test/reverse/InheritInverseConfigurationTest.java
index e277c32de..3f0d99a0c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/reverse/InheritInverseConfigurationTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/reverse/InheritInverseConfigurationTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.reverse;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.tools.Diagnostic.Kind;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/generics/ConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/selection/generics/ConversionTest.java
index 6dbb1ce2b..967979473 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/generics/ConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/generics/ConversionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.selection.generics;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigDecimal;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/jaxb/JaxbFactoryMethodSelectionTest.java b/processor/src/test/java/org/mapstruct/ap/test/selection/jaxb/JaxbFactoryMethodSelectionTest.java
index 5914598b0..e12b8e0c9 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/jaxb/JaxbFactoryMethodSelectionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/jaxb/JaxbFactoryMethodSelectionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.selection.jaxb;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.bind.annotation.XmlElementDecl;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/jaxb/UnderscoreSelectionTest.java b/processor/src/test/java/org/mapstruct/ap/test/selection/jaxb/UnderscoreSelectionTest.java
index 8477f510b..f05f5ad02 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/jaxb/UnderscoreSelectionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/jaxb/UnderscoreSelectionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.selection.jaxb;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveVsWrappedSelectionTest.java b/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveVsWrappedSelectionTest.java
index 467a63b76..6f9f4b845 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveVsWrappedSelectionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveVsWrappedSelectionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.selection.primitives;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java
index 2d97b58cc..76719abdc 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java
@@ -18,8 +18,8 @@
*/
package org.mapstruct.ap.test.selection.qualifier;
-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 java.util.Arrays;
import java.util.HashMap;
@@ -97,7 +97,7 @@ public class QualifierTest {
assertThat( germanMovies.getFacts() ).isNotNull();
assertThat( germanMovies.getFacts() ).hasSize( 3 );
- assertThat( germanMovies.getFacts() ).includes(
+ assertThat( germanMovies.getFacts() ).contains(
entry( "Regisseur", Arrays.asList( "M. Night Shyamalan" ) ),
entry( "Besetzung", Arrays.asList( "Bruce Willis", "Haley Joel Osment", "Toni Collette" ) ),
entry( "Handlungstichwörter", Arrays.asList( "Jungen", "Kinderpsychologe", "Ich sehe tote Menschen" ) )
@@ -171,7 +171,7 @@ public class QualifierTest {
assertThat( abstractEntry.getFacts() ).isNotNull();
assertThat( abstractEntry.getFacts() ).hasSize( 3 );
- assertThat( abstractEntry.getFacts() ).includes(
+ assertThat( abstractEntry.getFacts() ).contains(
entry( "director", Arrays.asList( "M. Night Shyamalan" ) ),
entry( "cast", Arrays.asList( "Bruce Willis", "Haley Joel Osment", "Toni Collette" ) ),
entry( "plot keywords", Arrays.asList( "boy", "child psychologist", "I see dead people" ) )
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/hybrid/HybridTest.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/hybrid/HybridTest.java
index a6561a3db..ac38536ac 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/hybrid/HybridTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/hybrid/HybridTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.selection.qualifier.hybrid;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/named/NamedTest.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/named/NamedTest.java
index c5b38f680..9a30a2e53 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/named/NamedTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/named/NamedTest.java
@@ -18,8 +18,8 @@
*/
package org.mapstruct.ap.test.selection.qualifier.named;
-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 java.util.Arrays;
import java.util.HashMap;
@@ -90,7 +90,7 @@ public class NamedTest {
assertThat( germanMovies.getFacts() ).isNotNull();
assertThat( germanMovies.getFacts() ).hasSize( 3 );
- assertThat( germanMovies.getFacts() ).includes(
+ assertThat( germanMovies.getFacts() ).contains(
entry( "Regisseur", Arrays.asList( "M. Night Shyamalan" ) ),
entry( "Besetzung", Arrays.asList( "Bruce Willis", "Haley Joel Osment", "Toni Collette" ) ),
entry( "Handlungstichwörter", Arrays.asList( "Jungen", "Kinderpsychologe", "Ich sehe tote Menschen" ) )
@@ -125,7 +125,7 @@ public class NamedTest {
assertThat( abstractEntry.getFacts() ).isNotNull();
assertThat( abstractEntry.getFacts() ).hasSize( 3 );
- assertThat( abstractEntry.getFacts() ).includes(
+ assertThat( abstractEntry.getFacts() ).contains(
entry( "director", Arrays.asList( "M. Night Shyamalan" ) ),
entry( "cast", Arrays.asList( "Bruce Willis", "Haley Joel Osment", "Toni Collette" ) ),
entry( "plot keywords", Arrays.asList( "boy", "child psychologist", "I see dead people" ) )
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/resulttype/InheritanceSelectionTest.java b/processor/src/test/java/org/mapstruct/ap/test/selection/resulttype/InheritanceSelectionTest.java
index c4b8ec2d9..9897bc0d9 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/resulttype/InheritanceSelectionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/resulttype/InheritanceSelectionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.selection.resulttype;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.HashMap;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/severalsources/SeveralSourceParametersTest.java b/processor/src/test/java/org/mapstruct/ap/test/severalsources/SeveralSourceParametersTest.java
index bc60bd71c..034d4c8bc 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/severalsources/SeveralSourceParametersTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/severalsources/SeveralSourceParametersTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.severalsources;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.tools.Diagnostic.Kind;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/SourcePropertyMapSeveralTimesTest.java b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/SourcePropertyMapSeveralTimesTest.java
index fb8ae87c2..46dfcbb89 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/SourcePropertyMapSeveralTimesTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/SourcePropertyMapSeveralTimesTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.severaltargets;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/source/constants/SourceConstantsTest.java b/processor/src/test/java/org/mapstruct/ap/test/source/constants/SourceConstantsTest.java
index 701fd7154..ec6bc1b14 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/source/constants/SourceConstantsTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/source/constants/SourceConstantsTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.source.constants;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/source/expressions/java/JavaExpressionTest.java b/processor/src/test/java/org/mapstruct/ap/test/source/expressions/java/JavaExpressionTest.java
index a587f2513..2b880e0b1 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/source/expressions/java/JavaExpressionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/source/expressions/java/JavaExpressionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.source.expressions.java;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/source/nullvaluecheckstrategy/PresenceCheckTest.java b/processor/src/test/java/org/mapstruct/ap/test/source/nullvaluecheckstrategy/PresenceCheckTest.java
index d038491cf..3e6a7ccbd 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/source/nullvaluecheckstrategy/PresenceCheckTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/source/nullvaluecheckstrategy/PresenceCheckTest.java
@@ -19,7 +19,7 @@
package org.mapstruct.ap.test.source.nullvaluecheckstrategy;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.WithClasses;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/source/presencecheck/spi/PresenceCheckTest.java b/processor/src/test/java/org/mapstruct/ap/test/source/presencecheck/spi/PresenceCheckTest.java
index 3c9338215..a688851d9 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/source/presencecheck/spi/PresenceCheckTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/source/presencecheck/spi/PresenceCheckTest.java
@@ -19,7 +19,7 @@
package org.mapstruct.ap.test.source.presencecheck.spi;
import java.util.Arrays;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/template/InheritConfigurationTest.java b/processor/src/test/java/org/mapstruct/ap/test/template/InheritConfigurationTest.java
index 7e6da503d..80d88e3a8 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/template/InheritConfigurationTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/template/InheritConfigurationTest.java
@@ -19,7 +19,7 @@
package org.mapstruct.ap.test.template;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.tools.Diagnostic.Kind;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/unmappedtarget/UnmappedTargetTest.java b/processor/src/test/java/org/mapstruct/ap/test/unmappedtarget/UnmappedTargetTest.java
index 4a824511c..c7645907f 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/unmappedtarget/UnmappedTargetTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/unmappedtarget/UnmappedTargetTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.unmappedtarget;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.tools.Diagnostic.Kind;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/updatemethods/UpdateMethodsTest.java b/processor/src/test/java/org/mapstruct/ap/test/updatemethods/UpdateMethodsTest.java
index efad4ebe7..b70372319 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/updatemethods/UpdateMethodsTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/updatemethods/UpdateMethodsTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.updatemethods;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/updatemethods/selection/ExternalSelectionTest.java b/processor/src/test/java/org/mapstruct/ap/test/updatemethods/selection/ExternalSelectionTest.java
index 9572df9bf..ffd247ab1 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/updatemethods/selection/ExternalSelectionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/updatemethods/selection/ExternalSelectionTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.updatemethods.selection;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.HashMap;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/value/EnumToEnumMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/value/EnumToEnumMappingTest.java
index 502eab2bd..cee55a97c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/value/EnumToEnumMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/value/EnumToEnumMappingTest.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.test.value;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.tools.Diagnostic.Kind;
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/assertions/JavaFileAssert.java b/processor/src/test/java/org/mapstruct/ap/testutil/assertions/JavaFileAssert.java
index cec264ae0..39a5d9d98 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/assertions/JavaFileAssert.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/assertions/JavaFileAssert.java
@@ -21,9 +21,9 @@ package org.mapstruct.ap.testutil.assertions;
import java.io.File;
import java.io.IOException;
-import org.fest.assertions.Assertions;
-import org.fest.assertions.FileAssert;
-import org.fest.assertions.StringAssert;
+import org.assertj.core.api.AbstractCharSequenceAssert;
+import org.assertj.core.api.Assertions;
+import org.assertj.core.api.FileAssert;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
@@ -44,7 +44,7 @@ public class JavaFileAssert extends FileAssert {
/**
* @return assertion on the file content
*/
- public StringAssert content() {
+ public AbstractCharSequenceAssert, String> content() {
exists();
isFile();
@@ -52,7 +52,7 @@ public class JavaFileAssert extends FileAssert {
return Assertions.assertThat( Files.toString( actual, Charsets.UTF_8 ) );
}
catch ( IOException e ) {
- failIfCustomMessageIsSet( e );
+ failWithMessage( "Unable to read" + actual.toString() + ". Exception: " + e.getMessage() );
}
return null;
}
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/runner/CompilingStatement.java b/processor/src/test/java/org/mapstruct/ap/testutil/runner/CompilingStatement.java
index db9cb2d4b..a2904786d 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/runner/CompilingStatement.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/runner/CompilingStatement.java
@@ -18,7 +18,7 @@
*/
package org.mapstruct.ap.testutil.runner;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayOutputStream;
import java.io.File;