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/21 22:34:53 UTC
svn commit: r999612 [5/10] - in /maven/plugins/trunk/maven-assembly-plugin:
./ src/main/java/org/apache/maven/plugin/assembly/
src/main/java/org/apache/maven/plugin/assembly/archive/
src/main/java/org/apache/maven/plugin/assembly/archive/archiver/ src/...
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java Tue Sep 21 20:34:50 2010
@@ -41,15 +41,16 @@ public final class ProjectUtils
{
}
- public static Set getProjectModules( MavenProject project, List reactorProjects, boolean includeSubModules,
- Logger logger )
+ public static Set<MavenProject> getProjectModules( final MavenProject project,
+ final List<MavenProject> reactorProjects,
+ final boolean includeSubModules, final Logger logger )
throws IOException
{
- Set singleParentSet = Collections.singleton( project );
+ final Set<MavenProject> singleParentSet = Collections.singleton( project );
- Set moduleCandidates = new LinkedHashSet( reactorProjects );
+ final Set<MavenProject> moduleCandidates = new LinkedHashSet<MavenProject>( reactorProjects );
- Set modules = new LinkedHashSet();
+ final Set<MavenProject> modules = new LinkedHashSet<MavenProject>();
// we temporarily add the master project to the modules set, since this
// set is pulling double duty as a set of
@@ -65,9 +66,9 @@ public final class ProjectUtils
{
changed = 0;
- for ( Iterator candidateIterator = moduleCandidates.iterator(); candidateIterator.hasNext(); )
+ for ( final Iterator<MavenProject> candidateIterator = moduleCandidates.iterator(); candidateIterator.hasNext(); )
{
- MavenProject moduleCandidate = ( MavenProject ) candidateIterator.next();
+ final MavenProject moduleCandidate = candidateIterator.next();
if ( moduleCandidate.getFile() == null )
{
@@ -77,19 +78,19 @@ public final class ProjectUtils
continue;
}
- Set currentPotentialParents;
+ Set<MavenProject> currentPotentialParents;
if ( includeSubModules )
{
- currentPotentialParents = new HashSet( modules );
+ currentPotentialParents = new HashSet<MavenProject>( modules );
}
else
{
currentPotentialParents = singleParentSet;
}
- for ( Iterator parentIterator = currentPotentialParents.iterator(); parentIterator.hasNext(); )
+ for ( final Iterator<MavenProject> parentIterator = currentPotentialParents.iterator(); parentIterator.hasNext(); )
{
- MavenProject potentialParent = ( MavenProject ) parentIterator.next();
+ final MavenProject potentialParent = parentIterator.next();
if ( potentialParent.getFile() == null )
{
@@ -130,13 +131,15 @@ public final class ProjectUtils
return modules;
}
- private static boolean projectContainsModule( MavenProject mainProject, MavenProject moduleProject )
+ private static boolean projectContainsModule( final MavenProject mainProject, final MavenProject moduleProject )
throws IOException
{
- List modules = mainProject.getModules();
- File basedir = mainProject.getBasedir();
+ @SuppressWarnings( "unchecked" )
+ final List<String> modules = mainProject.getModules();
+ final File basedir = mainProject.getBasedir();
- File moduleFile = moduleProject.getFile().getCanonicalFile();
+ final File moduleFile = moduleProject.getFile()
+ .getCanonicalFile();
File moduleBasedir = moduleProject.getBasedir();
@@ -147,11 +150,11 @@ public final class ProjectUtils
moduleBasedir = moduleBasedir.getCanonicalFile();
- for ( Iterator it = modules.iterator(); it.hasNext(); )
+ for ( final Iterator<String> it = modules.iterator(); it.hasNext(); )
{
- String moduleSubpath = ( String ) it.next();
+ final String moduleSubpath = it.next();
- File moduleDir = new File( basedir, moduleSubpath ).getCanonicalFile();
+ final File moduleDir = new File( basedir, moduleSubpath ).getCanonicalFile();
if ( moduleDir.equals( moduleFile ) || moduleDir.equals( moduleBasedir ) )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PropertyUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PropertyUtils.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PropertyUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/PropertyUtils.java Tue Sep 21 20:34:50 2010
@@ -32,7 +32,6 @@ import java.io.IOException;
import java.util.Enumeration;
import java.util.Properties;
-
/**
* @author <a href="mailto:kenney@neonics.com">Kenney Westerhof</a>
* @version $Id$
@@ -46,13 +45,17 @@ public final class PropertyUtils
/**
* Reads a property file, resolving all internal variables.
- *
- * @param propfile The property file to load
- * @param fail wheter to throw an exception when the file cannot be loaded or to return null
- * @param useSystemProps wheter to incorporate System.getProperties settings into the returned Properties object.
+ *
+ * @param propfile
+ * The property file to load
+ * @param fail
+ * wheter to throw an exception when the file cannot be loaded or to return null
+ * @param useSystemProps
+ * wheter to incorporate System.getProperties settings into the returned Properties object.
* @return the loaded and fully resolved Properties object
*/
- public static Properties getInterpolatedPropertiesFromFile( File propfile, boolean fail, boolean useSystemProps )
+ public static Properties getInterpolatedPropertiesFromFile( final File propfile, final boolean fail,
+ final boolean useSystemProps )
throws IOException, AssemblyFormattingException
{
Properties props;
@@ -68,7 +71,7 @@ public final class PropertyUtils
if ( propfile.exists() )
{
- FileInputStream inStream = new FileInputStream( propfile );
+ final FileInputStream inStream = new FileInputStream( propfile );
try
{
props.load( inStream );
@@ -83,20 +86,22 @@ public final class PropertyUtils
throw new FileNotFoundException( propfile.toString() );
}
- StringSearchInterpolator interpolator = new StringSearchInterpolator();
+ final StringSearchInterpolator interpolator = new StringSearchInterpolator();
interpolator.addValueSource( new PropertiesBasedValueSource( props ) );
- for ( Enumeration n = props.propertyNames(); n.hasMoreElements(); )
+ for ( @SuppressWarnings( "rawtypes" )
+ final Enumeration n = props.propertyNames(); n.hasMoreElements(); )
{
- String key = (String) n.nextElement();
+ final String key = (String) n.nextElement();
String value = props.getProperty( key );
try
{
value = interpolator.interpolate( value );
}
- catch ( InterpolationException e )
+ catch ( final InterpolationException e )
{
- throw new AssemblyFormattingException( "Failed to interpolate property value: '" + value + "' for key: '" + key + "'. Reason: " + e.getMessage(), e );
+ throw new AssemblyFormattingException( "Failed to interpolate property value: '" + value
+ + "' for key: '" + key + "'. Reason: " + e.getMessage(), e );
}
props.setProperty( key, value );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java Tue Sep 21 20:34:50 2010
@@ -31,51 +31,57 @@ public final class TypeConversionUtils
{
private static final int U_R = 256;
+
private static final int U_W = 128;
+
private static final int U_X = 64;
private static final int G_R = 32;
+
private static final int G_W = 16;
+
private static final int G_X = 8;
private static final int W_R = 4;
+
private static final int W_W = 2;
+
private static final int W_X = 1;
private TypeConversionUtils()
{
}
- public static String[] toStringArray( List list )
+ public static String[] toStringArray( final List<String> list )
{
String[] result = null;
if ( ( list != null ) && !list.isEmpty() )
{
- result = (String[]) list.toArray( new String[0] );
+ result = list.toArray( new String[0] );
}
return result;
}
- public static int modeToInt( String mode, Logger logger )
- throws AssemblyFormattingException
+ public static int modeToInt( final String mode, final Logger logger ) throws AssemblyFormattingException
{
- if ( mode == null || mode.trim().length() < 1 )
+ if ( mode == null || mode.trim()
+ .length() < 1 )
{
return -1;
}
try
{
- int value = Integer.parseInt( mode, 8 );
+ final int value = Integer.parseInt( mode, 8 );
// discard sanity assessment here; we're pushing ahead.
verifyModeSanity( value, logger );
return value;
}
- catch( NumberFormatException e )
+ catch ( final NumberFormatException e )
{
throw new AssemblyFormattingException( "Failed to parse mode as an octal number: \'" + mode + "\'.", e );
}
@@ -83,9 +89,9 @@ public final class TypeConversionUtils
// the boolean return type is for people who want to make a decision based on the sanity
// assessment.
- public static boolean verifyModeSanity( int mode, Logger logger )
+ public static boolean verifyModeSanity( final int mode, final Logger logger )
{
- StringBuffer messages = new StringBuffer();
+ final StringBuffer messages = new StringBuffer();
messages.append( "The mode: " + Integer.toString( mode, 8 ) + " contains nonsensical permissions:" );
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=999612&r1=999611&r2=999612&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 Tue Sep 21 20:34:50 2010
@@ -19,21 +19,20 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
+import org.apache.maven.plugin.assembly.AssemblyContext;
+import org.apache.maven.plugin.assembly.DefaultAssemblyContext;
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase;
+import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.testutils.MockManager;
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.archiver.ArchiveFinalizer;
import org.codehaus.plexus.archiver.ArchivedFileSet;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
@@ -46,23 +45,19 @@ import org.codehaus.plexus.archiver.tar.
import org.codehaus.plexus.archiver.tar.TarLongFileMode;
import org.codehaus.plexus.archiver.war.WarArchiver;
import org.codehaus.plexus.archiver.zip.ZipArchiver;
-import org.codehaus.plexus.collections.ActiveCollectionManager;
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.util.FileUtils;
-import org.easymock.ArgumentsMatcher;
import org.easymock.MockControl;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import junit.framework.Assert;
@@ -70,8 +65,9 @@ public class DefaultAssemblyArchiverTest
extends PlexusTestCase
{
- private TestFileManager fileManager = new TestFileManager( "def-assy-archiver.test.", "" );
+ private final TestFileManager fileManager = new TestFileManager( "def-assy-archiver.test.", "" );
+ @Override
public void tearDown()
throws Exception
{
@@ -83,27 +79,27 @@ public class DefaultAssemblyArchiverTest
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
IOException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForAssemblyArchiver macMgr = new MockAndControlForAssemblyArchiver( mm );
+ final MockAndControlForAssemblyArchiver macMgr = new MockAndControlForAssemblyArchiver( mm );
macMgr.expectGetArchiver( "zip", Archiver.class );
macMgr.expectGetDestFile( new File( "test" ) );
- MockControl phaseControl = MockControl.createControl( AssemblyArchiverPhase.class );
+ final MockControl phaseControl = MockControl.createControl( AssemblyArchiverPhase.class );
mm.add( phaseControl );
- AssemblyArchiverPhase phase = (AssemblyArchiverPhase) phaseControl.getMock();
+ final AssemblyArchiverPhase phase = (AssemblyArchiverPhase) phaseControl.getMock();
phase.execute( null, null, null, null );
phaseControl.setMatcher( MockControl.ALWAYS_MATCHER );
- MockControl csControl = MockControl.createControl( AssemblerConfigurationSource.class );
+ final MockControl csControl = MockControl.createControl( AssemblerConfigurationSource.class );
mm.add( csControl );
- AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) csControl.getMock();
+ final AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) csControl.getMock();
- File tempDir = fileManager.createTempDir();
+ final File tempDir = fileManager.createTempDir();
FileUtils.deleteDirectory( tempDir );
configSource.getTemporaryRootDirectory();
@@ -115,7 +111,7 @@ public class DefaultAssemblyArchiverTest
configSource.isIgnoreDirFormatExtensions();
csControl.setReturnValue( false, MockControl.ZERO_OR_MORE );
- File outDir = fileManager.createTempDir();
+ final File outDir = fileManager.createTempDir();
macMgr.archiver.setDestFile( new File( outDir, "full-name.zip" ) );
@@ -123,11 +119,11 @@ public class DefaultAssemblyArchiverTest
{
macMgr.archiver.createArchive();
}
- catch ( ArchiverException e )
+ catch ( final ArchiverException e )
{
fail( "Should never happen" );
}
- catch ( IOException e )
+ catch ( final IOException e )
{
fail( "Should never happen" );
}
@@ -137,15 +133,26 @@ public class DefaultAssemblyArchiverTest
configSource.getFinalName();
csControl.setReturnValue( "finalName" );
-
+
configSource.getArchiverConfig();
csControl.setReturnValue( null, MockControl.ZERO_OR_MORE );
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
+ final AssemblyContext context = new DefaultAssemblyContext();
+
+ try
+ {
+ macMgr.dependencyResolver.resolve( assembly, configSource, context );
+ macMgr.dependencyResolverControl.setMatcher( MockControl.ALWAYS_MATCHER );
+ }
+ catch ( final DependencyResolutionException e )
+ {
+ fail( "Should never happen" );
+ }
mm.replayAll();
- DefaultAssemblyArchiver subject = createSubject( macMgr, Collections.singletonList( phase ), null );
+ final DefaultAssemblyArchiver subject = createSubject( macMgr, Collections.singletonList( phase ), null );
subject.createArchive( assembly, "full-name", "zip", configSource );
@@ -155,41 +162,43 @@ public class DefaultAssemblyArchiverTest
public void testCreateArchiver_ShouldConfigureArchiver()
throws NoSuchArchiverException, ArchiverException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
+ final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
- TestArchiverWithConfig archiver = new TestArchiverWithConfig();
+ final TestArchiverWithConfig archiver = new TestArchiverWithConfig();
macArchiverManager.expectGetArchiver( "dummy", archiver );
- MockControl configCtl = MockControl.createControl( AssemblerConfigurationSource.class );
- AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) configCtl.getMock();
-
- String simpleConfig = "value";
-
+ final MockControl configCtl = MockControl.createControl( AssemblerConfigurationSource.class );
+ final AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) configCtl.getMock();
+
+ final String simpleConfig = "value";
+
configSource.getArchiverConfig();
- configCtl.setReturnValue( "<configuration><simpleConfig>" + simpleConfig + "</simpleConfig></configuration>", MockControl.ZERO_OR_MORE );
-
- MavenProject project = new MavenProject( new Model() );
-
+ configCtl.setReturnValue( "<configuration><simpleConfig>" + simpleConfig + "</simpleConfig></configuration>",
+ MockControl.ZERO_OR_MORE );
+
+ final MavenProject project = new MavenProject( new Model() );
+
configSource.getProject();
configCtl.setReturnValue( project, MockControl.ZERO_OR_MORE );
-
+
configSource.getMavenSession();
configCtl.setReturnValue( null, MockControl.ZERO_OR_MORE );
-
+
configSource.isDryRun();
configCtl.setReturnValue( false, MockControl.ZERO_OR_MORE );
-
+
mm.add( configCtl );
mm.replayAll();
- DefaultAssemblyArchiver subject = createSubject( macArchiverManager, Collections.EMPTY_LIST, null );
+ final DefaultAssemblyArchiver subject =
+ createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
subject.createArchiver( "dummy", false, "finalName", configSource, null );
-
+
assertEquals( simpleConfig, archiver.getSimpleConfig() );
mm.verifyAll();
@@ -198,16 +207,16 @@ public class DefaultAssemblyArchiverTest
public void testCreateArchiver_ShouldCreateTarArchiverWithNoCompression()
throws NoSuchArchiverException, ArchiverException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- TestTarArchiver ttArchiver = new TestTarArchiver();
+ final TestTarArchiver ttArchiver = new TestTarArchiver();
- MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
+ final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
macArchiverManager.expectGetArchiver( "tar", ttArchiver );
- MockControl configCtl = MockControl.createControl( AssemblerConfigurationSource.class );
- AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) configCtl.getMock();
+ final MockControl configCtl = MockControl.createControl( AssemblerConfigurationSource.class );
+ final AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) configCtl.getMock();
configSource.getTarLongFileMode();
configCtl.setReturnValue( TarLongFileMode.FAIL, MockControl.ZERO_OR_MORE );
@@ -217,18 +226,19 @@ public class DefaultAssemblyArchiverTest
configSource.getArchiverConfig();
configCtl.setReturnValue( null, MockControl.ZERO_OR_MORE );
-
+
configSource.getProject();
configCtl.setReturnValue( new MavenProject( new Model() ), MockControl.ZERO_OR_MORE );
configSource.getJarArchiveConfiguration();
configCtl.setReturnValue( null, MockControl.ZERO_OR_MORE );
-
+
mm.add( configCtl );
mm.replayAll();
- DefaultAssemblyArchiver subject = createSubject( macArchiverManager, Collections.EMPTY_LIST, null );
+ final DefaultAssemblyArchiver subject =
+ createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
subject.createArchiver( "tar", false, "finalName", configSource, null );
@@ -241,16 +251,16 @@ public class DefaultAssemblyArchiverTest
public void testCreateArchiver_ShouldCreateWarArchiverWithIgnoreWebxmlSetToFalse()
throws NoSuchArchiverException, ArchiverException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- TestWarArchiver twArchiver = new TestWarArchiver();
+ final TestWarArchiver twArchiver = new TestWarArchiver();
- MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
+ final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
macArchiverManager.expectGetArchiver( "war", twArchiver );
- MockControl configCtl = MockControl.createControl( AssemblerConfigurationSource.class );
- AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) configCtl.getMock();
+ final MockControl configCtl = MockControl.createControl( AssemblerConfigurationSource.class );
+ final AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) configCtl.getMock();
configSource.isDryRun();
configCtl.setReturnValue( false, MockControl.ZERO_OR_MORE );
@@ -260,15 +270,16 @@ public class DefaultAssemblyArchiverTest
configSource.getProject();
configCtl.setReturnValue( new MavenProject( new Model() ), MockControl.ZERO_OR_MORE );
-
+
configSource.getJarArchiveConfiguration();
configCtl.setReturnValue( null, MockControl.ZERO_OR_MORE );
-
+
mm.add( configCtl );
-
+
mm.replayAll();
- DefaultAssemblyArchiver subject = createSubject( macArchiverManager, Collections.EMPTY_LIST, null );
+ final DefaultAssemblyArchiver subject =
+ createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
subject.createArchiver( "war", false, null, configSource, null );
@@ -278,28 +289,29 @@ public class DefaultAssemblyArchiverTest
public void testCreateArchiver_ShouldCreateZipArchiver()
throws NoSuchArchiverException, ArchiverException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- ZipArchiver archiver = new ZipArchiver();
+ final ZipArchiver archiver = new ZipArchiver();
- MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
+ final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
macArchiverManager.expectGetArchiver( "zip", archiver );
- MockControl configCtl = MockControl.createControl( AssemblerConfigurationSource.class );
- AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) configCtl.getMock();
+ final MockControl configCtl = MockControl.createControl( AssemblerConfigurationSource.class );
+ final AssemblerConfigurationSource configSource = (AssemblerConfigurationSource) configCtl.getMock();
configSource.isDryRun();
configCtl.setReturnValue( false, MockControl.ZERO_OR_MORE );
configSource.getArchiverConfig();
configCtl.setReturnValue( null, MockControl.ZERO_OR_MORE );
-
+
mm.add( configCtl );
mm.replayAll();
- DefaultAssemblyArchiver subject = createSubject( macArchiverManager, Collections.EMPTY_LIST, null );
+ final DefaultAssemblyArchiver subject =
+ createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
subject.createArchiver( "zip", false, null, configSource, null );
}
@@ -411,17 +423,18 @@ public class DefaultAssemblyArchiverTest
public void testCreateWarArchiver_ShouldDisableIgnoreWebxmlOption()
throws NoSuchArchiverException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- TestWarArchiver twArchiver = new TestWarArchiver();
+ final TestWarArchiver twArchiver = new TestWarArchiver();
- MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
+ final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
macArchiverManager.expectGetArchiver( "war", twArchiver );
mm.replayAll();
- DefaultAssemblyArchiver subject = createSubject( macArchiverManager, Collections.EMPTY_LIST, null );
+ final DefaultAssemblyArchiver subject =
+ createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
subject.createWarArchiver();
@@ -431,17 +444,18 @@ public class DefaultAssemblyArchiverTest
public void testCreateTarArchiver_ShouldNotInitializeCompression()
throws NoSuchArchiverException, ArchiverException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- TestTarArchiver ttArchiver = new TestTarArchiver();
+ final TestTarArchiver ttArchiver = new TestTarArchiver();
- MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
+ final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
macArchiverManager.expectGetArchiver( "tar", ttArchiver );
mm.replayAll();
- DefaultAssemblyArchiver subject = createSubject( macArchiverManager, Collections.EMPTY_LIST, null );
+ final DefaultAssemblyArchiver subject =
+ createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
subject.createTarArchiver( "tar", TarLongFileMode.FAIL );
@@ -454,17 +468,18 @@ public class DefaultAssemblyArchiverTest
public void testCreateTarArchiver_ShouldInitializeGZipCompression()
throws NoSuchArchiverException, ArchiverException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- TestTarArchiver ttArchiver = new TestTarArchiver();
+ final TestTarArchiver ttArchiver = new TestTarArchiver();
- MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
+ final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
macArchiverManager.expectGetArchiver( "tar", ttArchiver );
mm.replayAll();
- DefaultAssemblyArchiver subject = createSubject( macArchiverManager, Collections.EMPTY_LIST, null );
+ final DefaultAssemblyArchiver subject =
+ createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
subject.createTarArchiver( "tar.gz", TarLongFileMode.FAIL );
@@ -477,17 +492,18 @@ public class DefaultAssemblyArchiverTest
public void testCreateTarArchiver_ShouldInitializeBZipCompression()
throws NoSuchArchiverException, ArchiverException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- TestTarArchiver ttArchiver = new TestTarArchiver();
+ final TestTarArchiver ttArchiver = new TestTarArchiver();
- MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
+ final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
macArchiverManager.expectGetArchiver( "tar", ttArchiver );
mm.replayAll();
- DefaultAssemblyArchiver subject = createSubject( macArchiverManager, Collections.EMPTY_LIST, null );
+ final DefaultAssemblyArchiver subject =
+ createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
subject.createTarArchiver( "tar.bz2", TarLongFileMode.FAIL );
@@ -500,17 +516,18 @@ public class DefaultAssemblyArchiverTest
public void testCreateTarArchiver_ShouldFailWithInvalidCompression()
throws NoSuchArchiverException, ArchiverException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- TestTarArchiver ttArchiver = new TestTarArchiver();
+ final TestTarArchiver ttArchiver = new TestTarArchiver();
- MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
+ final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm );
macArchiverManager.expectGetArchiver( "tar", ttArchiver );
mm.replayAll();
- DefaultAssemblyArchiver subject = createSubject( macArchiverManager, Collections.EMPTY_LIST, null );
+ final DefaultAssemblyArchiver subject =
+ createSubject( macArchiverManager, new ArrayList<AssemblyArchiverPhase>(), null );
try
{
@@ -518,7 +535,7 @@ public class DefaultAssemblyArchiverTest
fail( "Invalid compression formats should throw an error." );
}
- catch ( IllegalArgumentException e )
+ catch ( final IllegalArgumentException e )
{
// expected.
}
@@ -526,11 +543,12 @@ public class DefaultAssemblyArchiverTest
mm.verifyAll();
}
- private DefaultAssemblyArchiver createSubject( MockAndControlForAssemblyArchiver macMgr, List phases, Logger logger )
+ private DefaultAssemblyArchiver createSubject( final MockAndControlForAssemblyArchiver macMgr,
+ final List<AssemblyArchiverPhase> phases, Logger logger )
{
- DefaultAssemblyArchiver subject =
- new DefaultAssemblyArchiver( macMgr.archiverManager, macMgr.collectionManager, macMgr.resolver, phases );
-
+ final DefaultAssemblyArchiver subject =
+ new DefaultAssemblyArchiver( macMgr.archiverManager, macMgr.dependencyResolver, phases );
+
subject.setContainer( getContainer() );
if ( logger == null )
@@ -553,17 +571,13 @@ public class DefaultAssemblyArchiverTest
Archiver archiver;
- MockControl collectionManagerControl;
+ MockControl dependencyResolverControl;
- ActiveCollectionManager collectionManager;
-
- MockControl resolverControl;
-
- DependencyResolver resolver;
+ DependencyResolver dependencyResolver;
private final MockManager mm;
- public MockAndControlForAssemblyArchiver( MockManager mm )
+ public MockAndControlForAssemblyArchiver( final MockManager mm )
{
this.mm = mm;
control = MockControl.createControl( ArchiverManager.class );
@@ -571,44 +585,19 @@ public class DefaultAssemblyArchiverTest
archiverManager = (ArchiverManager) control.getMock();
- collectionManagerControl = MockControl.createControl( ActiveCollectionManager.class );
- mm.add( collectionManagerControl );
+ dependencyResolverControl = MockControl.createControl( DependencyResolver.class );
+ mm.add( dependencyResolverControl );
- collectionManager = (ActiveCollectionManager) collectionManagerControl.getMock();
-
- resolverControl = MockControl.createControl( DependencyResolver.class );
- mm.add( resolverControl );
-
- resolver = (DependencyResolver) resolverControl.getMock();
-
- try
- {
- resolver.buildManagedVersionMap( null, null );
- }
- catch ( ArtifactResolutionException e )
- {
- }
- catch ( ArchiveCreationException e )
- {
- }
- catch ( InvalidVersionSpecificationException e )
- {
- }
- catch ( InvalidDependencyVersionException e )
- {
- }
-
- resolverControl.setMatcher( MockControl.ALWAYS_MATCHER );
- resolverControl.setReturnValue( Collections.EMPTY_MAP, MockControl.ZERO_OR_MORE );
+ dependencyResolver = (DependencyResolver) dependencyResolverControl.getMock();
}
- void expectGetDestFile( File file )
+ void expectGetDestFile( final File file )
{
archiver.getDestFile();
archiverControl.setReturnValue( file, MockControl.ZERO_OR_MORE );
}
- void createArchiver( Class archiverClass )
+ void createArchiver( final Class<?> archiverClass )
{
archiverControl = MockControl.createControl( archiverClass );
mm.add( archiverControl );
@@ -616,49 +605,13 @@ public class DefaultAssemblyArchiverTest
archiver = (Archiver) archiverControl.getMock();
}
- void expectSetArchiverFinalizers()
- {
- ( (FinalizerEnabled) archiver ).setArchiveFinalizers( null );
- archiverControl.setMatcher( MockControl.ALWAYS_MATCHER );
- }
-
- void expectSetArchiverFinalizers( final Set finalizerClasses )
- {
- ( (FinalizerEnabled) archiver ).setArchiveFinalizers( null );
- archiverControl.setMatcher( new ArgumentsMatcher()
- {
-
- public boolean matches( Object[] expected, Object[] actual )
- {
- boolean match = true;
- List actualClasses = (List) actual[0];
-
- Set finClasses = new HashSet( finalizerClasses );
-
- for ( Iterator it = actualClasses.iterator(); it.hasNext(); )
- {
- ArchiveFinalizer finalizer = (ArchiveFinalizer) it.next();
- match = match && finClasses.remove( finalizer.getClass() );
- }
-
- return match;
- }
-
- public String toString( Object[] arguments )
- {
- return "Matcher for finalizer-classes: " + finalizerClasses;
- }
-
- } );
- }
-
// void expectSetArchiverFilters()
// {
// ( ( FilterEnabled ) archiver ).setArchiveFilters( null );
// archiverControl.setMatcher( MockControl.ALWAYS_MATCHER );
// }
- void expectGetArchiver( String format, Class archiverClass )
+ void expectGetArchiver( final String format, final Class<?> archiverClass )
{
createArchiver( archiverClass );
@@ -666,7 +619,7 @@ public class DefaultAssemblyArchiverTest
{
archiverManager.getArchiver( format );
}
- catch ( NoSuchArchiverException e )
+ catch ( final NoSuchArchiverException e )
{
Assert.fail( "should never happen" );
}
@@ -674,7 +627,7 @@ public class DefaultAssemblyArchiverTest
control.setReturnValue( archiver );
}
- void expectGetArchiver( String format, Archiver archiver )
+ void expectGetArchiver( final String format, final Archiver archiver )
throws NoSuchArchiverException
{
archiverManager.getArchiver( format );
@@ -686,51 +639,40 @@ public class DefaultAssemblyArchiverTest
extends TarArchiver
{
- boolean archiveCreated;
-
- boolean optionsRetrieved;
-
TarCompressionMethod compressionMethod;
- int defaultDirMode;
-
- int defaultFileMode;
-
TarLongFileMode longFileMode;
- TarOptions options;
-
+ @Override
protected void execute()
throws ArchiverException, IOException
{
- defaultDirMode = getOverrideDirectoryMode();
- defaultFileMode = getOverrideFileMode();
-
- archiveCreated = true;
super.createArchive();
}
+ @Override
public TarOptions getOptions()
{
- optionsRetrieved = true;
return super.getOptions();
}
- public void setCompression( TarCompressionMethod mode )
+ @Override
+ public void setCompression( final TarCompressionMethod mode )
{
compressionMethod = mode;
super.setCompression( mode );
}
- public void setLongfile( TarLongFileMode mode )
+ @Override
+ public void setLongfile( final TarLongFileMode mode )
{
longFileMode = mode;
super.setLongfile( mode );
}
- public void setOptions( TarOptions options )
+ @Override
+ public void setOptions( final TarOptions options )
{
- this.options = options;
super.setOptions( options );
}
@@ -742,7 +684,8 @@ public class DefaultAssemblyArchiverTest
boolean ignoreWebxml;
- public void setIgnoreWebxml( boolean ignore )
+ @Override
+ public void setIgnoreWebxml( final boolean ignore )
{
ignoreWebxml = ignore;
super.setIgnoreWebxml( ignore );
@@ -759,85 +702,85 @@ public class DefaultAssemblyArchiverTest
public static final class TestArchiverWithConfig
implements Archiver
{
-
+
private String simpleConfig;
-
- public void setSimpleConfig( String simpleConfig )
+
+ public void setSimpleConfig( final String simpleConfig )
{
this.simpleConfig = simpleConfig;
}
-
+
public String getSimpleConfig()
{
return simpleConfig;
}
- public void addArchivedFileSet( File arg0 )
+ public void addArchivedFileSet( final File arg0 )
throws ArchiverException
{
}
- public void addArchivedFileSet( ArchivedFileSet arg0 )
+ public void addArchivedFileSet( final ArchivedFileSet arg0 )
throws ArchiverException
{
}
- public void addArchivedFileSet( File arg0, String arg1 )
+ public void addArchivedFileSet( final File arg0, final String arg1 )
throws ArchiverException
{
}
- public void addArchivedFileSet( File arg0, String[] arg1, String[] arg2 )
+ public void addArchivedFileSet( final File arg0, final String[] arg1, final String[] arg2 )
throws ArchiverException
{
}
- public void addArchivedFileSet( File arg0, String arg1, String[] arg2, String[] arg3 )
+ public void addArchivedFileSet( final File arg0, final String arg1, final String[] arg2, final String[] arg3 )
throws ArchiverException
{
}
- public void addDirectory( File arg0 )
+ public void addDirectory( final File arg0 )
throws ArchiverException
{
}
- public void addDirectory( File arg0, String arg1 )
+ public void addDirectory( final File arg0, final String arg1 )
throws ArchiverException
{
}
- public void addDirectory( File arg0, String[] arg1, String[] arg2 )
+ public void addDirectory( final File arg0, final String[] arg1, final String[] arg2 )
throws ArchiverException
{
}
- public void addDirectory( File arg0, String arg1, String[] arg2, String[] arg3 )
+ public void addDirectory( final File arg0, final String arg1, final String[] arg2, final String[] arg3 )
throws ArchiverException
{
}
- public void addFile( File arg0, String arg1 )
+ public void addFile( final File arg0, final String arg1 )
throws ArchiverException
{
}
- public void addFile( File arg0, String arg1, int arg2 )
+ public void addFile( final File arg0, final String arg1, final int arg2 )
throws ArchiverException
{
}
- public void addFileSet( FileSet arg0 )
+ public void addFileSet( final FileSet arg0 )
throws ArchiverException
{
}
- public void addResource( PlexusIoResource arg0, String arg1, int arg2 )
+ public void addResource( final PlexusIoResource arg0, final String arg1, final int arg2 )
throws ArchiverException
{
}
- public void addResources( PlexusIoResourceCollection arg0 )
+ public void addResources( final PlexusIoResourceCollection arg0 )
throws ArchiverException
{
}
@@ -862,6 +805,7 @@ public class DefaultAssemblyArchiverTest
return null;
}
+ @SuppressWarnings( "rawtypes" )
public Map getFiles()
{
return null;
@@ -888,27 +832,27 @@ public class DefaultAssemblyArchiverTest
return false;
}
- public void setDefaultDirectoryMode( int arg0 )
+ public void setDefaultDirectoryMode( final int arg0 )
{
}
- public void setDefaultFileMode( int arg0 )
+ public void setDefaultFileMode( final int arg0 )
{
}
- public void setDestFile( File arg0 )
+ public void setDestFile( final File arg0 )
{
}
- public void setDotFileDirectory( File arg0 )
+ public void setDotFileDirectory( final File arg0 )
{
}
- public void setForced( boolean arg0 )
+ public void setForced( final boolean arg0 )
{
}
- public void setIncludeEmptyDirs( boolean arg0 )
+ public void setIncludeEmptyDirs( final boolean arg0 )
{
}
@@ -917,7 +861,7 @@ public class DefaultAssemblyArchiverTest
return Archiver.DUPLICATES_ADD;
}
- public void setDuplicateBehavior( String duplicate )
+ public void setDuplicateBehavior( final String duplicate )
{
}
@@ -941,11 +885,11 @@ public class DefaultAssemblyArchiverTest
return 0;
}
- public void setDirectoryMode( int mode )
+ public void setDirectoryMode( final int mode )
{
}
- public void setFileMode( int mode )
+ public void setFileMode( final int mode )
{
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java Tue Sep 21 20:34:50 2010
@@ -31,7 +31,7 @@ import org.easymock.MockControl;
import java.io.File;
import java.io.IOException;
-import java.util.Collections;
+import java.util.ArrayList;
import java.util.List;
import junit.framework.TestCase;
@@ -40,33 +40,34 @@ public class AssemblyProxyArchiverTest
extends TestCase
{
- private TestFileManager fileManager = new TestFileManager( "massembly-proxyArchiver", "" );
+ private final TestFileManager fileManager = new TestFileManager( "massembly-proxyArchiver", "" );
- public void tearDown()
- throws Exception
+ @Override
+ public void tearDown() throws Exception
{
fileManager.cleanUp();
}
- public void testAddFile_NoPerms_CallAcceptFilesOnlyOnce()
- throws IOException, ArchiverException
+ public void testAddFile_NoPerms_CallAcceptFilesOnlyOnce() throws IOException, ArchiverException
{
- MockControl delegateControl = MockControl.createControl( Archiver.class );
- Archiver delegate = (Archiver) delegateControl.getMock();
+ final MockControl delegateControl = MockControl.createControl( Archiver.class );
+ final Archiver delegate = (Archiver) delegateControl.getMock();
delegate.addFile( null, null );
delegateControl.setMatcher( MockControl.ALWAYS_MATCHER );
delegateControl.setVoidCallable();
- CounterSelector counter = new CounterSelector( true );
- List selectors = Collections.singletonList( counter );
+ final CounterSelector counter = new CounterSelector( true );
+ final List<FileSelector> selectors = new ArrayList<FileSelector>();
+ selectors.add( counter );
delegateControl.replay();
- AssemblyProxyArchiver archiver = new AssemblyProxyArchiver( "", delegate, Collections.EMPTY_LIST, selectors,
- Collections.EMPTY_LIST, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ final AssemblyProxyArchiver archiver =
+ new AssemblyProxyArchiver( "", delegate, null, selectors, null, new ConsoleLogger( Logger.LEVEL_DEBUG,
+ "test" ) );
- File inputFile = fileManager.createTempFile();
+ final File inputFile = fileManager.createTempFile();
archiver.addFile( inputFile, "file.txt" );
@@ -75,25 +76,26 @@ public class AssemblyProxyArchiverTest
delegateControl.verify();
}
- public void testAddDirectory_NoPerms_CallAcceptFilesOnlyOnce()
- throws IOException, ArchiverException
+ public void testAddDirectory_NoPerms_CallAcceptFilesOnlyOnce() throws IOException, ArchiverException
{
- Archiver delegate = new JarArchiver();
+ final Archiver delegate = new JarArchiver();
- File output = fileManager.createTempFile();
+ final File output = fileManager.createTempFile();
delegate.setDestFile( output );
- CounterSelector counter = new CounterSelector( true );
- List selectors = Collections.singletonList( counter );
+ final CounterSelector counter = new CounterSelector( true );
+ final List<FileSelector> selectors = new ArrayList<FileSelector>();
+ selectors.add( counter );
+
+ final AssemblyProxyArchiver archiver =
+ new AssemblyProxyArchiver( "", delegate, null, selectors, null, new ConsoleLogger( Logger.LEVEL_DEBUG,
+ "test" ) );
- AssemblyProxyArchiver archiver = new AssemblyProxyArchiver( "", delegate, Collections.EMPTY_LIST, selectors,
- Collections.EMPTY_LIST, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
-
- File dir = fileManager.createTempDir();
+ final File dir = fileManager.createTempDir();
fileManager.createFile( dir, "file.txt", "This is a test." );
archiver.addDirectory( dir );
-
+
archiver.createArchive();
assertEquals( 1, counter.getCount() );
@@ -107,7 +109,7 @@ public class AssemblyProxyArchiverTest
private boolean answer = false;
- public CounterSelector( boolean answer )
+ public CounterSelector( final boolean answer )
{
this.answer = answer;
}
@@ -117,8 +119,7 @@ public class AssemblyProxyArchiverTest
return count;
}
- public boolean isSelected( FileInfo fileInfo )
- throws IOException
+ public boolean isSelected( final FileInfo fileInfo ) throws IOException
{
if ( fileInfo.isFile() )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java Tue Sep 21 20:34:50 2010
@@ -21,11 +21,11 @@ package org.apache.maven.plugin.assembly
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Model;
+import org.apache.maven.plugin.assembly.DefaultAssemblyContext;
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock;
import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.DependencySet;
@@ -45,20 +45,21 @@ public class DependencySetAssemblyPhaseT
extends TestCase
{
- private MockManager mockManager = new MockManager();
+ private final MockManager mockManager = new MockManager();
public void testExecute_ShouldAddOneDependencyFromProject()
- throws AssemblyFormattingException, ArchiveCreationException, IOException, InvalidAssemblerConfigurationException
+ throws AssemblyFormattingException, ArchiveCreationException, IOException,
+ InvalidAssemblerConfigurationException
{
- String outputLocation = "/out";
+ final String outputLocation = "/out";
- MavenProject project = newMavenProject( "group", "project", "0" );
+ final MavenProject project = newMavenProject( "group", "project", "0" );
- ArtifactMock projectArtifactMock = new ArtifactMock( mockManager, "group", "project", "0", "jar", false );
+ final ArtifactMock projectArtifactMock = new ArtifactMock( mockManager, "group", "project", "0", "jar", false );
project.setArtifact( projectArtifactMock.getArtifact() );
- DependencySet ds = new DependencySet();
+ final DependencySet ds = new DependencySet();
ds.setUseProjectArtifact( false );
ds.setOutputDirectory( outputLocation );
ds.setOutputFileNameMapping( "${artifact.artifactId}" );
@@ -66,47 +67,51 @@ public class DependencySetAssemblyPhaseT
ds.setScope( Artifact.SCOPE_COMPILE );
ds.setFileMode( Integer.toString( 10, 8 ) );
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setId( "test" );
assembly.setIncludeBaseDirectory( false );
assembly.addDependencySet( ds );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager, project );
+ final MockAndControlForAddDependencySetsTask macTask =
+ new MockAndControlForAddDependencySetsTask( mockManager, project );
- ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "dep", "1", "jar", false );
- File artifactFile = artifactMock.setNewFile();
+ final ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "dep", "1", "jar", false );
+ final File artifactFile = artifactMock.setNewFile();
- System.out.println( "On test setup, hashcode for dependency artifact: " + artifactMock.getArtifact().hashCode() );
+ System.out.println( "On test setup, hashcode for dependency artifact: " + artifactMock.getArtifact()
+ .hashCode() );
macTask.expectCSGetRepositories( null, null );
- macTask.expectResolveDependencies( Collections.singleton( artifactMock.getArtifact() ) );
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectAddFile( artifactFile, "out/dep", 10 );
macTask.expectGetSession( null );
-
+
project.setArtifacts( Collections.singleton( artifactMock.getArtifact() ) );
macTask.expectCSGetFinalName( "final-name" );
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- MavenProject depProject = newMavenProject( "group", "dep", "1" );
+ final MavenProject depProject = newMavenProject( "group", "dep", "1" );
macTask.expectBuildFromRepository( depProject );
mockManager.replayAll();
- createPhase( macTask, logger ).execute( assembly, macTask.archiver, macTask.configSource );
+ final DefaultAssemblyContext context = new DefaultAssemblyContext();
+ context.setResolvedArtifacts( Collections.singleton( artifactMock.getArtifact() ) );
+
+ createPhase( macTask, logger ).execute( assembly, macTask.archiver, macTask.configSource, context );
mockManager.verifyAll();
}
- private MavenProject newMavenProject( String groupId, String artifactId, String version )
+ private MavenProject newMavenProject( final String groupId, final String artifactId, final String version )
{
- Model model = new Model();
+ final Model model = new Model();
model.setGroupId( groupId );
model.setArtifactId( artifactId );
model.setVersion( version );
@@ -115,36 +120,37 @@ public class DependencySetAssemblyPhaseT
}
public void testExecute_ShouldNotAddDependenciesWhenProjectHasNone()
- throws AssemblyFormattingException, ArchiveCreationException, IOException, InvalidAssemblerConfigurationException
+ throws AssemblyFormattingException, ArchiveCreationException, IOException,
+ InvalidAssemblerConfigurationException
{
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setId( "test" );
assembly.setIncludeBaseDirectory( false );
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager, null );
+ final MockAndControlForAddDependencySetsTask macTask =
+ new MockAndControlForAddDependencySetsTask( mockManager, null );
mockManager.replayAll();
- createPhase( macTask, logger ).execute( assembly, null, macTask.configSource );
+ createPhase( macTask, logger ).execute( assembly, null, macTask.configSource, new DefaultAssemblyContext() );
mockManager.verifyAll();
}
- private DependencySetAssemblyPhase createPhase( MockAndControlForAddDependencySetsTask macTask, Logger logger )
+ private DependencySetAssemblyPhase createPhase( final MockAndControlForAddDependencySetsTask macTask,
+ final Logger logger )
{
MavenProjectBuilder projectBuilder = null;
- DependencyResolver dependencyResolver = null;
if ( macTask != null )
{
projectBuilder = macTask.projectBuilder;
- dependencyResolver = macTask.dependencyResolver;
}
- DependencySetAssemblyPhase phase = new DependencySetAssemblyPhase( projectBuilder, dependencyResolver, logger );
+ final DependencySetAssemblyPhase phase = new DependencySetAssemblyPhase( projectBuilder, logger );
phase.enableLogging( logger );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java Tue Sep 21 20:34:50 2010
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.assembly
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
+import org.apache.maven.plugin.assembly.DefaultAssemblyContext;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.model.Assembly;
@@ -45,8 +46,9 @@ public class FileItemAssemblyPhaseTest
extends TestCase
{
- private TestFileManager fileManager = new TestFileManager( "file-item-phase.test.", "" );
+ private final TestFileManager fileManager = new TestFileManager( "file-item-phase.test.", "" );
+ @Override
public void tearDown()
throws IOException
{
@@ -56,22 +58,22 @@ public class FileItemAssemblyPhaseTest
public void testExecute_ShouldAddNothingWhenNoFileItemsArePresent()
throws ArchiveCreationException, AssemblyFormattingException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
+ final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
- File basedir = fileManager.createTempDir();
+ final File basedir = fileManager.createTempDir();
macCS.expectGetBasedir( basedir );
- MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
+ final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setId( "test" );
mm.replayAll();
- createPhase( macLogger.logger ).execute( assembly, null, macCS.configSource );
+ createPhase( macLogger.logger ).execute( assembly, null, macCS.configSource, new DefaultAssemblyContext() );
mm.verifyAll();
}
@@ -79,17 +81,17 @@ public class FileItemAssemblyPhaseTest
public void testExecute_ShouldAddAbsoluteFileNoFilterNoLineEndingConversion()
throws ArchiveCreationException, AssemblyFormattingException, IOException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
+ final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
- File basedir = fileManager.createTempDir();
+ final File basedir = fileManager.createTempDir();
- File file = fileManager.createFile( basedir, "file.txt", "This is a test file." );
+ final File file = fileManager.createFile( basedir, "file.txt", "This is a test file." );
macCS.expectGetBasedir( basedir );
- File tempRoot = fileManager.createTempDir();
+ final File tempRoot = fileManager.createTempDir();
macCS.expectGetTemporaryRootDirectory( tempRoot );
@@ -97,26 +99,29 @@ public class FileItemAssemblyPhaseTest
macCS.expectGetFinalName( "final-name" );
- MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
+ final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
- MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
+ final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setId( "test" );
- FileItem fi = new FileItem();
+ final FileItem fi = new FileItem();
fi.setSource( file.getAbsolutePath() );
fi.setFiltered( false );
fi.setLineEnding( "keep" );
fi.setFileMode( "777" );
- macArchiver.expectAddFile( file, "file.txt", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macArchiver.expectAddFile( file,
+ "file.txt",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
assembly.addFile( fi );
mm.replayAll();
- createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
+ createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource,
+ new DefaultAssemblyContext() );
mm.verifyAll();
}
@@ -124,17 +129,17 @@ public class FileItemAssemblyPhaseTest
public void testExecute_ShouldAddRelativeFileNoFilterNoLineEndingConversion()
throws ArchiveCreationException, AssemblyFormattingException, IOException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
+ final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
- File basedir = fileManager.createTempDir();
+ final File basedir = fileManager.createTempDir();
- File file = fileManager.createFile( basedir, "file.txt", "This is a test file." );
+ final File file = fileManager.createFile( basedir, "file.txt", "This is a test file." );
macCS.expectGetBasedir( basedir );
- File tempRoot = fileManager.createTempDir();
+ final File tempRoot = fileManager.createTempDir();
macCS.expectGetTemporaryRootDirectory( tempRoot );
@@ -142,26 +147,29 @@ public class FileItemAssemblyPhaseTest
macCS.expectGetFinalName( "final-name" );
- MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
+ final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
- MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
+ final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setId( "test" );
- FileItem fi = new FileItem();
+ final FileItem fi = new FileItem();
fi.setSource( "file.txt" );
fi.setFiltered( false );
fi.setLineEnding( "keep" );
fi.setFileMode( "777" );
- macArchiver.expectAddFile( file, "file.txt", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macArchiver.expectAddFile( file,
+ "file.txt",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
assembly.addFile( fi );
mm.replayAll();
- createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
+ createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource,
+ new DefaultAssemblyContext() );
mm.verifyAll();
}
@@ -169,19 +177,21 @@ public class FileItemAssemblyPhaseTest
public void testExecute_WithOutputDirectory()
throws Exception
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
+ final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
- File basedir = fileManager.createTempDir();
+ final File basedir = fileManager.createTempDir();
- File readmeFile = fileManager.createFile( basedir, "README.txt", "This is a test file for README.txt." );
- File licenseFile = fileManager.createFile( basedir, "LICENSE.txt", "This is a test file for LICENSE.txt." );
- File configFile = fileManager.createFile( basedir, "config/config.txt", "This is a test file for config/config.txt" );
+ final File readmeFile = fileManager.createFile( basedir, "README.txt", "This is a test file for README.txt." );
+ final File licenseFile =
+ fileManager.createFile( basedir, "LICENSE.txt", "This is a test file for LICENSE.txt." );
+ final File configFile =
+ fileManager.createFile( basedir, "config/config.txt", "This is a test file for config/config.txt" );
macCS.expectGetBasedir( basedir );
- File tempRoot = fileManager.createTempDir();
+ final File tempRoot = fileManager.createTempDir();
macCS.expectGetTemporaryRootDirectory( tempRoot );
@@ -189,38 +199,44 @@ public class FileItemAssemblyPhaseTest
macCS.expectGetFinalName( "final-name" );
- MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
+ final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
- MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
+ final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setId( "test" );
assembly.setIncludeBaseDirectory( true );
- FileItem readmeFileItem = new FileItem();
+ final FileItem readmeFileItem = new FileItem();
readmeFileItem.setSource( "README.txt" );
readmeFileItem.setOutputDirectory( "" );
readmeFileItem.setFiltered( false );
readmeFileItem.setLineEnding( "keep" );
readmeFileItem.setFileMode( "777" );
- FileItem licenseFileItem = new FileItem();
+ final FileItem licenseFileItem = new FileItem();
licenseFileItem.setSource( "LICENSE.txt" );
licenseFileItem.setOutputDirectory( "/" );
licenseFileItem.setFiltered( false );
licenseFileItem.setLineEnding( "keep" );
licenseFileItem.setFileMode( "777" );
- FileItem configFileItem = new FileItem();
+ final FileItem configFileItem = new FileItem();
configFileItem.setSource( "config/config.txt" );
configFileItem.setOutputDirectory( "config" );
configFileItem.setFiltered( false );
configFileItem.setLineEnding( "keep" );
configFileItem.setFileMode( "777" );
- macArchiver.expectAddFile( readmeFile, "README.txt", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macArchiver.expectAddFile( licenseFile, "LICENSE.txt", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macArchiver.expectAddFile( configFile, "config/config.txt", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macArchiver.expectAddFile( readmeFile,
+ "README.txt",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macArchiver.expectAddFile( licenseFile,
+ "LICENSE.txt",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macArchiver.expectAddFile( configFile,
+ "config/config.txt",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
assembly.addFile( readmeFileItem );
assembly.addFile( licenseFileItem );
@@ -228,7 +244,8 @@ public class FileItemAssemblyPhaseTest
mm.replayAll();
- createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
+ createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource,
+ new DefaultAssemblyContext() );
mm.verifyAll();
}
@@ -236,20 +253,21 @@ public class FileItemAssemblyPhaseTest
public void testExecute_WithOutputDirectoryAndDestName()
throws Exception
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
+ final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
- File basedir = fileManager.createTempDir();
+ final File basedir = fileManager.createTempDir();
- File readmeFile = fileManager.createFile( basedir, "README.txt", "This is a test file for README.txt." );
- File licenseFile = fileManager.createFile( basedir, "LICENSE.txt", "This is a test file for LICENSE.txt." );
- File configFile = fileManager.createFile( basedir, "config/config.txt",
- "This is a test file for config/config.txt" );
+ final File readmeFile = fileManager.createFile( basedir, "README.txt", "This is a test file for README.txt." );
+ final File licenseFile =
+ fileManager.createFile( basedir, "LICENSE.txt", "This is a test file for LICENSE.txt." );
+ final File configFile =
+ fileManager.createFile( basedir, "config/config.txt", "This is a test file for config/config.txt" );
macCS.expectGetBasedir( basedir );
- File tempRoot = fileManager.createTempDir();
+ final File tempRoot = fileManager.createTempDir();
macCS.expectGetTemporaryRootDirectory( tempRoot );
@@ -257,15 +275,15 @@ public class FileItemAssemblyPhaseTest
macCS.expectGetFinalName( "final-name" );
- MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
+ final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
- MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
+ final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setId( "test" );
assembly.setIncludeBaseDirectory( true );
- FileItem readmeFileItem = new FileItem();
+ final FileItem readmeFileItem = new FileItem();
readmeFileItem.setSource( "README.txt" );
readmeFileItem.setOutputDirectory( "" );
readmeFileItem.setDestName( "README_renamed.txt" );
@@ -273,7 +291,7 @@ public class FileItemAssemblyPhaseTest
readmeFileItem.setLineEnding( "keep" );
readmeFileItem.setFileMode( "777" );
- FileItem licenseFileItem = new FileItem();
+ final FileItem licenseFileItem = new FileItem();
licenseFileItem.setSource( "LICENSE.txt" );
licenseFileItem.setOutputDirectory( "/" );
licenseFileItem.setDestName( "LICENSE_renamed.txt" );
@@ -281,7 +299,7 @@ public class FileItemAssemblyPhaseTest
licenseFileItem.setLineEnding( "keep" );
licenseFileItem.setFileMode( "777" );
- FileItem configFileItem = new FileItem();
+ final FileItem configFileItem = new FileItem();
configFileItem.setSource( "config/config.txt" );
configFileItem.setDestName( "config_renamed.txt" );
configFileItem.setOutputDirectory( "config" );
@@ -289,9 +307,15 @@ public class FileItemAssemblyPhaseTest
configFileItem.setLineEnding( "keep" );
configFileItem.setFileMode( "777" );
- macArchiver.expectAddFile( readmeFile, "README_renamed.txt", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macArchiver.expectAddFile( licenseFile, "LICENSE_renamed.txt", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macArchiver.expectAddFile( configFile, "config/config_renamed.txt", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macArchiver.expectAddFile( readmeFile,
+ "README_renamed.txt",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macArchiver.expectAddFile( licenseFile,
+ "LICENSE_renamed.txt",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macArchiver.expectAddFile( configFile,
+ "config/config_renamed.txt",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
assembly.addFile( readmeFileItem );
assembly.addFile( licenseFileItem );
@@ -299,7 +323,8 @@ public class FileItemAssemblyPhaseTest
mm.replayAll();
- createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
+ createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource,
+ new DefaultAssemblyContext() );
mm.verifyAll();
}
@@ -307,20 +332,21 @@ public class FileItemAssemblyPhaseTest
public void testExecute_WithOutputDirectoryAndDestNameAndIncludeBaseDirectoryFalse()
throws Exception
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
+ final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
- File basedir = fileManager.createTempDir();
+ final File basedir = fileManager.createTempDir();
- File readmeFile = fileManager.createFile( basedir, "README.txt", "This is a test file for README.txt." );
- File licenseFile = fileManager.createFile( basedir, "LICENSE.txt", "This is a test file for LICENSE.txt." );
- File configFile = fileManager.createFile( basedir, "config/config.txt",
- "This is a test file for config/config.txt" );
+ final File readmeFile = fileManager.createFile( basedir, "README.txt", "This is a test file for README.txt." );
+ final File licenseFile =
+ fileManager.createFile( basedir, "LICENSE.txt", "This is a test file for LICENSE.txt." );
+ final File configFile =
+ fileManager.createFile( basedir, "config/config.txt", "This is a test file for config/config.txt" );
macCS.expectGetBasedir( basedir );
- File tempRoot = fileManager.createTempDir();
+ final File tempRoot = fileManager.createTempDir();
macCS.expectGetTemporaryRootDirectory( tempRoot );
@@ -328,29 +354,29 @@ public class FileItemAssemblyPhaseTest
macCS.expectGetFinalName( "final-name" );
- MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
+ final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
- MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
+ final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setId( "test" );
assembly.setIncludeBaseDirectory( false );
- FileItem readmeFileItem = new FileItem();
+ final FileItem readmeFileItem = new FileItem();
readmeFileItem.setSource( "README.txt" );
readmeFileItem.setDestName( "README_renamed.txt" );
readmeFileItem.setFiltered( false );
readmeFileItem.setLineEnding( "keep" );
readmeFileItem.setFileMode( "777" );
- FileItem licenseFileItem = new FileItem();
+ final FileItem licenseFileItem = new FileItem();
licenseFileItem.setSource( "LICENSE.txt" );
licenseFileItem.setDestName( "LICENSE_renamed.txt" );
licenseFileItem.setFiltered( false );
licenseFileItem.setLineEnding( "keep" );
licenseFileItem.setFileMode( "777" );
- FileItem configFileItem = new FileItem();
+ final FileItem configFileItem = new FileItem();
configFileItem.setSource( "config/config.txt" );
configFileItem.setDestName( "config_renamed.txt" );
configFileItem.setOutputDirectory( "config" );
@@ -358,9 +384,15 @@ public class FileItemAssemblyPhaseTest
configFileItem.setLineEnding( "keep" );
configFileItem.setFileMode( "777" );
- macArchiver.expectAddFile( readmeFile, "README_renamed.txt", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macArchiver.expectAddFile( licenseFile, "LICENSE_renamed.txt", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- macArchiver.expectAddFile( configFile, "config/config_renamed.txt", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macArchiver.expectAddFile( readmeFile,
+ "README_renamed.txt",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macArchiver.expectAddFile( licenseFile,
+ "LICENSE_renamed.txt",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macArchiver.expectAddFile( configFile,
+ "config/config_renamed.txt",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
assembly.addFile( readmeFileItem );
assembly.addFile( licenseFileItem );
@@ -368,14 +400,15 @@ public class FileItemAssemblyPhaseTest
mm.replayAll();
- createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource );
+ createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource,
+ new DefaultAssemblyContext() );
mm.verifyAll();
}
- private FileItemAssemblyPhase createPhase( Logger logger )
+ private FileItemAssemblyPhase createPhase( final Logger logger )
{
- FileItemAssemblyPhase phase = new FileItemAssemblyPhase();
+ final FileItemAssemblyPhase phase = new FileItemAssemblyPhase();
phase.enableLogging( logger );
return phase;
@@ -387,21 +420,21 @@ public class FileItemAssemblyPhaseTest
MockControl control;
- public MockAndControlForArchiver( MockManager mockManager )
+ public MockAndControlForArchiver( final MockManager mockManager )
{
control = MockControl.createControl( Archiver.class );
mockManager.add( control );
- archiver = ( Archiver ) control.getMock();
+ archiver = (Archiver) control.getMock();
}
- public void expectAddFile( File file, String outputLocation, int fileMode )
+ public void expectAddFile( final File file, final String outputLocation, final int fileMode )
{
try
{
archiver.addFile( file, outputLocation, fileMode );
}
- catch ( ArchiverException e )
+ catch ( final ArchiverException e )
{
Assert.fail( "Should never happen." );
}
@@ -414,36 +447,36 @@ public class FileItemAssemblyPhaseTest
MockControl control;
- public MockAndControlForConfigSource( MockManager mockManager )
+ public MockAndControlForConfigSource( final MockManager mockManager )
{
control = MockControl.createControl( AssemblerConfigurationSource.class );
mockManager.add( control );
- configSource = ( AssemblerConfigurationSource ) control.getMock();
-
+ configSource = (AssemblerConfigurationSource) control.getMock();
+
configSource.getMavenSession();
control.setReturnValue( null, MockControl.ZERO_OR_MORE );
}
- public void expectGetProject( MavenProject project )
+ public void expectGetProject( final MavenProject project )
{
configSource.getProject();
control.setReturnValue( project, MockControl.ONE_OR_MORE );
}
- public void expectGetFinalName( String finalName )
+ public void expectGetFinalName( final String finalName )
{
configSource.getFinalName();
control.setReturnValue( finalName, MockControl.ONE_OR_MORE );
}
- public void expectGetTemporaryRootDirectory( File tempRoot )
+ public void expectGetTemporaryRootDirectory( final File tempRoot )
{
configSource.getTemporaryRootDirectory();
control.setReturnValue( tempRoot, MockControl.ONE_OR_MORE );
}
- public void expectGetBasedir( File basedir )
+ public void expectGetBasedir( final File basedir )
{
configSource.getBasedir();
control.setReturnValue( basedir, MockControl.ONE_OR_MORE );
@@ -456,12 +489,12 @@ public class FileItemAssemblyPhaseTest
MockControl control;
- public MockAndControlForLogger( MockManager mockManager )
+ public MockAndControlForLogger( final MockManager mockManager )
{
control = MockControl.createControl( Logger.class );
mockManager.add( control );
- logger = ( Logger ) control.getMock();
+ logger = (Logger) control.getMock();
}
}