You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2010/09/24 23:17:41 UTC
svn commit: r1001079 - in /maven/plugins/trunk/maven-assembly-plugin: ./
src/it/projects/basic-features/local-repo-interp/
src/it/projects/basic-features/local-repo-interp/src/
src/it/projects/basic-features/local-repo-interp/src/main/
src/it/projects/...
Author: jdcasey
Date: Fri Sep 24 21:17:40 2010
New Revision: 1001079
URL: http://svn.apache.org/viewvc?rev=1001079&view=rev
Log:
[MASSEMBLY-333] Allow access to local repository using ${settings.localRepository} and ${localRepository} expressions."
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/files/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/files/some.file (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/verify.bsh (with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1001079&r1=1001078&r2=1001079&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri Sep 24 21:17:40 2010
@@ -36,7 +36,7 @@ under the License.
<description>A Maven 2 plugin to create archives of your project's sources, classes, dependencies etc. from flexible assembly descriptors.</description>
<prerequisites>
- <maven>2.0.6</maven>
+ <maven>2.0.11</maven>
</prerequisites>
<scm>
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/goals.txt?rev=1001079&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/goals.txt Fri Sep 24 21:17:40 2010
@@ -0,0 +1,2 @@
+clean
+org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:attached
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/pom.xml?rev=1001079&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/pom.xml Fri Sep 24 21:17:40 2010
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>test</artifactId>
+ <version>1</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml?rev=1001079&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml Fri Sep 24 21:17:40 2010
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <files>
+ <file>
+ <source>${localRepository}/org/apache/maven/plugins/maven-assembly-plugin/${testVersion}/maven-assembly-plugin-${testVersion}.jar</source>
+ <outputDirectory>unprefixed</outputDirectory>
+ <destName>maven-assembly-plugin.jar</destName>
+ </file>
+ <file>
+ <source>${settings.localRepository}/org/apache/maven/plugins/maven-assembly-plugin/${testVersion}/maven-assembly-plugin-${testVersion}.jar</source>
+ <outputDirectory>prefixed</outputDirectory>
+ <destName>maven-assembly-plugin.jar</destName>
+ </file>
+ </files>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/files/some.file
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/files/some.file?rev=1001079&view=auto
==============================================================================
(empty)
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/src/main/files/some.file
------------------------------------------------------------------------------
svn:executable = *
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/verify.bsh?rev=1001079&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/verify.bsh Fri Sep 24 21:17:40 2010
@@ -0,0 +1,18 @@
+import java.io.*;
+
+File f = new File( basedir, "target/test-1-bin/unprefixed/maven-assembly-plugin.jar" );
+File f2 = new File( basedir, "target/test-1-bin/prefixed/maven-assembly-plugin.jar" );
+
+if ( !f.exists() || !f.isFile() )
+{
+ System.out.println( "File: " + f + " doesn't exist, or isn't a file." );
+ return false;
+}
+
+if ( !f2.exists() || !f2.isFile() )
+{
+ System.out.println( "File: " + f2 + " doesn't exist, or isn't a file." );
+ return false;
+}
+
+return true;
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/local-repo-interp/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java?rev=1001079&r1=1001078&r2=1001079&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java Fri Sep 24 21:17:40 2010
@@ -83,7 +83,8 @@ public class AssemblyInterpolator
ENVIRONMENT_VARIABLES = environmentVariables;
}
- public AssemblyInterpolator() throws IOException
+ public AssemblyInterpolator()
+ throws IOException
{
}
@@ -180,6 +181,24 @@ public class AssemblyInterpolator
interpolator.addValueSource( new PrefixedObjectValueSource( InterpolationConstants.PROJECT_PREFIXES, project,
true ) );
+ final Properties settingsProperties = new Properties();
+ if ( configSource.getLocalRepository() != null )
+ {
+ settingsProperties.setProperty( "localRepository", configSource.getLocalRepository()
+ .getBasedir() );
+ settingsProperties.setProperty( "settings.localRepository", configSource.getLocalRepository()
+ .getBasedir() );
+ }
+ else if ( session != null && session.getSettings() != null )
+ {
+ settingsProperties.setProperty( "localRepository", session.getSettings()
+ .getLocalRepository() );
+ settingsProperties.setProperty( "settings.localRepository", configSource.getLocalRepository()
+ .getBasedir() );
+ }
+
+ interpolator.addValueSource( new PropertiesBasedValueSource( settingsProperties ) );
+
Properties commandLineProperties = System.getProperties();
try
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java?rev=1001079&r1=1001078&r2=1001079&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/InterpolationConstants.java Fri Sep 24 21:17:40 2010
@@ -11,6 +11,8 @@ public final class InterpolationConstant
public static final List<String> PROJECT_PROPERTIES_PREFIXES;
+ public static final String SETTINGS_PREFIX = "settings.";
+
static
{
final List<String> projectPrefixes = new ArrayList<String>();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java?rev=1001079&r1=1001078&r2=1001079&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java Fri Sep 24 21:17:40 2010
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.AssemblyContext;
@@ -252,6 +253,16 @@ public class DefaultAssemblyArchiverTest
configSource.isUpdateOnly();
configCtl.setReturnValue( false, MockControl.ZERO_OR_MORE );
+ final MockControl lrCtl = MockControl.createControl( ArtifactRepository.class );
+ final ArtifactRepository lr = (ArtifactRepository) lrCtl.getMock();
+ mm.add( lrCtl );
+
+ lr.getBasedir();
+ lrCtl.setReturnValue( "/path/to/local/repo", MockControl.ZERO_OR_MORE );
+
+ configSource.getLocalRepository();
+ configCtl.setReturnValue( lr, MockControl.ZERO_OR_MORE );
+
mm.add( configCtl );
mm.replayAll();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java?rev=1001079&r1=1001078&r2=1001079&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java Fri Sep 24 21:17:40 2010
@@ -19,11 +19,7 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.io.IOException;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
@@ -37,14 +33,20 @@ import org.codehaus.plexus.logging.conso
import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl;
+import java.io.IOException;
+import java.util.Properties;
+
+import junit.framework.TestCase;
+
public class AssemblyExpressionEvaluatorTest
extends TestCase
{
private AssemblyInterpolator interpolator;
-
- private ConfigSourceStub configSourceStub = new ConfigSourceStub();
+ private final ConfigSourceStub configSourceStub = new ConfigSourceStub();
+
+ @Override
public void setUp()
throws IOException
{
@@ -56,15 +58,15 @@ public class AssemblyExpressionEvaluator
public void testShouldResolveModelGroupId()
throws ExpressionEvaluationException
{
- Model model = new Model();
+ final Model model = new Model();
model.setArtifactId( "artifact-id" );
model.setGroupId( "group.id" );
model.setVersion( "1" );
model.setPackaging( "jar" );
-
+
configSourceStub.setProject( new MavenProject( model ) );
-
- Object result = new AssemblyExpressionEvaluator( configSourceStub ).evaluate( "assembly.${groupId}" );
+
+ final Object result = new AssemblyExpressionEvaluator( configSourceStub ).evaluate( "assembly.${groupId}" );
assertEquals( "assembly.group.id", result );
}
@@ -72,20 +74,20 @@ public class AssemblyExpressionEvaluator
public void testShouldResolveModelPropertyBeforeModelGroupId()
throws ExpressionEvaluationException
{
- Model model = new Model();
+ final Model model = new Model();
model.setArtifactId( "artifact-id" );
model.setGroupId( "group.id" );
model.setVersion( "1" );
model.setPackaging( "jar" );
- Properties props = new Properties();
+ final Properties props = new Properties();
props.setProperty( "groupId", "other.id" );
model.setProperties( props );
configSourceStub.setProject( new MavenProject( model ) );
-
- Object result = new AssemblyExpressionEvaluator( configSourceStub ).evaluate( "assembly.${groupId}" );
+
+ final Object result = new AssemblyExpressionEvaluator( configSourceStub ).evaluate( "assembly.${groupId}" );
assertEquals( "assembly.other.id", result );
}
@@ -93,47 +95,57 @@ public class AssemblyExpressionEvaluator
public void testShouldResolveContextValueBeforeModelPropertyOrModelGroupIdInAssemblyId()
throws ExpressionEvaluationException
{
- Model model = new Model();
+ final Model model = new Model();
model.setArtifactId( "artifact-id" );
model.setGroupId( "group.id" );
model.setVersion( "1" );
model.setPackaging( "jar" );
- Properties props = new Properties();
+ final Properties props = new Properties();
props.setProperty( "groupId", "other.id" );
model.setProperties( props );
- MockManager mm = new MockManager();
-
- MockControl sessionControl = MockClassControl.createControl( MavenSession.class );
- MavenSession session = (MavenSession) sessionControl.getMock();
-
+ final MockManager mm = new MockManager();
+
+ final MockControl sessionControl = MockClassControl.createControl( MavenSession.class );
+ final MavenSession session = (MavenSession) sessionControl.getMock();
+
mm.add( sessionControl );
-
- Properties execProps = new Properties();
+
+ final Properties execProps = new Properties();
execProps.setProperty( "groupId", "still.another.id" );
-
+
session.getExecutionProperties();
sessionControl.setReturnValue( execProps, MockControl.ZERO_OR_MORE );
-
- MockControl csControl = MockControl.createControl( AssemblerConfigurationSource.class );
- AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csControl.getMock();
-
+
+ final MockControl csControl = MockControl.createControl( AssemblerConfigurationSource.class );
+ final AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csControl.getMock();
+
mm.add( csControl );
-
+
cs.getMavenSession();
csControl.setReturnValue( session, MockControl.ZERO_OR_MORE );
-
+
cs.getProject();
csControl.setReturnValue( new MavenProject( model ), MockControl.ZERO_OR_MORE );
-
+
+ final MockControl lrCtl = MockControl.createControl( ArtifactRepository.class );
+ final ArtifactRepository lr = (ArtifactRepository) lrCtl.getMock();
+ mm.add( lrCtl );
+
+ lr.getBasedir();
+ lrCtl.setReturnValue( "/path/to/local/repo", MockControl.ZERO_OR_MORE );
+
+ cs.getLocalRepository();
+ csControl.setReturnValue( lr, MockControl.ZERO_OR_MORE );
+
mm.replayAll();
- Object result = new AssemblyExpressionEvaluator( cs ).evaluate( "assembly.${groupId}" );
+ final Object result = new AssemblyExpressionEvaluator( cs ).evaluate( "assembly.${groupId}" );
assertEquals( "assembly.still.another.id", result );
-
+
mm.verifyAll();
mm.clear();
}
@@ -141,15 +153,15 @@ public class AssemblyExpressionEvaluator
public void testShouldReturnUnchangedInputForUnresolvedExpression()
throws ExpressionEvaluationException
{
- Model model = new Model();
+ final Model model = new Model();
model.setArtifactId( "artifact-id" );
model.setGroupId( "group.id" );
model.setVersion( "1" );
model.setPackaging( "jar" );
-
+
configSourceStub.setProject( new MavenProject( model ) );
- Object result = new AssemblyExpressionEvaluator( configSourceStub ).evaluate( "assembly.${unresolved}" );
+ final Object result = new AssemblyExpressionEvaluator( configSourceStub ).evaluate( "assembly.${unresolved}" );
assertEquals( "assembly.${unresolved}", result );
}
@@ -157,17 +169,18 @@ public class AssemblyExpressionEvaluator
public void testShouldInterpolateMultiDotProjectExpression()
throws ExpressionEvaluationException
{
- Build build = new Build();
+ final Build build = new Build();
build.setFinalName( "final-name" );
- Model model = new Model();
+ final Model model = new Model();
model.setBuild( build );
configSourceStub.setProject( new MavenProject( model ) );
- Object result = new AssemblyExpressionEvaluator( configSourceStub ).evaluate( "assembly.${project.build.finalName}" );
+ final Object result =
+ new AssemblyExpressionEvaluator( configSourceStub ).evaluate( "assembly.${project.build.finalName}" );
assertEquals( "assembly.final-name", result );
}
-
+
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java?rev=1001079&r1=1001078&r2=1001079&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java Fri Sep 24 21:17:40 2010
@@ -19,6 +19,7 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
@@ -48,7 +49,8 @@ public class AssemblyInterpolatorTest
private final AssemblerConfigurationSource configSourceStub = new ConfigSourceStub();
@Override
- public void setUp() throws IOException
+ public void setUp()
+ throws IOException
{
interpolator = new AssemblyInterpolator();
@@ -86,7 +88,8 @@ public class AssemblyInterpolatorTest
assertEquals( "${artifactId}.${packaging}", outputSet.getOutputFileNameMapping() );
}
- public void testDependencySetOutputDirectoryIsNotInterpolated() throws IOException, AssemblyInterpolationException
+ public void testDependencySetOutputDirectoryIsNotInterpolated()
+ throws IOException, AssemblyInterpolationException
{
final Model model = new Model();
model.setArtifactId( "artifact-id" );
@@ -114,7 +117,8 @@ public class AssemblyInterpolatorTest
assertEquals( "${artifactId}.${packaging}", outputSet.getOutputDirectory() );
}
- public void testShouldResolveModelGroupIdInAssemblyId() throws AssemblyInterpolationException
+ public void testShouldResolveModelGroupIdInAssemblyId()
+ throws AssemblyInterpolationException
{
final Model model = new Model();
model.setArtifactId( "artifact-id" );
@@ -131,7 +135,8 @@ public class AssemblyInterpolatorTest
assertEquals( "assembly.group.id", result.getId() );
}
- public void testShouldResolveModelPropertyBeforeModelGroupIdInAssemblyId() throws AssemblyInterpolationException
+ public void testShouldResolveModelPropertyBeforeModelGroupIdInAssemblyId()
+ throws AssemblyInterpolationException
{
final Model model = new Model();
model.setArtifactId( "artifact-id" );
@@ -189,6 +194,16 @@ public class AssemblyInterpolatorTest
mm.add( csControl );
+ final MockControl lrCtl = MockControl.createControl( ArtifactRepository.class );
+ final ArtifactRepository lr = (ArtifactRepository) lrCtl.getMock();
+ mm.add( lrCtl );
+
+ lr.getBasedir();
+ lrCtl.setReturnValue( "/path/to/local/repo", MockControl.ZERO_OR_MORE );
+
+ cs.getLocalRepository();
+ csControl.setReturnValue( lr, MockControl.ZERO_OR_MORE );
+
cs.getMavenSession();
csControl.setReturnValue( session, MockControl.ZERO_OR_MORE );
@@ -202,7 +217,8 @@ public class AssemblyInterpolatorTest
mm.clear();
}
- public void testShouldNotTouchUnresolvedExpression() throws AssemblyInterpolationException
+ public void testShouldNotTouchUnresolvedExpression()
+ throws AssemblyInterpolationException
{
final Model model = new Model();
model.setArtifactId( "artifact-id" );
@@ -219,7 +235,8 @@ public class AssemblyInterpolatorTest
assertEquals( "assembly.${unresolved}", result.getId() );
}
- public void testShouldInterpolateMultiDotProjectExpression() throws AssemblyInterpolationException
+ public void testShouldInterpolateMultiDotProjectExpression()
+ throws AssemblyInterpolationException
{
final Build build = new Build();
build.setFinalName( "final-name" );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java?rev=1001079&r1=1001078&r2=1001079&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java Fri Sep 24 21:17:40 2010
@@ -65,6 +65,10 @@ public class DefaultAssemblyReaderTest
private AssemblerConfigurationSource configSource;
+ private ArtifactRepository localRepo;
+
+ private MockControl localRepoControl;
+
@Override
public void setUp()
{
@@ -76,11 +80,13 @@ public class DefaultAssemblyReaderTest
configSource = (AssemblerConfigurationSource) configSourceControl.getMock();
- final MockControl localRepoControl = MockControl.createControl( ArtifactRepository.class );
- final ArtifactRepository localRepo = (ArtifactRepository) localRepoControl.getMock();
-
+ localRepoControl = MockControl.createControl( ArtifactRepository.class );
+ localRepo = (ArtifactRepository) localRepoControl.getMock();
mockManager.add( localRepoControl );
+ localRepo.getBasedir();
+ localRepoControl.setReturnValue( "/path/to/local/repo", MockControl.ZERO_OR_MORE );
+
configSource.getLocalRepository();
configSourceControl.setReturnValue( localRepo, MockControl.ZERO_OR_MORE );