You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2014/10/23 21:08:21 UTC
svn commit: r1633925 - in /maven/plugins/trunk/maven-assembly-plugin/src:
main/java/org/apache/maven/plugin/assembly/archive/task/
main/java/org/apache/maven/plugin/assembly/format/
main/java/org/apache/maven/plugin/assembly/io/ test/java/org/apache/ma...
Author: krosenvold
Date: Thu Oct 23 19:08:20 2014
New Revision: 1633925
URL: http://svn.apache.org/r1633925
Log:
More cleanup
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.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/RepositoryAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.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/format/FileFormatterTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java?rev=1633925&r1=1633924&r2=1633925&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java Thu Oct 23 19:08:20 2014
@@ -19,7 +19,6 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
import org.codehaus.plexus.archiver.Archiver;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java?rev=1633925&r1=1633924&r2=1633925&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReflectionProperties.java Thu Oct 23 19:08:20 2014
@@ -40,7 +40,7 @@ public class ReflectionProperties
private final MavenProject project;
- boolean escapedBackslashesInFilePath;
+ final boolean escapedBackslashesInFilePath;
public ReflectionProperties( final MavenProject aProject, final boolean escapedBackslashesInFilePath )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java?rev=1633925&r1=1633924&r2=1633925&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java Thu Oct 23 19:08:20 2014
@@ -33,7 +33,7 @@ class RelativeFileLocatorStrategy
implements LocatorStrategy
{
- private File basedir;
+ private final File basedir;
public RelativeFileLocatorStrategy( File basedir )
{
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=1633925&r1=1633924&r2=1633925&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 Thu Oct 23 19:08:20 2014
@@ -195,8 +195,7 @@ public class DefaultAssemblyArchiverTest
macArchiverManager.expectGetArchiver( "dummy", archiver );
- final MockControl configCtl = MockControl.createControl( AssemblerConfigurationSource.class );
- final AssemblerConfigurationSource configSource = mm.createControl().createMock( AssemblerConfigurationSource.class);
+ final AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class);
final String simpleConfig = "value";
@@ -205,20 +204,15 @@ public class DefaultAssemblyArchiverTest
final MavenProject project = new MavenProject( new Model() );
- configSource.getProject();
- configCtl.setReturnValue( project, MockControl.ZERO_OR_MORE );
+ expect(configSource.getProject()).andReturn( project ).anyTimes();
- configSource.getMavenSession();
- configCtl.setReturnValue( null, MockControl.ZERO_OR_MORE );
+ expect(configSource.getMavenSession()).andReturn( null ).anyTimes();
- configSource.isDryRun();
- configCtl.setReturnValue( false, MockControl.ZERO_OR_MORE );
+ expect(configSource.isDryRun()).andReturn( false ).anyTimes();
- configSource.getWorkingDirectory();
- configCtl.setReturnValue( new File( "." ), MockControl.ZERO_OR_MORE );
+ expect(configSource.getWorkingDirectory()).andReturn( new File( "." )).anyTimes();
- configSource.isUpdateOnly();
- configCtl.setReturnValue( false, MockControl.ZERO_OR_MORE );
+ expect(configSource.isUpdateOnly()).andReturn( false ).anyTimes();
final ArtifactRepository lr = mm.createMock( ArtifactRepository.class );
@@ -510,12 +504,12 @@ public class DefaultAssemblyArchiverTest
private final class MockAndControlForAssemblyArchiver
{
- ArchiverManager archiverManager;
+ final ArchiverManager archiverManager;
Archiver archiver;
- DependencyResolver dependencyResolver;
+ final DependencyResolver dependencyResolver;
private final EasyMockSupport mm;
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=1633925&r1=1633924&r2=1633925&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 Thu Oct 23 19:08:20 2014
@@ -106,7 +106,7 @@ public class FileSetAssemblyPhaseTest
final int[] modes = { -1, -1, dirMode, fileMode };
- macTask.expectAdditionOfSingleFileSet( project, basedir, "final-name", false, modes, 1, true );
+ macTask.expectAdditionOfSingleFileSet( project, "final-name", false, modes, 1, true );
mm.replayAll();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java?rev=1633925&r1=1633924&r2=1633925&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java Thu Oct 23 19:08:20 2014
@@ -29,8 +29,6 @@ import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoBuilderConfigSourceWrapper;
-import org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoInfoWrapper;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.Repository;
@@ -126,7 +124,7 @@ public class RepositoryAssemblyPhaseTest
macArchiver.expectModeChange( -1, -1, mode, mode, true );
macArchiver.expectAddDirectory( outDir, "out/", null, null );
- macRepo.expectAssemble( outDir, repo, macCS.configSource );
+ macRepo.expectAssemble();
assembly.addRepository( repo );
@@ -175,108 +173,6 @@ public class RepositoryAssemblyPhaseTest
Assert.fail( "Should never happen." );
}
- // TODO: WTF
- /*
- control.setMatcher( new AbstractMatcher()
- {
-
- @Override
- protected boolean argumentMatches( final Object expected, final Object actual )
- {
- final FileSet e = (FileSet) expected;
- final FileSet a = (FileSet) actual;
-
- if ( !eq( e.getDirectory(), a.getDirectory() ) )
- {
- System.out.println( "FileSet directory expected: " + e.getDirectory() + "\nActual: "
- + a.getDirectory() );
-
- return false;
- }
-
- if ( !eq( e.getPrefix(), a.getPrefix() ) )
- {
- System.out.println( "FileSet prefix expected: " + e.getPrefix() + "\nActual: " + a.getPrefix() );
-
- return false;
- }
-
- if ( !areq( e.getIncludes(), a.getIncludes() ) )
- {
- System.out.println( "FileSet includes expected: " + arToStr( e.getIncludes() ) + "\nActual: "
- + arToStr( a.getIncludes() ) );
-
- return false;
- }
-
- if ( !areq( e.getExcludes(), a.getExcludes() ) )
- {
- System.out.println( "FileSet excludes expected: " + arToStr( e.getExcludes() ) + "\nActual: "
- + arToStr( a.getExcludes() ) );
-
- return false;
- }
-
- return true;
- }
-
- @Override
- protected String argumentToString( final Object argument )
- {
- final FileSet a = (FileSet) argument;
-
- return argument == null ? "Null FileSet" : "FileSet:[dir=" + a.getDirectory() + ", prefix: "
- + a.getPrefix() + "\nincludes:\n" + arToStr( a.getIncludes() ) + "\nexcludes:\n"
- + arToStr( a.getExcludes() ) + "]";
- }
-
- private String arToStr( final String[] array )
- {
- return array == null ? "-EMPTY-" : StringUtils.join( array, "\n\t" );
- }
-
- private boolean areq( final String[] first, final String[] second )
- {
- if ( ( first == null || first.length == 0 ) && ( second == null || second.length == 0 ) )
- {
- return true;
- }
- else if ( first == null && second != null )
- {
- return false;
- }
- else if ( first != null && second == null )
- {
- return false;
- }
- else
- {
- return Arrays.equals( first, second );
- }
- }
-
- private boolean eq( final Object first, final Object second )
- {
- if ( first == null && second == null )
- {
- return true;
- }
- else if ( first == null && second != null )
- {
- return false;
- }
- else if ( first != null && second == null )
- {
- return false;
- }
- else
- {
- return first.equals( second );
- }
- }
-
- } );*/
-
EasyMock.expectLastCall().atLeastOnce();
}
@@ -353,8 +249,7 @@ public class RepositoryAssemblyPhaseTest
repositoryAssembler = mockManager.createMock(RepositoryAssembler.class);
}
- public void expectAssemble( final File dir, final Repository repo,
- final AssemblerConfigurationSource configSource )
+ public void expectAssemble()
{
try
{
@@ -362,7 +257,6 @@ public class RepositoryAssemblyPhaseTest
(RepositoryInfo) anyObject(),
( RepositoryBuilderConfigSource)anyObject() );
EasyMock.expectLastCall().atLeastOnce();
-// control.setMatcher( MockControl.ALWAYS_MATCHER );
}
catch ( final RepositoryAssemblyException e )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java?rev=1633925&r1=1633924&r2=1633925&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java Thu Oct 23 19:08:20 2014
@@ -209,7 +209,7 @@ public class AddArtifactTaskTest
File artifactFile = artifactMock.setNewFile();
mac.expectGetDestFile( new File( "junk" ) );
- mac.expectAddArchivedFileSet( artifactFile, outputLocation, includes, excludes );
+ mac.expectAddArchivedFileSet();
mockManager.replayAll();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java?rev=1633925&r1=1633924&r2=1633925&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java Thu Oct 23 19:08:20 2014
@@ -226,8 +226,7 @@ public class AddDependencySetsTaskTest
if ( unpack )
{
- macTask.expectAddArchivedFileSet( artifactFile, outputLocation + "/",
- AddArtifactTask.DEFAULT_INCLUDES_ARRAY, null );
+ macTask.expectAddArchivedFileSet();
macTask.expectModeChange( -1, -1, 10, 10, 2 );
}
else
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java?rev=1633925&r1=1633924&r2=1633925&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java Thu Oct 23 19:08:20 2014
@@ -30,7 +30,6 @@ import org.apache.maven.plugin.assembly.
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.FileSet;
-import org.easymock.MockControl;
import org.easymock.classextension.EasyMockSupport;
import static org.easymock.EasyMock.anyObject;
@@ -86,7 +85,7 @@ public class AddDirectoryTaskTest
try
{
- archiver.addFileSet( (FileSet)anyObject());
+ archiver.addFileSet( (FileSet) anyObject() );
}
catch ( ArchiverException e )
{
@@ -113,7 +112,7 @@ public class AddDirectoryTaskTest
try
{
- archiver.addFileSet( (FileSet)anyObject() );
+ archiver.addFileSet( (FileSet) anyObject() );
}
catch ( ArchiverException e )
{
@@ -145,7 +144,7 @@ public class AddDirectoryTaskTest
try
{
- archiver.addFileSet( (FileSet)anyObject() );
+ archiver.addFileSet( (FileSet) anyObject() );
}
catch ( ArchiverException e )
{
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=1633925&r1=1633924&r2=1633925&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 Thu Oct 23 19:08:20 2014
@@ -74,8 +74,7 @@ public class MockAndControlForAddArtifac
expect(archiver.getDestFile()).andReturn( destFile ).atLeastOnce();
}
- public void expectAddArchivedFileSet( final File artifactFile, final String outputLocation,
- final String[] includes, final String[] excludes )
+ public void expectAddArchivedFileSet()
{
try
{
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=1633925&r1=1633924&r2=1633925&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 Thu Oct 23 19:08:20 2014
@@ -45,11 +45,11 @@ public class MockAndControlForAddDepende
public final Archiver archiver;
- public AssemblerConfigurationSource configSource;
+ public final AssemblerConfigurationSource configSource;
- public MavenProjectBuilder projectBuilder;
+ public final MavenProjectBuilder projectBuilder;
- public ArchiverManager archiverManager;
+ public final ArchiverManager archiverManager;
private final MavenProject project;
@@ -78,8 +78,7 @@ public class MockAndControlForAddDepende
expect(configSource.getProject()).andReturn( project ).anyTimes();
}
- public void expectAddArchivedFileSet( final File file, final String outputLocation, final String[] includes,
- final String[] excludes )
+ public void expectAddArchivedFileSet()
{
try
{
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=1633925&r1=1633924&r2=1633925&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 Thu Oct 23 19:08:20 2014
@@ -19,11 +19,7 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.io.File;
-
import junit.framework.Assert;
-
-import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
import org.apache.maven.project.MavenProject;
@@ -33,6 +29,8 @@ import org.codehaus.plexus.archiver.File
import org.easymock.EasyMock;
import org.easymock.classextension.EasyMockSupport;
+import java.io.File;
+
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect;
@@ -60,11 +58,6 @@ public class MockAndControlForAddFileSet
expect(configSource.getArchiveBaseDirectory()).andReturn( archiveBaseDir ).anyTimes();
}
- public void expectGetBasedir( File basedir )
- {
- expect( configSource.getBasedir()).andReturn( basedir ).anyTimes();
- }
-
void expectModeChanges( int[] modes, int modeChangeCount )
{
expect(archiver.getOverrideDirectoryMode()).andReturn( modes[0] );
@@ -98,8 +91,7 @@ public class MockAndControlForAddFileSet
}
}
- public void expectAdditionOfSingleFileSet( MavenProject project, File basedir, String finalName,
- boolean shouldAddDir, int[] modes, int modeChangeCount,
+ public void expectAdditionOfSingleFileSet( MavenProject project, String finalName, boolean shouldAddDir, int[] modes, int modeChangeCount,
boolean isDebugEnabled )
{
expectAdditionOfSingleFileSet( project, finalName, shouldAddDir, modes, modeChangeCount,
@@ -146,11 +138,6 @@ public class MockAndControlForAddFileSet
expect(configSource.getProject()).andReturn( project ).atLeastOnce();
}
- public void expectGetSession( MavenSession session )
- {
- expect(configSource.getMavenSession()).andReturn( session ).atLeastOnce();
- }
-
public void expectGetFinalName( String finalName )
{
expect( configSource.getFinalName()).andReturn( finalName ).atLeastOnce();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java?rev=1633925&r1=1633924&r2=1633925&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java Thu Oct 23 19:08:20 2014
@@ -28,7 +28,6 @@ import org.apache.maven.shared.filtering
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.easymock.MockControl;
import org.easymock.classextension.EasyMockSupport;
import java.io.File;
@@ -450,7 +449,7 @@ public class FileFormatterTest
final List<String> delimiters = Collections.unmodifiableList( Arrays.asList( "${*}", "@", "#", "(*)" ) );
- enableBasicFilteringConfiguration( basedir, Collections.singletonList( filterProps.getCanonicalPath() ), true,
+ enableBasicFilteringConfiguration( basedir, Collections.singletonList( filterProps.getCanonicalPath() ),
delimiters );
final File file =
@@ -475,7 +474,7 @@ public class FileFormatterTest
final List<String> delimiters = Collections.unmodifiableList( Arrays.asList( "#", "(*)" ) );
- enableBasicFilteringConfiguration( basedir, Collections.singletonList( filterProps.getCanonicalPath() ), false,
+ enableBasicFilteringConfiguration( basedir, Collections.singletonList( filterProps.getCanonicalPath() ),
delimiters );
final File file =
@@ -558,8 +557,7 @@ public class FileFormatterTest
enableFilteringConfiguration( project, basedir, null, configFilterFilenames, includeProjectBuildFilters );
}
- private void enableBasicFilteringConfiguration( final File basedir, final List<String> buildFilterFilenames,
- final boolean useDefault, final List<String> delimiters )
+ private void enableBasicFilteringConfiguration( final File basedir, final List<String> buildFilterFilenames, final List<String> delimiters )
throws Exception
{