svn commit: r1778361 - in /maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations: TestAnnotationsReader.java scanner/DefaultMojoAnnotationsScannerTest.java

[gboue]

Author: gboue
Date: Thu Jan 12 00:06:50 2017
New Revision: 1778361

URL: http://svn.apache.org/viewvc?rev=1778361&view=rev
Log:
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.

Modified:
    
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
    
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java?rev=1778361&r1=1778360&r2=1778361&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
 Thu Jan 12 00:06:50 2017
@@ -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() );
 

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java?rev=1778361&r1=1778360&r2=1778361&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java
 Thu Jan 12 00:06:50 2017
@@ -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 DefaultMojoAnnotationsScann
         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 );
     }
 
 }