Modified: 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/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=438528&r1=438527&r2=438528&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/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java Wed Aug 30 08:59:57 2006 @@ -4,11 +4,12 @@ import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.handler.ArtifactHandler; import org.apache.maven.model.Model; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; import org.apache.maven.plugin.assembly.archive.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.DependencyResolver; import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.plugin.assembly.testutils.TestFileManager; @@ -19,10 +20,8 @@ import org.apache.maven.plugins.assembly.model.ModuleSources; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; -import org.apache.maven.project.ProjectBuildingException; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; -import org.easymock.ArgumentsMatcher; import org.easymock.MockControl; import java.io.File; @@ -60,7 +59,8 @@ } public void testExecute_ShouldAddOneModuleSetWithOneModuleInIt() - throws ArchiveCreationException, AssemblyFormattingException, IOException, InvalidAssemblerConfigurationException + throws ArchiveCreationException, AssemblyFormattingException, IOException, + InvalidAssemblerConfigurationException { MockManager mm = new MockManager(); @@ -120,7 +120,8 @@ } public void testAddModuleBinaries_ShouldFilterPomModule() - throws ArchiveCreationException, AssemblyFormattingException, IOException, InvalidAssemblerConfigurationException + throws ArchiveCreationException, AssemblyFormattingException, IOException, + InvalidAssemblerConfigurationException { MockManager mm = new MockManager(); @@ -141,14 +142,17 @@ mm.replayAll(); - createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleBinaries( binaries, projects, macTask.archiver, - macTask.configSource, false ); + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleBinaries( binaries, projects, + macTask.archiver, + macTask.configSource, + false ); mm.verifyAll(); } public void testAddModuleBinaries_ShouldAddOneModuleArtifactAndNoDeps() - throws ArchiveCreationException, AssemblyFormattingException, IOException, InvalidAssemblerConfigurationException + throws ArchiveCreationException, AssemblyFormattingException, IOException, + InvalidAssemblerConfigurationException { MockManager mm = new MockManager(); @@ -174,21 +178,22 @@ Set projects = Collections.singleton( project ); mm.replayAll(); - + Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); - createPhase( logger, null ).addModuleBinaries( binaries, projects, macTask.archiver, - macTask.configSource, false ); + createPhase( logger, null ).addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource, + false ); mm.verifyAll(); } public void testAddModuleBinaries_ShouldAddOneModuleArtifactAndWithOneDepArtifact() - throws ArchiveCreationException, AssemblyFormattingException, IOException, InvalidAssemblerConfigurationException + throws ArchiveCreationException, AssemblyFormattingException, IOException, + InvalidAssemblerConfigurationException { MockManager mm = new MockManager(); - MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm ); + MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm ); macTask.expectArtifactGetFile( true ); macTask.expectGetFinalName( "final-name" ); @@ -197,24 +202,18 @@ macTask.expectGetArtifactHandler(); macTask.expectAddFile( "out/artifact", Integer.parseInt( "777", 8 ) ); - macTask.configSource.getRemoteRepositories(); - macTask.configSourceCtl.setReturnValue( null, MockControl.ONE_OR_MORE ); - - macTask.configSource.getLocalRepository(); - macTask.configSourceCtl.setReturnValue( null, MockControl.ONE_OR_MORE ); - ModuleBinaries binaries = new ModuleBinaries(); binaries.setUnpack( false ); binaries.setFileMode( "777" ); binaries.setOutputDirectory( "out" ); binaries.setOutputFileNameMapping( "artifact" ); - + DependencySet ds = new DependencySet(); ds.setOutputDirectory( binaries.getOutputDirectory() ); ds.setOutputFileNameMapping( "${artifactId}" ); ds.setFileMode( "777" ); - + binaries.addDependencySet( ds ); MavenProject project = createProject( "group", "artifact", "version", null ); @@ -227,7 +226,6 @@ macDepArtifact.expectIsSnapshot( false ); macDepArtifact.expectGetArtifactHandler(); macDepArtifact.expectGetArtifactId( "dep" ); - macDepArtifact.expectGetScope( Artifact.SCOPE_COMPILE ); macDepArtifact.expectGetFile(); macTask.expectAddFile( macDepArtifact.artifactFile, "out/dep", Integer.parseInt( "777", 8 ) ); @@ -236,11 +234,10 @@ depProject.setArtifact( macDepArtifact.artifact ); - MockAndControlForProjectBuilder macPB = new MockAndControlForProjectBuilder( mm ); - - macPB.expectBuildFromRepository( macDepArtifact.artifact, depProject ); - - project.setArtifacts( new HashSet( Collections.singleton( macDepArtifact.artifact ) ) ); + macTask.expectBuildFromRepository( depProject ); + + macTask.expectCSGetRepositories( null, null ); + macTask.expectResolveDependencies( Collections.singleton( macDepArtifact.artifact ) ); Set projects = Collections.singleton( project ); @@ -248,20 +245,20 @@ Logger overrideLogger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); - ModuleSetAssemblyPhase phase = createPhase( overrideLogger, macPB.projectBuilder ); - + ModuleSetAssemblyPhase phase = createPhase( overrideLogger, macTask ); + phase.addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource, false ); mm.verifyAll(); } - public void testAddModuleBinaries_ShouldAddOneModuleArtifactAndWithOneDepArtifactUsingImpliedDepSet() - throws ArchiveCreationException, AssemblyFormattingException, IOException, InvalidAssemblerConfigurationException + throws ArchiveCreationException, AssemblyFormattingException, IOException, + InvalidAssemblerConfigurationException { MockManager mm = new MockManager(); - MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm ); + MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm ); macTask.expectArtifactGetFile( true ); macTask.expectArtifactGetArtifactId( "artifact" ); @@ -271,12 +268,6 @@ macTask.expectGetArtifactHandler(); macTask.expectAddFile( "out/artifact", Integer.parseInt( "777", 8 ) ); - macTask.configSource.getRemoteRepositories(); - macTask.configSourceCtl.setReturnValue( null, MockControl.ONE_OR_MORE ); - - macTask.configSource.getLocalRepository(); - macTask.configSourceCtl.setReturnValue( null, MockControl.ONE_OR_MORE ); - ModuleBinaries binaries = new ModuleBinaries(); binaries.setUnpack( false ); @@ -295,7 +286,6 @@ macDepArtifact.expectIsSnapshot( false ); macDepArtifact.expectGetArtifactHandler(); macDepArtifact.expectGetArtifactId( "dep" ); - macDepArtifact.expectGetScope( Artifact.SCOPE_COMPILE ); macDepArtifact.expectGetFile(); macTask.expectAddFile( macDepArtifact.artifactFile, "out/dep", Integer.parseInt( "777", 8 ) ); @@ -304,11 +294,10 @@ depProject.setArtifact( macDepArtifact.artifact ); - MockAndControlForProjectBuilder macPB = new MockAndControlForProjectBuilder( mm ); - - macPB.expectBuildFromRepository( macDepArtifact.artifact, depProject ); + macTask.expectBuildFromRepository( depProject ); - project.setArtifacts( new HashSet( Collections.singleton( macDepArtifact.artifact ) ) ); + macTask.expectCSGetRepositories( null, null ); + macTask.expectResolveDependencies( Collections.singleton( macDepArtifact.artifact ) ); Set projects = Collections.singleton( project ); @@ -316,74 +305,13 @@ Logger overrideLogger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); - ModuleSetAssemblyPhase phase = createPhase( overrideLogger, macPB.projectBuilder ); - + ModuleSetAssemblyPhase phase = createPhase( overrideLogger, macTask ); + phase.addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource, false ); mm.verifyAll(); } - private final class MockAndControlForProjectBuilder - { - MavenProjectBuilder projectBuilder; - - MockControl control; - - public MockAndControlForProjectBuilder( MockManager mm ) - { - control = MockControl.createControl( MavenProjectBuilder.class ); - mm.add( control ); - - projectBuilder = ( MavenProjectBuilder ) control.getMock(); - } - - void expectBuildFromRepository( Artifact artifact, MavenProject result ) - { - try - { - projectBuilder.buildFromRepository( artifact, null, null ); - } - catch ( ProjectBuildingException e ) - { - Assert.fail( "should never happen" ); - } - - control.setMatcher( FIRST_PARAM_MATCHER ); - control.setReturnValue( result, MockControl.ONE_OR_MORE ); - } - } - - private static final ArgumentsMatcher FIRST_PARAM_MATCHER = new ArgumentsMatcher() - { - - public boolean matches( Object[] test, Object[] args ) - { - if ( test.length < 1 && args.length < 1 ) - { - return true; - } - - if ( test[0] == null && args[0] == null ) - { - return true; - } - - if ( test[0].equals( args[0] ) ) - { - return true; - } - - return false; - } - - public String toString( Object[] args ) - { - return "with first argument " - + ( args.length > 0 ? " of \'" + String.valueOf( args[0] ) + "\'" : "missing" ); - } - - }; - public void testCollectExcludesFromQueuedArtifacts_ShouldAddOneExclusion() { MockManager mm = new MockManager(); @@ -397,7 +325,10 @@ Set artifactIds = Collections.singleton( "group:artifact:jar" ); - List result = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).collectExcludesFromQueuedArtifacts( artifactIds, excludes ); + List result = + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).collectExcludesFromQueuedArtifacts( + artifactIds, + excludes ); assertEquals( 1, result.size() ); @@ -414,7 +345,10 @@ Set artifactIds = Collections.singleton( "group:artifact:jar" ); - List result = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).collectExcludesFromQueuedArtifacts( artifactIds, null ); + List result = + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).collectExcludesFromQueuedArtifacts( + artifactIds, + null ); assertEquals( 1, result.size() ); @@ -439,7 +373,8 @@ try { - createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addArtifact( macTask.artifact, null, null, null, null, false ); + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addArtifact( macTask.artifact, null, + null, null, null, false ); fail( "Expected ArchiveCreationException since artifact file is null." ); } @@ -477,8 +412,10 @@ mm.replayAll(); - createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addArtifact( macTask.artifact, project, macTask.archiver, - macTask.configSource, binaries, false ); + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addArtifact( macTask.artifact, project, + macTask.archiver, + macTask.configSource, + binaries, false ); mm.verifyAll(); } @@ -490,7 +427,8 @@ mm.replayAll(); - createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleSourceFileSets( null, null, null, null, false ); + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleSourceFileSets( null, null, null, + null, false ); mm.verifyAll(); } @@ -503,7 +441,15 @@ MockAndControlForAddFileSetsTask macTask = new MockAndControlForAddFileSetsTask( mm, fileManager ); MavenProject project = createProject( "group", "artifact", "version", null ); - + +// MockAndControlForArtifact macArtifact = new MockAndControlForArtifact( mm ); +// +// macArtifact.expectIsSnapshot( false ); +// macArtifact.expectGetClassifier(); +// macArtifact.expectGetArtifactHandler(); +// +// project.setArtifact( macArtifact.artifact ); +// Set projects = Collections.singleton( project ); ModuleSources sources = new ModuleSources(); @@ -534,20 +480,24 @@ { MockManager mm = new MockManager(); - MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm ); + MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm ); MavenProject project = createProject( "group", "artifact", "version", null ); List projects = Collections.singletonList( project ); - macCS.expectGetProject( project ); - macCS.expectGetReactorProjects( projects ); + macTask.expectGetProject( project ); + macTask.expectGetReactorProjects( projects ); ModuleSet moduleSet = new ModuleSet(); mm.replayAll(); - Set moduleProjects = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).getModuleProjects( moduleSet, macCS.configSource ); + Set moduleProjects = + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), macTask ).getModuleProjects( + moduleSet, + macTask.configSource, + true ); assertTrue( moduleProjects.isEmpty() ); @@ -559,7 +509,7 @@ { MockManager mm = new MockManager(); - MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm ); + MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm ); MavenProject project = createProject( "group", "artifact", "version", null ); MavenProject project2 = createProject( "group", "artifact2", "version", null ); @@ -568,14 +518,18 @@ projects.add( project ); projects.add( project2 ); - macCS.expectGetProject( project ); - macCS.expectGetReactorProjects( projects ); + macTask.expectGetProject( project ); + macTask.expectGetReactorProjects( projects ); ModuleSet moduleSet = new ModuleSet(); mm.replayAll(); - Set moduleProjects = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).getModuleProjects( moduleSet, macCS.configSource ); + Set moduleProjects = + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), macTask ).getModuleProjects( + moduleSet, + macTask.configSource, + true ); assertTrue( moduleProjects.isEmpty() ); @@ -587,7 +541,7 @@ { MockManager mm = new MockManager(); - MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm ); + MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm ); MavenProject project = createProject( "group", "artifact", "version", null ); MavenProject project2 = createProject( "group", "artifact2", "version", project ); @@ -596,14 +550,18 @@ projects.add( project ); projects.add( project2 ); - macCS.expectGetProject( project ); - macCS.expectGetReactorProjects( projects ); + macTask.expectGetProject( project ); + macTask.expectGetReactorProjects( projects ); ModuleSet moduleSet = new ModuleSet(); mm.replayAll(); - Set moduleProjects = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).getModuleProjects( moduleSet, macCS.configSource ); + Set moduleProjects = + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), macTask ).getModuleProjects( + moduleSet, + macTask.configSource, + true ); assertFalse( moduleProjects.isEmpty() ); @@ -619,7 +577,7 @@ { MockManager mm = new MockManager(); - MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm ); + MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm ); MavenProject project = createProject( "group", "artifact", "version", null ); MavenProject project2 = createProject( "group", "artifact2", "version", project ); @@ -630,14 +588,18 @@ projects.add( project2 ); projects.add( project3 ); - macCS.expectGetProject( project ); - macCS.expectGetReactorProjects( projects ); + macTask.expectGetProject( project ); + macTask.expectGetReactorProjects( projects ); ModuleSet moduleSet = new ModuleSet(); mm.replayAll(); - Set moduleProjects = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).getModuleProjects( moduleSet, macCS.configSource ); + Set moduleProjects = + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), macTask ).getModuleProjects( + moduleSet, + macTask.configSource, + true ); assertEquals( 2, moduleProjects.size() ); @@ -655,7 +617,7 @@ { MockManager mm = new MockManager(); - MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm ); + MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm ); List macArtifacts = new ArrayList(); @@ -677,8 +639,8 @@ projects.add( project2 ); projects.add( project3 ); - macCS.expectGetProject( project ); - macCS.expectGetReactorProjects( projects ); + macTask.expectGetProject( project ); + macTask.expectGetReactorProjects( projects ); ModuleSet moduleSet = new ModuleSet(); @@ -686,7 +648,11 @@ mm.replayAll(); - Set moduleProjects = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).getModuleProjects( moduleSet, macCS.configSource ); + Set moduleProjects = + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), macTask ).getModuleProjects( + moduleSet, + macTask.configSource, + true ); assertTrue( moduleProjects.isEmpty() ); @@ -799,11 +765,18 @@ return project; } - private ModuleSetAssemblyPhase createPhase( Logger logger, MavenProjectBuilder projectBuilder ) + private ModuleSetAssemblyPhase createPhase( Logger logger, MockAndControlForAddDependencySetsTask macTask ) { - ModuleSetAssemblyPhase phase = new ModuleSetAssemblyPhase( projectBuilder ); + MavenProjectBuilder projectBuilder = null; + DependencyResolver dependencyResolver = null; + + if ( macTask != null ) + { + projectBuilder = macTask.projectBuilder; + dependencyResolver = macTask.dependencyResolver; + } - phase.enableLogging( logger ); + ModuleSetAssemblyPhase phase = new ModuleSetAssemblyPhase( projectBuilder, dependencyResolver, logger ); return phase; } @@ -904,33 +877,6 @@ { artifact.getArtifactId(); control.setReturnValue( artifactId, MockControl.ONE_OR_MORE ); - } - } - - private final class MockAndControlForConfigSource - { - AssemblerConfigurationSource configSource; - - MockControl control; - - MockAndControlForConfigSource( MockManager mockManager ) - { - control = MockControl.createControl( AssemblerConfigurationSource.class ); - mockManager.add( control ); - - configSource = ( AssemblerConfigurationSource ) control.getMock(); - } - - public void expectGetReactorProjects( List projects ) - { - configSource.getReactorProjects(); - control.setReturnValue( projects, MockControl.ONE_OR_MORE ); - } - - public void expectGetProject( MavenProject project ) - { - configSource.getProject(); - control.setReturnValue( project, MockControl.ONE_OR_MORE ); } }
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java?rev=438528&r1=438527&r2=438528&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java Wed Aug 30 08:59:57 2006 @@ -1,17 +1,13 @@ package org.apache.maven.plugin.assembly.archive.task; 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.archive.ArchiveCreationException; -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.format.AssemblyFormattingException; import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.plugins.assembly.model.DependencySet; import org.apache.maven.project.MavenProject; -import org.apache.maven.project.MavenProjectBuilder; -import org.apache.maven.project.ProjectBuildingException; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; import org.easymock.MockControl; @@ -22,35 +18,35 @@ import java.util.List; import java.util.Set; -import junit.framework.Assert; import junit.framework.TestCase; public class AddDependencySetsTaskTest extends TestCase { - + private MockManager mockManager = new MockManager(); public void testAddDependencySet_ShouldNotAddDependenciesWhenProjectHasNone() throws AssemblyFormattingException, ArchiveCreationException { MavenProject project = new MavenProject( new Model() ); - - MockAndControlForConfigSource macCS = new MockAndControlForConfigSource(); + + MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager ); + + macTask.expectCSGetRepositories( null, null ); + macTask.expectResolveDependencies( Collections.EMPTY_SET ); DependencySet ds = new DependencySet(); ds.setOutputDirectory( "/out" ); - MockAndControlForLogger macLog = new MockAndControlForLogger(); - - macLog.expectInfo( "Processing DependencySet" ); - mockManager.replayAll(); + + Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); AddDependencySetsTask task = - new AddDependencySetsTask( Collections.singletonList( ds ), project, null, macLog.logger ); - - task.addDependencySet( ds, null, macCS.configSource, false ); + new AddDependencySetsTask( Collections.singletonList( ds ), project, macTask.projectBuilder, macTask.dependencyResolver, logger ); + + task.addDependencySet( ds, null, macTask.configSource, false ); mockManager.verifyAll(); } @@ -81,14 +77,16 @@ ds.setDirectoryMode( Integer.toString( 8, 8 ) ); ds.setFileMode( Integer.toString( 8, 8 ) ); - MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mockManager ); + MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager ); macTask.expectArtifactGetFile(); macTask.expectArtifactGetType( "jar" ); - macTask.expectArtifactGetScope( Artifact.SCOPE_COMPILE ); macTask.expectGetClassifier( null ); macTask.expectIsSnapshot( false ); macTask.expectGetArtifactHandler(); + + macTask.expectCSGetRepositories( null, null ); + macTask.expectResolveDependencies( Collections.singleton( macTask.artifact ) ); if ( unpack ) { @@ -100,66 +98,61 @@ macTask.expectAddFile( outputLocation + "/artifact", 8 ); } - project.setArtifacts( Collections.singleton( macTask.artifact ) ); - - MockAndControlForConfigSource macCS = new MockAndControlForConfigSource(); - - macCS.enableGetFinalName( "final-name" ); - macCS.enableGetRepositories( null, Collections.EMPTY_LIST ); - - MockAndControlForLogger macLog = new MockAndControlForLogger(); + macTask.expectCSGetFinalName( "final-name" ); - macLog.expectInfo( "Processing DependencySet" ); - - MockAndControlForProjectBuilder macPB = new MockAndControlForProjectBuilder(); - MavenProject depProject = new MavenProject( new Model() ); + + macTask.expectBuildFromRepository( depProject ); - macPB.expectBuildFromRepository( depProject ); + Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); AddDependencySetsTask task = - new AddDependencySetsTask( Collections.singletonList( ds ), project, macPB.projectBuilder, macLog.logger ); - + new AddDependencySetsTask( Collections.singletonList( ds ), project, macTask.projectBuilder, + macTask.dependencyResolver, logger ); + mockManager.replayAll(); - task.addDependencySet( ds, macTask.archiver, macCS.configSource, false ); + task.addDependencySet( ds, macTask.archiver, macTask.configSource, false ); mockManager.verifyAll(); } - + public void testGetDependencyArtifacts_ShouldGetOneDependencyArtifact() + throws ArchiveCreationException { MavenProject project = new MavenProject( new Model() ); - MockAndControlForArtifact mac = new MockAndControlForArtifact(); - - mac.expectGetScope( Artifact.SCOPE_COMPILE ); + MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager ); - project.setArtifacts( Collections.singleton( mac.artifact ) ); + macTask.expectCSGetRepositories( null, null ); + macTask.expectResolveDependencies( Collections.singleton( macTask.artifact ) ); + + project.setArtifacts( Collections.singleton( macTask.artifact ) ); DependencySet dependencySet = new DependencySet(); Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); - MockAndControlForProjectBuilder macPB = new MockAndControlForProjectBuilder(); - mockManager.replayAll(); AddDependencySetsTask task = - new AddDependencySetsTask( Collections.singletonList( dependencySet ), project, macPB.projectBuilder, logger ); - - Set result = task.getDependencyArtifacts( project, dependencySet ); + new AddDependencySetsTask( Collections.singletonList( dependencySet ), project, macTask.projectBuilder, + macTask.dependencyResolver, logger ); + + Set result = task.resolveDependencyArtifacts( dependencySet, macTask.configSource ); assertNotNull( result ); assertEquals( 1, result.size() ); - assertSame( mac.artifact, result.iterator().next() ); + assertSame( macTask.artifact, result.iterator().next() ); mockManager.verifyAll(); } - public void testGetDependencyArtifacts_ShouldFilterOneDependencyArtifactViaInclude() + public void testGetDependencyArtifacts_ShouldFilterOneDependencyArtifactViaInclude() throws ArchiveCreationException { MavenProject project = new MavenProject( new Model() ); + + MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager ); Set artifacts = new HashSet(); @@ -168,7 +161,6 @@ mac.enableGetGroupId( "group" ); mac.enableGetArtifactId( "artifact" ); mac.enableGetDependencyConflictId( "group:artifact:jar" ); - mac.expectGetScope( Artifact.SCOPE_COMPILE ); artifacts.add( mac.artifact ); @@ -177,13 +169,13 @@ mac2.enableGetGroupId( "group2" ); mac2.enableGetArtifactId( "artifact2" ); mac2.enableGetDependencyConflictId( "group2:artifact2:jar" ); - mac2.expectGetScope( Artifact.SCOPE_COMPILE ); mac2.enableGetDependencyTrail( Collections.EMPTY_LIST ); mac2.enableGetId( "group2:artifact2:1.0" ); artifacts.add( mac2.artifact ); - project.setArtifacts( artifacts ); + macTask.expectCSGetRepositories( null, null ); + macTask.expectResolveDependencies( artifacts ); DependencySet dependencySet = new DependencySet(); @@ -194,9 +186,9 @@ mockManager.replayAll(); AddDependencySetsTask task = - new AddDependencySetsTask( Collections.singletonList( dependencySet ), project, null, logger ); - - Set result = task.getDependencyArtifacts( project, dependencySet ); + new AddDependencySetsTask( Collections.singletonList( dependencySet ), project, null, macTask.dependencyResolver, logger ); + + Set result = task.resolveDependencyArtifacts( dependencySet, macTask.configSource ); assertNotNull( result ); assertEquals( 1, result.size() ); @@ -253,99 +245,6 @@ { artifact.getScope(); control.setReturnValue( scope, MockControl.ONE_OR_MORE ); - } - } - - private final class MockAndControlForConfigSource - { - AssemblerConfigurationSource configSource; - - MockControl control; - - MockAndControlForConfigSource() - { - control = MockControl.createControl( AssemblerConfigurationSource.class ); - mockManager.add( control ); - - configSource = ( AssemblerConfigurationSource ) control.getMock(); - } - - public void enableGetRepositories( ArtifactRepository localRepo, List remoteRepos ) - { - configSource.getLocalRepository(); - control.setReturnValue( localRepo, MockControl.ONE_OR_MORE ); - - configSource.getRemoteRepositories(); - control.setReturnValue( remoteRepos, MockControl.ONE_OR_MORE ); - } - - public void enableGetFinalName( String finalName ) - { - configSource.getFinalName(); - control.setReturnValue( finalName, MockControl.ONE_OR_MORE ); - } - - void enableGetProject( MavenProject project ) - { - configSource.getProject(); - control.setReturnValue( project, MockControl.ONE_OR_MORE ); - } - } - - private final class MockAndControlForLogger - { - Logger logger; - - MockControl control; - - MockAndControlForLogger() - { - control = MockControl.createControl( Logger.class ); - mockManager.add( control ); - - logger = ( Logger ) control.getMock(); - - logger.isDebugEnabled(); - control.setReturnValue( true, MockControl.ZERO_OR_MORE ); - - logger.debug( null ); - control.setMatcher( MockControl.ALWAYS_MATCHER ); - control.setVoidCallable( MockControl.ZERO_OR_MORE ); - } - - void expectInfo( String message ) - { - logger.info( message ); - control.setVoidCallable( MockControl.ONE_OR_MORE ); - } - } - - private final class MockAndControlForProjectBuilder - { - MavenProjectBuilder projectBuilder; - - MockControl control; - - public MockAndControlForProjectBuilder() - { - control = MockControl.createControl( MavenProjectBuilder.class ); - mockManager.add( control ); - - projectBuilder = ( MavenProjectBuilder ) control.getMock(); - } - - public void expectBuildFromRepository( MavenProject project ) - { - try - { - projectBuilder.buildFromRepository( null, null, null ); - control.setMatcher( MockControl.ALWAYS_MATCHER ); - control.setReturnValue( project, MockControl.ONE_OR_MORE ); - } - catch ( ProjectBuildingException e ) - { - Assert.fail( "should never happen" ); - } } } Added: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java?rev=438528&view=auto ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java (added) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java Wed Aug 30 08:59:57 2006 @@ -0,0 +1,299 @@ +package org.apache.maven.plugin.assembly.archive.task.testutils; + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.handler.ArtifactHandler; +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.resolver.ArtifactNotFoundException; +import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugin.assembly.artifact.DependencyResolver; +import org.apache.maven.plugin.assembly.testutils.MockManager; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.MavenProjectBuilder; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.artifact.InvalidDependencyVersionException; +import org.codehaus.plexus.archiver.Archiver; +import org.codehaus.plexus.archiver.ArchiverException; +import org.easymock.MockControl; + +import java.io.File; +import java.io.IOException; +import java.util.List; +import java.util.Set; + +import junit.framework.Assert; + +public class MockAndControlForAddDependencySetsTask +{ + + public MockControl artifactCtl; + + public Artifact artifact; + + public File artifactFile; + + public Archiver archiver; + + public MockControl archiverCtl; + + public AssemblerConfigurationSource configSource; + + public MockControl configSourceCtl; + + public ArtifactHandler artifactHandler; + + public MockControl artifactHandlerCtl; + + public DependencyResolver dependencyResolver; + + public MockControl dependencyResolverCtl; + + public MavenProjectBuilder projectBuilder; + + public MockControl projectBuilderCtl; + + public MockAndControlForAddDependencySetsTask( MockManager mockManager ) + { + artifactCtl = MockControl.createControl( Artifact.class ); + mockManager.add( artifactCtl ); + + artifact = ( Artifact ) artifactCtl.getMock(); + + artifactHandlerCtl = MockControl.createControl( ArtifactHandler.class ); + mockManager.add( artifactHandlerCtl ); + + artifactHandler = (ArtifactHandler) artifactHandlerCtl.getMock(); + + archiverCtl = MockControl.createControl( Archiver.class ); + mockManager.add( archiverCtl ); + + archiver = (Archiver) archiverCtl.getMock(); + + configSourceCtl = MockControl.createControl( AssemblerConfigurationSource.class ); + mockManager.add( configSourceCtl ); + + configSource = (AssemblerConfigurationSource) configSourceCtl.getMock(); + + dependencyResolverCtl = MockControl.createControl( DependencyResolver.class ); + mockManager.add( dependencyResolverCtl ); + + dependencyResolver = ( DependencyResolver ) dependencyResolverCtl.getMock(); + + projectBuilderCtl = MockControl.createControl( MavenProjectBuilder.class ); + mockManager.add( projectBuilderCtl ); + + projectBuilder = ( MavenProjectBuilder ) projectBuilderCtl.getMock(); + } + + public void expectGetArtifactHandler() + { + artifact.getArtifactHandler(); + artifactCtl.setReturnValue( artifactHandler, MockControl.ONE_OR_MORE ); + } + + public void expectGetClassifier( String classifier ) + { + artifact.getClassifier(); + artifactCtl.setReturnValue( classifier, MockControl.ONE_OR_MORE ); + } + + public void expectGetFinalName( String finalName ) + { + configSource.getFinalName(); + configSourceCtl.setReturnValue( finalName, MockControl.ONE_OR_MORE ); + } + + public void expectArtifactGetFile() throws IOException + { + expectArtifactGetFile( true ); + } + + public void expectArtifactGetFile( boolean createTempFile ) throws IOException + { + if ( createTempFile ) + { + artifactFile = File.createTempFile( "add-artifact-task.test.", ".jar" ); + } + + artifact.getFile(); + + artifactCtl.setReturnValue( artifactFile, MockControl.ZERO_OR_MORE ); + } + + public void expectAddArchivedFileSet( String outputLocation, String[] includes, String[] excludes ) + { + try + { + archiver.addArchivedFileSet( artifactFile, outputLocation, includes, excludes ); + + if ( includes != null || excludes != null ) + { + archiverCtl.setMatcher( MockControl.ARRAY_MATCHER ); + } + + archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE ); + } + catch ( ArchiverException e ) + { + Assert.fail( "Should never happen." ); + } + } + + public void expectModeChange( int originalDirMode, int originalFileMode, int dirMode, int fileMode, + int numberOfChanges ) + { + archiver.getDefaultDirectoryMode(); + archiverCtl.setReturnValue( originalDirMode ); + + archiver.getDefaultFileMode(); + archiverCtl.setReturnValue( originalFileMode ); + + // one of the changes will occur below, when we restore the original mode. + if ( numberOfChanges > 1 ) + { + for( int i = 1; i< numberOfChanges; i++ ) + { + archiver.setDefaultDirectoryMode( dirMode ); + archiver.setDefaultFileMode( fileMode ); + } + } + + archiver.setDefaultDirectoryMode( originalDirMode ); + archiver.setDefaultFileMode( originalFileMode ); + } + + public void expectAddFile( String outputLocation ) + { + try + { + archiver.addFile( artifactFile, outputLocation ); + archiverCtl.setMatcher( MockControl.ALWAYS_MATCHER ); + archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE ); + } + catch ( ArchiverException e ) + { + Assert.fail( "Should never happen." ); + } + } + + public void expectAddFile( String outputLocation, int fileMode ) + { + try + { + archiver.addFile( artifactFile, outputLocation, fileMode ); + archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE ); + } + catch ( ArchiverException e ) + { + Assert.fail( "Should never happen." ); + } + } + + public void expectAddFile( File file, String outputLocation, int fileMode ) + { + try + { + archiver.addFile( file, outputLocation, fileMode ); + archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE ); + } + catch ( ArchiverException e ) + { + Assert.fail( "Should never happen." ); + } + } + + public void expectArtifactGetScope( String scope ) + { + artifact.getScope(); + artifactCtl.setReturnValue( scope, MockControl.ONE_OR_MORE ); + } + + public void expectGetProject( MavenProject project ) + { + configSource.getProject(); + configSourceCtl.setReturnValue( project, MockControl.ONE_OR_MORE ); + } + + public void expectGetReactorProjects( List projects ) + { + configSource.getReactorProjects(); + configSourceCtl.setReturnValue( projects, MockControl.ONE_OR_MORE ); + } + + public void expectArtifactGetDependencyConflictId( String dependencyConflictId ) + { + artifact.getDependencyConflictId(); + artifactCtl.setReturnValue( dependencyConflictId, MockControl.ONE_OR_MORE ); + } + + public void expectIsSnapshot( boolean isSnapshot ) + { + artifact.isSnapshot(); + artifactCtl.setReturnValue( isSnapshot, MockControl.ONE_OR_MORE ); + } + + public void expectArtifactGetType( String type ) + { + artifact.getType(); + artifactCtl.setReturnValue( type, MockControl.ONE_OR_MORE ); + } + + public void expectArtifactGetArtifactId( String artifactId ) + { + artifact.getArtifactId(); + artifactCtl.setReturnValue( artifactId, MockControl.ONE_OR_MORE ); + } + + public void expectCSGetFinalName( String finalName ) + { + configSource.getFinalName(); + configSourceCtl.setReturnValue( finalName, MockControl.ONE_OR_MORE ); + } + + public void expectCSGetRepositories( ArtifactRepository localRepo, List remoteRepos ) + { + configSource.getLocalRepository(); + configSourceCtl.setReturnValue( localRepo, MockControl.ONE_OR_MORE ); + + configSource.getRemoteRepositories(); + configSourceCtl.setReturnValue( remoteRepos, MockControl.ONE_OR_MORE ); + } + + public void expectBuildFromRepository( MavenProject project ) + { + try + { + projectBuilder.buildFromRepository( null, null, null ); + projectBuilderCtl.setMatcher( MockControl.ALWAYS_MATCHER ); + projectBuilderCtl.setReturnValue( project, MockControl.ONE_OR_MORE ); + } + catch ( ProjectBuildingException e ) + { + Assert.fail( "should never happen" ); + } + } + + public void expectResolveDependencies( Set resolvedArtifacts ) + { + try + { + dependencyResolver.resolveDependencies( null, null, null, null ); + } + catch ( ArtifactResolutionException e ) + { + Assert.fail( "should never happen!" ); + } + catch ( ArtifactNotFoundException e ) + { + Assert.fail( "should never happen!" ); + } + catch ( InvalidDependencyVersionException e ) + { + Assert.fail( "should never happen!" ); + } + + dependencyResolverCtl.setMatcher( MockControl.ALWAYS_MATCHER ); + dependencyResolverCtl.setReturnValue( resolvedArtifacts, MockControl.ONE_OR_MORE ); + } + +} Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: 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/plugin/assembly/utils/ProjectUtilsTest.java?rev=438528&r1=438527&r2=438528&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/plugin/assembly/utils/ProjectUtilsTest.java Wed Aug 30 08:59:57 2006 @@ -49,11 +49,12 @@ projects.add( master ); projects.add( module ); - Set result = ProjectUtils.getProjectModules( master, projects, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) ); + Set result = + ProjectUtils.getProjectModules( master, projects, true, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) ); assertNotNull( result ); assertEquals( 1, result.size() ); - assertEquals( module.getId(), ((MavenProject) result.iterator().next()).getId() ); + assertEquals( module.getId(), ( ( MavenProject ) result.iterator().next() ).getId() ); } public void testGetProjectModules_ShouldNotIncludeMasterProject() @@ -61,14 +62,15 @@ { MavenProject master = createTestProject( "test", "testGroup", "1.0" ); - Set result = ProjectUtils.getProjectModules( master, Collections.singletonList( master ), new ConsoleLogger( - Logger.LEVEL_INFO, "test" ) ); + Set result = + ProjectUtils.getProjectModules( master, Collections.singletonList( master ), true, + new ConsoleLogger( Logger.LEVEL_INFO, "test" ) ); assertNotNull( result ); assertTrue( result.isEmpty() ); } - public void testGetProjectModules_ShouldIncludeInDirectModuleOfMasterProject() + public void testGetProjectModules_ShouldIncludeInDirectModuleOfMasterWhenIncludeSubModulesIsTrue() throws IOException { MavenProject master = createTestProject( "test", "testGroup", "1.0" ); @@ -93,7 +95,8 @@ projects.add( module ); projects.add( subModule ); - Set result = ProjectUtils.getProjectModules( master, projects, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) ); + Set result = + ProjectUtils.getProjectModules( master, projects, true, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) ); assertNotNull( result ); assertEquals( 2, result.size() ); @@ -104,6 +107,44 @@ verifyProjectsPresent( verify, result ); } + public void testGetProjectModules_ShouldExcludeInDirectModuleOfMasterWhenIncludeSubModulesIsFalse() + throws IOException + { + MavenProject master = createTestProject( "test", "testGroup", "1.0" ); + + master.setFile( new File( "project/pom.xml" ) ); + + master.getModel().addModule( "module" ); + + MavenProject module = createTestProject( "module", "testGroup", "1.0" ); + + module.getModel().addModule( "submodule" ); + + module.setFile( new File( "project/module/pom.xml" ) ); + + MavenProject subModule = createTestProject( "sub-module", "testGroup", "1.0" ); + + subModule.setFile( new File( "project/module/submodule/pom.xml" ) ); + + List projects = new ArrayList( 3 ); + + projects.add( master ); + projects.add( module ); + projects.add( subModule ); + + Set result = + ProjectUtils.getProjectModules( master, projects, false, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) ); + + assertNotNull( result ); + assertEquals( 1, result.size() ); + + List verify = new ArrayList( projects ); + verify.remove( master ); + verify.remove( subModule ); + + verifyProjectsPresent( verify, result ); + } + public void testGetProjectModules_ShouldExcludeNonModuleOfMasterProject() throws IOException { @@ -120,7 +161,8 @@ projects.add( master ); projects.add( other ); - Set result = ProjectUtils.getProjectModules( master, projects, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) ); + Set result = + ProjectUtils.getProjectModules( master, projects, true, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) ); assertNotNull( result ); assertTrue( result.isEmpty() ); @@ -134,13 +176,13 @@ for ( Iterator it = result.iterator(); it.hasNext(); ) { - MavenProject project = (MavenProject) it.next(); + MavenProject project = ( MavenProject ) it.next(); boolean removed = false; for ( Iterator verifyIterator = verifyCopy.iterator(); verifyIterator.hasNext(); ) { - MavenProject verification = (MavenProject) verifyIterator.next(); + MavenProject verification = ( MavenProject ) verifyIterator.next(); if ( verification.getId().equals( project.getId() ) ) { @@ -166,32 +208,32 @@ } } -// private void verifyProjectsNotPresent( List verify, Set result ) -// { -// List verifyCopy = new ArrayList( verify ); -// -// for ( Iterator it = result.iterator(); it.hasNext(); ) -// { -// MavenProject project = (MavenProject) it.next(); -// -// for ( Iterator verifyIterator = verifyCopy.iterator(); verifyIterator.hasNext(); ) -// { -// MavenProject verification = (MavenProject) verifyIterator.next(); -// -// if ( verification.getId().equals( project.getId() ) ) -// { -// verifyIterator.remove(); -// } -// } -// } -// -// if ( verifyCopy.size() != verify.size() ) -// { -// List found = new ArrayList( verify ); -// found.removeAll( verifyCopy ); -// -// fail( "Failed to verify absence of: " + found ); -// } -// } + // private void verifyProjectsNotPresent( List verify, Set result ) + // { + // List verifyCopy = new ArrayList( verify ); + // + // for ( Iterator it = result.iterator(); it.hasNext(); ) + // { + // MavenProject project = (MavenProject) it.next(); + // + // for ( Iterator verifyIterator = verifyCopy.iterator(); verifyIterator.hasNext(); ) + // { + // MavenProject verification = (MavenProject) verifyIterator.next(); + // + // if ( verification.getId().equals( project.getId() ) ) + // { + // verifyIterator.remove(); + // } + // } + // } + // + // if ( verifyCopy.size() != verify.size() ) + // { + // List found = new ArrayList( verify ); + // found.removeAll( verifyCopy ); + // + // fail( "Failed to verify absence of: " + found ); + // } + // } }
