Author: krosenvold
Date: Sat Jun 13 13:30:34 2015
New Revision: 1685250
URL: http://svn.apache.org/r1685250
Log:
Cleaned up code slightly
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.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/archive/phase/FileSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.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/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1685250&r1=1685249&r2=1685250&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
Sat Jun 13 13:30:34 2015
@@ -409,8 +409,7 @@ public class DefaultAssemblyArchiver
final AssemblerConfigurationSource
configSource )
throws ComponentLookupException, ComponentConfigurationException
{
- final ComponentConfigurator configurator =
- (ComponentConfigurator) container.lookup(
ComponentConfigurator.ROLE, "basic" );
+ final ComponentConfigurator configurator = container.lookup(
ComponentConfigurator.class, "basic" );
final ConfigurationListener listener = new DebugConfigurationListener(
getLogger() );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?rev=1685250&r1=1685249&r2=1685250&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
Sat Jun 13 13:30:34 2015
@@ -103,34 +103,41 @@ public class DefaultDependencyResolver
updateDependencySetResolutionRequirements( dependencySet, info,
assemblyId, currentProject );
updateModuleSetResolutionRequirements( assemblyId, moduleSet,
dependencySet, info, configSource );
- Set<Artifact> artifacts;
- if ( info.isResolutionRequired() )
- {
- final List<ArtifactRepository> repos =
- aggregateRemoteArtifactRepositories(
configSource.getRemoteRepositories(),
-
info.getEnabledProjects() );
+ resolve( assembly, configSource, result, dependencySet, info );
- artifacts = info.getArtifacts();
- if ( info.isResolvedTransitively() )
- {
- getLogger().debug( "Resolving project dependencies
transitively." );
- artifacts = resolveTransitively( artifacts, repos, info,
configSource );
- }
- else
- {
- getLogger().debug( "Resolving project dependencies ONLY. "
- + "Transitive dependencies WILL NOT
be included in the results." );
- artifacts = resolveNonTransitively( assembly, artifacts,
configSource, repos );
- }
+ }
+ return result;
+ }
+
+ private void resolve( Assembly assembly, AssemblerConfigurationSource
configSource,
+ Map<DependencySet, Set<Artifact>> result,
DependencySet dependencySet,
+ ResolutionManagementInfo info )
+ throws DependencyResolutionException
+ {
+ Set<Artifact> artifacts;
+ if ( info.isResolutionRequired() )
+ {
+ final List<ArtifactRepository> repos =
+ aggregateRemoteArtifactRepositories(
configSource.getRemoteRepositories(), info.getEnabledProjects() );
+
+ artifacts = info.getArtifacts();
+ if ( info.isResolvedTransitively() )
+ {
+ getLogger().debug( "Resolving project dependencies
transitively." );
+ artifacts = resolveTransitively( artifacts, repos, info,
configSource );
}
else
{
- artifacts = new HashSet<Artifact>();
+ getLogger().debug( "Resolving project dependencies ONLY. "
+ + "Transitive dependencies WILL NOT be
included in the results." );
+ artifacts = resolveNonTransitively( assembly, artifacts,
configSource, repos );
}
- result.put( dependencySet, artifacts );
-
}
- return result;
+ else
+ {
+ artifacts = new HashSet<Artifact>();
+ }
+ result.put( dependencySet, artifacts );
}
public Map<DependencySet, Set<Artifact>> resolveDependencySets( final
Assembly assembly,
@@ -150,31 +157,7 @@ public class DefaultDependencyResolver
final AssemblyId assemblyId = AssemblyId.createAssemblyId(
assembly );
updateDependencySetResolutionRequirements( dependencySet, info,
assemblyId, currentProject );
- Set<Artifact> artifacts;
- if ( info.isResolutionRequired() )
- {
- final List<ArtifactRepository> repos =
- aggregateRemoteArtifactRepositories(
configSource.getRemoteRepositories(),
-
info.getEnabledProjects() );
-
- artifacts = info.getArtifacts();
- if ( info.isResolvedTransitively() )
- {
- getLogger().debug( "Resolving project dependencies
transitively." );
- artifacts = resolveTransitively( artifacts, repos, info,
configSource );
- }
- else
- {
- getLogger().debug( "Resolving project dependencies ONLY. "
- + "Transitive dependencies WILL NOT
be included in the results." );
- artifacts = resolveNonTransitively( assembly, artifacts,
configSource, repos );
- }
- }
- else
- {
- artifacts = new HashSet<Artifact>();
- }
- result.put( dependencySet, artifacts );
+ resolve( assembly, configSource, result, dependencySet, info );
}
return result;
@@ -314,7 +297,7 @@ public class DefaultDependencyResolver
// TODO: such a call in MavenMetadataSource too -
packaging not really the intention of
// type
final Artifact artifact =
- factory.createBuildArtifact( p.getGroupId(),
p.getArtifactId(), p.getVersion(),
+ resolver.createArtifact( p.getGroupId(),
p.getArtifactId(), p.getVersion(),
p.getPackaging() );
p.setArtifact( artifact );
}
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=1685250&r1=1685249&r2=1685250&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
Sat Jun 13 13:30:34 2015
@@ -59,8 +59,14 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
+import static org.easymock.EasyMock.anyBoolean;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
public class DefaultAssemblyArchiverTest
{
@@ -69,13 +75,6 @@ public class DefaultAssemblyArchiverTest
private PlexusContainer container;
- @Before
- public void setup()
- throws PlexusContainerException
- {
- container = new DefaultPlexusContainer();
- }
-
@AfterClass
public static void tearDown()
throws Exception
@@ -83,6 +82,37 @@ public class DefaultAssemblyArchiverTest
fileManager.cleanUp();
}
+ public static void setupInterpolators( AssemblerConfigurationSource
configSource )
+ {
+ expect( configSource.getRepositoryInterpolator() ).andReturn(
+ FixedStringSearchInterpolator.create() ).anyTimes();
+ expect( configSource.getCommandLinePropsInterpolator() ).andReturn(
+ FixedStringSearchInterpolator.create() ).anyTimes();
+ expect( configSource.getEnvInterpolator() ).andReturn(
FixedStringSearchInterpolator.create() ).anyTimes();
+ expect( configSource.getMainProjectInterpolator() ).andReturn(
+ FixedStringSearchInterpolator.create() ).anyTimes();
+
+ }
+
+ public static void setupInterpolators( AssemblerConfigurationSource
configSource, MavenProject mavenProject )
+ {
+ expect( configSource.getRepositoryInterpolator() ).andReturn(
+ FixedStringSearchInterpolator.create() ).anyTimes();
+ expect( configSource.getCommandLinePropsInterpolator() ).andReturn(
+ FixedStringSearchInterpolator.create() ).anyTimes();
+ expect( configSource.getEnvInterpolator() ).andReturn(
FixedStringSearchInterpolator.create() ).anyTimes();
+ expect( configSource.getMainProjectInterpolator() ).andReturn(
+ AbstractAssemblyMojo.mainProjectInterpolator( mavenProject )
).anyTimes();
+
+ }
+
+ @Before
+ public void setup()
+ throws PlexusContainerException
+ {
+ container = new DefaultPlexusContainer();
+ }
+
@Test( expected = InvalidAssemblerConfigurationException.class )
public void failWhenAssemblyIdIsNull()
throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException
@@ -91,8 +121,8 @@ public class DefaultAssemblyArchiverTest
final MockAndControlForAssemblyArchiver macMgr = new
MockAndControlForAssemblyArchiver( mm );
- final AssemblerConfigurationSource configSource =
mm.createControl().createMock(
- AssemblerConfigurationSource.class );
+ final AssemblerConfigurationSource configSource =
+ mm.createControl().createMock( AssemblerConfigurationSource.class
);
mm.replayAll();
@@ -114,9 +144,9 @@ public class DefaultAssemblyArchiverTest
macMgr.expectGetArchiver( "zip", Archiver.class );
macMgr.expectGetDestFile( new File( "test" ) );
- final AssemblyArchiverPhase phase =
mm.createControl().createMock(AssemblyArchiverPhase.class );
+ final AssemblyArchiverPhase phase = mm.createControl().createMock(
AssemblyArchiverPhase.class );
- phase.execute( (Assembly)anyObject(), (Archiver)anyObject(),
(AssemblerConfigurationSource)anyObject() );
+ phase.execute( (Assembly) anyObject(), (Archiver) anyObject(),
(AssemblerConfigurationSource) anyObject() );
final AssemblerConfigurationSource configSource =
mm.createControl().createMock( AssemblerConfigurationSource.class
);
@@ -124,9 +154,9 @@ public class DefaultAssemblyArchiverTest
final File tempDir = fileManager.createTempDir();
FileUtils.deleteDirectory( tempDir );
- expect(configSource.getTemporaryRootDirectory()).andReturn( tempDir
).anyTimes();
- expect( configSource.isDryRun()).andReturn( false ).anyTimes();
- expect( configSource.isIgnoreDirFormatExtensions()).andReturn( false
).anyTimes();
+ expect( configSource.getTemporaryRootDirectory() ).andReturn( tempDir
).anyTimes();
+ expect( configSource.isDryRun() ).andReturn( false ).anyTimes();
+ expect( configSource.isIgnoreDirFormatExtensions() ).andReturn( false
).anyTimes();
final File outDir = fileManager.createTempDir();
@@ -145,25 +175,26 @@ public class DefaultAssemblyArchiverTest
fail( "Should never happen" );
}
- expect(configSource.getOutputDirectory()).andReturn( outDir );
+ expect( configSource.getOutputDirectory() ).andReturn( outDir );
expect( configSource.getFinalName() ).andReturn( "finalName" );
- expect( configSource.getArchiverConfig()).andReturn( null ).anyTimes();
- expect( configSource.getWorkingDirectory()).andReturn( new File(
"." )).anyTimes();
- expect( configSource.isUpdateOnly()).andReturn( false ).anyTimes();
- expect( configSource.isIgnorePermissions()).andReturn( false
).anyTimes();
+ expect( configSource.getArchiverConfig() ).andReturn( null
).anyTimes();
+ expect( configSource.getWorkingDirectory() ).andReturn( new File( "."
) ).anyTimes();
+ expect( configSource.isUpdateOnly() ).andReturn( false ).anyTimes();
+ expect( configSource.isIgnorePermissions() ).andReturn( false
).anyTimes();
final Assembly assembly = new Assembly();
assembly.setId( "id" );
- // try
- // {
- // expect( macMgr.dependencyResolver.resolve( (Assembly)
anyObject(), (AssemblerConfigurationSource) anyObject() )).andReturn( new
HashSet<Artifact>( ) );
+ // try
+ // {
+ // expect( macMgr.dependencyResolver.resolve( (Assembly)
anyObject(), (AssemblerConfigurationSource)
+ // anyObject() )).andReturn( new HashSet<Artifact>( ) );
// macMgr.dependencyResolverControl.setMatcher(
MockControl.ALWAYS_MATCHER );
- // }
- // catch ( final DependencyResolutionException e )
- // {
+ // }
+ // catch ( final DependencyResolutionException e )
+ // {
// fail( "Should never happen" );
- // }
+ // }
mm.replayAll();
@@ -186,34 +217,33 @@ public class DefaultAssemblyArchiverTest
macArchiverManager.expectGetArchiver( "dummy", archiver );
- final AssemblerConfigurationSource configSource = mm.createMock(
AssemblerConfigurationSource.class);
+ final AssemblerConfigurationSource configSource = mm.createMock(
AssemblerConfigurationSource.class );
final String simpleConfig = "value";
- expect( configSource.getArchiverConfig()).andReturn(
- "<configuration><simpleConfig>" + simpleConfig +
"</simpleConfig></configuration>").anyTimes();
+ expect( configSource.getArchiverConfig() ).andReturn(
+ "<configuration><simpleConfig>" + simpleConfig +
"</simpleConfig></configuration>" ).anyTimes();
final MavenProject project = new MavenProject( new Model() );
- expect(configSource.getProject()).andReturn( project ).anyTimes();
+ expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect(configSource.getMavenSession()).andReturn( null ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
- expect(configSource.isDryRun()).andReturn( false ).anyTimes();
+ expect( configSource.isDryRun() ).andReturn( false ).anyTimes();
- expect(configSource.getWorkingDirectory()).andReturn( new File( "."
)).anyTimes();
+ expect( configSource.getWorkingDirectory() ).andReturn( new File( "."
) ).anyTimes();
- expect(configSource.isUpdateOnly()).andReturn( false ).anyTimes();
+ expect( configSource.isUpdateOnly() ).andReturn( false ).anyTimes();
final ArtifactRepository lr = mm.createMock( ArtifactRepository.class
);
- expect(lr.getBasedir()).andReturn( "/path/to/local/repo" ).anyTimes();
+ expect( lr.getBasedir() ).andReturn( "/path/to/local/repo"
).anyTimes();
- expect(configSource.getLocalRepository()).andReturn( lr ).anyTimes();
+ expect( configSource.getLocalRepository() ).andReturn( lr ).anyTimes();
expect( configSource.isIgnorePermissions() ).andReturn( true );
setupInterpolators( configSource, project );
-
mm.replayAll();
final DefaultAssemblyArchiver subject =
@@ -226,25 +256,6 @@ public class DefaultAssemblyArchiverTest
mm.verifyAll();
}
- public static void setupInterpolators( AssemblerConfigurationSource
configSource )
- {
- expect( configSource.getRepositoryInterpolator() ).andReturn(
FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getCommandLinePropsInterpolator() ).andReturn(
FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getEnvInterpolator() ).andReturn(
FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getMainProjectInterpolator() ).andReturn(
FixedStringSearchInterpolator.create() ).anyTimes();
-
- }
-
- public static void setupInterpolators( AssemblerConfigurationSource
configSource, MavenProject mavenProject )
- {
- expect( configSource.getRepositoryInterpolator() ).andReturn(
FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getCommandLinePropsInterpolator() ).andReturn(
FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getEnvInterpolator() ).andReturn(
FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getMainProjectInterpolator() ).andReturn(
AbstractAssemblyMojo.mainProjectInterpolator( mavenProject) ).anyTimes();
-
- }
-
-
@Test
public void testCreateArchiver_ShouldCreateTarArchiverWithNoCompression()
throws NoSuchArchiverException, ArchiverException
@@ -264,6 +275,20 @@ public class DefaultAssemblyArchiverTest
expect( configSource.getArchiverConfig()).andReturn( null ).anyTimes();
+ final DefaultAssemblyArchiver subject = setupStdExpectations( mm,
macArchiverManager, configSource );
+
+ subject.createArchiver( "tar", false, "finalName", configSource, null,
false );
+
+ assertNull( ttArchiver.compressionMethod );
+ assertEquals( TarLongFileMode.fail, ttArchiver.longFileMode );
+
+ mm.verifyAll();
+ }
+
+ private DefaultAssemblyArchiver setupStdExpectations( EasyMockSupport mm,
+
MockAndControlForAssemblyArchiver macArchiverManager,
+
AssemblerConfigurationSource configSource )
+ {
expect( configSource.getProject()).andReturn( new MavenProject( new
Model() ) ).anyTimes();
expect( configSource.getJarArchiveConfiguration()).andReturn( null
).anyTimes();
@@ -276,15 +301,7 @@ public class DefaultAssemblyArchiverTest
mm.replayAll();
- final DefaultAssemblyArchiver subject =
- createSubject( macArchiverManager, new
ArrayList<AssemblyArchiverPhase>(), null );
-
- subject.createArchiver( "tar", false, "finalName", configSource, null,
false );
-
- assertNull( ttArchiver.compressionMethod );
- assertEquals( TarLongFileMode.fail, ttArchiver.longFileMode );
-
- mm.verifyAll();
+ return createSubject( macArchiverManager, new
ArrayList<AssemblyArchiverPhase>(), null );
}
@Test
@@ -304,16 +321,7 @@ public class DefaultAssemblyArchiverTest
expect( configSource.isDryRun()).andReturn( false ).anyTimes();
expect( configSource.getArchiverConfig()).andReturn( null ).anyTimes();
expect( configSource.getMavenSession()).andReturn( null ).anyTimes();
- expect( configSource.getProject()).andReturn( new MavenProject( new
Model() ) ).anyTimes();
- expect( configSource.getJarArchiveConfiguration()).andReturn( null
).anyTimes();
- expect( configSource.getWorkingDirectory()).andReturn( new File( "." )
).anyTimes();
- expect( configSource.isUpdateOnly()).andReturn( false ).anyTimes();
- expect( configSource.isIgnorePermissions()).andReturn( true
).anyTimes();
-
- mm.replayAll();
-
- final DefaultAssemblyArchiver subject =
- createSubject( macArchiverManager, new
ArrayList<AssemblyArchiverPhase>(), null );
+ final DefaultAssemblyArchiver subject = setupStdExpectations( mm,
macArchiverManager, configSource );
subject.createArchiver( "war", false, null, configSource, null, false
);
@@ -514,64 +522,6 @@ public class DefaultAssemblyArchiverTest
return subject;
}
- private final class MockAndControlForAssemblyArchiver
- {
- final ArchiverManager archiverManager;
-
-
- Archiver archiver;
-
- final DependencyResolver dependencyResolver;
-
- private final EasyMockSupport mm;
-
- public MockAndControlForAssemblyArchiver( final EasyMockSupport mm )
- {
- this.mm = mm;
- archiverManager = mm.createControl().createMock(
ArchiverManager.class );
-
- dependencyResolver = mm.createControl().createMock(
DependencyResolver.class );
-
- }
-
- void expectGetDestFile( final File file )
- {
- expect(archiver.getDestFile()).andReturn( file ).anyTimes();
- }
-
- void createArchiver( final Class<? extends Archiver> archiverClass )
- {
- archiver = mm.createControl().createMock(archiverClass);
-
- archiver.setForced( anyBoolean() );
- expectLastCall().anyTimes();
-
- archiver.setIgnorePermissions( false );
- expectLastCall().anyTimes();
- }
-
- void expectGetArchiver( final String format, final Class<? extends
Archiver> archiverClass )
- {
- createArchiver( archiverClass );
-
- try
- {
- expect(archiverManager.getArchiver( format )).andReturn(
archiver );
- }
- catch ( final NoSuchArchiverException e )
- {
- Assert.fail( "should never happen" );
- }
-
- }
-
- void expectGetArchiver( final String format, final Archiver archiver )
- throws NoSuchArchiverException
- {
- expect(archiverManager.getArchiver( format )).andReturn( archiver
);
- }
- }
-
private static final class TestTarArchiver
extends TarArchiver
{
@@ -636,4 +586,61 @@ public class DefaultAssemblyArchiverTest
}
}
+ private final class MockAndControlForAssemblyArchiver
+ {
+ final ArchiverManager archiverManager;
+
+ final DependencyResolver dependencyResolver;
+
+ private final EasyMockSupport mm;
+
+ Archiver archiver;
+
+ public MockAndControlForAssemblyArchiver( final EasyMockSupport mm )
+ {
+ this.mm = mm;
+ archiverManager = mm.createControl().createMock(
ArchiverManager.class );
+
+ dependencyResolver = mm.createControl().createMock(
DependencyResolver.class );
+
+ }
+
+ void expectGetDestFile( final File file )
+ {
+ expect( archiver.getDestFile() ).andReturn( file ).anyTimes();
+ }
+
+ void createArchiver( final Class<? extends Archiver> archiverClass )
+ {
+ archiver = mm.createControl().createMock( archiverClass );
+
+ archiver.setForced( anyBoolean() );
+ expectLastCall().anyTimes();
+
+ archiver.setIgnorePermissions( false );
+ expectLastCall().anyTimes();
+ }
+
+ void expectGetArchiver( final String format, final Class<? extends
Archiver> archiverClass )
+ {
+ createArchiver( archiverClass );
+
+ try
+ {
+ expect( archiverManager.getArchiver( format ) ).andReturn(
archiver );
+ }
+ catch ( final NoSuchArchiverException e )
+ {
+ Assert.fail( "should never happen" );
+ }
+
+ }
+
+ void expectGetArchiver( final String format, final Archiver archiver )
+ throws NoSuchArchiverException
+ {
+ expect( archiverManager.getArchiver( format ) ).andReturn(
archiver );
+ }
+ }
+
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java?rev=1685250&r1=1685249&r2=1685250&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
Sat Jun 13 13:30:34 2015
@@ -19,11 +19,7 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-
import junit.framework.TestCase;
-
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
@@ -37,6 +33,8 @@ import org.codehaus.plexus.logging.Logge
import org.easymock.EasyMock;
import org.easymock.classextension.EasyMockSupport;
+import java.io.IOException;
+
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=1685250&r1=1685249&r2=1685250&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
Sat Jun 13 13:30:34 2015
@@ -40,7 +40,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuilder;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java?rev=1685250&r1=1685249&r2=1685250&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
Sat Jun 13 13:30:34 2015
@@ -19,14 +19,7 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.io.File;
-import java.nio.charset.Charset;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Set;
-
import junit.framework.Assert;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
@@ -42,6 +35,12 @@ import org.codehaus.plexus.archiver.Arch
import org.easymock.EasyMock;
import org.easymock.classextension.EasyMockSupport;
+import java.io.File;
+import java.nio.charset.Charset;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Set;
+
import static org.easymock.EasyMock.anyInt;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect;
@@ -51,12 +50,12 @@ public class MockAndControlForAddArtifac
public final Archiver archiver;
- public AssemblerConfigurationSource configSource;
-
- private MavenProject project = null;
+ public final AssemblerConfigurationSource configSource;
public final DependencyResolver dependencyResolver;
+ private MavenProject project = null;
+
public MockAndControlForAddArtifactTask( final EasyMockSupport mockManager
)
{
this( mockManager, null );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java?rev=1685250&r1=1685249&r2=1685250&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
Sat Jun 13 13:30:34 2015
@@ -19,15 +19,7 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.io.File;
-import java.nio.charset.Charset;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
import junit.framework.Assert;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
@@ -39,7 +31,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.model.DependencySet;
import org.apache.maven.project.DependencyResolutionResult;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectBuildingRequest;
@@ -52,6 +43,13 @@ import org.easymock.EasyMock;
import org.easymock.classextension.EasyMockSupport;
import org.sonatype.aether.RepositorySystemSession;
+import java.io.File;
+import java.nio.charset.Charset;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
import static org.easymock.EasyMock.anyInt;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect;
@@ -67,10 +65,10 @@ public class MockAndControlForAddDepende
public final ArchiverManager archiverManager;
- private final MavenProject project;
-
public final DependencyResolver dependencyResolver;
+ private final MavenProject project;
+
private final MavenSession session;
private final RepositorySystemSession repositorySession;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java?rev=1685250&r1=1685249&r2=1685250&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
Sat Jun 13 13:30:34 2015
@@ -40,7 +40,7 @@ public class MockAndControlForAddFileSet
public final AssemblerConfigurationSource configSource;
- public Archiver archiver;
+ public final Archiver archiver;
public File archiveBaseDir;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=1685250&r1=1685249&r2=1685250&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
Sat Jun 13 13:30:34 2015
@@ -68,9 +68,9 @@ public class DefaultDependencyResolverTe
super.setUp();
resolver = lookup( RepositorySystem.class );
- factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
- repoFactory = (ArtifactRepositoryFactory) lookup(
ArtifactRepositoryFactory.ROLE );
- layout = (ArtifactRepositoryLayout) lookup(
ArtifactRepositoryLayout.ROLE, "default" );
+ factory = lookup( ArtifactFactory.class );
+ repoFactory = lookup( ArtifactRepositoryFactory.class );
+ layout = lookup( ArtifactRepositoryLayout.class, "default" );
logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
}
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=1685250&r1=1685249&r2=1685250&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
Sat Jun 13 13:30:34 2015
@@ -72,6 +72,16 @@ public class DefaultAssemblyReaderTest
private AssemblerConfigurationSource configSource;
+ public static StringReader writeToStringReader( Assembly assembly )
+ throws IOException
+ {
+ final StringWriter sw = new StringWriter();
+ final AssemblyXpp3Writer assemblyWriter = new AssemblyXpp3Writer();
+
+ assemblyWriter.write( sw, assembly );
+
+ return new StringReader( sw.toString() );
+ }
@Override
public void setUp()
@@ -122,31 +132,6 @@ public class DefaultAssemblyReaderTest
mockManager.verifyAll();
}
- public void
testIncludeSiteInAssembly_ShouldAddSiteDirFileSetWhenDirExists()
- throws IOException, InvalidAssemblerConfigurationException
- {
- final File siteDir = fileManager.createTempDir();
-
- expect( configSource.getSiteDirectory()).andReturn( siteDir
).anyTimes();
-
- final Assembly assembly = new Assembly();
-
- mockManager.replayAll();
-
- new DefaultAssemblyReader().includeSiteInAssembly( assembly,
configSource );
-
- final List<FileSet> fileSets = assembly.getFileSets();
-
- assertNotNull( fileSets );
- assertEquals( 1, fileSets.size() );
-
- final FileSet fs = fileSets.get( 0 );
-
- assertEquals( siteDir.getPath(), fs.getDirectory() );
-
- mockManager.verifyAll();
- }
-
// public void testReadComponent_ShouldReadComponentFromXml()
// throws IOException, AssemblyReadException
// {
@@ -224,6 +209,31 @@ public class DefaultAssemblyReaderTest
// mockManager.verifyAll();
// }
+ public void
testIncludeSiteInAssembly_ShouldAddSiteDirFileSetWhenDirExists()
+ throws IOException, InvalidAssemblerConfigurationException
+ {
+ final File siteDir = fileManager.createTempDir();
+
+ expect( configSource.getSiteDirectory() ).andReturn( siteDir
).anyTimes();
+
+ final Assembly assembly = new Assembly();
+
+ mockManager.replayAll();
+
+ new DefaultAssemblyReader().includeSiteInAssembly( assembly,
configSource );
+
+ final List<FileSet> fileSets = assembly.getFileSets();
+
+ assertNotNull( fileSets );
+ assertEquals( 1, fileSets.size() );
+
+ final FileSet fs = fileSets.get( 0 );
+
+ assertEquals( siteDir.getPath(), fs.getDirectory() );
+
+ mockManager.verifyAll();
+ }
+
public void
testMergeComponentWithAssembly_ShouldAddOneFileSetToExistingListOfTwo()
{
final Assembly assembly = new Assembly();
@@ -365,49 +375,9 @@ public class DefaultAssemblyReaderTest
assertNotNull( depSets );
assertEquals( 3, depSets.size() );
- assertEquals( Artifact.SCOPE_RUNTIME, depSets.get( 0 )
- .getScope() );
- assertEquals( Artifact.SCOPE_COMPILE, depSets.get( 1 )
- .getScope() );
- assertEquals( Artifact.SCOPE_SYSTEM, depSets.get( 2 )
- .getScope() );
- }
-
- public void
testMergeComponentWithAssembly_ShouldAddOneContainerDescriptorHandlerToExistingListOfTwo()
- {
- final Assembly assembly = new Assembly();
-
- ContainerDescriptorHandlerConfig cfg = new
ContainerDescriptorHandlerConfig();
- cfg.setHandlerName( "one" );
-
- assembly.addContainerDescriptorHandler( cfg );
-
- cfg = new ContainerDescriptorHandlerConfig();
- cfg.setHandlerName( "two" );
-
- assembly.addContainerDescriptorHandler( cfg );
-
- final Component component = new Component();
-
- cfg = new ContainerDescriptorHandlerConfig();
- cfg.setHandlerName( "three" );
-
- component.addContainerDescriptorHandler( cfg );
-
- new DefaultAssemblyReader().mergeComponentWithAssembly( component,
assembly );
-
- final List<ContainerDescriptorHandlerConfig> result =
assembly.getContainerDescriptorHandlers();
-
- assertNotNull( result );
- assertEquals( 3, result.size() );
-
- final Iterator<ContainerDescriptorHandlerConfig> it =
result.iterator();
- assertEquals( "one", it.next()
- .getHandlerName() );
- assertEquals( "two", it.next()
- .getHandlerName() );
- assertEquals( "three", it.next()
- .getHandlerName() );
+ assertEquals( Artifact.SCOPE_RUNTIME, depSets.get( 0 ).getScope() );
+ assertEquals( Artifact.SCOPE_COMPILE, depSets.get( 1 ).getScope() );
+ assertEquals( Artifact.SCOPE_SYSTEM, depSets.get( 2 ).getScope() );
}
// FIXME: Deep merging should take place...
@@ -457,6 +427,40 @@ public class DefaultAssemblyReaderTest
//
// }
+ public void
testMergeComponentWithAssembly_ShouldAddOneContainerDescriptorHandlerToExistingListOfTwo()
+ {
+ final Assembly assembly = new Assembly();
+
+ ContainerDescriptorHandlerConfig cfg = new
ContainerDescriptorHandlerConfig();
+ cfg.setHandlerName( "one" );
+
+ assembly.addContainerDescriptorHandler( cfg );
+
+ cfg = new ContainerDescriptorHandlerConfig();
+ cfg.setHandlerName( "two" );
+
+ assembly.addContainerDescriptorHandler( cfg );
+
+ final Component component = new Component();
+
+ cfg = new ContainerDescriptorHandlerConfig();
+ cfg.setHandlerName( "three" );
+
+ component.addContainerDescriptorHandler( cfg );
+
+ new DefaultAssemblyReader().mergeComponentWithAssembly( component,
assembly );
+
+ final List<ContainerDescriptorHandlerConfig> result =
assembly.getContainerDescriptorHandlers();
+
+ assertNotNull( result );
+ assertEquals( 3, result.size() );
+
+ final Iterator<ContainerDescriptorHandlerConfig> it =
result.iterator();
+ assertEquals( "one", it.next().getHandlerName() );
+ assertEquals( "two", it.next().getHandlerName() );
+ assertEquals( "three", it.next().getHandlerName() );
+ }
+
public void
testMergeComponentsWithMainAssembly_ShouldAddOneFileSetToAssembly()
throws IOException, AssemblyReadException
{
@@ -525,27 +529,7 @@ public class DefaultAssemblyReaderTest
final Assembly assembly = new Assembly();
assembly.setId( "test" );
- final StringReader sr = writeToStringReader( assembly );
-
- final File basedir = fileManager.createTempDir();
-
- expect( configSource.getBasedir()).andReturn( basedir ).anyTimes();
-
- final Model model = new Model();
- model.setGroupId( "group" );
- model.setArtifactId( "artifact" );
- model.setVersion( "version" );
-
- final MavenProject project = new MavenProject( model );
-
- expect( configSource.getProject()).andReturn( project ).anyTimes();
-
- expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes();
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- mockManager.replayAll();
-
- final Assembly result = new DefaultAssemblyReader().readAssembly( sr,
"testLocation", null, configSource );
+ final Assembly result = doReadAssembly( assembly );
assertEquals( assembly.getId(), result.getId() );
@@ -769,23 +753,22 @@ public class DefaultAssemblyReaderTest
mockManager.verifyAll();
}
- public static StringReader writeToStringReader( Assembly assembly )
- throws IOException
+ public void
testReadAssembly_ShouldReadAssemblyWithInterpolationWithoutComponentsOrSiteDirInclusion()
+ throws IOException, AssemblyReadException,
InvalidAssemblerConfigurationException
{
- final StringWriter sw = new StringWriter();
- final AssemblyXpp3Writer assemblyWriter = new AssemblyXpp3Writer();
+ final Assembly assembly = new Assembly();
+ assembly.setId( "${groupId}-assembly" );
- assemblyWriter.write( sw, assembly );
+ final Assembly result = doReadAssembly( assembly );
- return new StringReader( sw.toString() );
+ assertEquals( "group-assembly", result.getId() );
+
+ mockManager.verifyAll();
}
- public void
testReadAssembly_ShouldReadAssemblyWithInterpolationWithoutComponentsOrSiteDirInclusion()
+ private Assembly doReadAssembly( Assembly assembly )
throws IOException, AssemblyReadException,
InvalidAssemblerConfigurationException
{
- final Assembly assembly = new Assembly();
- assembly.setId( "${groupId}-assembly" );
-
final StringReader sr = writeToStringReader( assembly );
final File basedir = fileManager.createTempDir();
@@ -807,11 +790,7 @@ public class DefaultAssemblyReaderTest
mockManager.replayAll();
- final Assembly result = new DefaultAssemblyReader().readAssembly( sr,
"testLocation", null, configSource );
-
- assertEquals( "group-assembly", result.getId() );
-
- mockManager.verifyAll();
+ return new DefaultAssemblyReader().readAssembly( sr, "testLocation",
null, configSource );
}
public void testGetAssemblyFromDescriptorFile_ShouldReadAssembly()
