You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/08/30 06:03:49 UTC
svn commit: r438341 [4/5] - in /maven/plugins/trunk/maven-release-plugin/src:
main/java/org/apache/maven/plugins/release/
main/java/org/apache/maven/plugins/release/config/
main/java/org/apache/maven/plugins/release/phase/
main/java/org/apache/maven/pl...
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java?rev=438341&r1=438340&r2=438341&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java Tue Aug 29 21:03:46 2006
@@ -18,7 +18,7 @@
import org.apache.maven.plugins.release.ReleaseExecutionException;
import org.apache.maven.plugins.release.ReleaseFailureException;
-import org.apache.maven.plugins.release.config.ReleaseConfiguration;
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
import org.apache.maven.plugins.release.scm.DefaultScmRepositoryConfigurator;
import org.apache.maven.plugins.release.scm.ReleaseScmCommandException;
import org.apache.maven.plugins.release.scm.ReleaseScmRepositoryException;
@@ -56,39 +56,38 @@
public void testRewriteBasicPom()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromBasicPom();
+ ReleaseDescriptor config = createConfigurationFromBasicPom();
mapNextVersion( config, "groupId:artifactId" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewritePomWithParent()
throws Exception
{
- ReleaseConfiguration config = createConfigurationForPomWithParentAlternateNextVersion( "pom-with-parent" );
+ ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( "pom-with-parent" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewritePomWithUnmappedParent()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromProjects( "pom-with-parent" );
+ ReleaseDescriptor config = createConfigurationFromProjects( "pom-with-parent" );
// Process the child first
- List reactorProjects = new ArrayList( config.getReactorProjects() );
+ List reactorProjects = new ArrayList( getReactorProjects() );
Collections.reverse( reactorProjects );
- config.setReactorProjects( reactorProjects );
mapAlternateNextVersion( config, "groupId:subproject1" );
try
{
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
fail( "Should have thrown an exception" );
}
@@ -101,39 +100,38 @@
public void testRewritePomWithReleasedParent()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromProjects( "pom-with-released-parent" );
+ ReleaseDescriptor config = createConfigurationFromProjects( "pom-with-released-parent" );
mapAlternateNextVersion( config, "groupId:subproject1" );
config.mapReleaseVersion( "groupId:artifactId", "1" );
config.mapDevelopmentVersion( "groupId:artifactId", "1" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
- protected abstract void mapAlternateNextVersion( ReleaseConfiguration config, String projectId );
+ protected abstract void mapAlternateNextVersion( ReleaseDescriptor config, String projectId );
public void testRewritePomWithInheritedVersion()
throws Exception
{
- ReleaseConfiguration config = createConfigurationForWithParentNextVersion( "pom-with-inherited-version" );
+ ReleaseDescriptor config = createConfigurationForWithParentNextVersion( "pom-with-inherited-version" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewritePomWithChangedInheritedVersion()
throws Exception
{
- ReleaseConfiguration config =
+ ReleaseDescriptor config =
createConfigurationForPomWithParentAlternateNextVersion( "pom-with-inherited-version" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- MavenProject project =
- (MavenProject) getProjectsAsMap( config.getReactorProjects() ).get( "groupId:subproject1" );
+ MavenProject project = (MavenProject) getProjectsAsMap( getReactorProjects() ).get( "groupId:subproject1" );
String actual = FileUtils.fileRead( project.getFile() );
String expected =
@@ -141,28 +139,28 @@
assertEquals( "Check the transformed POM", expected, actual );
}
- protected abstract ReleaseConfiguration createConfigurationForPomWithParentAlternateNextVersion( String path )
+ protected abstract ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( String path )
throws Exception;
public void testRewritePomDependencies()
throws Exception
{
- ReleaseConfiguration config = createDefaultConfiguration( "internal-snapshot-dependencies" );
+ ReleaseDescriptor config = createDefaultConfiguration( "internal-snapshot-dependencies" );
mapNextVersion( config, "groupId:subsubproject" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewritePomUnmappedDependencies()
throws Exception
{
- ReleaseConfiguration config = createUnmappedConfiguration( "internal-snapshot-dependencies" );
+ ReleaseDescriptor config = createUnmappedConfiguration( "internal-snapshot-dependencies" );
try
{
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
fail( "Should have thrown an exception" );
}
@@ -175,31 +173,31 @@
public void testRewritePomDependenciesDifferentVersion()
throws Exception
{
- ReleaseConfiguration config = createDifferingVersionConfiguration( "internal-differing-snapshot-dependencies" );
+ ReleaseDescriptor config = createDifferingVersionConfiguration( "internal-differing-snapshot-dependencies" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewriteManagedPomDependencies()
throws Exception
{
- ReleaseConfiguration config = createMappedConfiguration( "internal-managed-snapshot-dependency" );
+ ReleaseDescriptor config = createMappedConfiguration( "internal-managed-snapshot-dependency" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewriteManagedPomUnmappedDependencies()
throws Exception
{
- ReleaseConfiguration config = createUnmappedConfiguration( "internal-managed-snapshot-dependency" );
+ ReleaseDescriptor config = createUnmappedConfiguration( "internal-managed-snapshot-dependency" );
try
{
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
fail( "Should have thrown an exception" );
}
@@ -212,21 +210,21 @@
public void testRewritePomPlugins()
throws Exception
{
- ReleaseConfiguration config = createDefaultConfiguration( "internal-snapshot-plugins" );
+ ReleaseDescriptor config = createDefaultConfiguration( "internal-snapshot-plugins" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewritePomUnmappedPlugins()
throws Exception
{
- ReleaseConfiguration config = createUnmappedConfiguration( "internal-snapshot-plugins" );
+ ReleaseDescriptor config = createUnmappedConfiguration( "internal-snapshot-plugins" );
try
{
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
fail( "Should have thrown an exception" );
}
@@ -239,31 +237,31 @@
public void testRewritePomPluginsDifferentVersion()
throws Exception
{
- ReleaseConfiguration config = createDifferingVersionConfiguration( "internal-differing-snapshot-plugins" );
+ ReleaseDescriptor config = createDifferingVersionConfiguration( "internal-differing-snapshot-plugins" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewriteManagedPomPlugins()
throws Exception
{
- ReleaseConfiguration config = createMappedConfiguration( "internal-managed-snapshot-plugin" );
+ ReleaseDescriptor config = createMappedConfiguration( "internal-managed-snapshot-plugin" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewriteManagedPomUnmappedPlugins()
throws Exception
{
- ReleaseConfiguration config = createUnmappedConfiguration( "internal-managed-snapshot-plugin" );
+ ReleaseDescriptor config = createUnmappedConfiguration( "internal-managed-snapshot-plugin" );
try
{
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
fail( "Should have thrown an exception" );
}
@@ -276,21 +274,21 @@
public void testRewritePomReportPlugins()
throws Exception
{
- ReleaseConfiguration config = createDefaultConfiguration( "internal-snapshot-report-plugins" );
+ ReleaseDescriptor config = createDefaultConfiguration( "internal-snapshot-report-plugins" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewritePomUnmappedReportPlugins()
throws Exception
{
- ReleaseConfiguration config = createUnmappedConfiguration( "internal-snapshot-report-plugins" );
+ ReleaseDescriptor config = createUnmappedConfiguration( "internal-snapshot-report-plugins" );
try
{
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
fail( "Should have thrown an exception" );
}
@@ -303,32 +301,31 @@
public void testRewritePomReportPluginsDifferentVersion()
throws Exception
{
- ReleaseConfiguration config =
- createDifferingVersionConfiguration( "internal-differing-snapshot-report-plugins" );
+ ReleaseDescriptor config = createDifferingVersionConfiguration( "internal-differing-snapshot-report-plugins" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewritePomExtension()
throws Exception
{
- ReleaseConfiguration config = createDefaultConfiguration( "internal-snapshot-extension" );
+ ReleaseDescriptor config = createDefaultConfiguration( "internal-snapshot-extension" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewritePomUnmappedExtension()
throws Exception
{
- ReleaseConfiguration config = createUnmappedConfiguration( "internal-snapshot-extension" );
+ ReleaseDescriptor config = createUnmappedConfiguration( "internal-snapshot-extension" );
try
{
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
fail( "Should have thrown an exception" );
}
@@ -341,30 +338,30 @@
public void testRewritePomExtensionDifferentVersion()
throws Exception
{
- ReleaseConfiguration config = createDifferingVersionConfiguration( "internal-differing-snapshot-extension" );
+ ReleaseDescriptor config = createDifferingVersionConfiguration( "internal-differing-snapshot-extension" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewriteBasicPomWithEditMode()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromBasicPom();
- config.setUseEditMode( true );
+ ReleaseDescriptor config = createConfigurationFromBasicPom();
+ config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
public void testRewriteBasicPomWithEditModeFailure()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromBasicPom();
- config.setUseEditMode( true );
+ ReleaseDescriptor config = createConfigurationFromBasicPom();
+ config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
ScmManagerStub scmManager = new ScmManagerStub();
@@ -372,12 +369,12 @@
(DefaultScmRepositoryConfigurator) lookup( ScmRepositoryConfigurator.ROLE );
configurator.setScmManager( scmManager );
- ScmProviderStub providerStub = (ScmProviderStub) scmManager.getProviderByUrl( config.getUrl() );
+ ScmProviderStub providerStub = (ScmProviderStub) scmManager.getProviderByUrl( config.getScmSourceUrl() );
providerStub.setEditScmResult( new EditScmResult( "", "", "", false ) );
try
{
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
fail( "Should have thrown an exception" );
}
@@ -390,8 +387,8 @@
public void testRewriteBasicPomWithEditModeException()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromBasicPom();
- config.setUseEditMode( true );
+ ReleaseDescriptor config = createConfigurationFromBasicPom();
+ config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
Mock scmProviderMock = new Mock( ScmProvider.class );
@@ -406,7 +403,7 @@
try
{
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
fail( "Should have thrown an exception" );
}
@@ -424,11 +421,11 @@
// Run a second time to check they are not duplicated
for ( int i = 0; i < 2; i++ )
{
- ReleaseConfiguration config = createConfigurationFromBasicPom( copyFiles );
+ ReleaseDescriptor config = createConfigurationFromBasicPom( copyFiles );
mapNextVersion( config, "groupId:artifactId" );
config.setAddSchema( true );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
String expected = readTestProjectFile( "basic-pom/expected-pom-with-schema.xml" );
String actual = readTestProjectFile( "basic-pom/pom.xml" );
@@ -441,8 +438,8 @@
public void testSimulateRewriteEditModeSkipped()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromBasicPom();
- config.setUseEditMode( true );
+ ReleaseDescriptor config = createConfigurationFromBasicPom();
+ config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
Mock scmProviderMock = new Mock( ScmProvider.class );
@@ -454,7 +451,7 @@
configurator.setScmManager( scmManager );
scmManager.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
- phase.simulate( config );
+ phase.simulate( config, null, getReactorProjects() );
// Getting past mock is success
assertTrue( true );
@@ -463,11 +460,11 @@
public void testRewriteUnmappedPom()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromBasicPom();
+ ReleaseDescriptor config = createConfigurationFromBasicPom();
try
{
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
fail( "Should have thrown an exception" );
}
@@ -480,19 +477,19 @@
public void testRewriteBasicPomWithScmRepoException()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromBasicPom();
- config.setUseEditMode( true );
+ ReleaseDescriptor config = createConfigurationFromBasicPom();
+ config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
Mock scmManagerMock = new Mock( ScmManager.class );
scmManagerMock.expects( new InvokeAtLeastOnceMatcher() ).method( "makeScmRepository" ).with(
- new IsEqual( config.getUrl() ) ).will( new ThrowStub( new ScmRepositoryException( "..." ) ) );
+ new IsEqual( config.getScmSourceUrl() ) ).will( new ThrowStub( new ScmRepositoryException( "..." ) ) );
setMockScmManager( scmManagerMock );
try
{
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
fail( "Should have thrown an exception" );
}
@@ -505,19 +502,19 @@
public void testRewriteBasicPomWithNoSuchProviderException()
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromBasicPom();
- config.setUseEditMode( true );
+ ReleaseDescriptor config = createConfigurationFromBasicPom();
+ config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
Mock scmManagerMock = new Mock( ScmManager.class );
scmManagerMock.expects( new InvokeAtLeastOnceMatcher() ).method( "makeScmRepository" ).with(
- new IsEqual( config.getUrl() ) ).will( new ThrowStub( new NoSuchScmProviderException( "..." ) ) );
+ new IsEqual( config.getScmSourceUrl() ) ).will( new ThrowStub( new NoSuchScmProviderException( "..." ) ) );
setMockScmManager( scmManagerMock );
try
{
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
fail( "Should have thrown an exception" );
}
@@ -531,19 +528,19 @@
throws Exception
{
// This occurs when it is release:perform run standalone. Just check there are no errors.
- ReleaseConfiguration config = new ReleaseConfiguration();
- config.setUrl( "scm:svn:file://localhost/tmp/scm-repo" );
- config.setWorkingDirectory( getTestFile( "target/test/checkout" ) );
+ ReleaseDescriptor config = new ReleaseDescriptor();
+ config.setScmSourceUrl( "scm:svn:file://localhost/tmp/scm-repo" );
+ config.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
- phase.clean( config );
+ phase.clean( reactorProjects );
assertTrue( true );
}
- private ReleaseConfiguration createUnmappedConfiguration( String path )
+ private ReleaseDescriptor createUnmappedConfiguration( String path )
throws Exception
{
- ReleaseConfiguration config = createConfigurationFromProjects( path );
+ ReleaseDescriptor config = createConfigurationFromProjects( path );
unmapNextVersion( config, "groupId:subproject1" );
mapNextVersion( config, "groupId:subproject2" );
@@ -552,56 +549,56 @@
return config;
}
- protected ReleaseConfiguration createConfigurationFromProjects( String path )
+ protected ReleaseDescriptor createConfigurationFromProjects( String path )
throws Exception
{
return createConfigurationFromProjects( path, true );
}
- protected ReleaseConfiguration createDefaultConfiguration( String path )
+ protected ReleaseDescriptor createDefaultConfiguration( String path )
throws Exception
{
- ReleaseConfiguration config = createMappedConfiguration( path );
+ ReleaseDescriptor config = createMappedConfiguration( path );
mapNextVersion( config, "groupId:subproject4" );
return config;
}
- protected ReleaseConfiguration createMappedConfiguration( String path )
+ protected ReleaseDescriptor createMappedConfiguration( String path )
throws Exception
{
- ReleaseConfiguration config = createDifferingVersionConfiguration( path );
+ ReleaseDescriptor config = createDifferingVersionConfiguration( path );
mapNextVersion( config, "groupId:subproject3" );
return config;
}
- private ReleaseConfiguration createDifferingVersionConfiguration( String path )
+ private ReleaseDescriptor createDifferingVersionConfiguration( String path )
throws Exception
{
- ReleaseConfiguration config = createConfigurationForWithParentNextVersion( path );
+ ReleaseDescriptor config = createConfigurationForWithParentNextVersion( path );
mapNextVersion( config, "groupId:subproject2" );
return config;
}
- protected ReleaseConfiguration createConfigurationFromBasicPom()
+ protected ReleaseDescriptor createConfigurationFromBasicPom()
throws Exception
{
return createConfigurationFromBasicPom( true );
}
- protected abstract ReleaseConfiguration createConfigurationForWithParentNextVersion( String path )
+ protected abstract ReleaseDescriptor createConfigurationForWithParentNextVersion( String path )
throws Exception;
- protected abstract void unmapNextVersion( ReleaseConfiguration config, String projectId );
+ protected abstract void unmapNextVersion( ReleaseDescriptor config, String projectId );
- protected abstract void mapNextVersion( ReleaseConfiguration config, String projectId );
+ protected abstract void mapNextVersion( ReleaseDescriptor config, String projectId );
- protected abstract ReleaseConfiguration createConfigurationFromProjects( String path, boolean copyFiles )
+ protected abstract ReleaseDescriptor createConfigurationFromProjects( String path, boolean copyFiles )
throws Exception;
- protected abstract ReleaseConfiguration createConfigurationFromBasicPom( boolean copyFiles )
+ protected abstract ReleaseDescriptor createConfigurationFromBasicPom( boolean copyFiles )
throws Exception;
protected abstract String readTestProjectFile( String fileName )
@@ -610,10 +607,10 @@
public void testRewritePomDependenciesWithNamespace()
throws Exception
{
- ReleaseConfiguration config = createDefaultConfiguration( "pom-with-namespace" );
+ ReleaseDescriptor config = createDefaultConfiguration( "pom-with-namespace" );
- phase.execute( config );
+ phase.execute( config, null, getReactorProjects() );
- assertTrue( compareFiles( config.getReactorProjects() ) );
+ assertTrue( compareFiles( getReactorProjects() ) );
}
}
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/CheckDependencySnapshotsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/CheckDependencySnapshotsPhaseTest.java?rev=438341&r1=438340&r2=438341&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/CheckDependencySnapshotsPhaseTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/CheckDependencySnapshotsPhaseTest.java Tue Aug 29 21:03:46 2006
@@ -18,7 +18,7 @@
import org.apache.maven.plugins.release.ReleaseExecutionException;
import org.apache.maven.plugins.release.ReleaseFailureException;
-import org.apache.maven.plugins.release.config.ReleaseConfiguration;
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.jmock.Mock;
@@ -45,11 +45,11 @@
public void testNoSnapshotDependencies()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "no-snapshot-dependencies" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "no-snapshot-dependencies" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -58,11 +58,11 @@
public void testSnapshotDependenciesInProjectOnly()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "internal-snapshot-dependencies" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-snapshot-dependencies" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -71,12 +71,12 @@
public void testSnapshotReleasePluginNonInteractive()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "snapshot-release-plugin" );
- releaseConfiguration.setInteractive( false );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "snapshot-release-plugin" );
+ releaseDescriptor.setInteractive( false );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -87,7 +87,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -103,7 +103,7 @@
CheckDependencySnapshotsPhase phase =
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "snapshot-release-plugin" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "snapshot-release-plugin" );
Mock mockPrompter = new Mock( Prompter.class );
mockPrompter.expects( new InvokeOnceMatcher() ).method( "showMessage" );
@@ -112,7 +112,7 @@
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -127,7 +127,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -143,20 +143,20 @@
CheckDependencySnapshotsPhase phase =
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "snapshot-release-plugin" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "snapshot-release-plugin" );
Mock mockPrompter = new Mock( Prompter.class );
mockPrompter.expects( new InvokeOnceMatcher() ).method( "prompt" ).will( new ReturnStub( "yes" ) );
mockPrompter.expects( new InvokeOnceMatcher() ).method( "showMessage" );
phase.setPrompter( (Prompter) mockPrompter.proxy() );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
mockPrompter.reset();
mockPrompter.expects( new InvokeOnceMatcher() ).method( "prompt" ).will( new ReturnStub( "yes" ) );
mockPrompter.expects( new InvokeOnceMatcher() ).method( "showMessage" );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
assertTrue( true );
}
@@ -167,7 +167,7 @@
CheckDependencySnapshotsPhase phase =
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "snapshot-release-plugin" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "snapshot-release-plugin" );
Mock mockPrompter = new Mock( Prompter.class );
mockPrompter.expects( new InvokeOnceMatcher() ).method( "showMessage" );
@@ -176,7 +176,7 @@
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -191,7 +191,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -207,7 +207,7 @@
CheckDependencySnapshotsPhase phase =
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "snapshot-release-plugin" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "snapshot-release-plugin" );
Mock mockPrompter = new Mock( Prompter.class );
mockPrompter.expects( new InvokeOnceMatcher() ).method( "showMessage" );
@@ -217,7 +217,7 @@
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -233,7 +233,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -246,12 +246,12 @@
public void testSnapshotDependenciesInProjectOnlyMismatchedVersion()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "internal-differing-snapshot-dependencies" );
+ ReleaseDescriptor releaseDescriptor =
+ createDescriptorFromProjects( "internal-differing-snapshot-dependencies" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -262,7 +262,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -275,12 +275,11 @@
public void testSnapshotManagedDependenciesInProjectOnly()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "internal-managed-snapshot-dependency" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-managed-snapshot-dependency" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -289,12 +288,12 @@
public void testSnapshotUnusedInternalManagedDependency()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "unused-internal-managed-snapshot-dependency" );
+ ReleaseDescriptor releaseDescriptor =
+ createDescriptorFromProjects( "unused-internal-managed-snapshot-dependency" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -303,12 +302,12 @@
public void testSnapshotUnusedExternalManagedDependency()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "unused-external-managed-snapshot-dependency" );
+ ReleaseDescriptor releaseDescriptor =
+ createDescriptorFromProjects( "unused-external-managed-snapshot-dependency" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -317,12 +316,11 @@
public void testSnapshotExternalManagedDependency()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "external-managed-snapshot-dependency" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-managed-snapshot-dependency" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -333,7 +331,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -346,11 +344,11 @@
public void testSnapshotDependenciesOutsideProjectOnly()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "external-snapshot-dependencies" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-snapshot-dependencies" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -361,7 +359,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -374,12 +372,12 @@
public void testSnapshotDependenciesInsideAndOutsideProject()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "internal-and-external-snapshot-dependencies" );
+ ReleaseDescriptor releaseDescriptor =
+ createDescriptorFromProjects( "internal-and-external-snapshot-dependencies" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -390,7 +388,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -403,11 +401,11 @@
public void testNoSnapshotReportPlugins()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "no-snapshot-report-plugins" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "no-snapshot-report-plugins" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -416,12 +414,11 @@
public void testSnapshotReportPluginsInProjectOnly()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "internal-snapshot-report-plugins" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-snapshot-report-plugins" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -430,12 +427,11 @@
public void testSnapshotReportPluginsOutsideProjectOnly()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "external-snapshot-report-plugins" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-snapshot-report-plugins" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -446,7 +442,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -459,12 +455,12 @@
public void testSnapshotReportPluginsInsideAndOutsideProject()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "internal-and-external-snapshot-report-plugins" );
+ ReleaseDescriptor releaseDescriptor =
+ createDescriptorFromProjects( "internal-and-external-snapshot-report-plugins" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -475,7 +471,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -488,11 +484,11 @@
public void testNoSnapshotPlugins()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "no-snapshot-plugins" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "no-snapshot-plugins" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -501,11 +497,11 @@
public void testSnapshotPluginsInProjectOnly()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "internal-snapshot-plugins" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-snapshot-plugins" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -514,12 +510,11 @@
public void testSnapshotManagedPluginInProjectOnly()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "internal-managed-snapshot-plugin" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-managed-snapshot-plugin" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -528,12 +523,11 @@
public void testSnapshotUnusedInternalManagedPlugin()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "unused-internal-managed-snapshot-plugin" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "unused-internal-managed-snapshot-plugin" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -542,12 +536,11 @@
public void testSnapshotUnusedExternalManagedPlugin()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "unused-external-managed-snapshot-plugin" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "unused-external-managed-snapshot-plugin" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -556,12 +549,11 @@
public void testSnapshotExternalManagedPlugin()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "external-managed-snapshot-plugin" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-managed-snapshot-plugin" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -572,7 +564,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -585,11 +577,11 @@
public void testSnapshotPluginsOutsideProjectOnly()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "external-snapshot-plugins" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-snapshot-plugins" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -600,7 +592,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -613,12 +605,11 @@
public void testSnapshotPluginsInsideAndOutsideProject()
throws Exception
{
- ReleaseConfiguration releaseConfiguration =
- createConfigurationFromProjects( "internal-and-external-snapshot-plugins" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-and-external-snapshot-plugins" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -629,7 +620,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -642,11 +633,11 @@
public void testSnapshotExternalParent()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "external-snapshot-parent/child" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-snapshot-parent/child" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -657,7 +648,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -670,11 +661,11 @@
public void testReleaseExternalParent()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "external-parent/child" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-parent/child" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -683,11 +674,11 @@
public void testSnapshotExternalExtension()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "external-snapshot-extension" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-snapshot-extension" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -698,7 +689,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
fail( "Should have failed execution" );
}
@@ -711,11 +702,11 @@
public void testSnapshotInternalExtension()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "internal-snapshot-extension" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-snapshot-extension" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -724,20 +715,20 @@
public void testReleaseExternalExtension()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = createConfigurationFromProjects( "external-extension" );
+ ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-extension" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, getReactorProjects() );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, getReactorProjects() );
// successful execution is verification enough
assertTrue( true );
}
- private ReleaseConfiguration createConfigurationFromProjects( String path )
+ private ReleaseDescriptor createDescriptorFromProjects( String path )
throws Exception
{
- return createConfigurationFromProjects( "check-dependencies/", path, true );
+ return createDescriptorFromProjects( "check-dependencies/", path, true );
}
}
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/CheckPomPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/CheckPomPhaseTest.java?rev=438341&r1=438340&r2=438341&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/CheckPomPhaseTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/CheckPomPhaseTest.java Tue Aug 29 21:03:46 2006
@@ -19,7 +19,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Scm;
import org.apache.maven.plugins.release.ReleaseFailureException;
-import org.apache.maven.plugins.release.config.ReleaseConfiguration;
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
import org.apache.maven.plugins.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
@@ -47,13 +47,12 @@
public void testCorrectlyConfigured()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setUrl( "scm-url" );
- releaseConfiguration.setReactorProjects( Collections.singletonList( createProject( "1.0-SNAPSHOT" ) ) );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setScmSourceUrl( "scm-url" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, Collections.singletonList( createProject( "1.0-SNAPSHOT" ) ) );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, Collections.singletonList( createProject( "1.0-SNAPSHOT" ) ) );
// successful execution is verification enough
assertTrue( true );
@@ -62,78 +61,73 @@
public void testGetUrlFromProjectConnection()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
MavenProject project = createProject( "1.0-SNAPSHOT" );
Scm scm = new Scm();
scm.setConnection( "scm:svn:file://localhost/tmp/repo" );
project.setScm( scm );
- releaseConfiguration.setReactorProjects( Collections.singletonList( project ) );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, Collections.singletonList( project ) );
- assertEquals( "Check URL", "scm:svn:file://localhost/tmp/repo", releaseConfiguration.getUrl() );
+ assertEquals( "Check URL", "scm:svn:file://localhost/tmp/repo", releaseDescriptor.getScmSourceUrl() );
}
public void testGetUrlFromProjectConnectionSimulate()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
MavenProject project = createProject( "1.0-SNAPSHOT" );
Scm scm = new Scm();
scm.setConnection( "scm:svn:file://localhost/tmp/repo" );
project.setScm( scm );
- releaseConfiguration.setReactorProjects( Collections.singletonList( project ) );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, Collections.singletonList( project ) );
- assertEquals( "Check URL", "scm:svn:file://localhost/tmp/repo", releaseConfiguration.getUrl() );
+ assertEquals( "Check URL", "scm:svn:file://localhost/tmp/repo", releaseDescriptor.getScmSourceUrl() );
}
public void testGetUrlFromProjectDevConnection()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
MavenProject project = createProject( "1.0-SNAPSHOT" );
Scm scm = new Scm();
scm.setConnection( "scm:svn:file://localhost/tmp/repo" );
scm.setDeveloperConnection( "scm:svn:https://localhost/tmp/repo" );
project.setScm( scm );
- releaseConfiguration.setReactorProjects( Collections.singletonList( project ) );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, Collections.singletonList( project ) );
- assertEquals( "Check URL", "scm:svn:https://localhost/tmp/repo", releaseConfiguration.getUrl() );
+ assertEquals( "Check URL", "scm:svn:https://localhost/tmp/repo", releaseDescriptor.getScmSourceUrl() );
}
public void testGetUrlFromProjectDevConnectionSimulate()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
MavenProject project = createProject( "1.0-SNAPSHOT" );
Scm scm = new Scm();
scm.setConnection( "scm:svn:file://localhost/tmp/repo" );
scm.setDeveloperConnection( "scm:svn:https://localhost/tmp/repo" );
project.setScm( scm );
- releaseConfiguration.setReactorProjects( Collections.singletonList( project ) );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, Collections.singletonList( project ) );
- assertEquals( "Check URL", "scm:svn:https://localhost/tmp/repo", releaseConfiguration.getUrl() );
+ assertEquals( "Check URL", "scm:svn:https://localhost/tmp/repo", releaseDescriptor.getScmSourceUrl() );
}
public void testGetInvalidUrl()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
MavenProject project = createProject( "1.0-SNAPSHOT" );
Scm scm = new Scm();
scm.setConnection( "scm:cvs:" );
project.setScm( scm );
- releaseConfiguration.setReactorProjects( Collections.singletonList( project ) );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, Collections.singletonList( project ) );
fail( "Should have thrown an exception" );
}
@@ -146,16 +140,15 @@
public void testGetInvalidProvider()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
MavenProject project = createProject( "1.0-SNAPSHOT" );
Scm scm = new Scm();
scm.setConnection( "scm:foo:" );
project.setScm( scm );
- releaseConfiguration.setReactorProjects( Collections.singletonList( project ) );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, Collections.singletonList( project ) );
fail( "Should have thrown an exception" );
}
@@ -168,12 +161,11 @@
public void testMissingUrl()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( Collections.singletonList( createProject( "1.0-SNAPSHOT" ) ) );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, Collections.singletonList( createProject( "1.0-SNAPSHOT" ) ) );
fail( "Should have failed to execute" );
}
@@ -184,7 +176,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, Collections.singletonList( createProject( "1.0-SNAPSHOT" ) ) );
fail( "Should have failed to simulate" );
}
@@ -197,13 +189,12 @@
public void testReleasingNonSnapshot()
throws Exception
{
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setUrl( "scm-url" );
- releaseConfiguration.setReactorProjects( Collections.singletonList( createProject( "1.0" ) ) );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setScmSourceUrl( "scm-url" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, Collections.singletonList( createProject( "1.0" ) ) );
fail( "Should have failed to execute" );
}
@@ -214,7 +205,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, Collections.singletonList( createProject( "1.0" ) ) );
fail( "Should have failed to simulate" );
}
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/EndReleasePhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/EndReleasePhaseTest.java?rev=438341&r1=438340&r2=438341&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/EndReleasePhaseTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/EndReleasePhaseTest.java Tue Aug 29 21:03:46 2006
@@ -18,7 +18,7 @@
import org.apache.maven.plugins.release.ReleaseExecutionException;
import org.apache.maven.plugins.release.ReleaseFailureException;
-import org.apache.maven.plugins.release.config.ReleaseConfiguration;
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
import org.codehaus.plexus.PlexusTestCase;
/**
@@ -42,7 +42,7 @@
public void testExecute()
throws ReleaseExecutionException, ReleaseFailureException
{
- phase.execute( new ReleaseConfiguration() );
+ phase.execute( new ReleaseDescriptor(), null, null );
assertTrue( true );
}
@@ -50,7 +50,7 @@
public void testSimulate()
throws ReleaseExecutionException, ReleaseFailureException
{
- phase.simulate( new ReleaseConfiguration() );
+ phase.simulate( new ReleaseDescriptor(), null, null );
assertTrue( true );
}
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/InputVariablesPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/InputVariablesPhaseTest.java?rev=438341&r1=438340&r2=438341&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/InputVariablesPhaseTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/InputVariablesPhaseTest.java Tue Aug 29 21:03:46 2006
@@ -18,7 +18,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.plugins.release.ReleaseExecutionException;
-import org.apache.maven.plugins.release.config.ReleaseConfiguration;
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.components.interactivity.Prompter;
@@ -62,26 +62,24 @@
List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.mapReleaseVersion( "groupId:artifactId", "1.0" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.mapReleaseVersion( "groupId:artifactId", "1.0" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- assertEquals( "Check tag", "tag-value", releaseConfiguration.getReleaseLabel() );
+ assertEquals( "Check tag", "tag-value", releaseDescriptor.getScmReleaseLabel() );
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.mapReleaseVersion( "groupId:artifactId", "1.0" );
+ releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.mapReleaseVersion( "groupId:artifactId", "1.0" );
mockPrompter.reset();
mockPrompter.expects( new InvokeOnceMatcher() ).method( "prompt" ).with( new IsAnything(),
new IsEqual( "artifactId-1.0" ) ).will(
new ReturnStub( "simulated-tag-value" ) );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
- assertEquals( "Check tag", "simulated-tag-value", releaseConfiguration.getReleaseLabel() );
+ assertEquals( "Check tag", "simulated-tag-value", releaseDescriptor.getScmReleaseLabel() );
}
public void testUnmappedVersion()
@@ -89,12 +87,11 @@
{
List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Expected an exception" );
}
@@ -103,12 +100,11 @@
assertNull( "check no cause", e.getCause() );
}
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
+ releaseDescriptor = new ReleaseDescriptor();
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Expected an exception" );
}
@@ -127,26 +123,24 @@
List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.setInteractive( false );
- releaseConfiguration.mapReleaseVersion( "groupId:artifactId", "1.0" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setInteractive( false );
+ releaseDescriptor.mapReleaseVersion( "groupId:artifactId", "1.0" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- assertEquals( "Check tag", "artifactId-1.0", releaseConfiguration.getReleaseLabel() );
+ assertEquals( "Check tag", "artifactId-1.0", releaseDescriptor.getScmReleaseLabel() );
mockPrompter.reset();
mockPrompter.expects( new TestFailureMatcher( "prompter should not be called" ) ).method( "prompt" );
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.setInteractive( false );
- releaseConfiguration.mapReleaseVersion( "groupId:artifactId", "1.0" );
+ releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setInteractive( false );
+ releaseDescriptor.mapReleaseVersion( "groupId:artifactId", "1.0" );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
- assertEquals( "Check tag", "artifactId-1.0", releaseConfiguration.getReleaseLabel() );
+ assertEquals( "Check tag", "artifactId-1.0", releaseDescriptor.getScmReleaseLabel() );
}
public void testInputVariablesNonInteractiveConfigured()
@@ -158,26 +152,24 @@
List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.setInteractive( false );
- releaseConfiguration.setReleaseLabel( "tag-value" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setInteractive( false );
+ releaseDescriptor.setScmReleaseLabel( "tag-value" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- assertEquals( "Check tag", "tag-value", releaseConfiguration.getReleaseLabel() );
+ assertEquals( "Check tag", "tag-value", releaseDescriptor.getScmReleaseLabel() );
mockPrompter.reset();
mockPrompter.expects( new TestFailureMatcher( "prompter should not be called" ) ).method( "prompt" );
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.setInteractive( false );
- releaseConfiguration.setReleaseLabel( "simulated-tag-value" );
+ releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setInteractive( false );
+ releaseDescriptor.setScmReleaseLabel( "simulated-tag-value" );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
- assertEquals( "Check tag", "simulated-tag-value", releaseConfiguration.getReleaseLabel() );
+ assertEquals( "Check tag", "simulated-tag-value", releaseDescriptor.getScmReleaseLabel() );
}
public void testInputVariablesInteractiveConfigured()
@@ -189,24 +181,22 @@
List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.setReleaseLabel( "tag-value" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setScmReleaseLabel( "tag-value" );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- assertEquals( "Check tag", "tag-value", releaseConfiguration.getReleaseLabel() );
+ assertEquals( "Check tag", "tag-value", releaseDescriptor.getScmReleaseLabel() );
mockPrompter.reset();
mockPrompter.expects( new TestFailureMatcher( "prompter should not be called" ) ).method( "prompt" );
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.setReleaseLabel( "simulated-tag-value" );
+ releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setScmReleaseLabel( "simulated-tag-value" );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
- assertEquals( "Check tag", "simulated-tag-value", releaseConfiguration.getReleaseLabel() );
+ assertEquals( "Check tag", "simulated-tag-value", releaseDescriptor.getScmReleaseLabel() );
}
public void testPrompterException()
@@ -219,13 +209,12 @@
List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.mapReleaseVersion( "groupId:artifactId", "1.0" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.mapReleaseVersion( "groupId:artifactId", "1.0" );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Expected an exception" );
}
@@ -234,9 +223,8 @@
assertEquals( "check cause", PrompterException.class, e.getCause().getClass() );
}
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.mapReleaseVersion( "groupId:artifactId", "1.0" );
+ releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.mapReleaseVersion( "groupId:artifactId", "1.0" );
mockPrompter.reset();
mockPrompter.expects( new InvokeOnceMatcher() ).method( "prompt" ).will(
@@ -244,7 +232,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Expected an exception" );
}
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/MapVersionsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/MapVersionsPhaseTest.java?rev=438341&r1=438340&r2=438341&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/MapVersionsPhaseTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/MapVersionsPhaseTest.java Tue Aug 29 21:03:46 2006
@@ -18,7 +18,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.plugins.release.ReleaseExecutionException;
-import org.apache.maven.plugins.release.config.ReleaseConfiguration;
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
import org.apache.maven.plugins.release.versions.VersionParseException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
@@ -57,26 +57,24 @@
List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0-SNAPSHOT" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
assertEquals( "Check mapped versions", Collections.singletonMap( "groupId:artifactId", "2.0" ),
- releaseConfiguration.getReleaseVersions() );
+ releaseDescriptor.getReleaseVersions() );
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
+ releaseDescriptor = new ReleaseDescriptor();
mockPrompter.reset();
mockPrompter.expects( new InvokeOnceMatcher() ).method( "prompt" ).with( new IsAnything(),
new IsEqual( "1.0" ) ).will(
new ReturnStub( "2.0" ) );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
assertEquals( "Check mapped versions", Collections.singletonMap( "groupId:artifactId", "2.0" ),
- releaseConfiguration.getReleaseVersions() );
+ releaseDescriptor.getReleaseVersions() );
}
public void testMapReleaseVersionsNonInteractive()
@@ -90,26 +88,24 @@
List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0-SNAPSHOT" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.setInteractive( false );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setInteractive( false );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
assertEquals( "Check mapped versions", Collections.singletonMap( "groupId:artifactId", "1.0" ),
- releaseConfiguration.getReleaseVersions() );
+ releaseDescriptor.getReleaseVersions() );
mockPrompter.reset();
mockPrompter.expects( new TestFailureMatcher( "prompter should not be called" ) ).method( "prompt" );
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.setInteractive( false );
+ releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setInteractive( false );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
assertEquals( "Check mapped versions", Collections.singletonMap( "groupId:artifactId", "1.0" ),
- releaseConfiguration.getReleaseVersions() );
+ releaseDescriptor.getReleaseVersions() );
}
public void testMapDevVersionsInteractive()
@@ -125,26 +121,24 @@
List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
assertEquals( "Check mapped versions", Collections.singletonMap( "groupId:artifactId", "2.0-SNAPSHOT" ),
- releaseConfiguration.getDevelopmentVersions() );
+ releaseDescriptor.getDevelopmentVersions() );
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
+ releaseDescriptor = new ReleaseDescriptor();
mockPrompter.reset();
mockPrompter.expects( new InvokeOnceMatcher() ).method( "prompt" ).with( new IsAnything(),
new IsEqual( "1.1-SNAPSHOT" ) ).will(
new ReturnStub( "2.0-SNAPSHOT" ) );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
assertEquals( "Check mapped versions", Collections.singletonMap( "groupId:artifactId", "2.0-SNAPSHOT" ),
- releaseConfiguration.getDevelopmentVersions() );
+ releaseDescriptor.getDevelopmentVersions() );
}
public void testMapDevVersionsNonInteractive()
@@ -158,26 +152,24 @@
List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.setInteractive( false );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setInteractive( false );
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
assertEquals( "Check mapped versions", Collections.singletonMap( "groupId:artifactId", "1.1-SNAPSHOT" ),
- releaseConfiguration.getDevelopmentVersions() );
+ releaseDescriptor.getDevelopmentVersions() );
mockPrompter.reset();
mockPrompter.expects( new TestFailureMatcher( "prompter should not be called" ) ).method( "prompt" );
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.setInteractive( false );
+ releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setInteractive( false );
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
assertEquals( "Check mapped versions", Collections.singletonMap( "groupId:artifactId", "1.1-SNAPSHOT" ),
- releaseConfiguration.getDevelopmentVersions() );
+ releaseDescriptor.getDevelopmentVersions() );
}
public void testPrompterException()
@@ -192,12 +184,11 @@
List reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Expected an exception" );
}
@@ -206,8 +197,7 @@
assertEquals( "check cause", PrompterException.class, e.getCause().getClass() );
}
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
+ releaseDescriptor = new ReleaseDescriptor();
mockPrompter.reset();
mockPrompter.expects( new InvokeOnceMatcher() ).method( "prompt" ).will(
@@ -215,7 +205,7 @@
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Expected an exception" );
}
@@ -237,25 +227,23 @@
List reactorProjects = Collections.singletonList( createProject( "artifactId", "foo" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
assertEquals( "Check mapped versions", Collections.singletonMap( "groupId:artifactId", "2.0-SNAPSHOT" ),
- releaseConfiguration.getDevelopmentVersions() );
+ releaseDescriptor.getDevelopmentVersions() );
mockPrompter.reset();
mockPrompter.expects( new InvokeOnceMatcher() ).method( "prompt" ).with( new IsAnything(), new IsNull() ).will(
new ReturnStub( "2.0-SNAPSHOT" ) );
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
+ releaseDescriptor = new ReleaseDescriptor();
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
assertEquals( "Check mapped versions", Collections.singletonMap( "groupId:artifactId", "2.0-SNAPSHOT" ),
- releaseConfiguration.getDevelopmentVersions() );
+ releaseDescriptor.getDevelopmentVersions() );
}
public void testInvalidVersionNonInteractive()
@@ -265,13 +253,12 @@
List reactorProjects = Collections.singletonList( createProject( "artifactId", "foo" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.setInteractive( false );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setInteractive( false );
try
{
- phase.execute( releaseConfiguration );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Expected an exception" );
}
@@ -280,13 +267,12 @@
assertEquals( "check cause", VersionParseException.class, e.getCause().getClass() );
}
- releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( reactorProjects );
- releaseConfiguration.setInteractive( false );
+ releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setInteractive( false );
try
{
- phase.simulate( releaseConfiguration );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Expected an exception" );
}
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ReleasePhaseStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ReleasePhaseStub.java?rev=438341&r1=438340&r2=438341&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ReleasePhaseStub.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ReleasePhaseStub.java Tue Aug 29 21:03:46 2006
@@ -16,7 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.plugins.release.config.ReleaseConfiguration;
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
+import org.apache.maven.settings.Settings;
+
+import java.util.List;
/**
* Test stub for testing if a phase is executed.
@@ -41,17 +44,17 @@
*/
private boolean cleaned;
- public void execute( ReleaseConfiguration releaseConfiguration )
+ public void execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
{
executed = true;
}
- public void simulate( ReleaseConfiguration releaseConfiguration )
+ public void simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
{
simulated = true;
}
- public void clean( ReleaseConfiguration config )
+ public void clean( List reactorProjects )
{
cleaned = true;
}