Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java (from r1685251, 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/plugins/assembly/archive/DefaultAssemblyArchiverTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/DefaultAssemblyArchiverTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive; +package org.apache.maven.plugins.assembly.archive; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,15 +22,15 @@ package org.apache.maven.plugin.assembly import junit.framework.Assert; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.Model; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.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.mojos.AbstractAssemblyMojo; -import org.apache.maven.plugin.assembly.testutils.TestFileManager; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.phase.AssemblyArchiverPhase; +import org.apache.maven.plugins.assembly.artifact.DependencyResolutionException; +import org.apache.maven.plugins.assembly.artifact.DependencyResolver; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.mojos.AbstractAssemblyMojo; +import org.apache.maven.plugins.assembly.testutils.TestFileManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.DefaultPlexusContainer; import org.codehaus.plexus.PlexusContainer; @@ -270,10 +270,10 @@ public class DefaultAssemblyArchiverTest final AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class ); - expect( configSource.getTarLongFileMode()).andReturn( TarLongFileMode.fail.toString()).anyTimes(); - expect( configSource.isDryRun()).andReturn( false ).anyTimes(); + expect( configSource.getTarLongFileMode() ).andReturn( TarLongFileMode.fail.toString() ).anyTimes(); + expect( configSource.isDryRun() ).andReturn( false ).anyTimes(); - expect( configSource.getArchiverConfig()).andReturn( null ).anyTimes(); + expect( configSource.getArchiverConfig() ).andReturn( null ).anyTimes(); final DefaultAssemblyArchiver subject = setupStdExpectations( mm, macArchiverManager, configSource ); @@ -289,15 +289,15 @@ public class DefaultAssemblyArchiverTest MockAndControlForAssemblyArchiver macArchiverManager, AssemblerConfigurationSource configSource ) { - expect( configSource.getProject()).andReturn( new MavenProject( new Model() ) ).anyTimes(); + expect( configSource.getProject() ).andReturn( new MavenProject( new Model() ) ).anyTimes(); - expect( configSource.getJarArchiveConfiguration()).andReturn( null ).anyTimes(); + expect( configSource.getJarArchiveConfiguration() ).andReturn( null ).anyTimes(); - expect( configSource.getWorkingDirectory()).andReturn( new File( "." ) ).anyTimes(); + expect( configSource.getWorkingDirectory() ).andReturn( new File( "." ) ).anyTimes(); - expect( configSource.isUpdateOnly()).andReturn( false ).anyTimes(); + expect( configSource.isUpdateOnly() ).andReturn( false ).anyTimes(); - expect( configSource.isIgnorePermissions()).andReturn( true ).anyTimes(); + expect( configSource.isIgnorePermissions() ).andReturn( true ).anyTimes(); mm.replayAll(); @@ -318,9 +318,9 @@ public class DefaultAssemblyArchiverTest final AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class ); - expect( configSource.isDryRun()).andReturn( false ).anyTimes(); - expect( configSource.getArchiverConfig()).andReturn( null ).anyTimes(); - expect( configSource.getMavenSession()).andReturn( null ).anyTimes(); + expect( configSource.isDryRun() ).andReturn( false ).anyTimes(); + expect( configSource.getArchiverConfig() ).andReturn( null ).anyTimes(); + expect( configSource.getMavenSession() ).andReturn( null ).anyTimes(); final DefaultAssemblyArchiver subject = setupStdExpectations( mm, macArchiverManager, configSource ); subject.createArchiver( "war", false, null, configSource, null, false ); @@ -342,12 +342,12 @@ public class DefaultAssemblyArchiverTest final AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class ); - expect( configSource.isDryRun()).andReturn( false ).anyTimes(); - expect( configSource.getArchiverConfig()).andReturn( null ).anyTimes(); - expect( configSource.getWorkingDirectory()).andReturn( new File( "." ) ).anyTimes(); - expect( configSource.isUpdateOnly()).andReturn( false ).anyTimes(); - expect( configSource.getJarArchiveConfiguration()).andReturn( null ).anyTimes(); - expect( configSource.isIgnorePermissions()).andReturn( true ).anyTimes(); + expect( configSource.isDryRun() ).andReturn( false ).anyTimes(); + expect( configSource.getArchiverConfig() ).andReturn( null ).anyTimes(); + expect( configSource.getWorkingDirectory() ).andReturn( new File( "." ) ).anyTimes(); + expect( configSource.isUpdateOnly() ).andReturn( false ).anyTimes(); + expect( configSource.getJarArchiveConfiguration() ).andReturn( null ).anyTimes(); + expect( configSource.isIgnorePermissions() ).andReturn( true ).anyTimes(); mm.replayAll(); @@ -387,7 +387,7 @@ public class DefaultAssemblyArchiverTest final TestTarArchiver ttArchiver = new TestTarArchiver(); - final DefaultAssemblyArchiver subject = createSubject(mm, ttArchiver); + final DefaultAssemblyArchiver subject = createSubject( mm, ttArchiver ); subject.createTarArchiver( "tar", TarLongFileMode.fail ); @@ -397,8 +397,9 @@ public class DefaultAssemblyArchiverTest mm.verifyAll(); } - private DefaultAssemblyArchiver createSubject(EasyMockSupport mm, - TestTarArchiver ttArchiver) throws NoSuchArchiverException { + private DefaultAssemblyArchiver createSubject( EasyMockSupport mm, TestTarArchiver ttArchiver ) + throws NoSuchArchiverException + { final MockAndControlForAssemblyArchiver macArchiverManager = new MockAndControlForAssemblyArchiver( mm ); macArchiverManager.expectGetArchiver( "tar", ttArchiver ); @@ -416,7 +417,7 @@ public class DefaultAssemblyArchiverTest final TestTarArchiver ttArchiver = new TestTarArchiver(); - final DefaultAssemblyArchiver subject = createSubject(mm, ttArchiver); + final DefaultAssemblyArchiver subject = createSubject( mm, ttArchiver ); subject.createTarArchiver( "tar.gz", TarLongFileMode.fail ); @@ -434,7 +435,7 @@ public class DefaultAssemblyArchiverTest final TestTarArchiver ttArchiver = new TestTarArchiver(); - final DefaultAssemblyArchiver subject = createSubject(mm, ttArchiver); + final DefaultAssemblyArchiver subject = createSubject( mm, ttArchiver ); subject.createTarArchiver( "tgz", TarLongFileMode.fail ); @@ -452,7 +453,7 @@ public class DefaultAssemblyArchiverTest final TestTarArchiver ttArchiver = new TestTarArchiver(); - final DefaultAssemblyArchiver subject = createSubject(mm, ttArchiver); + final DefaultAssemblyArchiver subject = createSubject( mm, ttArchiver ); subject.createTarArchiver( "tar.bz2", TarLongFileMode.fail ); @@ -470,7 +471,7 @@ public class DefaultAssemblyArchiverTest final TestTarArchiver ttArchiver = new TestTarArchiver(); - final DefaultAssemblyArchiver subject = createSubject(mm, ttArchiver); + final DefaultAssemblyArchiver subject = createSubject( mm, ttArchiver ); subject.createTarArchiver( "tbz2", TarLongFileMode.fail ); @@ -488,7 +489,7 @@ public class DefaultAssemblyArchiverTest final TestTarArchiver ttArchiver = new TestTarArchiver(); - final DefaultAssemblyArchiver subject = createSubject(mm, ttArchiver); + final DefaultAssemblyArchiver subject = createSubject( mm, ttArchiver ); try { @@ -507,8 +508,7 @@ public class DefaultAssemblyArchiverTest private DefaultAssemblyArchiver createSubject( final MockAndControlForAssemblyArchiver macMgr, final List<AssemblyArchiverPhase> phases, Logger logger ) { - final DefaultAssemblyArchiver subject = - new DefaultAssemblyArchiver( macMgr.archiverManager, phases ); + final DefaultAssemblyArchiver subject = new DefaultAssemblyArchiver( macMgr.archiverManager, phases ); subject.setContainer( container );
Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive; +package org.apache.maven.plugins.assembly.archive; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +22,7 @@ package org.apache.maven.plugin.assembly import junit.framework.TestCase; import org.apache.maven.archiver.MavenArchiveConfiguration; import org.apache.maven.model.Model; -import org.apache.maven.plugin.assembly.testutils.TestFileManager; +import org.apache.maven.plugins.assembly.testutils.TestFileManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.archiver.ArchiveFinalizer; import org.codehaus.plexus.archiver.Archiver; @@ -89,10 +89,8 @@ public class ManifestCreationFinalizerTe JarArchiver archiver = new JarArchiver(); - archiver.setArchiveFinalizers( Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer( - null, - project, - config ) ) ); + archiver.setArchiveFinalizers( + Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer( null, project, config ) ) ); File file = fileManager.createTempFile(); @@ -108,7 +106,7 @@ public class ManifestCreationFinalizerTe IOUtil.copy( reader, writer ); - assertTrue(writer.toString().contains("Main-Class: Stuff")); + assertTrue( writer.toString().contains( "Main-Class: Stuff" ) ); // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4823678 ( (JarURLConnection) resource.openConnection() ).getJarFile().close(); @@ -127,10 +125,8 @@ public class ManifestCreationFinalizerTe JarArchiver archiver = new JarArchiver(); - archiver.setArchiveFinalizers( Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer( - null, - project, - config ) ) ); + archiver.setArchiveFinalizers( + Collections.<ArchiveFinalizer>singletonList( new ManifestCreationFinalizer( null, project, config ) ) ); File file = fileManager.createTempFile(); @@ -148,7 +144,7 @@ public class ManifestCreationFinalizerTe System.out.println( "Test Manifest:\n\n" + writer ); - assertTrue(writer.toString().contains(testKey + ": " + testValue)); + assertTrue( writer.toString().contains( testKey + ": " + testValue ) ); // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4823678 ( (JarURLConnection) resource.openConnection() ).getJarFile().close(); @@ -162,7 +158,7 @@ public class ManifestCreationFinalizerTe MockAndControlForArchiver( EasyMockSupport mm ) { - archiver = mm.createMock(Archiver.class); + archiver = mm.createMock( Archiver.class ); } } Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java (from r1685251, 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/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.archiver; +package org.apache.maven.plugins.assembly.archive.archiver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,17 +19,7 @@ package org.apache.maven.plugin.assembly * under the License. */ -import static org.easymock.EasyMock.anyObject; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.maven.plugin.assembly.testutils.TestFileManager; +import org.apache.maven.plugins.assembly.testutils.TestFileManager; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.diags.TrackingArchiver; @@ -46,8 +36,17 @@ import org.junit.AfterClass; import org.junit.Test; import javax.annotation.Nonnull; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import static org.easymock.EasyMock.anyObject; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; -@SuppressWarnings("ResultOfMethodCallIgnored") +@SuppressWarnings( "ResultOfMethodCallIgnored" ) public class AssemblyProxyArchiverTest { @@ -119,12 +118,12 @@ public class AssemblyProxyArchiverTest throws IOException, ArchiverException { EasyMockSupport mm = new EasyMockSupport(); - final Archiver delegate = mm.createMock(Archiver.class); + final Archiver delegate = mm.createMock( Archiver.class ); - delegate.addFile( (File)anyObject(), (String)anyObject() ); + delegate.addFile( (File) anyObject(), (String) anyObject() ); EasyMock.expectLastCall().anyTimes(); - delegate.setForced(true); + delegate.setForced( true ); EasyMock.expectLastCall().anyTimes(); final CounterSelector counter = new CounterSelector( true ); Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -18,12 +18,13 @@ package org.apache.maven.plugin.assembly * specific language governing permissions and limitations * under the License. */ -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.artifact.DependencyResolutionException; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.model.Assembly; + +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.artifact.DependencyResolutionException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; import org.codehaus.plexus.archiver.Archiver; import org.junit.Test; @@ -31,12 +32,34 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertSame; public class AssemblyArchiverPhaseComparatorTest { - class Basic implements AssemblyArchiverPhase { + @Test + public void comparatorSortsCorrectly() + throws Exception + { + List<AssemblyArchiverPhase> items = new ArrayList<AssemblyArchiverPhase>(); + Unordered2 u2 = new Unordered2(); + items.add( u2 ); + Ordered2 o2 = new Ordered2(); + items.add( o2 ); + Ordered1 o1 = new Ordered1(); + items.add( o1 ); + Unordered1 u1 = new Unordered1(); + items.add( u1 ); + Collections.sort( items, new AssemblyArchiverPhaseComparator() ); + assertSame( u1, items.get( 0 ) ); + assertSame( u2, items.get( 1 ) ); + assertSame( o1, items.get( 2 ) ); + assertSame( o2, items.get( 3 ) ); + } + + class Basic + implements AssemblyArchiverPhase + { public void execute( Assembly assembly, Archiver archiver, AssemblerConfigurationSource configSource ) throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException, DependencyResolutionException @@ -45,7 +68,9 @@ public class AssemblyArchiverPhaseCompar } } - class Ordered1 extends Basic implements PhaseOrder + class Ordered1 + extends Basic + implements PhaseOrder { public int order() { @@ -53,38 +78,23 @@ public class AssemblyArchiverPhaseCompar } } - class Ordered2 extends Basic implements PhaseOrder + class Ordered2 + extends Basic + implements PhaseOrder { public int order() { return 30; } } - class Unordered1 extends Basic - { - } - class Unordered2 extends Basic + class Unordered1 + extends Basic { } - @Test - public void comparatorSortsCorrectly() - throws Exception + class Unordered2 + extends Basic { - List<AssemblyArchiverPhase> items = new ArrayList<AssemblyArchiverPhase>( ); - Unordered2 u2 = new Unordered2(); - items.add( u2 ); - Ordered2 o2 = new Ordered2(); - items.add( o2 ); - Ordered1 o1 = new Ordered1(); - items.add( o1 ); - Unordered1 u1 = new Unordered1(); - items.add( u1 ); - Collections.sort( items, new AssemblyArchiverPhaseComparator() ); - assertSame( u1, items.get( 0 ) ); - assertSame( u2, items.get(1) ); - assertSame( o1, items.get(2) ); - assertSame( o2, items.get(3) ); } } \ No newline at end of file Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java (from r1685251, 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/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,15 +22,15 @@ package org.apache.maven.plugin.assembly import junit.framework.TestCase; import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Model; -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.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.model.DependencySet; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.archive.task.testutils.ArtifactMock; +import org.apache.maven.plugins.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask; +import org.apache.maven.plugins.assembly.artifact.DependencyResolutionException; +import org.apache.maven.plugins.assembly.artifact.DependencyResolver; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.DependencySet; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; import org.codehaus.plexus.logging.Logger; @@ -78,15 +78,14 @@ public class DependencySetAssemblyPhaseT final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "dep", "1", "jar", false ); - 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.expectGetDestFile( new File( "junk" ) ); // macTask.expectAddFile( artifactFile, "out/dep", 10 ); - project.setArtifacts( Collections.singleton( artifactMock.getArtifact() ) ); macTask.expectCSGetFinalName( "final-name" ); @@ -101,7 +100,8 @@ public class DependencySetAssemblyPhaseT mm.replayAll(); - createPhase( macTask, logger, macTask.dependencyResolver ).execute( assembly, macTask.archiver, macTask.configSource ); + createPhase( macTask, logger, macTask.dependencyResolver ).execute( assembly, macTask.archiver, + macTask.configSource ); mm.verifyAll(); } @@ -127,8 +127,7 @@ public class DependencySetAssemblyPhaseT final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); - final MockAndControlForAddDependencySetsTask macTask = - new MockAndControlForAddDependencySetsTask( mm, null ); + final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, null ); macTask.expectResolveDependencySets(); Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java (from r1685251, 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/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,15 +21,14 @@ package org.apache.maven.plugin.assembly import junit.framework.Assert; import junit.framework.TestCase; - import org.apache.maven.model.Model; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.model.FileItem; -import org.apache.maven.plugin.assembly.testutils.TestFileManager; -import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.FileItem; +import org.apache.maven.plugins.assembly.testutils.TestFileManager; +import org.apache.maven.plugins.assembly.utils.TypeConversionUtils; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.utils.Os; import org.codehaus.plexus.archiver.Archiver; @@ -114,12 +113,11 @@ public class FileItemAssemblyPhaseTest 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 ); @@ -158,9 +156,8 @@ public class FileItemAssemblyPhaseTest 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 ); @@ -197,11 +194,11 @@ public class FileItemAssemblyPhaseTest if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) { macLogger.logger.error( "OS=Windows and the assembly descriptor contains a *nix-specific " - + "root-relative-reference (starting with slash) /" ); + + "root-relative-reference (starting with slash) /" ); } else { - macLogger.logger.warn( (String)anyObject() ); + macLogger.logger.warn( (String) anyObject() ); } final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm ); @@ -231,15 +228,15 @@ public class FileItemAssemblyPhaseTest 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 ); @@ -274,16 +271,15 @@ public class FileItemAssemblyPhaseTest macCS.expectGetFinalName( "final-name" ); macCS.expectInterpolators(); - final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm ); if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) { macLogger.logger.error( "OS=Windows and the assembly descriptor contains a *nix-specific " - + "root-relative-reference (starting with slash) /" ); + + "root-relative-reference (starting with slash) /" ); } else { - macLogger.logger.warn( (String)anyObject() ); + macLogger.logger.warn( (String) anyObject() ); } final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm ); @@ -316,15 +312,22 @@ 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 ); @@ -389,15 +392,22 @@ 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 ); @@ -424,14 +434,14 @@ public class FileItemAssemblyPhaseTest public MockAndControlForArchiver( final EasyMockSupport mockManager ) { - archiver = mockManager.createMock(Archiver.class); + archiver = mockManager.createMock( Archiver.class ); } public void expectAddFile( final File file, final String outputLocation, final int fileMode ) { try { - archiver.addResource( ( PlexusIoResource) anyObject(), (String) anyObject(), anyInt() ); + archiver.addResource( (PlexusIoResource) anyObject(), (String) anyObject(), anyInt() ); } catch ( final ArchiverException e ) { @@ -447,44 +457,46 @@ public class FileItemAssemblyPhaseTest public MockAndControlForConfigSource( final EasyMockSupport mockManager ) { - configSource = mockManager.createMock(AssemblerConfigurationSource.class); + configSource = mockManager.createMock( AssemblerConfigurationSource.class ); - expect(configSource.getMavenSession()).andReturn( null ).anyTimes(); + expect( configSource.getMavenSession() ).andReturn( null ).anyTimes(); } public void expectGetProject( final MavenProject project ) { - expect(configSource.getProject()).andReturn( project ).atLeastOnce(); + expect( configSource.getProject() ).andReturn( project ).atLeastOnce(); } public void expectGetFinalName( final String finalName ) { - expect( configSource.getFinalName()).andReturn( finalName ).atLeastOnce(); + expect( configSource.getFinalName() ).andReturn( finalName ).atLeastOnce(); } - public void expectInterpolators( ) + public void expectInterpolators() { - expect(configSource.getCommandLinePropsInterpolator()).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes(); - expect(configSource.getEnvInterpolator()).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes(); - expect(configSource.getMainProjectInterpolator()).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes(); + expect( configSource.getCommandLinePropsInterpolator() ).andReturn( + FixedStringSearchInterpolator.empty() ).anyTimes(); + expect( configSource.getEnvInterpolator() ).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes(); + expect( configSource.getMainProjectInterpolator() ).andReturn( + FixedStringSearchInterpolator.empty() ).anyTimes(); } public void expectGetTemporaryRootDirectory( final File tempRoot ) { - expect( configSource.getTemporaryRootDirectory()).andReturn( tempRoot ).atLeastOnce(); + expect( configSource.getTemporaryRootDirectory() ).andReturn( tempRoot ).atLeastOnce(); } public void expectGetBasedir( final File basedir ) { - expect( configSource.getBasedir()).andReturn( basedir ).atLeastOnce(); + expect( configSource.getBasedir() ).andReturn( basedir ).atLeastOnce(); } - public void expectGetEncoding( ) + public void expectGetEncoding() { - expect( configSource.getEncoding()).andReturn( "UTF-8").atLeastOnce(); + expect( configSource.getEncoding() ).andReturn( "UTF-8" ).atLeastOnce(); } -} + } private final class MockAndControlForLogger { @@ -493,7 +505,7 @@ public class FileItemAssemblyPhaseTest public MockAndControlForLogger( final EasyMockSupport mockManager ) { - logger = mockManager.createMock (Logger.class); + logger = mockManager.createMock( Logger.class ); } } Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java (from r1685251, 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/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,13 +21,13 @@ package org.apache.maven.plugin.assembly import junit.framework.TestCase; import org.apache.maven.model.Model; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest; -import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.model.FileSet; -import org.apache.maven.plugin.assembly.testutils.TestFileManager; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest; +import org.apache.maven.plugins.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.FileSet; +import org.apache.maven.plugins.assembly.testutils.TestFileManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.logging.Logger; import org.easymock.EasyMock; @@ -61,8 +61,7 @@ public class FileSetAssemblyPhaseTest assembly.setId( "test" ); final MockAndControlForLogger macLogger = new MockAndControlForLogger(); - final MockAndControlForAddFileSetsTask macTask = - new MockAndControlForAddFileSetsTask( mm, fileManager ); + final MockAndControlForAddFileSetsTask macTask = new MockAndControlForAddFileSetsTask( mm, fileManager ); mm.replayAll(); @@ -88,8 +87,7 @@ public class FileSetAssemblyPhaseTest assembly.addFileSet( fs ); final MockAndControlForLogger macLogger = new MockAndControlForLogger(); - final MockAndControlForAddFileSetsTask macTask = - new MockAndControlForAddFileSetsTask( mm, fileManager ); + final MockAndControlForAddFileSetsTask macTask = new MockAndControlForAddFileSetsTask( mm, fileManager ); macTask.expectGetArchiveBaseDirectory(); @@ -104,7 +102,7 @@ public class FileSetAssemblyPhaseTest macTask.expectAdditionOfSingleFileSet( project, "final-name", false, modes, 1, true ); - DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource ); + DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource ); mm.replayAll(); @@ -128,24 +126,25 @@ public class FileSetAssemblyPhaseTest MockAndControlForLogger() { - logger = mm.createMock(Logger.class); + logger = mm.createMock( Logger.class ); } public void expectDebug( final boolean debugCheck, final boolean debugEnabled ) { if ( debugCheck ) { - expect( logger.isDebugEnabled()).andReturn( debugEnabled ).anyTimes(); + expect( logger.isDebugEnabled() ).andReturn( debugEnabled ).anyTimes(); } logger.debug( (String) anyObject() ); EasyMock.expectLastCall().anyTimes(); } + public void expectWarn( final boolean debugCheck, final boolean debugEnabled ) { if ( debugCheck ) { - expect( logger.isDebugEnabled()).andReturn( debugEnabled ).anyTimes(); + expect( logger.isDebugEnabled() ).andReturn( debugEnabled ).anyTimes(); } logger.debug( (String) anyObject() ); @@ -153,11 +152,12 @@ public class FileSetAssemblyPhaseTest logger.warn( (String) anyObject() ); EasyMock.expectLastCall().anyTimes(); } + public void expectError( final boolean debugCheck, final boolean debugEnabled ) { if ( debugCheck ) { - expect( logger.isDebugEnabled()).andReturn( debugEnabled ).anyTimes(); + expect( logger.isDebugEnabled() ).andReturn( debugEnabled ).anyTimes(); } logger.debug( (String) anyObject() ); Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,23 +22,23 @@ package org.apache.maven.plugin.assembly import junit.framework.Assert; import junit.framework.TestCase; import org.apache.maven.model.Model; -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest; -import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock; -import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddArtifactTask; -import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask; -import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask; -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.model.FileSet; -import org.apache.maven.plugin.assembly.model.ModuleBinaries; -import org.apache.maven.plugin.assembly.model.ModuleSet; -import org.apache.maven.plugin.assembly.model.ModuleSources; -import org.apache.maven.plugin.assembly.testutils.TestFileManager; -import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest; +import org.apache.maven.plugins.assembly.archive.task.testutils.ArtifactMock; +import org.apache.maven.plugins.assembly.archive.task.testutils.MockAndControlForAddArtifactTask; +import org.apache.maven.plugins.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask; +import org.apache.maven.plugins.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask; +import org.apache.maven.plugins.assembly.artifact.DependencyResolutionException; +import org.apache.maven.plugins.assembly.artifact.DependencyResolver; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.FileSet; +import org.apache.maven.plugins.assembly.model.ModuleBinaries; +import org.apache.maven.plugins.assembly.model.ModuleSet; +import org.apache.maven.plugins.assembly.model.ModuleSources; +import org.apache.maven.plugins.assembly.testutils.TestFileManager; +import org.apache.maven.plugins.assembly.utils.TypeConversionUtils; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; import org.codehaus.plexus.logging.Logger; @@ -246,10 +246,8 @@ public class ModuleSetAssemblyPhaseTest createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources, project, macTask.configSource ); - assertEquals( 1, result.getExcludes() - .size() ); - assertEquals( "submodule/**", result.getExcludes() - .get( 0 ) ); + assertEquals( 1, result.getExcludes().size() ); + assertEquals( "submodule/**", result.getExcludes().get( 0 ) ); mm.verifyAll(); } @@ -289,7 +287,6 @@ public class ModuleSetAssemblyPhaseTest macTask.expectGetDestFile( new File( "junk" ) ); macTask.expectGetMode( 0777, 0777 ); - final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ); macTask.expectAddFile( moduleArtifactFile, "out/artifact", mode ); @@ -318,7 +315,7 @@ public class ModuleSetAssemblyPhaseTest mm.replayAll(); - final ModuleSetAssemblyPhase phase = createPhase( logger, macTask.dependencyResolver, null); + final ModuleSetAssemblyPhase phase = createPhase( logger, macTask.dependencyResolver, null ); phase.execute( assembly, macTask.archiver, macTask.configSource ); mm.verifyAll(); @@ -378,8 +375,8 @@ public class ModuleSetAssemblyPhaseTest macTask.expectGetFinalName( "final-name" ); macTask.expectGetDestFile( new File( "junk" ) ); macTask.expectGetMode( 0222, 0222 ); - macTask.expectAddFile( artifactFile, "out/artifact", - TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) ); + macTask.expectAddFile( artifactFile, "out/artifact", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( + Logger.LEVEL_DEBUG, "test" ) ) ); final ModuleBinaries binaries = new ModuleBinaries(); @@ -402,7 +399,9 @@ public class ModuleSetAssemblyPhaseTest final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); - createPhase( logger, macTask.dependencyResolver, null ).addModuleBinaries( null, null, binaries, projects, macTask.archiver, macTask.configSource ); + createPhase( logger, macTask.dependencyResolver, null ).addModuleBinaries( null, null, binaries, projects, + macTask.archiver, + macTask.configSource ); mm.verifyAll(); } @@ -436,7 +435,8 @@ public class ModuleSetAssemblyPhaseTest try { - createPhase( logger, null ).addModuleBinaries( null, null, binaries, projects, macTask.archiver, macTask.configSource ); + createPhase( logger, null ).addModuleBinaries( null, null, binaries, projects, macTask.archiver, + macTask.configSource ); fail( "Should throw an invalid configuration exception because of module with missing attachment." ); } @@ -461,8 +461,8 @@ public class ModuleSetAssemblyPhaseTest macTask.expectGetFinalName( "final-name" ); macTask.expectGetDestFile( new File( "junk" ) ); - macTask.expectAddFile( artifactFile, "out/artifact", - TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) ); + macTask.expectAddFile( artifactFile, "out/artifact", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( + Logger.LEVEL_DEBUG, "test" ) ) ); macTask.expectGetMode( 0222, 0222 ); final ModuleBinaries binaries = new ModuleBinaries(); @@ -485,7 +485,9 @@ public class ModuleSetAssemblyPhaseTest final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); - createPhase( logger, macTask.dependencyResolver, null ).addModuleBinaries( null, null, binaries, projects, macTask.archiver, macTask.configSource ); + createPhase( logger, macTask.dependencyResolver, null ).addModuleBinaries( null, null, binaries, projects, + macTask.archiver, + macTask.configSource ); mm.verifyAll(); } @@ -503,9 +505,8 @@ public class ModuleSetAssemblyPhaseTest try { - createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact( artifactMock.getArtifact(), - null, null, null, - null ); + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact( + artifactMock.getArtifact(), null, null, null, null ); fail( "Expected ArchiveCreationException since artifact file is null." ); } @@ -534,9 +535,8 @@ public class ModuleSetAssemblyPhaseTest macTask.expectGetDestFile( new File( "junk" ) ); macTask.expectGetMode( 0222, 0222 ); - - macTask.expectAddFile( artifactFile, "out/artifact", - TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) ); + macTask.expectAddFile( artifactFile, "out/artifact", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( + Logger.LEVEL_DEBUG, "test" ) ) ); final ModuleBinaries binaries = new ModuleBinaries(); binaries.setOutputDirectory( "out" ); @@ -547,11 +547,8 @@ public class ModuleSetAssemblyPhaseTest mm.replayAll(); - createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact( artifactMock.getArtifact(), - project, - macTask.archiver, - macTask.configSource, - binaries ); + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact( + artifactMock.getArtifact(), project, macTask.archiver, macTask.configSource, binaries ); mm.verifyAll(); } @@ -600,15 +597,15 @@ public class ModuleSetAssemblyPhaseTest final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ); final int[] modes = { -1, -1, mode, mode }; - macTask.expectAdditionOfSingleFileSet( project, "final-name", false, modes, 1, true, - false ); + macTask.expectAdditionOfSingleFileSet( project, "final-name", false, modes, 1, true, false ); DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource ); mm.replayAll(); final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); - createPhase( logger, null ).addModuleSourceFileSets( sources, projects, macTask.archiver, macTask.configSource ); + createPhase( logger, null ).addModuleSourceFileSets( sources, projects, macTask.archiver, + macTask.configSource ); mm.verifyAll(); } @@ -620,7 +617,8 @@ public class ModuleSetAssemblyPhaseTest final MavenProject project = createProject( "group", "artifact", "version", null ); - final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project ); + final MockAndControlForAddDependencySetsTask macTask = + new MockAndControlForAddDependencySetsTask( mm, project ); final List<MavenProject> projects = Collections.singletonList( project ); @@ -646,7 +644,8 @@ public class ModuleSetAssemblyPhaseTest final MavenProject project = createProject( "group", "artifact", "version", null ); - final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project ); + final MockAndControlForAddDependencySetsTask macTask = + new MockAndControlForAddDependencySetsTask( mm, project ); final MavenProject project2 = createProject( "group", "artifact2", "version", null ); @@ -676,7 +675,8 @@ public class ModuleSetAssemblyPhaseTest final MavenProject project = createProject( "group", "artifact", "version", null ); - final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project ); + final MockAndControlForAddDependencySetsTask macTask = + new MockAndControlForAddDependencySetsTask( mm, project ); final MavenProject project2 = createProject( "group", "artifact2", "version", project ); @@ -696,8 +696,7 @@ public class ModuleSetAssemblyPhaseTest assertFalse( moduleProjects.isEmpty() ); - final MavenProject result = moduleProjects.iterator() - .next(); + final MavenProject result = moduleProjects.iterator().next(); assertEquals( "artifact2", result.getArtifactId() ); @@ -711,7 +710,8 @@ public class ModuleSetAssemblyPhaseTest final MavenProject project = createProject( "group", "artifact", "version", null ); - final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project ); + final MockAndControlForAddDependencySetsTask macTask = + new MockAndControlForAddDependencySetsTask( mm, project ); final MavenProject project2 = createProject( "group", "artifact2", "version", project ); final MavenProject project3 = createProject( "group", "artifact3", "version", project2 ); @@ -749,7 +749,8 @@ public class ModuleSetAssemblyPhaseTest final MavenProject project = createProject( "group", "artifact", "version", null ); - final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project ); + final MockAndControlForAddDependencySetsTask macTask = + new MockAndControlForAddDependencySetsTask( mm, project ); addArtifact( project, mm, false ); @@ -780,7 +781,8 @@ public class ModuleSetAssemblyPhaseTest mm.verifyAll(); } - private ArtifactMock addArtifact( final MavenProject project, final EasyMockSupport mm, final boolean expectDepTrailCheck ) + private ArtifactMock addArtifact( final MavenProject project, final EasyMockSupport mm, + final boolean expectDepTrailCheck ) { final ArtifactMock macArtifact = new ArtifactMock( mm, project.getGroupId(), project.getArtifactId(), project.getVersion(), @@ -819,8 +821,9 @@ public class ModuleSetAssemblyPhaseTest System.out.println( "Unexpected projects in output: " ); - for (final MavenProject project : checkTooMany) { - System.out.println(project.getId()); + for ( final MavenProject project : checkTooMany ) + { + System.out.println( project.getId() ); } } @@ -833,8 +836,9 @@ public class ModuleSetAssemblyPhaseTest System.out.println( "Expected projects missing from output: " ); - for (final MavenProject project : checkTooMany) { - System.out.println(project.getId()); + for ( final MavenProject project : checkTooMany ) + { + System.out.println( project.getId() ); } } @@ -865,8 +869,7 @@ public class ModuleSetAssemblyPhaseTest final File parentBase = parentProject.getBasedir(); pomFile = new File( parentBase, artifactId + "/pom.xml" ); - parentProject.getModel() - .addModule( artifactId ); + parentProject.getModel().addModule( artifactId ); project.setParent( parentProject ); } @@ -889,7 +892,8 @@ public class ModuleSetAssemblyPhaseTest return new ModuleSetAssemblyPhase( projectBuilder, dr, logger ); } - private ModuleSetAssemblyPhase createPhase( final Logger logger, DependencyResolver dr, ProjectBuilder projectBuilder1 ) + private ModuleSetAssemblyPhase createPhase( final Logger logger, DependencyResolver dr, + ProjectBuilder projectBuilder1 ) { return new ModuleSetAssemblyPhase( projectBuilder1, dr, logger ); } Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java (from r1685251, 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/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,21 +19,17 @@ package org.apache.maven.plugin.assembly * under the License. */ -import java.io.File; -import java.io.IOException; - import junit.framework.Assert; import junit.framework.TestCase; - 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.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.model.Repository; -import org.apache.maven.plugin.assembly.testutils.TestFileManager; -import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.Repository; +import org.apache.maven.plugins.assembly.testutils.TestFileManager; +import org.apache.maven.plugins.assembly.utils.TypeConversionUtils; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.repository.RepositoryAssembler; import org.apache.maven.shared.repository.RepositoryAssemblyException; @@ -49,6 +45,9 @@ import org.codehaus.plexus.logging.conso import org.easymock.classextension.EasyMock; import org.easymock.classextension.EasyMockSupport; +import java.io.File; +import java.io.IOException; + import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.expect; @@ -86,7 +85,8 @@ public class RepositoryAssemblyPhaseTest createPhase( macRepo.repositoryAssembler, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ).execute( assembly, macArchiver.archiver, - macCS.configSource ); + macCS + .configSource ); mm.verifyAll(); } @@ -107,7 +107,6 @@ public class RepositoryAssemblyPhaseTest macCS.expectGetFinalName( "final-name" ); macCS.expectInterpolators(); - final Assembly assembly = new Assembly(); assembly.setId( "test" ); @@ -133,7 +132,8 @@ public class RepositoryAssemblyPhaseTest createPhase( macRepo.repositoryAssembler, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ).execute( assembly, macArchiver.archiver, - macCS.configSource ); + macCS + .configSource ); mm.verifyAll(); } @@ -153,7 +153,7 @@ public class RepositoryAssemblyPhaseTest public MockAndControlForArchiver( final EasyMockSupport mockManager ) { - archiver = mockManager.createMock (Archiver.class); + archiver = mockManager.createMock( Archiver.class ); } public void expectAddDirectory( final File outDir, final String location, final String[] includes, @@ -167,7 +167,7 @@ public class RepositoryAssemblyPhaseTest fs.setIncludes( includes ); fs.setExcludes( excludes ); - archiver.addFileSet( (FileSet)anyObject() ); + archiver.addFileSet( (FileSet) anyObject() ); } catch ( final ArchiverException e ) { @@ -180,9 +180,9 @@ public class RepositoryAssemblyPhaseTest void expectModeChange( final int defaultDirMode, final int defaultFileMode, final int dirMode, final int fileMode, final boolean expectTwoSets ) { - expect( archiver.getOverrideDirectoryMode()).andReturn( defaultDirMode ); + expect( archiver.getOverrideDirectoryMode() ).andReturn( defaultDirMode ); - expect( archiver.getOverrideFileMode()).andReturn( defaultFileMode ); + expect( archiver.getOverrideFileMode() ).andReturn( defaultFileMode ); if ( expectTwoSets ) { @@ -213,31 +213,33 @@ public class RepositoryAssemblyPhaseTest public MockAndControlForConfigSource( final EasyMockSupport mockManager ) { - configSource = mockManager.createMock(AssemblerConfigurationSource.class); + configSource = mockManager.createMock( AssemblerConfigurationSource.class ); - expect( configSource.getMavenSession()).andReturn( null ).anyTimes(); + expect( configSource.getMavenSession() ).andReturn( null ).anyTimes(); } public void expectGetProject( final MavenProject project ) { - expect(configSource.getProject()).andReturn( project ).atLeastOnce(); + expect( configSource.getProject() ).andReturn( project ).atLeastOnce(); } public void expectGetFinalName( final String finalName ) { - expect(configSource.getFinalName()).andReturn( finalName ).atLeastOnce(); + expect( configSource.getFinalName() ).andReturn( finalName ).atLeastOnce(); } - public void expectInterpolators( ) + public void expectInterpolators() { - expect(configSource.getCommandLinePropsInterpolator()).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes(); - expect(configSource.getEnvInterpolator()).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes(); - expect(configSource.getMainProjectInterpolator()).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes(); + expect( configSource.getCommandLinePropsInterpolator() ).andReturn( + FixedStringSearchInterpolator.empty() ).anyTimes(); + expect( configSource.getEnvInterpolator() ).andReturn( FixedStringSearchInterpolator.empty() ).anyTimes(); + expect( configSource.getMainProjectInterpolator() ).andReturn( + FixedStringSearchInterpolator.empty() ).anyTimes(); } public void expectGetTemporaryRootDirectory( final File tempRoot ) { - expect(configSource.getTemporaryRootDirectory()).andReturn( tempRoot ).atLeastOnce(); + expect( configSource.getTemporaryRootDirectory() ).andReturn( tempRoot ).atLeastOnce(); } // @@ -254,16 +256,15 @@ public class RepositoryAssemblyPhaseTest MockAndControlForRepositoryAssembler( final EasyMockSupport mockManager ) { - repositoryAssembler = mockManager.createMock(RepositoryAssembler.class); + repositoryAssembler = mockManager.createMock( RepositoryAssembler.class ); } public void expectAssemble() { try { - repositoryAssembler.buildRemoteRepository( (File)anyObject(), - (RepositoryInfo) anyObject(), - ( RepositoryBuilderConfigSource)anyObject() ); + repositoryAssembler.buildRemoteRepository( (File) anyObject(), (RepositoryInfo) anyObject(), + (RepositoryBuilderConfigSource) anyObject() ); EasyMock.expectLastCall().atLeastOnce(); } catch ( final RepositoryAssemblyException e ) Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java (from r1685251, 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/plugins/assembly/archive/task/AddArtifactTaskTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/task/AddArtifactTaskTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.task; +package org.apache.maven.plugins.assembly.archive.task; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,12 +22,12 @@ package org.apache.maven.plugin.assembly import junit.framework.TestCase; import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Model; -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.MockAndControlForAddArtifactTask; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.model.DependencySet; -import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.archive.task.testutils.ArtifactMock; +import org.apache.maven.plugins.assembly.archive.task.testutils.MockAndControlForAddArtifactTask; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.DependencySet; +import org.apache.maven.plugins.assembly.utils.TypeConversionUtils; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.archiver.ArchivedFileSet; import org.codehaus.plexus.archiver.ArchiverException; @@ -188,7 +188,7 @@ public class AddArtifactTaskTest mac.expectGetDestFile( new File( "junk" ) ); try { - mac.archiver.addArchivedFileSet( (ArchivedFileSet) anyObject(), (Charset) anyObject() ); + mac.archiver.addArchivedFileSet( (ArchivedFileSet) anyObject(), (Charset) anyObject() ); } catch ( ArchiverException e ) { Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java (from r1685251, 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/plugins/assembly/archive/task/AddDependencySetsTaskTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/task/AddDependencySetsTaskTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.task; +package org.apache.maven.plugins.assembly.archive.task; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,13 +22,13 @@ package org.apache.maven.plugin.assembly import junit.framework.TestCase; import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Model; -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest; -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.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.model.DependencySet; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest; +import org.apache.maven.plugins.assembly.archive.task.testutils.ArtifactMock; +import org.apache.maven.plugins.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.DependencySet; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingException; import org.codehaus.plexus.logging.Logger; @@ -107,15 +107,14 @@ public class AddDependencySetsTaskTest DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource ); - mockManager.replayAll(); final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); - final AddDependencySetsTask task = - new AddDependencySetsTask( Collections.singletonList( ds ), - Collections.singleton( depArtifactMock.getArtifact() ), depProject, - macTask.projectBuilder, logger ); + final AddDependencySetsTask task = new AddDependencySetsTask( Collections.singletonList( ds ), + Collections.singleton( + depArtifactMock.getArtifact() ), depProject, + macTask.projectBuilder, logger ); task.addDependencySet( ds, macTask.archiver, macTask.configSource ); @@ -127,7 +126,8 @@ public class AddDependencySetsTaskTest { final MavenProject project = new MavenProject( new Model() ); - final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager ); + final MockAndControlForAddDependencySetsTask macTask = + new MockAndControlForAddDependencySetsTask( mockManager ); final DependencySet ds = new DependencySet(); ds.setOutputDirectory( "/out" ); @@ -250,10 +250,10 @@ public class AddDependencySetsTaskTest final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); - final AddDependencySetsTask task = - new AddDependencySetsTask( Collections.singletonList( ds ), - Collections.singleton( artifactMock.getArtifact() ), project, - macTask.projectBuilder, logger ); + final AddDependencySetsTask task = new AddDependencySetsTask( Collections.singletonList( ds ), + Collections.singleton( + artifactMock.getArtifact() ), project, + macTask.projectBuilder, logger ); DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource ); mockManager.replayAll(); @@ -268,7 +268,8 @@ public class AddDependencySetsTaskTest { final MavenProject project = new MavenProject( new Model() ); - final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager ); + final MockAndControlForAddDependencySetsTask macTask = + new MockAndControlForAddDependencySetsTask( mockManager ); final ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version", "jar", false ); @@ -280,17 +281,16 @@ public class AddDependencySetsTaskTest mockManager.replayAll(); - final AddDependencySetsTask task = - new AddDependencySetsTask( Collections.singletonList( dependencySet ), - Collections.singleton( artifactMock.getArtifact() ), project, - macTask.projectBuilder, logger ); + final AddDependencySetsTask task = new AddDependencySetsTask( Collections.singletonList( dependencySet ), + Collections.singleton( + artifactMock.getArtifact() ), project, + macTask.projectBuilder, logger ); final Set<Artifact> result = task.resolveDependencyArtifacts( dependencySet ); assertNotNull( result ); assertEquals( 1, result.size() ); - assertSame( artifactMock.getArtifact(), result.iterator() - .next() ); + assertSame( artifactMock.getArtifact(), result.iterator().next() ); mockManager.verifyAll(); } @@ -326,8 +326,7 @@ public class AddDependencySetsTaskTest assertNotNull( result ); assertEquals( 1, result.size() ); - assertSame( am.getArtifact(), result.iterator() - .next() ); + assertSame( am.getArtifact(), result.iterator().next() ); mockManager.verifyAll(); } @@ -361,8 +360,7 @@ public class AddDependencySetsTaskTest assertNotNull( result ); assertEquals( 1, result.size() ); - assertSame( am.getArtifact(), result.iterator() - .next() ); + assertSame( am.getArtifact(), result.iterator().next() ); mockManager.verifyAll(); }
