Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ScmTagPhaseTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ScmTagPhaseTest.java?rev=438376&r1=438375&r2=438376&view=diff ============================================================================== --- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ScmTagPhaseTest.java (original) +++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ScmTagPhaseTest.java Tue Aug 29 22:23:04 2006 @@ -43,6 +43,7 @@ import org.jmock.core.stub.ThrowStub; import java.util.Collections; +import java.util.List; /** * Test the SCM tag phase. @@ -63,11 +64,12 @@ public void testTag() throws Exception { - ReleaseDescriptor config = createDescriptorFromProjects( "scm-commit/", "single-pom", false ); - config.setScmSourceUrl( "scm-url" ); - MavenProject rootProject = (MavenProject) getReactorProjects().get( 0 ); - config.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() ); - config.setScmReleaseLabel( "release-label" ); + ReleaseDescriptor descriptor = new ReleaseDescriptor(); + List reactorProjects = createReactorProjects(); + descriptor.setScmSourceUrl( "scm-url" ); + MavenProject rootProject = (MavenProject) reactorProjects.get( 0 ); + descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() ); + descriptor.setScmReleaseLabel( "release-label" ); ScmFileSet fileSet = new ScmFileSet( rootProject.getFile().getParentFile() ); @@ -80,7 +82,7 @@ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); - phase.execute( config, null, getReactorProjects() ); + phase.execute( descriptor, null, reactorProjects ); assertTrue( true ); } @@ -88,11 +90,12 @@ public void testCommitMultiModule() throws Exception { - ReleaseDescriptor config = createDescriptorFromProjects( "scm-commit/", "multiple-poms", false ); - config.setScmSourceUrl( "scm-url" ); - MavenProject rootProject = (MavenProject) getReactorProjects().get( 0 ); - config.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() ); - config.setScmReleaseLabel( "release-label" ); + ReleaseDescriptor descriptor = new ReleaseDescriptor(); + List reactorProjects = createReactorProjects( "scm-commit/", "multiple-poms", false ); + descriptor.setScmSourceUrl( "scm-url" ); + MavenProject rootProject = (MavenProject) reactorProjects.get( 0 ); + descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() ); + descriptor.setScmReleaseLabel( "release-label" ); ScmFileSet fileSet = new ScmFileSet( rootProject.getFile().getParentFile() ); @@ -105,7 +108,7 @@ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); - phase.execute( config, null, getReactorProjects() ); + phase.execute( descriptor, null, reactorProjects ); assertTrue( true ); } @@ -113,11 +116,12 @@ public void testTagNoReleaseLabel() throws Exception { - ReleaseDescriptor config = createDescriptorFromProjects( "scm-commit/", "single-pom", false ); + ReleaseDescriptor descriptor = new ReleaseDescriptor(); + List reactorProjects = createReactorProjects(); try { - phase.execute( config, null, getReactorProjects() ); + phase.execute( descriptor, null, reactorProjects ); fail( "Should have thrown an exception" ); } catch ( ReleaseFailureException e ) @@ -129,11 +133,12 @@ public void testSimulateTag() throws Exception { - ReleaseDescriptor config = createDescriptorFromProjects( "scm-commit/", "single-pom", false ); - config.setScmSourceUrl( "scm-url" ); - MavenProject rootProject = (MavenProject) getReactorProjects().get( 0 ); - config.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() ); - config.setScmReleaseLabel( "release-label" ); + ReleaseDescriptor descriptor = new ReleaseDescriptor(); + List reactorProjects = createReactorProjects(); + descriptor.setScmSourceUrl( "scm-url" ); + MavenProject rootProject = (MavenProject) reactorProjects.get( 0 ); + descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() ); + descriptor.setScmReleaseLabel( "release-label" ); Mock scmProviderMock = new Mock( ScmProvider.class ); scmProviderMock.expects( new TestFailureMatcher( "Shouldn't have called tag" ) ).method( "tag" ); @@ -141,7 +146,7 @@ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE ); stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() ); - phase.simulate( config, null, getReactorProjects() ); + phase.simulate( descriptor, null, reactorProjects ); assertTrue( true ); } @@ -149,11 +154,12 @@ public void testSimulateTagNoReleaseLabel() throws Exception { - ReleaseDescriptor config = createDescriptorFromProjects( "scm-commit/", "single-pom", false ); + ReleaseDescriptor descriptor = new ReleaseDescriptor(); + List reactorProjects = createReactorProjects(); try { - phase.simulate( config, null, getReactorProjects() ); + phase.simulate( descriptor, null, reactorProjects ); fail( "Should have thrown an exception" ); } catch ( ReleaseFailureException e ) @@ -165,7 +171,8 @@ public void testNoSuchScmProviderExceptionThrown() throws Exception { - ReleaseDescriptor releaseDescriptor = createReleaseConfiguration(); + List reactorProjects = createReactorProjects(); + ReleaseDescriptor releaseDescriptor = createReleaseDescriptor(); Mock scmManagerMock = new Mock( ScmManager.class ); scmManagerMock.expects( new InvokeOnceMatcher() ).method( "makeScmRepository" ).with( @@ -178,7 +185,7 @@ try { - phase.execute( releaseDescriptor, null, getReactorProjects() ); + phase.execute( releaseDescriptor, null, reactorProjects ); fail( "Status check should have failed" ); } @@ -191,7 +198,8 @@ public void testScmRepositoryExceptionThrown() throws Exception { - ReleaseDescriptor releaseDescriptor = createReleaseConfiguration(); + List reactorProjects = createReactorProjects(); + ReleaseDescriptor releaseDescriptor = createReleaseDescriptor(); Mock scmManagerMock = new Mock( ScmManager.class ); scmManagerMock.expects( new InvokeOnceMatcher() ).method( "makeScmRepository" ).with( @@ -204,7 +212,7 @@ try { - phase.execute( releaseDescriptor, null, getReactorProjects() ); + phase.execute( releaseDescriptor, null, reactorProjects ); fail( "Status check should have failed" ); } @@ -217,7 +225,8 @@ public void testScmExceptionThrown() throws Exception { - ReleaseDescriptor releaseDescriptor = createReleaseConfiguration(); + List reactorProjects = createReactorProjects(); + ReleaseDescriptor releaseDescriptor = createReleaseDescriptor(); Mock scmProviderMock = new Mock( ScmProvider.class ); scmProviderMock.expects( new InvokeOnceMatcher() ).method( "tag" ).will( @@ -228,7 +237,7 @@ try { - phase.execute( releaseDescriptor, null, getReactorProjects() ); + phase.execute( releaseDescriptor, null, reactorProjects ); fail( "Status check should have failed" ); } @@ -241,7 +250,8 @@ public void testScmResultFailure() throws Exception { - ReleaseDescriptor releaseDescriptor = createReleaseConfiguration(); + List reactorProjects = createReactorProjects(); + ReleaseDescriptor releaseDescriptor = createReleaseDescriptor(); ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE ); ScmProviderStub providerStub = @@ -251,7 +261,7 @@ try { - phase.execute( releaseDescriptor, null, getReactorProjects() ); + phase.execute( releaseDescriptor, null, reactorProjects ); fail( "Commit should have failed" ); } @@ -261,14 +271,19 @@ } } - private ReleaseDescriptor createReleaseConfiguration() + private List createReactorProjects() throws Exception { - ReleaseDescriptor config = createDescriptorFromProjects( "scm-commit/", "single-pom", false ); - config.setScmSourceUrl( "scm-url" ); - config.setScmReleaseLabel( "release-label" ); - config.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() ); - return config; + return createReactorProjects( "scm-commit/", "single-pom", false ); + } + + private static ReleaseDescriptor createReleaseDescriptor() + { + ReleaseDescriptor descriptor = new ReleaseDescriptor(); + descriptor.setScmSourceUrl( "scm-url" ); + descriptor.setScmReleaseLabel( "release-label" ); + descriptor.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() ); + return descriptor; } }
