Skip to content

Commit d296e04

Browse files
committed
[MPLUGIN-387] Switch from fest-assert to AssertJ 2.9.1
1 parent 9ff352c commit d296e04

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

maven-plugin-tools-annotations/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@
110110
<scope>test</scope>
111111
</dependency>
112112
<dependency>
113-
<groupId>org.easytesting</groupId>
114-
<artifactId>fest-assert</artifactId>
115-
<version>1.4</version>
113+
<groupId>org.assertj</groupId>
114+
<artifactId>assertj-core</artifactId>
115+
<version>2.9.1</version><!-- Java 7 -->
116116
<scope>test</scope>
117117
</dependency>
118118
</dependencies>

maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@
2929
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScanner;
3030
import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScannerRequest;
3131
import org.codehaus.plexus.PlexusTestCase;
32-
import org.fest.assertions.Assertions;
3332

3433
import java.io.File;
3534
import java.util.Arrays;
3635
import java.util.Collection;
3736
import java.util.Collections;
3837
import java.util.Map;
3938

39+
import static org.assertj.core.api.Assertions.assertThat;
40+
4041
/**
4142
* @author Olivier Lamy
4243
*/
@@ -57,7 +58,7 @@ public void testReadMojoClass()
5758

5859
System.out.println( "mojoAnnotatedClasses:" + mojoAnnotatedClasses );
5960

60-
Assertions.assertThat( mojoAnnotatedClasses ).isNotNull().isNotEmpty().hasSize( 1 );
61+
assertThat( mojoAnnotatedClasses ).isNotNull().isNotEmpty().hasSize( 1 );
6162

6263
MojoAnnotatedClass mojoAnnotatedClass = mojoAnnotatedClasses.values().iterator().next();
6364

@@ -78,10 +79,10 @@ public void testReadMojoClass()
7879
assertEquals( LifecyclePhase.PACKAGE, execute.phase() );
7980

8081
Collection<ComponentAnnotationContent> components = mojoAnnotatedClass.getComponents().values();
81-
Assertions.assertThat( components ).isNotNull().isNotEmpty().hasSize( 2 );
82+
assertThat( components ).isNotNull().isNotEmpty().hasSize( 2 );
8283

8384
Collection<ParameterAnnotationContent> parameters = mojoAnnotatedClass.getParameters().values();
84-
Assertions.assertThat( parameters ).isNotNull().isNotEmpty().hasSize( 2 ).contains(
85+
assertThat( parameters ).isNotNull().isNotEmpty().hasSize( 2 ).contains(
8586
new ParameterAnnotationContent( "bar", null, "thebar", "coolbar", true, false, String.class.getName() ),
8687
new ParameterAnnotationContent( "beer", null, "thebeer", "coolbeer", false, false,
8788
String.class.getName() ) );

0 commit comments

Comments
 (0)