stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use generics and other little code improvements 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1200891 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2011-11-11 14:05:46 +00:00
parent ce29792f53
commit f9bf892e25
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java
View File

@ -28,6 +28,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.tools.plugin.DefaultPluginToolsRequest; import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
import org.apache.maven.tools.plugin.ExtendedMojoDescriptor; import org.apache.maven.tools.plugin.ExtendedMojoDescriptor;
import org.apache.maven.tools.plugin.PluginToolsRequest; import org.apache.maven.tools.plugin.PluginToolsRequest;
import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor;
import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.FileUtils;
import java.io.File; import java.io.File;
@ -55,13 +56,10 @@ public class JavaMojoDescriptorExtractorTest
return result; return result;
} }
public List<MojoDescriptor> extract( String directory ) protected List<MojoDescriptor> extract( String directory )
throws Exception throws Exception
{ {
JavaMojoDescriptorExtractor extractor = new JavaMojoDescriptorExtractor();
File sourceFile = fileOf( "dir-flag.txt" ); File sourceFile = fileOf( "dir-flag.txt" );
File dir = sourceFile.getParentFile(); File dir = sourceFile.getParentFile();
Model model = new Model(); Model model = new Model();
@ -77,6 +75,8 @@ public class JavaMojoDescriptorExtractorTest
PluginToolsRequest request = new DefaultPluginToolsRequest( project, pluginDescriptor ).setEncoding( "UTF-8" ); PluginToolsRequest request = new DefaultPluginToolsRequest( project, pluginDescriptor ).setEncoding( "UTF-8" );
MojoDescriptorExtractor extractor = new JavaMojoDescriptorExtractor();
return extractor.execute( request ); return extractor.execute( request );
} }
@ -87,9 +87,8 @@ public class JavaMojoDescriptorExtractorTest
assertEquals( "Extracted mojos", 2, results.size() ); assertEquals( "Extracted mojos", 2, results.size() );
for ( int i = 0; i < 2; i++ ) for ( MojoDescriptor mojoDescriptor : results )
{ {
MojoDescriptor mojoDescriptor = (MojoDescriptor) results.get( i );
assertEquals( 1, mojoDescriptor.getParameters().size() ); assertEquals( 1, mojoDescriptor.getParameters().size() );
Parameter parameter = (Parameter) mojoDescriptor.getParameters().get( 0 ); Parameter parameter = (Parameter) mojoDescriptor.getParameters().get( 0 );
assertEquals( "project", parameter.getName() ); assertEquals( "project", parameter.getName() );
@ -104,7 +103,7 @@ public class JavaMojoDescriptorExtractorTest
assertEquals( 1, results.size() ); assertEquals( 1, results.size() );
MojoDescriptor mojoDescriptor = (MojoDescriptor) results.get( 0 ); MojoDescriptor mojoDescriptor = results.get( 0 );
@SuppressWarnings( "unchecked" ) @SuppressWarnings( "unchecked" )
List<Parameter> parameters = mojoDescriptor.getParameters(); List<Parameter> parameters = mojoDescriptor.getParameters();

6
maven-plugin-tools-java/src/test/resources/java-1.5/MyEnum.java
View File

@ -1,14 +1,14 @@
public enum MyEnum public enum MyEnum
{ {
@Deprecated() @Deprecated( )
SOME_VALUE, SOME_VALUE,
// cf. MPLUGIN-151 // cf. MPLUGIN-151
@SuppressWarnings("all") @SuppressWarnings( "all" )
ANOTHER_VALUE, ANOTHER_VALUE,
@SuppressWarnings(value = { "all" }) @SuppressWarnings( value = { "all" } )
YET_ANOTHER_VALUE; YET_ANOTHER_VALUE;
} }

8
maven-plugin-tools-java/src/test/resources/source3/TestAnnotation.java
View File

@ -1,8 +1,8 @@
package source3; package source3;
@Retention(RetentionPolicy.RUNTIME) @Retention( RetentionPolicy.RUNTIME )
@Target(ElementType.ANNOTATION_TYPE) @Target( ElementType.ANNOTATION_TYPE )
public @interface TestAnnotation
public @interface TestAnnotation { {
} }