You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2014/10/23 23:01:38 UTC
svn commit: r1633948 [21/21] - in /maven/plugins/branches/MASSEMBLY-704: ./
integration-test-archetype/
integration-test-archetype/src/main/resources/META-INF/maven/
integration-test-archetype/src/main/resources/archetype-resources/
integration-test-ar...
Modified: maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java Thu Oct 23 21:01:23 2014
@@ -28,6 +28,7 @@ import java.util.Map;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
+import org.codehaus.plexus.archiver.ArchiveEntry;
import org.codehaus.plexus.archiver.ArchivedFileSet;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
@@ -38,6 +39,9 @@ import org.codehaus.plexus.components.io
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.util.StringUtils;
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+
+import javax.annotation.Nonnull;
public class TrackingArchiverStub
implements Archiver
@@ -45,14 +49,10 @@ public class TrackingArchiverStub
private static final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- public boolean forced;
-
- public File destFile;
+ private File destFile;
public final List<Addition> added = new ArrayList<Addition>();
- public boolean created;
-
private boolean useJvmChmod;
private boolean ignorePermissions;
@@ -60,71 +60,83 @@ public class TrackingArchiverStub
public void createArchive()
throws ArchiverException, IOException
{
- created = true;
}
- public void addDirectory( final File directory )
+ public void addDirectory( final @Nonnull File directory )
throws ArchiverException
{
added.add( new Addition( directory, null, null, null, -1 ) );
}
- public void addDirectory( final File directory, final String prefix )
+ public void addDirectory( final @Nonnull File directory, final String prefix )
throws ArchiverException
{
added.add( new Addition( directory, prefix, null, null, -1 ) );
}
- public void addDirectory( final File directory, final String[] includes, final String[] excludes )
+ public void addDirectory( final @Nonnull File directory, final String[] includes, final String[] excludes )
throws ArchiverException
{
added.add( new Addition( directory, null, includes, excludes, -1 ) );
}
- public void addDirectory( final File directory, final String prefix, final String[] includes,
+ public void addDirectory( final @Nonnull File directory, final String prefix, final String[] includes,
final String[] excludes )
throws ArchiverException
{
added.add( new Addition( directory, prefix, includes, excludes, -1 ) );
}
- public void addFileSet( final FileSet fileSet )
+ public void addFileSet( final @Nonnull FileSet fileSet )
throws ArchiverException
{
added.add( new Addition( fileSet, null, null, null, -1 ) );
}
- public void addFile( final File inputFile, final String destFileName )
+ public void addFile( final @Nonnull File inputFile, final @Nonnull String destFileName )
throws ArchiverException
{
added.add( new Addition( inputFile, destFileName, null, null, -1 ) );
}
- public void addFile( final File inputFile, final String destFileName, final int permissions )
+ public void addFile( final @Nonnull File inputFile, final @Nonnull String destFileName, final int permissions )
throws ArchiverException
{
added.add( new Addition( inputFile, destFileName, null, null, permissions ) );
}
- public void addArchivedFileSet( final File archiveFile )
+ public void addArchivedFileSet( final @Nonnull File archiveFile )
throws ArchiverException
{
added.add( new Addition( archiveFile, null, null, null, -1 ) );
}
- public void addArchivedFileSet( final File archiveFile, final String prefix )
+ public void addArchivedFileSet( final @Nonnull File archiveFile, final String prefix )
throws ArchiverException
{
added.add( new Addition( archiveFile, prefix, null, null, -1 ) );
}
+ public void addSymlink( String s, String s2 )
+ throws ArchiverException
+ {
+ added.add( new Addition( s, null, null, null, -1 ) );
+ }
+
+ public void addSymlink( String s, int i, String s2 )
+ throws ArchiverException
+ {
+ added.add( new Addition( s, null, null, null, -1 ) );
+
+ }
+
public void addArchivedFileSet( final File archiveFile, final String[] includes, final String[] excludes )
throws ArchiverException
{
added.add( new Addition( archiveFile, null, includes, excludes, -1 ) );
}
- public void addArchivedFileSet( final File archiveFile, final String prefix, final String[] includes,
+ public void addArchivedFileSet( final @Nonnull File archiveFile, final String prefix, final String[] includes,
final String[] excludes )
throws ArchiverException
{
@@ -260,16 +272,18 @@ public class TrackingArchiverStub
{
}
- public ResourceIterator getResources()
+ public
+ @Nonnull
+ ResourceIterator getResources()
throws ArchiverException
{
- return null;
+ throw new NotImplementedException();
}
@SuppressWarnings( "rawtypes" )
- public Map getFiles()
+ public Map<String, ArchiveEntry> getFiles()
{
- return new HashMap();
+ return new HashMap<String, ArchiveEntry>();
}
public boolean isForced()
@@ -299,13 +313,18 @@ public class TrackingArchiverStub
{
/**
* {@inheritDoc}
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString()
{
- return "Addition (\n resource= " + resource + "\n directory= " + directory + "\n destination= " + destination + "\n permissions= " + permissions + "\n includes= " + (includes == null ? "-none-" : StringUtils.join(includes, ", ")) + "\n excludes= " + (excludes == null ? "-none-" : StringUtils.join(excludes, ", ")) + "\n)";
+ return "Addition (\n resource= " + resource + "\n directory= " + directory + "\n destination= "
+ + destination + "\n permissions= " + permissions + "\n includes= " + ( includes == null
+ ? "-none-"
+ : StringUtils.join( includes, ", " ) ) + "\n excludes= " + ( excludes == null
+ ? "-none-"
+ : StringUtils.join( excludes, ", " ) ) + "\n)";
}
public final Object resource;
Modified: maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java Thu Oct 23 21:01:23 2014
@@ -19,31 +19,25 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-
import junit.framework.TestCase;
-
import org.apache.maven.plugin.assembly.archive.ArchiveExpansionException;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.testutils.MockManager;
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
-import org.codehaus.plexus.util.IOUtil;
-import org.easymock.MockControl;
+import org.easymock.classextension.EasyMockSupport;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.easymock.EasyMock.expect;
public class AssemblyFileUtilsTest
extends TestCase
{
- private TestFileManager fileManager = new TestFileManager( "file-utils.test.", "" );
+ private final TestFileManager fileManager = new TestFileManager( "file-utils.test.", "" );
public void tearDown()
throws IOException
@@ -54,25 +48,18 @@ public class AssemblyFileUtilsTest
public void testUnpack_ShouldSetSourceAndDestinationAndCallExtract()
throws IOException, ArchiveExpansionException, NoSuchArchiverException
{
- MockManager mockManager = new MockManager();
+ EasyMockSupport mockManager = new EasyMockSupport();
File source = fileManager.createTempFile();
File destDir = fileManager.createTempDir();
- MockControl unarchiverCtl = MockControl.createControl( UnArchiver.class );
- mockManager.add( unarchiverCtl );
+ UnArchiver unarchiver = mockManager.createMock( UnArchiver.class );
- UnArchiver unarchiver = (UnArchiver) unarchiverCtl.getMock();
-
- MockControl archiverManagerCtl = MockControl.createControl( ArchiverManager.class );
- mockManager.add( archiverManagerCtl );
-
- ArchiverManager archiverManager = (ArchiverManager) archiverManagerCtl.getMock();
+ ArchiverManager archiverManager = mockManager.createMock( ArchiverManager.class );
try
{
- archiverManager.getUnArchiver( source );
- archiverManagerCtl.setReturnValue( unarchiver );
+ expect(archiverManager.getUnArchiver( source )).andReturn( unarchiver );
}
catch ( NoSuchArchiverException e )
{
@@ -98,222 +85,4 @@ public class AssemblyFileUtilsTest
mockManager.verifyAll();
}
- public void testGetLineEndingChars_ShouldReturnDosLineEnding()
- throws AssemblyFormattingException
- {
- assertEquals( "\r\n", AssemblyFileUtils.getLineEndingCharacters( "windows" ) );
- assertEquals( "\r\n", AssemblyFileUtils.getLineEndingCharacters( "dos" ) );
- assertEquals( "\r\n", AssemblyFileUtils.getLineEndingCharacters( "crlf" ) );
- }
-
- public void testGetLineEndingChars_ShouldReturnUnixLineEnding()
- throws AssemblyFormattingException
- {
- assertEquals( "\n", AssemblyFileUtils.getLineEndingCharacters( "unix" ) );
- assertEquals( "\n", AssemblyFileUtils.getLineEndingCharacters( "lf" ) );
- }
-
- public void testGetLineEndingChars_ShouldReturnNullLineEnding()
- throws AssemblyFormattingException
- {
- assertNull( AssemblyFileUtils.getLineEndingCharacters( "keep" ) );
- }
-
- public void testGetLineEndingChars_ShouldThrowFormattingExceptionWithInvalidHint()
- {
- try
- {
- AssemblyFileUtils.getLineEndingCharacters( "invalid" );
-
- fail( "Invalid line-ending hint should throw a formatting exception." );
- }
- catch ( AssemblyFormattingException e )
- {
- }
- }
-
- public void testConvertLineEndings_ShouldReplaceLFWithCRLF()
- throws IOException
- {
- String test = "This is a \ntest.";
- String check = "This is a \r\ntest.";
-
- testConversion( test, check, "\r\n", null );
- }
-
- public void testConvertLineEndings_ShouldReplaceLFWithCRLFAtEOF()
- throws IOException
- {
- String test = "This is a \ntest.\n";
- String check = "This is a \r\ntest.\r\n";
-
- testConversion( test, check, "\r\n", null );
- }
-
- public void testConvertLineEndings_ShouldReplaceCRLFWithLF()
- throws IOException
- {
- String test = "This is a \r\ntest.";
- String check = "This is a \ntest.";
-
- testConversion( test, check, "\n", null );
- }
-
- public void testConvertLineEndings_ShouldReplaceCRLFWithLFAtEOF()
- throws IOException
- {
- String test = "This is a \r\ntest.\r\n";
- String check = "This is a \ntest.\n";
-
- testConversion( test, check, "\n", null );
- }
-
- public void testConvertLineEndings_ShouldReplaceLFWithLF()
- throws IOException
- {
- String test = "This is a \ntest.";
- String check = "This is a \ntest.";
-
- testConversion( test, check, "\n", null );
- }
-
- public void testConvertLineEndings_ShouldReplaceLFWithLFAtEOF()
- throws IOException
- {
- String test = "This is a \ntest.\n";
- String check = "This is a \ntest.\n";
-
- testConversion( test, check, "\n", null );
- }
-
- public void testConvertLineEndings_ShouldReplaceCRLFWithCRLF()
- throws IOException
- {
- String test = "This is a \r\ntest.";
- String check = "This is a \r\ntest.";
-
- testConversion( test, check, "\r\n", null );
- }
-
- public void testConvertLineEndings_ShouldReplaceCRLFWithCRLFAtEOF()
- throws IOException
- {
- String test = "This is a \r\ntest.\r\n";
- String check = "This is a \r\ntest.\r\n";
-
- testConversion( test, check, "\r\n", null );
- }
-
- public void testConvertLineEndings_LFToCRLFNoEOFForceEOF()
- throws IOException
- {
- String test = "This is a \ntest.";
- String check = "This is a \r\ntest.\r\n";
-
- testConversion( test, check, "\r\n", true );
- }
-
- public void testConvertLineEndings_LFToCRLFWithEOFForceEOF()
- throws IOException
- {
- String test = "This is a \ntest.\n";
- String check = "This is a \r\ntest.\r\n";
-
- testConversion( test, check, "\r\n", true );
- }
-
- public void testConvertLineEndings_LFToCRLFNoEOFStripEOF()
- throws IOException
- {
- String test = "This is a \ntest.";
- String check = "This is a \r\ntest.";
-
- testConversion( test, check, "\r\n", false );
- }
-
- public void testConvertLineEndings_LFToCRLFWithEOFStripEOF()
- throws IOException
- {
- String test = "This is a \ntest.\n";
- String check = "This is a \r\ntest.";
-
- testConversion( test, check, "\r\n", false );
- }
-
- public void testConvertLineEndings_CRLFToLFNoEOFForceEOF()
- throws IOException
- {
- String test = "This is a \r\ntest.";
- String check = "This is a \ntest.\n";
-
- testConversion( test, check, "\n", true );
- }
-
- public void testConvertLineEndings_CRLFToLFWithEOFForceEOF()
- throws IOException
- {
- String test = "This is a \r\ntest.\r\n";
- String check = "This is a \ntest.\n";
-
- testConversion( test, check, "\n", true );
- }
-
- public void testConvertLineEndings_CRLFToLFNoEOFStripEOF()
- throws IOException
- {
- String test = "This is a \r\ntest.";
- String check = "This is a \ntest.";
-
- testConversion( test, check, "\n", false );
- }
-
- public void testConvertLineEndings_CRLFToLFWithEOFStripEOF()
- throws IOException
- {
- String test = "This is a \r\ntest.\r\n";
- String check = "This is a \ntest.";
-
- testConversion( test, check, "\n", false );
- }
-
- private void testConversion( String test, String check, String lineEndingChars, Boolean eof )
- throws IOException
- {
- File source = File.createTempFile( "line-conversion-test-in.", "" );
- source.deleteOnExit();
- File dest = File.createTempFile( "line-conversion-test-out.", "" );
- dest.deleteOnExit();
-
- FileWriter sourceWriter = null;
- StringReader sourceReader = new StringReader( test );
- try
- {
- sourceWriter = new FileWriter( source );
-
- IOUtil.copy( sourceReader, sourceWriter );
- }
- finally
- {
- IOUtil.close( sourceWriter );
- }
-
- // Using platform encoding for the conversion tests in this class is OK
- AssemblyFileUtils.convertLineEndings( source, dest, lineEndingChars, eof, null );
-
- FileReader destReader = null;
- StringWriter destWriter = new StringWriter();
- try
- {
- destReader = new FileReader( dest );
-
- IOUtil.copy( destReader, destWriter );
- }
- finally
- {
- IOUtil.close( destReader );
- }
-
- assertEquals( check, destWriter.toString() );
- }
-
}
Modified: maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java Thu Oct 23 21:01:23 2014
@@ -30,16 +30,16 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock;
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.project.MavenProject;
-import org.easymock.MockControl;
-import org.easymock.classextension.MockClassControl;
+import org.easymock.classextension.EasyMockSupport;
+
+import static org.easymock.EasyMock.expect;
public class AssemblyFormatUtilsTest
extends TestCase
{
- private final MockManager mockManager = new MockManager();
+ private final EasyMockSupport mockManager = new EasyMockSupport();
public void testFixRelativePathRefs_ShouldRemoveRelativeRefToCurrentDir()
throws AssemblyFormattingException
@@ -294,22 +294,14 @@ public class AssemblyFormatUtilsTest
artifactProject.setArtifact( artifactMock.getArtifact() );
- final MockControl sessionCtl = MockClassControl.createControl( MavenSession.class );
- mockManager.add( sessionCtl );
+ final MavenSession session = mockManager.createMock(MavenSession.class);
+ expect( session.getExecutionProperties()).andReturn( null ).anyTimes();
+
+ expect( session.getUserProperties()).andReturn( new Properties( ) ).anyTimes();
+
- final MavenSession session = (MavenSession) sessionCtl.getMock();
- session.getExecutionProperties();
- sessionCtl.setReturnValue( null, MockControl.ZERO_OR_MORE );
-
- session.getUserProperties();
- sessionCtl.setReturnValue( new Properties(), MockControl.ZERO_OR_MORE );
-
- final MockControl csCtl = MockControl.createControl( AssemblerConfigurationSource.class );
- mockManager.add( csCtl );
-
- final AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csCtl.getMock();
- cs.getMavenSession();
- csCtl.setReturnValue( session, MockControl.ZERO_OR_MORE );
+ final AssemblerConfigurationSource cs = mockManager.createMock( AssemblerConfigurationSource.class );
+ expect( cs.getMavenSession()).andReturn( session ).anyTimes();
mockManager.replayAll();
@@ -322,7 +314,7 @@ public class AssemblyFormatUtilsTest
mockManager.verifyAll();
// clear out for next call.
- mockManager.clear();
+ mockManager.resetAll();
}
public void testEvalFileNameMapping_ShouldResolveGroupIdInOutDir_UseArtifactInfo()
@@ -611,22 +603,15 @@ public class AssemblyFormatUtilsTest
new ArtifactMock( mockManager, moduleProject.getGroupId(), moduleProject.getArtifactId(),
moduleProject.getVersion(), "jar", false, null );
- final MockControl sessionCtl = MockClassControl.createControl( MavenSession.class );
- mockManager.add( sessionCtl );
- final MavenSession session = (MavenSession) sessionCtl.getMock();
- session.getExecutionProperties();
- sessionCtl.setReturnValue( System.getProperties(), MockControl.ZERO_OR_MORE );
-
- session.getUserProperties();
- sessionCtl.setReturnValue( new Properties(), MockControl.ZERO_OR_MORE );
-
- final MockControl csCtl = MockControl.createControl( AssemblerConfigurationSource.class );
- mockManager.add( csCtl );
-
- final AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csCtl.getMock();
- cs.getMavenSession();
- csCtl.setReturnValue( session, MockControl.ZERO_OR_MORE );
+ final MavenSession session = mockManager.createMock( MavenSession.class );
+ expect( session.getExecutionProperties()).andReturn( System.getProperties() ).anyTimes();
+
+ expect(session.getUserProperties()).andReturn( new Properties( ) ).anyTimes();
+
+
+ final AssemblerConfigurationSource cs = mockManager.createMock( AssemblerConfigurationSource.class );
+ expect( cs.getMavenSession()).andReturn( session ).anyTimes();
mockManager.replayAll();
@@ -640,7 +625,7 @@ public class AssemblyFormatUtilsTest
mockManager.verifyAll();
// clear out for next call.
- mockManager.clear();
+ mockManager.resetAll();
}
private void verifyOutputDir( final String outDir, final String finalName, final String projectFinalName,
@@ -666,11 +651,10 @@ public class AssemblyFormatUtilsTest
project.getModel().setBuild( build );
}
- final MavenProject mainProject = project;
final MavenProject moduleProject = createProject( "unknown", "unknown", "unknown", null );
final MavenProject artifactProject = createProject( "unknown", "unknown", "unknown", null );
- verifyOutputDir( outDir, finalName, mainProject, moduleProject, artifactProject, checkValue );
+ verifyOutputDir( outDir, finalName, project, moduleProject, artifactProject, checkValue );
}
private void verifyOutputDirUsingModuleProject( final String outDir, final String finalName, final String groupId,
@@ -689,11 +673,10 @@ public class AssemblyFormatUtilsTest
project.getModel().setBuild( build );
}
- final MavenProject moduleProject = project;
final MavenProject mainProject = createProject( "unknown", "unknown", "unknown", null );
final MavenProject artifactProject = createProject( "unknown", "unknown", "unknown", null );
- verifyOutputDir( outDir, finalName, mainProject, moduleProject, artifactProject, checkValue );
+ verifyOutputDir( outDir, finalName, mainProject, project, artifactProject, checkValue );
}
private void verifyOutputDirUsingArtifactProject( final String outDir, final String finalName,
@@ -712,11 +695,10 @@ public class AssemblyFormatUtilsTest
project.getModel().setBuild( build );
}
- final MavenProject artifactProject = project;
final MavenProject moduleProject = createProject( "unknown", "unknown", "unknown", null );
final MavenProject mainProject = createProject( "unknown", "unknown", "unknown", null );
- verifyOutputDir( outDir, finalName, mainProject, moduleProject, artifactProject, checkValue );
+ verifyOutputDir( outDir, finalName, mainProject, moduleProject, project, checkValue );
}
private void verifyOutputDir( final String outDir, final String finalName, final MavenProject mainProject,
@@ -724,22 +706,15 @@ public class AssemblyFormatUtilsTest
final String checkValue )
throws AssemblyFormattingException
{
- final MockControl sessionCtl = MockClassControl.createControl( MavenSession.class );
- mockManager.add( sessionCtl );
- final MavenSession session = (MavenSession) sessionCtl.getMock();
- session.getExecutionProperties();
- sessionCtl.setReturnValue( System.getProperties(), MockControl.ZERO_OR_MORE );
-
- session.getUserProperties();
- sessionCtl.setReturnValue( new Properties(), MockControl.ZERO_OR_MORE );
-
- final MockControl csCtl = MockControl.createControl( AssemblerConfigurationSource.class );
- mockManager.add( csCtl );
-
- final AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csCtl.getMock();
- cs.getMavenSession();
- csCtl.setReturnValue( session, MockControl.ZERO_OR_MORE );
+ final MavenSession session = mockManager.createMock( MavenSession.class );
+ expect( session.getExecutionProperties()).andReturn( System.getProperties()).anyTimes();
+
+ expect( session.getUserProperties()).andReturn( new Properties( ) ).anyTimes();
+
+
+ final AssemblerConfigurationSource cs = mockManager.createMock( AssemblerConfigurationSource.class );
+ expect( cs.getMavenSession()).andReturn( session ).anyTimes();
String result;
@@ -751,7 +726,7 @@ public class AssemblyFormatUtilsTest
mockManager.verifyAll();
- mockManager.clear();
+ mockManager.resetAll();
}
private void verifyDistroName( final String assemblyId, final String classifier, final String finalName,
@@ -772,14 +747,12 @@ public class AssemblyFormatUtilsTest
mockManager.verifyAll();
// clear it out for the next call.
- mockManager.clear();
+ mockManager.resetAll();
}
private final class MockAndControlForGetDistroName
{
- MockControl control;
-
- AssemblerConfigurationSource configSource;
+ final AssemblerConfigurationSource configSource;
private final String classifier;
@@ -794,24 +767,18 @@ public class AssemblyFormatUtilsTest
this.isAssemblyIdAppended = isAssemblyIdAppended;
this.classifier = classifier;
- control = MockControl.createControl( AssemblerConfigurationSource.class );
- mockManager.add( control );
-
- configSource = (AssemblerConfigurationSource) control.getMock();
+ configSource = mockManager.createMock (AssemblerConfigurationSource.class);
enableExpectations();
}
private void enableExpectations()
{
- configSource.getClassifier();
- control.setReturnValue( classifier, MockControl.ONE_OR_MORE );
+ expect(configSource.getClassifier()).andReturn( classifier ).atLeastOnce();
- configSource.isAssemblyIdAppended();
- control.setReturnValue( isAssemblyIdAppended, MockControl.ONE_OR_MORE );
+ expect(configSource.isAssemblyIdAppended()).andReturn( isAssemblyIdAppended ).atLeastOnce();
- configSource.getFinalName();
- control.setReturnValue( finalName, MockControl.ONE_OR_MORE );
+ expect( configSource.getFinalName()).andReturn( finalName ).atLeastOnce();
}
}
Modified: maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java Thu Oct 23 21:01:23 2014
@@ -19,30 +19,30 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import junit.framework.TestCase;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.testutils.MockManager;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.easymock.MockControl;
+import org.easymock.classextension.EasyMockSupport;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.easymock.EasyMock.expect;
public class FilterUtilsTest
extends TestCase
{
- private final MockManager mockManager = new MockManager();
+ private final EasyMockSupport mockManager = new EasyMockSupport();
private Logger logger;
@@ -54,29 +54,20 @@ public class FilterUtilsTest
private void clearAll()
{
- mockManager.clear();
-
logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
}
public void testFilterArtifacts_ShouldThrowExceptionUsingStrictModeWithUnmatchedInclude()
{
- final MockControl artifactCtl = MockControl.createControl( Artifact.class );
- final Artifact artifact = (Artifact) artifactCtl.getMock();
-
- mockManager.add( artifactCtl );
+ final Artifact artifact = mockManager.createMock( Artifact.class );
- artifact.getGroupId();
- artifactCtl.setReturnValue( "group", MockControl.ONE_OR_MORE );
+ expect(artifact.getGroupId()).andReturn( "group").atLeastOnce();
- artifact.getArtifactId();
- artifactCtl.setReturnValue( "artifact", MockControl.ONE_OR_MORE );
+ expect( artifact.getArtifactId()).andReturn( "artifact").atLeastOnce();
- artifact.getId();
- artifactCtl.setReturnValue( "group:artifact:type:version", MockControl.ONE_OR_MORE );
+ expect( artifact.getId()).andReturn( "group:artifact:type:version").atLeastOnce();
- artifact.getDependencyConflictId();
- artifactCtl.setReturnValue( "group:artifact:type", MockControl.ONE_OR_MORE );
+ expect( artifact.getDependencyConflictId()).andReturn( "group:artifact:type").atLeastOnce();
final List<String> includes = new ArrayList<String>();
@@ -274,7 +265,7 @@ public class FilterUtilsTest
mockManager.verifyAll();
// get ready for multiple calls per test.
- mockManager.clear();
+ mockManager.resetAll();
}
private void verifyProjectInclusion( final String groupId, final String artifactId, final String inclusionPattern,
@@ -342,7 +333,7 @@ public class FilterUtilsTest
mockManager.verifyAll();
// get ready for multiple calls per test.
- mockManager.clear();
+ mockManager.resetAll();
}
private static Model buildModel( final String groupId, final String artifactId )
@@ -357,7 +348,7 @@ public class FilterUtilsTest
private final class ProjectWithArtifactMockControl
extends MavenProject
{
- ArtifactMockAndControl mac;
+ final ArtifactMockAndControl mac;
ProjectWithArtifactMockControl( final String groupId, final String artifactId, final List<String> depTrail )
{
@@ -372,15 +363,13 @@ public class FilterUtilsTest
private final class ArtifactMockAndControl
{
- MockControl control;
+ final Artifact artifact;
- Artifact artifact;
+ final String groupId;
- String groupId;
+ final String artifactId;
- String artifactId;
-
- List<String> dependencyTrail;
+ final List<String> dependencyTrail;
ArtifactMockAndControl( final String groupId, final String artifactId, final List<String> dependencyTrail )
{
@@ -388,10 +377,7 @@ public class FilterUtilsTest
this.artifactId = artifactId;
this.dependencyTrail = dependencyTrail;
- control = MockControl.createControl( Artifact.class );
- mockManager.add( control );
-
- artifact = (Artifact) control.getMock();
+ artifact = mockManager.createMock (Artifact.class);
// this is always enabled, for verification purposes.
enableGetDependencyConflictId();
@@ -405,26 +391,21 @@ public class FilterUtilsTest
void enableGetDependencyTrail()
{
- artifact.getDependencyTrail();
- control.setReturnValue( dependencyTrail, MockControl.ZERO_OR_MORE );
+ expect( artifact.getDependencyTrail()).andReturn( dependencyTrail ).anyTimes();
}
void enableGetDependencyConflictId()
{
- artifact.getDependencyConflictId();
- control.setReturnValue( groupId + ":" + artifactId + ":jar", MockControl.ZERO_OR_MORE );
+ expect(artifact.getDependencyConflictId()).andReturn( groupId + ":" + artifactId + ":jar").anyTimes();
}
void enableGetGroupIdArtifactIdAndId()
{
- artifact.getGroupId();
- control.setReturnValue( groupId, MockControl.ZERO_OR_MORE );
+ expect( artifact.getGroupId()).andReturn( groupId).anyTimes();
- artifact.getArtifactId();
- control.setReturnValue( artifactId, MockControl.ZERO_OR_MORE );
+ expect( artifact.getArtifactId()).andReturn( artifactId ).anyTimes();
- artifact.getId();
- control.setReturnValue( groupId + ":" + artifactId + ":version:null:jar", MockControl.ZERO_OR_MORE );
+ expect( artifact.getId()).andReturn( groupId + ":" + artifactId + ":version:null:jar").anyTimes();
}
}
Modified: maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java Thu Oct 23 21:01:23 2014
@@ -45,9 +45,7 @@ public class ProjectUtilsTest
model.setGroupId( groupId );
model.setVersion( version );
- final MavenProject project = new MavenProject( model );
-
- return project;
+ return new MavenProject( model );
}
public void testGetProjectModules_ShouldIncludeDirectModuleOfMasterProject() throws IOException
Modified: maven/plugins/branches/MASSEMBLY-704/src/test/resources/assemblies/empty.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/test/resources/assemblies/empty.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/test/resources/assemblies/empty.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/test/resources/assemblies/empty.xml Thu Oct 23 21:01:23 2014
@@ -0,0 +1,20 @@
+<?xml version='1.0'?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+