Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.io; +package org.apache.maven.plugins.assembly.io; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,21 +23,21 @@ import junit.framework.TestCase; import org.apache.maven.artifact.Artifact; 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.DefaultAssemblyArchiverTest; -import org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.model.Component; -import org.apache.maven.plugin.assembly.model.ContainerDescriptorHandlerConfig; -import org.apache.maven.plugin.assembly.model.DependencySet; -import org.apache.maven.plugin.assembly.model.FileItem; -import org.apache.maven.plugin.assembly.model.FileSet; -import org.apache.maven.plugin.assembly.model.Repository; -import org.apache.maven.plugin.assembly.model.io.xpp3.AssemblyXpp3Writer; -import org.apache.maven.plugin.assembly.model.io.xpp3.ComponentXpp3Reader; -import org.apache.maven.plugin.assembly.model.io.xpp3.ComponentXpp3Writer; -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.DefaultAssemblyArchiverTest; +import org.apache.maven.plugins.assembly.interpolation.AssemblyInterpolator; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.Component; +import org.apache.maven.plugins.assembly.model.ContainerDescriptorHandlerConfig; +import org.apache.maven.plugins.assembly.model.DependencySet; +import org.apache.maven.plugins.assembly.model.FileItem; +import org.apache.maven.plugins.assembly.model.FileSet; +import org.apache.maven.plugins.assembly.model.Repository; +import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Writer; +import org.apache.maven.plugins.assembly.model.io.xpp3.ComponentXpp3Reader; +import org.apache.maven.plugins.assembly.model.io.xpp3.ComponentXpp3Writer; +import org.apache.maven.plugins.assembly.testutils.TestFileManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator; import org.codehaus.plexus.interpolation.fixed.InterpolationState; @@ -60,7 +60,7 @@ import java.util.List; import static org.easymock.EasyMock.expect; -@SuppressWarnings("ResultOfMethodCallIgnored") +@SuppressWarnings( "ResultOfMethodCallIgnored" ) public class DefaultAssemblyReaderTest extends TestCase { @@ -89,14 +89,15 @@ public class DefaultAssemblyReaderTest fileManager = new TestFileManager( "assembly-reader.test.", ".xml" ); mockManager = new EasyMockSupport(); - configSource = mockManager.createMock(AssemblerConfigurationSource.class); + configSource = mockManager.createMock( AssemblerConfigurationSource.class ); ArtifactRepository localRepo = mockManager.createMock( ArtifactRepository.class ); - expect( localRepo.getBasedir()).andReturn("/path/to/local/repo").anyTimes(); - expect(configSource.getLocalRepository()).andReturn( localRepo ).anyTimes(); - expect( configSource.getRemoteRepositories()).andReturn( Collections.<ArtifactRepository>emptyList()).anyTimes(); - expect(configSource.getMavenSession()).andReturn( null).anyTimes(); + expect( localRepo.getBasedir() ).andReturn( "/path/to/local/repo" ).anyTimes(); + expect( configSource.getLocalRepository() ).andReturn( localRepo ).anyTimes(); + expect( configSource.getRemoteRepositories() ).andReturn( + Collections.<ArtifactRepository>emptyList() ).anyTimes(); + expect( configSource.getMavenSession() ).andReturn( null ).anyTimes(); } @Override @@ -112,7 +113,7 @@ public class DefaultAssemblyReaderTest final File siteDir = File.createTempFile( "assembly-reader.", ".test" ); siteDir.delete(); - expect( configSource.getSiteDirectory()).andReturn( siteDir ).anyTimes(); + expect( configSource.getSiteDirectory() ).andReturn( siteDir ).anyTimes(); final Assembly assembly = new Assembly(); @@ -339,12 +340,9 @@ public class DefaultAssemblyReaderTest assertNotNull( depSets ); assertEquals( 3, depSets.size() ); - assertEquals( Artifact.SCOPE_RUNTIME, depSets.get( 0 ) - .getScope() ); - assertEquals( Artifact.SCOPE_COMPILE, depSets.get( 1 ) - .getScope() ); - assertEquals( Artifact.SCOPE_SYSTEM, depSets.get( 2 ) - .getScope() ); + assertEquals( Artifact.SCOPE_RUNTIME, depSets.get( 0 ).getScope() ); + assertEquals( Artifact.SCOPE_COMPILE, depSets.get( 1 ).getScope() ); + assertEquals( Artifact.SCOPE_SYSTEM, depSets.get( 2 ).getScope() ); } public void testMergeComponentWithAssembly_ShouldAddOneRepositoryToExistingListOfTwo() @@ -496,16 +494,15 @@ public class DefaultAssemblyReaderTest final File basedir = componentFile.getParentFile(); - final MavenProject project = new MavenProject(); - expect( configSource.getProject()).andReturn( project ).anyTimes(); - expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); + expect( configSource.getProject() ).andReturn( project ).anyTimes(); + expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes(); DefaultAssemblyArchiverTest.setupInterpolators( configSource ); InterpolationState is = new InterpolationState(); - ComponentXpp3Reader.ContentTransformer componentIp = AssemblyInterpolator.componentInterpolator( - FixedStringSearchInterpolator.create(), is, new ConsoleLogger( Logger.LEVEL_DEBUG, "console" ) ); - + ComponentXpp3Reader.ContentTransformer componentIp = + AssemblyInterpolator.componentInterpolator( FixedStringSearchInterpolator.create(), is, + new ConsoleLogger( Logger.LEVEL_DEBUG, "console" ) ); mockManager.replayAll(); @@ -548,11 +545,11 @@ public class DefaultAssemblyReaderTest final File siteDir = fileManager.createTempDir(); - expect( configSource.getSiteDirectory()).andReturn( siteDir ).anyTimes(); + expect( configSource.getSiteDirectory() ).andReturn( siteDir ).anyTimes(); final File basedir = fileManager.createTempDir(); - expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); + expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes(); final Model model = new Model(); model.setGroupId( "group" ); @@ -561,9 +558,9 @@ public class DefaultAssemblyReaderTest final MavenProject project = new MavenProject( model ); - expect(configSource.getProject()).andReturn( project ).anyTimes(); + expect( configSource.getProject() ).andReturn( project ).anyTimes(); - expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); + expect( configSource.isSiteIncluded() ).andReturn( false ).anyTimes(); DefaultAssemblyArchiverTest.setupInterpolators( configSource ); mockManager.replayAll(); @@ -576,8 +573,7 @@ public class DefaultAssemblyReaderTest assertEquals( 1, fileSets.size() ); - assertEquals( "/site", fileSets.get( 0 ) - .getOutputDirectory() ); + assertEquals( "/site", fileSets.get( 0 ).getOutputDirectory() ); mockManager.verifyAll(); } @@ -592,11 +588,11 @@ public class DefaultAssemblyReaderTest final File siteDir = fileManager.createTempDir(); - expect( configSource.getSiteDirectory()).andReturn( siteDir ).anyTimes(); + expect( configSource.getSiteDirectory() ).andReturn( siteDir ).anyTimes(); final File basedir = fileManager.createTempDir(); - expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); + expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes(); final Model model = new Model(); model.setGroupId( "group" ); @@ -605,9 +601,9 @@ public class DefaultAssemblyReaderTest final MavenProject project = new MavenProject( model ); - expect( configSource.getProject()).andReturn( project ).anyTimes(); + expect( configSource.getProject() ).andReturn( project ).anyTimes(); - expect( configSource.isSiteIncluded()).andReturn( true ).anyTimes(); + expect( configSource.isSiteIncluded() ).andReturn( true ).anyTimes(); DefaultAssemblyArchiverTest.setupInterpolators( configSource ); mockManager.replayAll(); @@ -620,8 +616,7 @@ public class DefaultAssemblyReaderTest assertEquals( 1, fileSets.size() ); - assertEquals( "/site", fileSets.get( 0 ) - .getOutputDirectory() ); + assertEquals( "/site", fileSets.get( 0 ).getOutputDirectory() ); mockManager.verifyAll(); } @@ -660,7 +655,7 @@ public class DefaultAssemblyReaderTest final StringReader sr = writeToStringReader( assembly ); - expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); + expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes(); final Model model = new Model(); model.setGroupId( "group" ); @@ -668,9 +663,9 @@ public class DefaultAssemblyReaderTest model.setVersion( "version" ); final MavenProject project = new MavenProject( model ); - expect( configSource.getProject()).andReturn( project ).anyTimes(); + expect( configSource.getProject() ).andReturn( project ).anyTimes(); - expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); + expect( configSource.isSiteIncluded() ).andReturn( false ).anyTimes(); DefaultAssemblyArchiverTest.setupInterpolators( configSource ); mockManager.replayAll(); @@ -683,13 +678,13 @@ public class DefaultAssemblyReaderTest assertEquals( 1, fileSets.size() ); - assertEquals( "/dir", fileSets.get( 0 ) - .getDirectory() ); + assertEquals( "/dir", fileSets.get( 0 ).getDirectory() ); mockManager.verifyAll(); } - public void testReadAssembly_ShouldReadAssemblyWithComponentInterpolationWithoutSiteDirInclusionOrAssemblyInterpolation() + public void + testReadAssembly_ShouldReadAssemblyWithComponentInterpolationWithoutSiteDirInclusionOrAssemblyInterpolation() throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException { final File componentsFile = fileManager.createTempFile(); @@ -723,7 +718,7 @@ public class DefaultAssemblyReaderTest final StringReader sr = writeToStringReader( assembly ); - expect( configSource.getBasedir()).andReturn( basedir ).atLeastOnce(); + expect( configSource.getBasedir() ).andReturn( basedir ).atLeastOnce(); final Model model = new Model(); model.setGroupId( "group" ); @@ -732,9 +727,9 @@ public class DefaultAssemblyReaderTest final MavenProject project = new MavenProject( model ); - expect( configSource.getProject()).andReturn( project ).atLeastOnce(); + expect( configSource.getProject() ).andReturn( project ).atLeastOnce(); - expect( configSource.isSiteIncluded()).andReturn( false ); + expect( configSource.isSiteIncluded() ).andReturn( false ); DefaultAssemblyArchiverTest.setupInterpolators( configSource ); mockManager.replayAll(); @@ -747,8 +742,7 @@ public class DefaultAssemblyReaderTest assertEquals( 1, fileSets.size() ); - assertEquals( "group-dir", fileSets.get( 0 ) - .getDirectory() ); + assertEquals( "group-dir", fileSets.get( 0 ).getDirectory() ); mockManager.verifyAll(); } @@ -773,7 +767,7 @@ public class DefaultAssemblyReaderTest final File basedir = fileManager.createTempDir(); - expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); + expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes(); final Model model = new Model(); model.setGroupId( "group" ); @@ -782,9 +776,9 @@ public class DefaultAssemblyReaderTest final MavenProject project = new MavenProject( model ); - expect( configSource.getProject()).andReturn( project ).anyTimes(); + expect( configSource.getProject() ).andReturn( project ).anyTimes(); - expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); + expect( configSource.isSiteIncluded() ).andReturn( false ).anyTimes(); DefaultAssemblyArchiverTest.setupInterpolators( configSource ); @@ -808,11 +802,11 @@ public class DefaultAssemblyReaderTest final File basedir = assemblyFile.getParentFile(); - expect( configSource.getBasedir()).andReturn( basedir).anyTimes(); + expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes(); - expect( configSource.getProject()).andReturn( new MavenProject( new Model() )).anyTimes(); + expect( configSource.getProject() ).andReturn( new MavenProject( new Model() ) ).anyTimes(); - expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); + expect( configSource.isSiteIncluded() ).andReturn( false ).anyTimes(); DefaultAssemblyArchiverTest.setupInterpolators( configSource ); @@ -841,13 +835,13 @@ public class DefaultAssemblyReaderTest { final File basedir = fileManager.createTempDir(); - expect( configSource.getBasedir()).andReturn( basedir).anyTimes(); + expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes(); - expect( configSource.getProject()).andReturn( new MavenProject( new Model() )).anyTimes(); + expect( configSource.getProject() ).andReturn( new MavenProject( new Model() ) ).anyTimes(); - expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); + expect( configSource.isSiteIncluded() ).andReturn( false ).anyTimes(); - expect( configSource.isIgnoreMissingDescriptor()).andReturn( false ).anyTimes(); + expect( configSource.isIgnoreMissingDescriptor() ).andReturn( false ).anyTimes(); DefaultAssemblyArchiverTest.setupInterpolators( configSource ); @@ -921,7 +915,8 @@ public class DefaultAssemblyReaderTest } catch ( final AssemblyReadException e ) { - fail( "Setting ignoreMissingDescriptor == true (true flag in performReadAssemblies, above) should NOT produce an exception." ); + fail( "Setting ignoreMissingDescriptor == true (true flag in performReadAssemblies, above) should NOT " + + "produce an exception." ); } } @@ -958,7 +953,7 @@ public class DefaultAssemblyReaderTest final List<String> files = writeAssembliesToFile( assemblies, basedir ); final List<Assembly> results = - performReadAssemblies( basedir, null, null, files.toArray(new String[files.size()]), null, null ); + performReadAssemblies( basedir, null, null, files.toArray( new String[files.size()] ), null, null ); assertNotNull( results ); assertEquals( 2, results.size() ); @@ -978,7 +973,7 @@ public class DefaultAssemblyReaderTest final File basedir = fileManager.createTempDir(); final List<Assembly> assemblies = - performReadAssemblies( basedir, null, null, null, new String[] { "bin", "src" }, null ); + performReadAssemblies( basedir, null, null, null, new String[]{ "bin", "src" }, null ); assertNotNull( assemblies ); assertEquals( 2, assemblies.size() ); @@ -1061,18 +1056,22 @@ public class DefaultAssemblyReaderTest { final List<String> files = new ArrayList<String>(); - for (final Assembly assembly : assemblies) { - final File assemblyFile = new File(dir, assembly.getId() + ".xml"); + for ( final Assembly assembly : assemblies ) + { + final File assemblyFile = new File( dir, assembly.getId() + ".xml" ); Writer writer = null; - try { - writer = new OutputStreamWriter(new FileOutputStream(assemblyFile), "UTF-8"); - new AssemblyXpp3Writer().write(writer, assembly); - } finally { - IOUtil.close(writer); + try + { + writer = new OutputStreamWriter( new FileOutputStream( assemblyFile ), "UTF-8" ); + new AssemblyXpp3Writer().write( writer, assembly ); + } + finally + { + IOUtil.close( writer ); } - files.add(assemblyFile.getAbsolutePath()); + files.add( assemblyFile.getAbsolutePath() ); } return files; @@ -1093,23 +1092,23 @@ public class DefaultAssemblyReaderTest final boolean ignoreMissing ) throws AssemblyReadException, InvalidAssemblerConfigurationException { - expect( configSource.getDescriptor()).andReturn( descriptor ); + expect( configSource.getDescriptor() ).andReturn( descriptor ); - expect( configSource.getDescriptorId()).andReturn( descriptorRef ); + expect( configSource.getDescriptorId() ).andReturn( descriptorRef ); - expect( configSource.getDescriptorReferences()).andReturn( descriptorRefs ); + expect( configSource.getDescriptorReferences() ).andReturn( descriptorRefs ); - expect( configSource.getDescriptors()).andReturn( descriptors ); + expect( configSource.getDescriptors() ).andReturn( descriptors ); - expect( configSource.getDescriptorSourceDirectory()).andReturn( descriptorDir ); + expect( configSource.getDescriptorSourceDirectory() ).andReturn( descriptorDir ); - expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); + expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes(); - expect( configSource.getProject()).andReturn( new MavenProject( new Model() )).anyTimes(); + expect( configSource.getProject() ).andReturn( new MavenProject( new Model() ) ).anyTimes(); - expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); + expect( configSource.isSiteIncluded() ).andReturn( false ).anyTimes(); - expect( configSource.isIgnoreMissingDescriptor()).andReturn( ignoreMissing).anyTimes(); + expect( configSource.isIgnoreMissingDescriptor() ).andReturn( ignoreMissing ).anyTimes(); DefaultAssemblyArchiverTest.setupInterpolators( configSource ); mockManager.replayAll();
Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategyTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategyTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategyTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategyTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategyTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.io; +package org.apache.maven.plugins.assembly.io; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +20,6 @@ package org.apache.maven.plugin.assembly */ import junit.framework.TestCase; - import org.apache.maven.shared.io.location.Location; import org.apache.maven.shared.io.location.LocatorStrategy; import org.apache.maven.shared.io.logging.DefaultMessageHolder; Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/PojoConfigSource.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/PojoConfigSource.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/PojoConfigSource.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/PojoConfigSource.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/PojoConfigSource.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/PojoConfigSource.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/PojoConfigSource.java Sat Jun 13 20:10:29 2015 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.plugin.assembly.testutils; +package org.apache.maven.plugins.assembly.testutils; import org.apache.maven.archiver.MavenArchiveConfiguration; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.execution.MavenSession; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.filtering.MavenReaderFilter; import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator; @@ -30,7 +30,8 @@ import javax.annotation.Nonnull; import java.io.File; import java.util.List; -public class PojoConfigSource implements AssemblerConfigurationSource +public class PojoConfigSource + implements AssemblerConfigurationSource { String descriptor; @@ -102,7 +103,7 @@ public class PojoConfigSource implements private MavenSession mavenSession; - private FixedStringSearchInterpolator rootInterpolator = FixedStringSearchInterpolator.empty(); + private FixedStringSearchInterpolator rootInterpolator = FixedStringSearchInterpolator.empty(); private FixedStringSearchInterpolator environmentInterpolator = FixedStringSearchInterpolator.empty(); @@ -115,6 +116,11 @@ public class PojoConfigSource implements return descriptor; } + public void setDescriptor( String descriptor ) + { + this.descriptor = descriptor; + } + public String getDescriptorId() { return decriptorId; @@ -125,11 +131,21 @@ public class PojoConfigSource implements return descriptors; } + public void setDescriptors( String[] descriptors ) + { + this.descriptors = descriptors; + } + public String[] getDescriptorReferences() { return descriptorReferences; } + public void setDescriptorReferences( String[] descriptorReferences ) + { + this.descriptorReferences = descriptorReferences; + } + public File getDescriptorSourceDirectory() { return descriptorSourceReference; @@ -140,6 +156,11 @@ public class PojoConfigSource implements return basedir; } + public void setBasedir( File basedir ) + { + this.basedir = basedir; + } + public MavenProject getProject() { return mavenProject; @@ -155,274 +176,279 @@ public class PojoConfigSource implements return siteDirectory; } + public void setSiteDirectory( File siteDirectory ) + { + this.siteDirectory = siteDirectory; + } + public String getFinalName() { return finalName; } - public boolean isAssemblyIdAppended() + public void setFinalName( String finalName ) { - return isAssemblyIdAppended; + this.finalName = finalName; } - public String getClassifier() + public boolean isAssemblyIdAppended() { - return classifier; + return isAssemblyIdAppended; } - public String getTarLongFileMode() + public void setAssemblyIdAppended( boolean isAssemblyIdAppended ) { - return tarLongFileMode; + this.isAssemblyIdAppended = isAssemblyIdAppended; } - public File getOutputDirectory() + public String getClassifier() { - return outputDirectory; + return classifier; } - public File getWorkingDirectory() + public void setClassifier( String classifier ) { - return workingDirectory; + this.classifier = classifier; } - public MavenArchiveConfiguration getJarArchiveConfiguration() + public String getTarLongFileMode() { - return jarArchiveConfiguration; + return tarLongFileMode; } - public ArtifactRepository getLocalRepository() + public void setTarLongFileMode( String tarLongFileMode ) { - return localRepository; + this.tarLongFileMode = tarLongFileMode; } - public File getTemporaryRootDirectory() + public File getOutputDirectory() { - return temporaryRootDirectory; + return outputDirectory; } - public File getArchiveBaseDirectory() + public void setOutputDirectory( File outputDirectory ) { - return archiveBaseDirectory; + this.outputDirectory = outputDirectory; } - public List<String> getFilters() + public File getWorkingDirectory() { - return filters; + return workingDirectory; } - public boolean isIncludeProjectBuildFilters() + public void setWorkingDirectory( File workingDirectory ) { - return isIncludeProjectBuildFilter; + this.workingDirectory = workingDirectory; } - public List<MavenProject> getReactorProjects() + public MavenArchiveConfiguration getJarArchiveConfiguration() { - return reactorProjects; + return jarArchiveConfiguration; } - public List<ArtifactRepository> getRemoteRepositories() + public void setJarArchiveConfiguration( MavenArchiveConfiguration jarArchiveConfiguration ) { - return remoteRepository; + this.jarArchiveConfiguration = jarArchiveConfiguration; } - public boolean isDryRun() + public ArtifactRepository getLocalRepository() { - return isDryRun; + return localRepository; } - public boolean isIgnoreDirFormatExtensions() + public void setLocalRepository( ArtifactRepository localRepository ) { - return isIgnoreDirFormatExtensions; + this.localRepository = localRepository; } - public boolean isIgnoreMissingDescriptor() + public File getTemporaryRootDirectory() { - return isIgnoreMissingDescriptor; + return temporaryRootDirectory; } - public MavenSession getMavenSession() + public void setTemporaryRootDirectory( File temporaryRootDirectory ) { - return mavenSession; + this.temporaryRootDirectory = temporaryRootDirectory; } - public String getArchiverConfig() + public File getArchiveBaseDirectory() { - return archiverConfig; + return archiveBaseDirectory; } - public MavenReaderFilter getMavenReaderFilter() + public void setArchiveBaseDirectory( File archiveBaseDirectory ) { - return mavenReaderFilter; + this.archiveBaseDirectory = archiveBaseDirectory; } - public boolean isUpdateOnly() + public List<String> getFilters() { - return isUpdateOnly; + return filters; } - public boolean isUseJvmChmod() + public void setFilters( List<String> filters ) { - return isUseJvmChmod; + this.filters = filters; } - public boolean isIgnorePermissions() + public boolean isIncludeProjectBuildFilters() { - return isIgnorePermissions; + return isIncludeProjectBuildFilter; } - public String getEncoding() + public List<MavenProject> getReactorProjects() { - return encoding; + return reactorProjects; } - public String getEscapeString() + public void setReactorProjects( List<MavenProject> reactorProjects ) { - return escapeString; + this.reactorProjects = reactorProjects; } - public List<String> getDelimiters() + public List<ArtifactRepository> getRemoteRepositories() { - return delimiters; + return remoteRepository; } - public void setDescriptor( String descriptor ) + public boolean isDryRun() { - this.descriptor = descriptor; + return isDryRun; } - public void setBasedir( File basedir ) + public void setDryRun( boolean isDryRun ) { - this.basedir = basedir; + this.isDryRun = isDryRun; } - public void setMavenProject( MavenProject mavenProject ) + public boolean isIgnoreDirFormatExtensions() { - this.mavenProject = mavenProject; + return isIgnoreDirFormatExtensions; } - public void setSitencluded( boolean isSitencluded ) + public void setIgnoreDirFormatExtensions( boolean isIgnoreDirFormatExtensions ) { - this.isSitencluded = isSitencluded; + this.isIgnoreDirFormatExtensions = isIgnoreDirFormatExtensions; } - public void setSiteDirectory( File siteDirectory ) + public boolean isIgnoreMissingDescriptor() { - this.siteDirectory = siteDirectory; + return isIgnoreMissingDescriptor; } - public void setDecriptorId( String decriptorId ) + public void setIgnoreMissingDescriptor( boolean isIgnoreMissingDescriptor ) { - this.decriptorId = decriptorId; + this.isIgnoreMissingDescriptor = isIgnoreMissingDescriptor; } - public void setFinalName( String finalName ) + public MavenSession getMavenSession() { - this.finalName = finalName; + return mavenSession; } - public void setDelimiters( List<String> delimiters ) + public void setMavenSession( MavenSession mavenSession ) { - this.delimiters = delimiters; + this.mavenSession = mavenSession; } - public void setEscapeString( String escapeString ) + public String getArchiverConfig() { - this.escapeString = escapeString; + return archiverConfig; } - public void setEncoding( String encoding ) + public void setArchiverConfig( String archiverConfig ) { - this.encoding = encoding; + this.archiverConfig = archiverConfig; } - public void setUpdateOnly( boolean isUpdateOnly ) + public MavenReaderFilter getMavenReaderFilter() { - this.isUpdateOnly = isUpdateOnly; + return mavenReaderFilter; } - public void setUseJvmChmod( boolean isUseJvmChmod ) + public void setMavenReaderFilter( MavenReaderFilter mavenReaderFilter ) { - this.isUseJvmChmod = isUseJvmChmod; + this.mavenReaderFilter = mavenReaderFilter; } - public void setIgnorePermissions( boolean isIgnorePermissions ) + public boolean isUpdateOnly() { - this.isIgnorePermissions = isIgnorePermissions; + return isUpdateOnly; } - public void setArchiverConfig( String archiverConfig ) + public void setUpdateOnly( boolean isUpdateOnly ) { - this.archiverConfig = archiverConfig; + this.isUpdateOnly = isUpdateOnly; } - public void setAssemblyIdAppended( boolean isAssemblyIdAppended ) + public boolean isUseJvmChmod() { - this.isAssemblyIdAppended = isAssemblyIdAppended; + return isUseJvmChmod; } - public void setClassifier( String classifier ) + public void setUseJvmChmod( boolean isUseJvmChmod ) { - this.classifier = classifier; + this.isUseJvmChmod = isUseJvmChmod; } - public void setTarLongFileMode( String tarLongFileMode ) + public boolean isIgnorePermissions() { - this.tarLongFileMode = tarLongFileMode; + return isIgnorePermissions; } - public void setWorkingDirectory( File workingDirectory ) + public void setIgnorePermissions( boolean isIgnorePermissions ) { - this.workingDirectory = workingDirectory; + this.isIgnorePermissions = isIgnorePermissions; } - public void setJarArchiveConfiguration( MavenArchiveConfiguration jarArchiveConfiguration ) + public String getEncoding() { - this.jarArchiveConfiguration = jarArchiveConfiguration; + return encoding; } - public void setMavenReaderFilter( MavenReaderFilter mavenReaderFilter ) + public void setEncoding( String encoding ) { - this.mavenReaderFilter = mavenReaderFilter; + this.encoding = encoding; } - public void setOutputDirectory( File outputDirectory ) + public String getEscapeString() { - this.outputDirectory = outputDirectory; + return escapeString; } - public void setDescriptors( String[] descriptors ) + public void setEscapeString( String escapeString ) { - this.descriptors = descriptors; + this.escapeString = escapeString; } - public void setDescriptorReferences( String[] descriptorReferences ) + public List<String> getDelimiters() { - this.descriptorReferences = descriptorReferences; + return delimiters; } - public void setDescriptorSourceReference( File descriptorSourceReference ) + public void setDelimiters( List<String> delimiters ) { - this.descriptorSourceReference = descriptorSourceReference; + this.delimiters = delimiters; } - public void setLocalRepository( ArtifactRepository localRepository ) + public void setMavenProject( MavenProject mavenProject ) { - this.localRepository = localRepository; + this.mavenProject = mavenProject; } - public void setTemporaryRootDirectory( File temporaryRootDirectory ) + public void setSitencluded( boolean isSitencluded ) { - this.temporaryRootDirectory = temporaryRootDirectory; + this.isSitencluded = isSitencluded; } - public void setArchiveBaseDirectory( File archiveBaseDirectory ) + public void setDecriptorId( String decriptorId ) { - this.archiveBaseDirectory = archiveBaseDirectory; + this.decriptorId = decriptorId; } - public void setFilters( List<String> filters ) + public void setDescriptorSourceReference( File descriptorSourceReference ) { - this.filters = filters; + this.descriptorSourceReference = descriptorSourceReference; } public void setIncludeProjectBuildFilter( boolean isIncludeProjectBuildFilter ) @@ -430,36 +456,11 @@ public class PojoConfigSource implements this.isIncludeProjectBuildFilter = isIncludeProjectBuildFilter; } - public void setReactorProjects( List<MavenProject> reactorProjects ) - { - this.reactorProjects = reactorProjects; - } - public void setRemoteRepository( List<ArtifactRepository> remoteRepository ) { this.remoteRepository = remoteRepository; } - public void setDryRun( boolean isDryRun ) - { - this.isDryRun = isDryRun; - } - - public void setIgnoreDirFormatExtensions( boolean isIgnoreDirFormatExtensions ) - { - this.isIgnoreDirFormatExtensions = isIgnoreDirFormatExtensions; - } - - public void setIgnoreMissingDescriptor( boolean isIgnoreMissingDescriptor ) - { - this.isIgnoreMissingDescriptor = isIgnoreMissingDescriptor; - } - - public void setMavenSession( MavenSession mavenSession ) - { - this.mavenSession = mavenSession; - } - @Nonnull public FixedStringSearchInterpolator getRepositoryInterpolator() { Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TestFileManager.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TestFileManager.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TestFileManager.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.testutils; +package org.apache.maven.plugins.assembly.testutils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -69,8 +69,7 @@ public class TestFileManager Thread cleanupWarning = new Thread( warning ); - Runtime.getRuntime() - .addShutdownHook( cleanupWarning ); + Runtime.getRuntime().addShutdownHook( cleanupWarning ); } private void maybeWarnAboutCleanUp() @@ -106,7 +105,8 @@ public class TestFileManager return dir; } - public synchronized File createTempFile() throws IOException + public synchronized File createTempFile() + throws IOException { final File tempFile = File.createTempFile( baseFilename, fileSuffix ); tempFile.deleteOnExit(); @@ -143,12 +143,12 @@ public class TestFileManager * NOTE: the file content is written using platform encoding. */ @SuppressWarnings( "ResultOfMethodCallIgnored" ) - public File createFile( final File dir, final String filename, final String contents ) throws IOException + public File createFile( final File dir, final String filename, final String contents ) + throws IOException { final File file = new File( dir, filename ); - file.getParentFile() - .mkdirs(); + file.getParentFile().mkdirs(); FileWriter writer = null; @@ -171,7 +171,8 @@ public class TestFileManager /** * NOTE: the file content is read using platform encoding. */ - public String getFileContents( final File file ) throws IOException + public String getFileContents( final File file ) + throws IOException { String result = null; @@ -191,7 +192,8 @@ public class TestFileManager } @Override - protected void finalize() throws Throwable + protected void finalize() + throws Throwable { maybeWarnAboutCleanUp(); Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtilsTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtilsTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtilsTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtilsTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,8 +20,8 @@ package org.apache.maven.plugin.assembly */ import junit.framework.TestCase; -import org.apache.maven.plugin.assembly.archive.ArchiveExpansionException; -import org.apache.maven.plugin.assembly.testutils.TestFileManager; +import org.apache.maven.plugins.assembly.archive.ArchiveExpansionException; +import org.apache.maven.plugins.assembly.testutils.TestFileManager; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.UnArchiver; import org.codehaus.plexus.archiver.manager.ArchiverManager; @@ -59,7 +59,7 @@ public class AssemblyFileUtilsTest try { - expect(archiverManager.getUnArchiver( source )).andReturn( unarchiver ); + expect( archiverManager.getUnArchiver( source ) ).andReturn( unarchiver ); } catch ( NoSuchArchiverException e ) { Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,22 +19,20 @@ package org.apache.maven.plugin.assembly * under the License. */ -import java.util.Properties; - import junit.framework.TestCase; - import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Build; import org.apache.maven.model.Model; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest; -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.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest; +import org.apache.maven.plugins.assembly.archive.task.testutils.ArtifactMock; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; import org.apache.maven.project.MavenProject; import org.easymock.classextension.EasyMockSupport; -import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.*; +import java.util.Properties; + import static org.easymock.EasyMock.expect; public class AssemblyFormatUtilsTest @@ -94,7 +92,8 @@ public class AssemblyFormatUtilsTest public void testGetOutputDir_ShouldResolveVersionInOutDir_UseArtifactInfo() throws AssemblyFormattingException { - verifyOutputDirUsingArtifactProject( "${artifact.version}", null, null, null, "version", null, null, "version/" ); + verifyOutputDirUsingArtifactProject( "${artifact.version}", null, null, null, "version", null, null, + "version/" ); } public void testGetOutputDir_ShouldResolveBuildFinalNameInOutDir_UseArtifactInfo() @@ -164,7 +163,8 @@ public class AssemblyFormatUtilsTest public void testGetOutputDir_ShouldResolveArtifactIdInOutDir_UseExplicitMainProject_projectRef() throws AssemblyFormattingException { - verifyOutputDirUsingMainProject( "${project.artifactId}", null, null, "artifact", null, null, null, "artifact/" ); + verifyOutputDirUsingMainProject( "${project.artifactId}", null, null, "artifact", null, null, null, + "artifact/" ); } public void testGetOutputDir_ShouldResolveVersionInOutDir_UseExplicitMainProject_projectRef() @@ -206,7 +206,8 @@ public class AssemblyFormatUtilsTest public void testGetOutputDir_ShouldResolveArtifactIdInOutDir() throws AssemblyFormattingException { - verifyOutputDirUsingMainProject( "${artifactId}", "finalName", null, "artifact", null, null, null, "artifact/" ); + verifyOutputDirUsingMainProject( "${artifactId}", "finalName", null, "artifact", null, null, null, + "artifact/" ); } public void testGetOutputDir_ShouldResolveVersionInOutDir() @@ -239,7 +240,7 @@ public class AssemblyFormatUtilsTest { verifyOutputDir( null, null, null, "" ); } - + public void testGetOutputDir_ShouldRemoveRelativeRefToCurrentDir() throws AssemblyFormattingException { @@ -283,7 +284,8 @@ public class AssemblyFormatUtilsTest "file.value/" ); } - public void testEvalFileNameMapping_ShouldResolveArtifactIdAndBaseVersionInOutDir_UseArtifactInfo_WithValidMainProject() + public void + testEvalFileNameMapping_ShouldResolveArtifactIdAndBaseVersionInOutDir_UseArtifactInfo_WithValidMainProject() throws AssemblyFormattingException { final MavenProject mainProject = createProject( "group", "main", "1", null ); @@ -296,22 +298,23 @@ public class AssemblyFormatUtilsTest artifactProject.setArtifact( artifactMock.getArtifact() ); - final MavenSession session = mockManager.createMock(MavenSession.class); - expect( session.getExecutionProperties()).andReturn( null ).anyTimes(); - - expect( session.getUserProperties()).andReturn( new Properties( ) ).anyTimes(); + final MavenSession session = mockManager.createMock( MavenSession.class ); + expect( session.getExecutionProperties() ).andReturn( null ).anyTimes(); + expect( session.getUserProperties() ).andReturn( new Properties() ).anyTimes(); final AssemblerConfigurationSource cs = mockManager.createMock( AssemblerConfigurationSource.class ); - expect( cs.getMavenSession()).andReturn( session ).anyTimes(); - DefaultAssemblyArchiverTest.setupInterpolators( cs); + expect( cs.getMavenSession() ).andReturn( session ).anyTimes(); + DefaultAssemblyArchiverTest.setupInterpolators( cs ); mockManager.replayAll(); final String result = - evaluateFileNameMapping( "${artifact.artifactId}-${artifact.baseVersion}", artifactMock.getArtifact(), - mainProject, null, cs, moduleProjectInterpolator( null ), - artifactProjectInterpolator( artifactProject ) ); + AssemblyFormatUtils.evaluateFileNameMapping( "${artifact.artifactId}-${artifact.baseVersion}", + artifactMock.getArtifact(), mainProject, null, cs, + AssemblyFormatUtils.moduleProjectInterpolator( null ), + AssemblyFormatUtils.artifactProjectInterpolator( + artifactProject ) ); /* final Artifact artifact = artifactMock.getArtifact(); @@ -392,13 +395,15 @@ public class AssemblyFormatUtilsTest public void testEvalFileNameMapping_ShouldResolveVersionInOutDir_UseExplicitMainProject() throws AssemblyFormattingException { - verifyEvalFileNameMappingUsingMainProject( "${pom.version}", null, null, null, "version", null, "version", null ); + verifyEvalFileNameMappingUsingMainProject( "${pom.version}", null, null, null, "version", null, "version", + null ); } public void testEvalFileNameMapping_ShouldResolveGroupIdInOutDir_UseExplicitMainProject_projectRef() throws AssemblyFormattingException { - verifyEvalFileNameMappingUsingMainProject( "${project.groupId}", null, "group", null, null, null, "group", null ); + verifyEvalFileNameMappingUsingMainProject( "${project.groupId}", null, "group", null, null, null, "group", + null ); } public void testEvalFileNameMapping_ShouldResolveArtifactIdInOutDir_UseExplicitMainProject_projectRef() @@ -418,29 +423,25 @@ public class AssemblyFormatUtilsTest public void testEvalFileNameMapping_ShouldRemoveRelativeRefToCurrentDir() throws AssemblyFormattingException { - verifyEvalFileNameMappingUsingMainProject( "./path/", null, null, null, null, null, "path/", - null ); + verifyEvalFileNameMappingUsingMainProject( "./path/", null, null, null, null, null, "path/", null ); } public void testEvalFileNameMapping_ShouldRemoveEmbeddedSameDirRef() throws AssemblyFormattingException { - verifyEvalFileNameMappingUsingMainProject( "some/./path/", null, null, null, null, null, "some/path/", - null ); + verifyEvalFileNameMappingUsingMainProject( "some/./path/", null, null, null, null, null, "some/path/", null ); } public void testEvalFileNameMapping_ShouldRemoveEmbeddedParentDirRef() throws AssemblyFormattingException { - verifyEvalFileNameMappingUsingMainProject( "some/../path/", null, null, null, null, null, "path/", - null ); + verifyEvalFileNameMappingUsingMainProject( "some/../path/", null, null, null, null, null, "path/", null ); } public void testEvalFileNameMapping_ShouldTruncateRelativeRefToParentDir() throws AssemblyFormattingException { - verifyEvalFileNameMappingUsingMainProject( "../path/", null, null, null, null, null, "path/", - null ); + verifyEvalFileNameMappingUsingMainProject( "../path/", null, null, null, null, null, "path/", null ); } public void testEvalFileNameMapping_ShouldPassExpressionThroughUnchanged() @@ -452,8 +453,8 @@ public class AssemblyFormatUtilsTest public void testEvalFileNameMapping_ShouldInsertClassifierAheadOfExtension() throws AssemblyFormattingException { - verifyEvalFileNameMapping( "filename-${artifact.classifier}.ext", "classifier", null, - "filename-classifier.ext", null ); + verifyEvalFileNameMapping( "filename-${artifact.classifier}.ext", "classifier", null, "filename-classifier.ext", + null ); } public void testEvalFileNameMapping_ShouldAppendDashClassifierWhenClassifierPresent() @@ -535,7 +536,8 @@ public class AssemblyFormatUtilsTest private void verifyEvalFileNameMappingUsingMainProject( final String expression, final String classifier, final String groupId, final String artifactId, final String version, final String extension, - final String checkValue, final Properties projectProperties ) + final String checkValue, + final Properties projectProperties ) throws AssemblyFormattingException { final MavenProject mainProject = createProject( groupId, artifactId, version, projectProperties ); @@ -620,25 +622,23 @@ public class AssemblyFormatUtilsTest new ArtifactMock( mockManager, moduleProject.getGroupId(), moduleProject.getArtifactId(), moduleProject.getVersion(), "jar", false, null ); - final MavenSession session = mockManager.createMock( MavenSession.class ); - expect( session.getExecutionProperties()).andReturn( System.getProperties() ).anyTimes(); - - expect(session.getUserProperties()).andReturn( new Properties( ) ).anyTimes(); + 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(); - DefaultAssemblyArchiverTest.setupInterpolators( cs, mainProject); - + expect( cs.getMavenSession() ).andReturn( session ).anyTimes(); + DefaultAssemblyArchiverTest.setupInterpolators( cs, mainProject ); mockManager.replayAll(); final String result = AssemblyFormatUtils.evaluateFileNameMapping( expression, artifactMock.getArtifact(), mainProject, moduleArtifactMock.getArtifact(), cs, - moduleProjectInterpolator( moduleProject ), - artifactProjectInterpolator( artifactProject ) ); + AssemblyFormatUtils.moduleProjectInterpolator( moduleProject ), + AssemblyFormatUtils.artifactProjectInterpolator( + artifactProject ) ); /* final String result = @@ -649,7 +649,8 @@ public class AssemblyFormatUtilsTest artifactProjectInterpolator( artifactProject ), mainArtifactPropsOnly( mainProject ), classifierRules( artifactMock.getArtifact() ), - FixedStringSearchInterpolator.create( new PropertiesBasedValueSource( System.getProperties() )) ); + FixedStringSearchInterpolator.create( new + PropertiesBasedValueSource( System.getProperties() )) ); */ assertEquals( checkValue, result ); @@ -711,10 +712,10 @@ public class AssemblyFormatUtilsTest verifyOutputDir( outDir, finalName, mainProject, project, artifactProject, checkValue ); } - private void verifyOutputDirUsingArtifactProject( final String outDir, final String finalName, - final String groupId, final String artifactId, - final String version, final String projectFinalName, - final Properties properties, final String checkValue ) + private void verifyOutputDirUsingArtifactProject( final String outDir, final String finalName, final String groupId, + final String artifactId, final String version, + final String projectFinalName, final Properties properties, + final String checkValue ) throws AssemblyFormattingException { final MavenProject project = createProject( groupId, artifactId, version, properties ); @@ -740,24 +741,21 @@ public class AssemblyFormatUtilsTest { final MavenSession session = mockManager.createMock( MavenSession.class ); - expect( session.getExecutionProperties()).andReturn( System.getProperties()).anyTimes(); - - expect( session.getUserProperties()).andReturn( new Properties( ) ).anyTimes(); - + 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(); - DefaultAssemblyArchiverTest.setupInterpolators( cs, mainProject); + expect( cs.getMavenSession() ).andReturn( session ).anyTimes(); + DefaultAssemblyArchiverTest.setupInterpolators( cs, mainProject ); String result; mockManager.replayAll(); - result = - AssemblyFormatUtils.getOutputDirectory( outDir, finalName, cs, - moduleProjectInterpolator( moduleProject ), - artifactProjectInterpolator( artifactProject ) ); - + result = AssemblyFormatUtils.getOutputDirectory( outDir, finalName, cs, + AssemblyFormatUtils.moduleProjectInterpolator( moduleProject ), + AssemblyFormatUtils.artifactProjectInterpolator( + artifactProject ) ); assertEquals( checkValue, result ); @@ -787,10 +785,13 @@ public class AssemblyFormatUtilsTest mockManager.resetAll(); } - public void testWindowsPath(){ - assertTrue( AssemblyFormatUtils.isWindowsPath( "C:\foobar" )); + public void testWindowsPath() + { + assertTrue( AssemblyFormatUtils.isWindowsPath( "C:\foobar" ) ); } - public void testLinuxRootReferencePath(){ + + public void testLinuxRootReferencePath() + { assertTrue( AssemblyFormatUtils.isLinuxRootReference( "/etc/home" ) ); } @@ -812,22 +813,21 @@ public class AssemblyFormatUtilsTest this.isAssemblyIdAppended = isAssemblyIdAppended; this.classifier = classifier; - configSource = mockManager.createMock (AssemblerConfigurationSource.class); + configSource = mockManager.createMock( AssemblerConfigurationSource.class ); enableExpectations(); } private void enableExpectations() { - expect(configSource.getClassifier()).andReturn( classifier ).atLeastOnce(); + expect( configSource.getClassifier() ).andReturn( classifier ).atLeastOnce(); - expect(configSource.isAssemblyIdAppended()).andReturn( isAssemblyIdAppended ).atLeastOnce(); + expect( configSource.isAssemblyIdAppended() ).andReturn( isAssemblyIdAppended ).atLeastOnce(); - expect( configSource.getFinalName()).andReturn( finalName ).atLeastOnce(); + expect( configSource.getFinalName() ).andReturn( finalName ).atLeastOnce(); } - } } Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,7 @@ 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.plugins.assembly.InvalidAssemblerConfigurationException; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; @@ -46,6 +46,15 @@ public class FilterUtilsTest private Logger logger; + private static Model buildModel( final String groupId, final String artifactId ) + { + final Model model = new Model(); + model.setGroupId( groupId ); + model.setArtifactId( artifactId ); + + return model; + } + @Override public void setUp() { @@ -61,13 +70,13 @@ public class FilterUtilsTest { final Artifact artifact = mockManager.createMock( Artifact.class ); - expect(artifact.getGroupId()).andReturn( "group").atLeastOnce(); + expect( artifact.getGroupId() ).andReturn( "group" ).atLeastOnce(); - expect( artifact.getArtifactId()).andReturn( "artifact").atLeastOnce(); + expect( artifact.getArtifactId() ).andReturn( "artifact" ).atLeastOnce(); - expect( artifact.getId()).andReturn( "group:artifact:type:version").atLeastOnce(); + expect( artifact.getId() ).andReturn( "group:artifact:type:version" ).atLeastOnce(); - expect( artifact.getDependencyConflictId()).andReturn( "group:artifact:type").atLeastOnce(); + expect( artifact.getDependencyConflictId() ).andReturn( "group:artifact:type" ).atLeastOnce(); final List<String> includes = new ArrayList<String>(); @@ -104,23 +113,17 @@ public class FilterUtilsTest public void testFilterArtifacts_ShouldNotRemoveArtifactTransitivelyIncluded() throws InvalidAssemblerConfigurationException { - verifyArtifactInclusion( "group", - "artifact", - "group:dependentArtifact", - null, - Arrays.asList("current:project:jar:1.0", - "group:dependentArtifact:jar:version"), null ); + verifyArtifactInclusion( "group", "artifact", "group:dependentArtifact", null, + Arrays.asList( "current:project:jar:1.0", "group:dependentArtifact:jar:version" ), + null ); } public void testFilterArtifacts_ShouldRemoveArtifactTransitivelyExcluded() throws InvalidAssemblerConfigurationException { - verifyArtifactExclusion( "group", - "artifact", - null, - "group:dependentArtifact", - Arrays.asList("current:project:jar:1.0", - "group:dependentArtifact:jar:version"), null ); + verifyArtifactExclusion( "group", "artifact", null, "group:dependentArtifact", + Arrays.asList( "current:project:jar:1.0", "group:dependentArtifact:jar:version" ), + null ); } public void testFilterArtifacts_ShouldRemoveArtifactDirectlyExcluded() @@ -164,22 +167,14 @@ public class FilterUtilsTest public void testFilterProjects_ShouldNotRemoveProjectTransitivelyIncluded() { - verifyProjectInclusion( "group", - "artifact", - "group:dependentArtifact", - null, - Arrays.asList("current:project:jar:1.0", - "group:dependentArtifact:jar:version") ); + verifyProjectInclusion( "group", "artifact", "group:dependentArtifact", null, + Arrays.asList( "current:project:jar:1.0", "group:dependentArtifact:jar:version" ) ); } public void testFilterProjects_ShouldRemoveProjectTransitivelyExcluded() { - verifyProjectExclusion( "group", - "artifact", - null, - "group:dependentArtifact", - Arrays.asList("current:project:jar:1.0", - "group:dependentArtifact:jar:version") ); + verifyProjectExclusion( "group", "artifact", null, "group:dependentArtifact", + Arrays.asList( "current:project:jar:1.0", "group:dependentArtifact:jar:version" ) ); } public void testFilterProjects_ShouldRemoveProjectDirectlyExcluded() @@ -250,9 +245,8 @@ public class FilterUtilsTest if ( verifyInclusion ) { assertEquals( 1, artifacts.size() ); - assertEquals( mac.artifact.getDependencyConflictId(), artifacts.iterator() - .next() - .getDependencyConflictId() ); + assertEquals( mac.artifact.getDependencyConflictId(), + artifacts.iterator().next().getDependencyConflictId() ); } else { @@ -322,9 +316,7 @@ public class FilterUtilsTest if ( verifyInclusion ) { assertEquals( 1, result.size() ); - assertEquals( pmac.getId(), result.iterator() - .next() - .getId() ); + assertEquals( pmac.getId(), result.iterator().next().getId() ); } else { @@ -337,15 +329,6 @@ public class FilterUtilsTest mockManager.resetAll(); } - private static Model buildModel( final String groupId, final String artifactId ) - { - final Model model = new Model(); - model.setGroupId( groupId ); - model.setArtifactId( artifactId ); - - return model; - } - private final class ProjectWithArtifactMockControl extends MavenProject { @@ -380,7 +363,7 @@ public class FilterUtilsTest this.artifactId = artifactId; this.dependencyTrail = dependencyTrail; - artifact = mockManager.createMock (Artifact.class); + artifact = mockManager.createMock( Artifact.class ); // this is always enabled, for verification purposes. enableGetDependencyConflictId(); @@ -394,21 +377,21 @@ public class FilterUtilsTest void enableGetDependencyTrail() { - expect( artifact.getDependencyTrail()).andReturn( dependencyTrail ).anyTimes(); + expect( artifact.getDependencyTrail() ).andReturn( dependencyTrail ).anyTimes(); } void enableGetDependencyConflictId() { - expect(artifact.getDependencyConflictId()).andReturn( groupId + ":" + artifactId + ":jar").anyTimes(); + expect( artifact.getDependencyConflictId() ).andReturn( groupId + ":" + artifactId + ":jar" ).anyTimes(); } void enableGetGroupIdArtifactIdAndId() { - expect( artifact.getGroupId()).andReturn( groupId).anyTimes(); + expect( artifact.getGroupId() ).andReturn( groupId ).anyTimes(); - expect( artifact.getArtifactId()).andReturn( artifactId ).anyTimes(); + expect( artifact.getArtifactId() ).andReturn( artifactId ).anyTimes(); - expect( artifact.getId()).andReturn( groupId + ":" + artifactId + ":version:null:jar").anyTimes(); + expect( artifact.getId() ).andReturn( groupId + ":" + artifactId + ":version:null:jar" ).anyTimes(); } } Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtilsTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtilsTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtilsTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtilsTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,9 @@ package org.apache.maven.plugin.assembly * under the License. */ -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.codehaus.plexus.util.IOUtil; +import org.junit.Test; import java.io.File; import java.io.FileReader; @@ -29,9 +30,8 @@ import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.codehaus.plexus.util.IOUtil; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; public class LineEndingsUtilsTest { Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -46,7 +46,9 @@ public class LinuxLineFeedInputStreamTes assertEquals( "a\nb\n", roundtrip( "a\rb" ) ); } - public void testCrAtEnd() throws Exception { + public void testCrAtEnd() + throws Exception + { assertEquals( "a\n", roundtrip( "a\r" ) ); } Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,12 @@ package org.apache.maven.plugin.assembly * under the License. */ +import junit.framework.TestCase; +import org.apache.maven.model.Model; +import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.logging.Logger; +import org.codehaus.plexus.logging.console.ConsoleLogger; + import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -27,13 +33,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import junit.framework.TestCase; - -import org.apache.maven.model.Model; -import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.logging.console.ConsoleLogger; - public class ProjectUtilsTest extends TestCase { @@ -48,14 +47,14 @@ public class ProjectUtilsTest return new MavenProject( model ); } - public void testGetProjectModules_ShouldIncludeDirectModuleOfMasterProject() throws IOException + public void testGetProjectModules_ShouldIncludeDirectModuleOfMasterProject() + throws IOException { final MavenProject master = createTestProject( "test", "testGroup", "1.0" ); master.setFile( new File( "pom.xml" ) ); - master.getModel() - .addModule( "module" ); + master.getModel().addModule( "module" ); final MavenProject module = createTestProject( "module", "testGroup", "1.0" ); @@ -71,12 +70,11 @@ public class ProjectUtilsTest assertNotNull( result ); assertEquals( 1, result.size() ); - assertEquals( module.getId(), result.iterator() - .next() - .getId() ); + assertEquals( module.getId(), result.iterator().next().getId() ); } - public void testGetProjectModules_ShouldNotIncludeMasterProject() throws IOException + public void testGetProjectModules_ShouldNotIncludeMasterProject() + throws IOException { final MavenProject master = createTestProject( "test", "testGroup", "1.0" ); @@ -95,13 +93,11 @@ public class ProjectUtilsTest master.setFile( new File( "project/pom.xml" ) ); - master.getModel() - .addModule( "module" ); + master.getModel().addModule( "module" ); final MavenProject module = createTestProject( "module", "testGroup", "1.0" ); - module.getModel() - .addModule( "submodule" ); + module.getModel().addModule( "submodule" ); module.setFile( new File( "project/module/pom.xml" ) ); @@ -134,13 +130,11 @@ public class ProjectUtilsTest master.setFile( new File( "project/pom.xml" ) ); - master.getModel() - .addModule( "module" ); + master.getModel().addModule( "module" ); final MavenProject module = createTestProject( "module", "testGroup", "1.0" ); - module.getModel() - .addModule( "submodule" ); + module.getModel().addModule( "submodule" ); module.setFile( new File( "project/module/pom.xml" ) ); @@ -167,7 +161,8 @@ public class ProjectUtilsTest verifyProjectsPresent( verify, result ); } - public void testGetProjectModules_ShouldExcludeNonModuleOfMasterProject() throws IOException + public void testGetProjectModules_ShouldExcludeNonModuleOfMasterProject() + throws IOException { final MavenProject master = createTestProject( "test", "testGroup", "1.0" ); @@ -195,21 +190,24 @@ public class ProjectUtilsTest final List<MavenProject> unexpected = new ArrayList<MavenProject>(); - for (final MavenProject project : result) { + for ( final MavenProject project : result ) + { boolean removed = false; - for (final Iterator<MavenProject> verifyIterator = verifyCopy.iterator(); verifyIterator.hasNext(); ) { + for ( final Iterator<MavenProject> verifyIterator = verifyCopy.iterator(); verifyIterator.hasNext(); ) + { final MavenProject verification = verifyIterator.next(); - if (verification.getId() - .equals(project.getId())) { + if ( verification.getId().equals( project.getId() ) ) + { verifyIterator.remove(); removed = true; } } - if (!removed) { - unexpected.add(project); + if ( !removed ) + { + unexpected.add( project ); } } Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,32 +19,33 @@ package org.apache.maven.plugin.assembly * under the License. */ +import junit.framework.TestCase; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.codehaus.plexus.logging.Logger; +import org.codehaus.plexus.logging.console.ConsoleLogger; + import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.ArrayList; import java.util.List; -import junit.framework.TestCase; - -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.logging.console.ConsoleLogger; - public class TypeConversionUtilsTest extends TestCase { - public void testModeToInt_InterpretAsOctalWithoutLeadingZero() throws AssemblyFormattingException + public void testModeToInt_InterpretAsOctalWithoutLeadingZero() + throws AssemblyFormattingException { - final int check = Integer.decode("0777"); + final int check = Integer.decode( "0777" ); final int test = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ); assertEquals( check, test ); } - public void testModeToInt_InterpretValuesWithLeadingZeroAsOctal() throws AssemblyFormattingException + public void testModeToInt_InterpretValuesWithLeadingZeroAsOctal() + throws AssemblyFormattingException { - final int check = Integer.decode("0777"); + final int check = Integer.decode( "0777" ); final int test = TypeConversionUtils.modeToInt( "0777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ); assertEquals( check, test ); @@ -114,8 +115,9 @@ public class TypeConversionUtilsTest { final String message = new String( baos.toByteArray() ); - for (final String checkMessage : messagesToCheckIfInsane) { - assertTrue("\'" + checkMessage + "\' is not present in output.", message.contains(checkMessage)); + for ( final String checkMessage : messagesToCheckIfInsane ) + { + assertTrue( "\'" + checkMessage + "\' is not present in output.", message.contains( checkMessage ) ); } } } Copied: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStreamTest.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStreamTest.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/WindowsLineFeedInputStreamTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.utils; +package org.apache.maven.plugins.assembly.utils; /* * Licensed to the Apache Software Foundation (ASF) under one
