diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml index 73b343d89..34c2db28f 100644 --- a/maven-plugin-tools-annotations/pom.xml +++ b/maven-plugin-tools-annotations/pom.xml @@ -110,9 +110,9 @@ test - org.easytesting - fest-assert - 1.4 + org.assertj + assertj-core + 2.9.1 test diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java index b7702df63..1f43e567a 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java @@ -29,7 +29,6 @@ import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScanner; import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScannerRequest; import org.codehaus.plexus.PlexusTestCase; -import org.fest.assertions.Assertions; import java.io.File; import java.util.Arrays; @@ -37,6 +36,8 @@ import java.util.Collections; import java.util.Map; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Olivier Lamy */ @@ -57,7 +58,7 @@ public void testReadMojoClass() System.out.println( "mojoAnnotatedClasses:" + mojoAnnotatedClasses ); - Assertions.assertThat( mojoAnnotatedClasses ).isNotNull().isNotEmpty().hasSize( 1 ); + assertThat( mojoAnnotatedClasses ).isNotNull().isNotEmpty().hasSize( 1 ); MojoAnnotatedClass mojoAnnotatedClass = mojoAnnotatedClasses.values().iterator().next(); @@ -78,10 +79,10 @@ public void testReadMojoClass() assertEquals( LifecyclePhase.PACKAGE, execute.phase() ); Collection components = mojoAnnotatedClass.getComponents().values(); - Assertions.assertThat( components ).isNotNull().isNotEmpty().hasSize( 2 ); + assertThat( components ).isNotNull().isNotEmpty().hasSize( 2 ); Collection parameters = mojoAnnotatedClass.getParameters().values(); - Assertions.assertThat( parameters ).isNotNull().isNotEmpty().hasSize( 2 ).contains( + assertThat( parameters ).isNotNull().isNotEmpty().hasSize( 2 ).contains( new ParameterAnnotationContent( "bar", null, "thebar", "coolbar", true, false, String.class.getName() ), new ParameterAnnotationContent( "beer", null, "thebeer", "coolbeer", false, false, String.class.getName() ) );