From f50e9ebb585cc95cd6e7ed97b612016b80f46956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Bou=C3=A9?= Date: Thu, 12 Jan 2017 00:06:50 +0000 Subject: [PATCH] Updating the unit tests so that they can be run successfully directly inside Eclipse: this means fixing the location of the basedir by extending from PlexusTestCase and using the getBasedir() method. git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1778361 13f79535-47bb-0310-9956-ffa450edef68 --- .../extractor/annotations/TestAnnotationsReader.java | 2 +- .../scanner/DefaultMojoAnnotationsScannerTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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 17a24bf..d39123a 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 @@ -50,7 +50,7 @@ public class TestAnnotationsReader MojoAnnotationsScanner mojoAnnotationsScanner = (MojoAnnotationsScanner) lookup( MojoAnnotationsScanner.ROLE ); MojoAnnotationsScannerRequest request = new MojoAnnotationsScannerRequest(); - request.setClassesDirectories( Collections.singletonList( new File( "target/test-classes" ) ) ); + request.setClassesDirectories( Collections.singletonList( new File( getBasedir(), "target/test-classes" ) ) ); request.setIncludePatterns( Arrays.asList( "**/FooMojo.class" ) ); request.setProject( new MavenProject() ); diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java index c10a6de..b90304b 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java @@ -23,17 +23,17 @@ import static org.easymock.EasyMock.*; import java.io.File; +import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.logging.Logger; -import junit.framework.TestCase; public class DefaultMojoAnnotationsScannerTest - extends TestCase + extends PlexusTestCase { private DefaultMojoAnnotationsScanner scanner = new DefaultMojoAnnotationsScanner(); public void testSkipModuleInfoClassInArchive() throws Exception { - scanner.scanArchive( new File( "src/test/resources/java9-module.jar"), null, false ); + scanner.scanArchive( new File( getBasedir(), "target/test-classes/java9-module.jar"), null, false ); } public void testJava8Annotations() throws Exception @@ -42,7 +42,7 @@ public class DefaultMojoAnnotationsScannerTest expect( logger.isDebugEnabled() ).andReturn( false ); replay( logger ); scanner.enableLogging( logger ); - scanner.scanArchive( new File( "src/test/resources/java8-annotations.jar"), null, false ); + scanner.scanArchive( new File( getBasedir(), "target/test-classes/java8-annotations.jar"), null, false ); } }