Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding tests for the plugin-parameter expression evaluator, and some better behavior around MojoExecution and PluginDescriptor instances. Also, bumping plexus-container-default to -alpha-45-SNAPSHOT to take advantage of a new MapConverter fix. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648053 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2008-04-14 23:22:10 +00:00
parent 3c05ebda15
commit d51e3b5e7a
4 changed files with 196 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.properties
View File

@ -19,8 +19,8 @@ debug=false
aspectj.version=1.5.3
retrotranslator.version=1.2.1
backport.version=3.0
classworlds.version=1.2-alpha-10
plexus.version=1.0-alpha-44
classworlds.version=1.2-alpha-12
plexus.version=1.0-alpha-45-SNAPSHOT
plexus-utils.version=1.5.2-SNAPSHOT
plexus-interpolation.version=1.0-SNAPSHOT
maven-artifact.version=3.0-SNAPSHOT

32
maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
View File

@ -274,6 +274,38 @@ public class PluginParameterExpressionEvaluator
e );
}
}
else if ( expression.equals( "mojo" ) )
{
value = mojoExecution;
}
else if ( expression.startsWith( "mojo" ) )
{
try
{
int pathSeparator = expression.indexOf( "/" );
if ( pathSeparator > 0 )
{
String pathExpression = expression.substring( 1, pathSeparator );
value = ReflectionValueExtractor.evaluate( pathExpression, mojoExecution );
value = value + expression.substring( pathSeparator );
}
else
{
value = ReflectionValueExtractor.evaluate( expression.substring( 1 ), mojoExecution );
}
}
catch ( Exception e )
{
// TODO: don't catch exception
throw new ExpressionEvaluationException( "Error evaluating plugin parameter expression: " + expression,
e );
}
}
else if ( expression.equals( "plugin" ) )
{
value = mojoDescriptor.getPluginDescriptor();
}
else if ( expression.startsWith( "plugin" ) )
{
try

161
maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
View File

@ -21,10 +21,12 @@ package org.apache.maven.plugin;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
@ -36,16 +38,23 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.easymock.MockControl;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -59,6 +68,121 @@ public class PluginParameterExpressionEvaluatorTest
{
private static final String FS = System.getProperty( "file.separator" );
private ArtifactFactory factory;
private PathTranslator pathTranslator;
public void setUp()
throws Exception
{
super.setUp();
factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
pathTranslator = (PathTranslator) lookup( PathTranslator.ROLE );
}
public void testPluginDescriptorExpressionReference()
throws ExpressionEvaluationException, CycleDetectedException, DuplicateProjectException
{
MojoExecution exec = newMojoExecution();
MavenSession session = newMavenSession();
Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, "test" );
Object result = new PluginParameterExpressionEvaluator( session, exec, pathTranslator,
logger, new Properties() ).evaluate( "${plugin}" );
System.out.println( "Result: " + result );
assertSame( "${plugin} expression does not return plugin descriptor.",
exec.getMojoDescriptor().getPluginDescriptor(),
result );
}
public void testPluginArtifactsExpressionReference()
throws ExpressionEvaluationException, CycleDetectedException, DuplicateProjectException
{
MojoExecution exec = newMojoExecution();
Artifact depArtifact = factory.createDependencyArtifact( "group",
"artifact",
VersionRange.createFromVersion( "1" ),
"jar",
null,
Artifact.SCOPE_COMPILE );
List deps = new ArrayList();
deps.add( depArtifact );
exec.getMojoDescriptor().getPluginDescriptor().setArtifacts( deps );
MavenSession session = newMavenSession();
Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, "test" );
List depResults = (List) new PluginParameterExpressionEvaluator( session, exec, pathTranslator,
logger, new Properties() ).evaluate( "${plugin.artifacts}" );
System.out.println( "Result: " + depResults );
assertNotNull( depResults );
assertEquals( 1, depResults.size() );
assertSame( "dependency artifact is wrong.", depArtifact, depResults.get( 0 ) );
}
public void testPluginArtifactMapExpressionReference()
throws ExpressionEvaluationException, CycleDetectedException, DuplicateProjectException
{
MojoExecution exec = newMojoExecution();
Artifact depArtifact = factory.createDependencyArtifact( "group",
"artifact",
VersionRange.createFromVersion( "1" ),
"jar",
null,
Artifact.SCOPE_COMPILE );
List deps = new ArrayList();
deps.add( depArtifact );
exec.getMojoDescriptor().getPluginDescriptor().setArtifacts( deps );
MavenSession session = newMavenSession();
Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, "test" );
Map depResults = (Map) new PluginParameterExpressionEvaluator( session, exec,
pathTranslator, logger,
new Properties() ).evaluate( "${plugin.artifactMap}" );
System.out.println( "Result: " + depResults );
assertNotNull( depResults );
assertEquals( 1, depResults.size() );
assertSame( "dependency artifact is wrong.",
depArtifact,
depResults.get( ArtifactUtils.versionlessKey( depArtifact ) ) );
}
public void testPluginArtifactIdExpressionReference()
throws ExpressionEvaluationException, CycleDetectedException, DuplicateProjectException
{
MojoExecution exec = newMojoExecution();
MavenSession session = newMavenSession();
Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, "test" );
Object result = new PluginParameterExpressionEvaluator( session, exec, pathTranslator,
logger, new Properties() ).evaluate( "${plugin.artifactId}" );
System.out.println( "Result: " + result );
assertSame( "${plugin.artifactId} expression does not return plugin descriptor's artifactId.",
exec.getMojoDescriptor().getPluginDescriptor().getArtifactId(),
result );
}
public void testValueExtractionWithAPomValueContainingAPath()
throws Exception
{
@ -327,4 +451,41 @@ public class PluginParameterExpressionEvaluatorTest
return artifactFactory.createBuildArtifact( groupId, artifactId, version, "jar" );
}
private MojoExecution newMojoExecution()
{
PluginDescriptor pd = new PluginDescriptor();
pd.setArtifactId( "my-plugin" );
pd.setGroupId( "org.myco.plugins" );
pd.setVersion( "1" );
MojoDescriptor md = new MojoDescriptor();
md.setPluginDescriptor( pd );
pd.addComponentDescriptor( md );
return new MojoExecution( md );
}
private MavenSession newMavenSession()
throws CycleDetectedException, DuplicateProjectException
{
Model model = new Model();
model.setGroupId( "group" );
model.setArtifactId( "artifact" );
model.setVersion( "1" );
MavenProject project = new MavenProject( model );
ReactorManager rm = new ReactorManager( Collections.singletonList( project ),
ReactorManager.FAIL_FAST );
MockControl reqCtl = MockControl.createControl( MavenExecutionRequest.class );
MavenExecutionRequest req = (MavenExecutionRequest) reqCtl.getMock();
MavenSession session = new MavenSession( getContainer(), req, new DefaultEventDispatcher(),
rm );
return session;
}
}

2
pom.xml
View File

@ -222,7 +222,7 @@ under the License.
</modules>
<properties>
<plexusVersion>1.0-alpha-44</plexusVersion>
<plexusVersion>1.0-alpha-45-SNAPSHOT</plexusVersion>
<wagonVersion>1.0-beta-2</wagonVersion>
</properties>