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 07:23:04 UTC
svn commit: r438376 [1/2] -
/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/
Author: brett
Date: Tue Aug 29 22:23:04 2006
New Revision: 438376
URL: http://svn.apache.org/viewvc?rev=438376&view=rev
Log:
[MRELEASE-130] remove reactorProjects field. It isn't initialised in setUp which makes it prone to errors in the future. This should make the tests a bit clearer.
Modified:
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractReleaseTestCase.java
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractRewritingReleasePhaseTestCase.java
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/CheckDependencySnapshotsPhaseTest.java
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ScmCommitPhaseTest.java
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ScmTagPhaseTest.java
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractReleaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractReleaseTestCase.java?rev=438376&r1=438375&r2=438376&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractReleaseTestCase.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/AbstractReleaseTestCase.java Tue Aug 29 22:23:04 2006
@@ -32,7 +32,6 @@
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
-import org.apache.maven.plugins.release.config.ReleaseDescriptor;
import org.apache.maven.plugins.release.scm.DefaultScmRepositoryConfigurator;
import org.apache.maven.plugins.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.profiles.DefaultProfileManager;
@@ -70,18 +69,6 @@
protected ReleasePhase phase;
- protected List reactorProjects;
-
- public List getReactorProjects()
- {
- return reactorProjects;
- }
-
- public void setReactorProjects( List reactorProjects )
- {
- this.reactorProjects = reactorProjects;
- }
-
protected void setUp()
throws Exception
{
@@ -128,7 +115,7 @@
return map;
}
- protected ReleaseDescriptor createDescriptorFromProjects( String path, String subpath, boolean copyFiles )
+ protected List createReactorProjects( String path, String subpath, boolean copyFiles )
throws Exception
{
File testFile = getTestFile( "target/test-classes/projects/" + path + subpath + "/pom.xml" );
@@ -150,7 +137,7 @@
profileManager.addProfile( profile );
profileManager.activateAsDefault( profile.getId() );
- reactorProjects = new ArrayList();
+ List reactorProjects = new ArrayList();
while ( !projectFiles.isEmpty() )
{
File file = (File) projectFiles.pop();
@@ -207,9 +194,7 @@
project.setArtifacts( result.getArtifacts() );
}
- ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
-
- return releaseDescriptor;
+ return reactorProjects;
}
protected void setMockScmManager( Mock scmManagerMock )
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=438376&r1=438375&r2=438376&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 22:23:04 2006
@@ -56,38 +56,42 @@
public void testRewriteBasicPom()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewritePomWithParent()
throws Exception
{
- ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( "pom-with-parent" );
+ List reactorProjects = createReactorProjects( "pom-with-parent" );
+ ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewritePomWithUnmappedParent()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( "pom-with-parent" );
+
+ List reactorProjects = createReactorProjects( "pom-with-parent" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
// Process the child first
- List reactorProjects = new ArrayList( getReactorProjects() );
+ reactorProjects = new ArrayList( reactorProjects );
Collections.reverse( reactorProjects );
mapAlternateNextVersion( config, "groupId:subproject1" );
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -100,15 +104,17 @@
public void testRewritePomWithReleasedParent()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( "pom-with-released-parent" );
+
+ List reactorProjects = createReactorProjects( "pom-with-released-parent" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
mapAlternateNextVersion( config, "groupId:subproject1" );
config.mapReleaseVersion( "groupId:artifactId", "1" );
config.mapDevelopmentVersion( "groupId:artifactId", "1" );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
protected abstract void mapAlternateNextVersion( ReleaseDescriptor config, String projectId );
@@ -116,22 +122,23 @@
public void testRewritePomWithInheritedVersion()
throws Exception
{
- ReleaseDescriptor config = createConfigurationForWithParentNextVersion( "pom-with-inherited-version" );
+ List reactorProjects = createReactorProjects( "pom-with-inherited-version" );
+ ReleaseDescriptor config = createConfigurationForWithParentNextVersion( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewritePomWithChangedInheritedVersion()
throws Exception
{
- ReleaseDescriptor config =
- createConfigurationForPomWithParentAlternateNextVersion( "pom-with-inherited-version" );
+ List reactorProjects = createReactorProjects( "pom-with-inherited-version" );
+ ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- MavenProject project = (MavenProject) getProjectsAsMap( getReactorProjects() ).get( "groupId:subproject1" );
+ MavenProject project = (MavenProject) getProjectsAsMap( reactorProjects ).get( "groupId:subproject1" );
String actual = FileUtils.fileRead( project.getFile() );
String expected =
@@ -139,28 +146,30 @@
assertEquals( "Check the transformed POM", expected, actual );
}
- protected abstract ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( String path )
+ protected abstract ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List reactorProjects )
throws Exception;
public void testRewritePomDependencies()
throws Exception
{
- ReleaseDescriptor config = createDefaultConfiguration( "internal-snapshot-dependencies" );
+ List reactorProjects = createReactorProjects( "internal-snapshot-dependencies" );
+ ReleaseDescriptor config = createDefaultConfiguration( reactorProjects );
mapNextVersion( config, "groupId:subsubproject" );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewritePomUnmappedDependencies()
throws Exception
{
- ReleaseDescriptor config = createUnmappedConfiguration( "internal-snapshot-dependencies" );
+ List reactorProjects = createReactorProjects( "internal-snapshot-dependencies" );
+ ReleaseDescriptor config = createUnmappedConfiguration( reactorProjects );
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -173,31 +182,34 @@
public void testRewritePomDependenciesDifferentVersion()
throws Exception
{
- ReleaseDescriptor config = createDifferingVersionConfiguration( "internal-differing-snapshot-dependencies" );
+ List reactorProjects = createReactorProjects( "internal-differing-snapshot-dependencies" );
+ ReleaseDescriptor config = createDifferingVersionConfiguration( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteManagedPomDependencies()
throws Exception
{
- ReleaseDescriptor config = createMappedConfiguration( "internal-managed-snapshot-dependency" );
+ List reactorProjects = createReactorProjects( "internal-managed-snapshot-dependency" );
+ ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteManagedPomUnmappedDependencies()
throws Exception
{
- ReleaseDescriptor config = createUnmappedConfiguration( "internal-managed-snapshot-dependency" );
+ List reactorProjects = createReactorProjects( "internal-managed-snapshot-dependency" );
+ ReleaseDescriptor config = createUnmappedConfiguration( reactorProjects );
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -210,21 +222,23 @@
public void testRewritePomPlugins()
throws Exception
{
- ReleaseDescriptor config = createDefaultConfiguration( "internal-snapshot-plugins" );
+ List reactorProjects = createReactorProjects( "internal-snapshot-plugins" );
+ ReleaseDescriptor config = createDefaultConfiguration( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewritePomUnmappedPlugins()
throws Exception
{
- ReleaseDescriptor config = createUnmappedConfiguration( "internal-snapshot-plugins" );
+ List reactorProjects = createReactorProjects( "internal-snapshot-plugins" );
+ ReleaseDescriptor config = createUnmappedConfiguration( reactorProjects );
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -237,31 +251,34 @@
public void testRewritePomPluginsDifferentVersion()
throws Exception
{
- ReleaseDescriptor config = createDifferingVersionConfiguration( "internal-differing-snapshot-plugins" );
+ List reactorProjects = createReactorProjects( "internal-differing-snapshot-plugins" );
+ ReleaseDescriptor config = createDifferingVersionConfiguration( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteManagedPomPlugins()
throws Exception
{
- ReleaseDescriptor config = createMappedConfiguration( "internal-managed-snapshot-plugin" );
+ List reactorProjects = createReactorProjects( "internal-managed-snapshot-plugin" );
+ ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteManagedPomUnmappedPlugins()
throws Exception
{
- ReleaseDescriptor config = createUnmappedConfiguration( "internal-managed-snapshot-plugin" );
+ List reactorProjects = createReactorProjects( "internal-managed-snapshot-plugin" );
+ ReleaseDescriptor config = createUnmappedConfiguration( reactorProjects );
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -274,21 +291,23 @@
public void testRewritePomReportPlugins()
throws Exception
{
- ReleaseDescriptor config = createDefaultConfiguration( "internal-snapshot-report-plugins" );
+ List reactorProjects = createReactorProjects( "internal-snapshot-report-plugins" );
+ ReleaseDescriptor config = createDefaultConfiguration( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewritePomUnmappedReportPlugins()
throws Exception
{
- ReleaseDescriptor config = createUnmappedConfiguration( "internal-snapshot-report-plugins" );
+ List reactorProjects = createReactorProjects( "internal-snapshot-report-plugins" );
+ ReleaseDescriptor config = createUnmappedConfiguration( reactorProjects );
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -301,31 +320,34 @@
public void testRewritePomReportPluginsDifferentVersion()
throws Exception
{
- ReleaseDescriptor config = createDifferingVersionConfiguration( "internal-differing-snapshot-report-plugins" );
+ List reactorProjects = createReactorProjects( "internal-differing-snapshot-report-plugins" );
+ ReleaseDescriptor config = createDifferingVersionConfiguration( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewritePomExtension()
throws Exception
{
- ReleaseDescriptor config = createDefaultConfiguration( "internal-snapshot-extension" );
+ List reactorProjects = createReactorProjects( "internal-snapshot-extension" );
+ ReleaseDescriptor config = createDefaultConfiguration( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewritePomUnmappedExtension()
throws Exception
{
- ReleaseDescriptor config = createUnmappedConfiguration( "internal-snapshot-extension" );
+ List reactorProjects = createReactorProjects( "internal-snapshot-extension" );
+ ReleaseDescriptor config = createUnmappedConfiguration( reactorProjects );
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -338,29 +360,32 @@
public void testRewritePomExtensionDifferentVersion()
throws Exception
{
- ReleaseDescriptor config = createDifferingVersionConfiguration( "internal-differing-snapshot-extension" );
+ List reactorProjects = createReactorProjects( "internal-differing-snapshot-extension" );
+ ReleaseDescriptor config = createDifferingVersionConfiguration( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithEditMode()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithEditModeFailure()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
@@ -374,7 +399,7 @@
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -387,7 +412,8 @@
public void testRewriteBasicPomWithEditModeException()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
@@ -403,7 +429,7 @@
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -421,11 +447,12 @@
// Run a second time to check they are not duplicated
for ( int i = 0; i < 2; i++ )
{
- ReleaseDescriptor config = createConfigurationFromBasicPom( copyFiles );
+ List reactorProjects = createReactorProjects( "basic-pom", copyFiles );
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
config.setAddSchema( true );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
String expected = readTestProjectFile( "basic-pom/expected-pom-with-schema.xml" );
String actual = readTestProjectFile( "basic-pom/pom.xml" );
@@ -438,7 +465,8 @@
public void testSimulateRewriteEditModeSkipped()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
@@ -451,7 +479,7 @@
configurator.setScmManager( scmManager );
scmManager.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
- phase.simulate( config, null, getReactorProjects() );
+ phase.simulate( config, null, reactorProjects );
// Getting past mock is success
assertTrue( true );
@@ -460,11 +488,12 @@
public void testRewriteUnmappedPom()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -477,7 +506,8 @@
public void testRewriteBasicPomWithScmRepoException()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
@@ -489,7 +519,7 @@
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -502,7 +532,8 @@
public void testRewriteBasicPomWithNoSuchProviderException()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.setScmUseEditMode( true );
mapNextVersion( config, "groupId:artifactId" );
@@ -514,7 +545,7 @@
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Should have thrown an exception" );
}
@@ -532,15 +563,15 @@
config.setScmSourceUrl( "scm:svn:file://localhost/tmp/scm-repo" );
config.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
- phase.clean( reactorProjects );
+ phase.clean( null );
assertTrue( true );
}
- private ReleaseDescriptor createUnmappedConfiguration( String path )
+ private ReleaseDescriptor createUnmappedConfiguration( List reactorProjects )
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( path );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
unmapNextVersion( config, "groupId:subproject1" );
mapNextVersion( config, "groupId:subproject2" );
@@ -549,57 +580,57 @@
return config;
}
- protected ReleaseDescriptor createConfigurationFromProjects( String path )
+ protected List createReactorProjects( String path )
throws Exception
{
- return createConfigurationFromProjects( path, true );
+ return createReactorProjects( path, true );
}
- protected ReleaseDescriptor createDefaultConfiguration( String path )
+ protected ReleaseDescriptor createDefaultConfiguration( List reactorProjects )
throws Exception
{
- ReleaseDescriptor config = createMappedConfiguration( path );
+ ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
mapNextVersion( config, "groupId:subproject4" );
return config;
}
- protected ReleaseDescriptor createMappedConfiguration( String path )
+ protected ReleaseDescriptor createMappedConfiguration( List reactorProjects )
throws Exception
{
- ReleaseDescriptor config = createDifferingVersionConfiguration( path );
+ ReleaseDescriptor config = createDifferingVersionConfiguration( reactorProjects );
mapNextVersion( config, "groupId:subproject3" );
return config;
}
- private ReleaseDescriptor createDifferingVersionConfiguration( String path )
+ private ReleaseDescriptor createDifferingVersionConfiguration( List reactorProjects )
throws Exception
{
- ReleaseDescriptor config = createConfigurationForWithParentNextVersion( path );
+ ReleaseDescriptor config = createConfigurationForWithParentNextVersion( reactorProjects );
mapNextVersion( config, "groupId:subproject2" );
return config;
}
- protected ReleaseDescriptor createConfigurationFromBasicPom()
+ protected List createReactorProjectsFromBasicPom()
throws Exception
{
- return createConfigurationFromBasicPom( true );
+ return createReactorProjects( "basic-pom" );
}
- protected abstract ReleaseDescriptor createConfigurationForWithParentNextVersion( String path )
+ protected abstract ReleaseDescriptor createConfigurationForWithParentNextVersion( List reactorProjects )
throws Exception;
protected abstract void unmapNextVersion( ReleaseDescriptor config, String projectId );
protected abstract void mapNextVersion( ReleaseDescriptor config, String projectId );
- protected abstract ReleaseDescriptor createConfigurationFromProjects( String path, boolean copyFiles )
- throws Exception;
-
- protected abstract ReleaseDescriptor createConfigurationFromBasicPom( boolean copyFiles )
- throws Exception;
+ protected ReleaseDescriptor createDescriptorFromBasicPom( List reactorProjects )
+ throws Exception
+ {
+ return createDescriptorFromProjects( reactorProjects );
+ }
protected abstract String readTestProjectFile( String fileName )
throws IOException;
@@ -607,10 +638,32 @@
public void testRewritePomDependenciesWithNamespace()
throws Exception
{
- ReleaseDescriptor config = createDefaultConfiguration( "pom-with-namespace" );
+ List reactorProjects = createReactorProjects( "pom-with-namespace" );
+ ReleaseDescriptor config = createDefaultConfiguration( reactorProjects );
+
+ phase.execute( config, null, reactorProjects );
+
+ assertTrue( compareFiles( reactorProjects ) );
+ }
+
+ protected abstract List createReactorProjects( String path, boolean copyFiles )
+ throws Exception;
+
+ protected ReleaseDescriptor createDescriptorFromProjects( List reactorProjects )
+ {
+ ReleaseDescriptor descriptor = new ReleaseDescriptor();
+ MavenProject rootProject = (MavenProject) reactorProjects.get( 0 );
+ if ( rootProject.getScm() == null )
+ {
+ descriptor.setScmSourceUrl( "scm:svn:file://localhost/tmp/scm-repo/trunk" );
+ }
+ else
+ {
+ descriptor.setScmSourceUrl( rootProject.getScm().getConnection() );
+ }
- phase.execute( config, null, getReactorProjects() );
+ descriptor.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
- assertTrue( compareFiles( getReactorProjects() ) );
+ return descriptor;
}
}
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=438376&r1=438375&r2=438376&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 22:23:04 2006
@@ -26,6 +26,8 @@
import org.jmock.core.stub.ReturnStub;
import org.jmock.core.stub.ThrowStub;
+import java.util.List;
+
/**
* Test the dependency snapshot check phase.
*
@@ -45,11 +47,12 @@
public void testNoSnapshotDependencies()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "no-snapshot-dependencies" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "no-snapshot-dependencies" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -58,11 +61,12 @@
public void testSnapshotDependenciesInProjectOnly()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-snapshot-dependencies" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "internal-snapshot-dependencies" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -71,12 +75,13 @@
public void testSnapshotReleasePluginNonInteractive()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "snapshot-release-plugin" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
releaseDescriptor.setInteractive( false );
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -87,7 +92,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -103,7 +108,8 @@
CheckDependencySnapshotsPhase phase =
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "snapshot-release-plugin" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
Mock mockPrompter = new Mock( Prompter.class );
mockPrompter.expects( new InvokeOnceMatcher() ).method( "showMessage" );
@@ -112,7 +118,7 @@
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -127,7 +133,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -143,20 +149,21 @@
CheckDependencySnapshotsPhase phase =
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "snapshot-release-plugin" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = 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( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
mockPrompter.reset();
mockPrompter.expects( new InvokeOnceMatcher() ).method( "prompt" ).will( new ReturnStub( "yes" ) );
mockPrompter.expects( new InvokeOnceMatcher() ).method( "showMessage" );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
assertTrue( true );
}
@@ -167,7 +174,8 @@
CheckDependencySnapshotsPhase phase =
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "snapshot-release-plugin" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
Mock mockPrompter = new Mock( Prompter.class );
mockPrompter.expects( new InvokeOnceMatcher() ).method( "showMessage" );
@@ -176,7 +184,7 @@
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -191,7 +199,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -207,7 +215,8 @@
CheckDependencySnapshotsPhase phase =
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "snapshot-release-plugin" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
Mock mockPrompter = new Mock( Prompter.class );
mockPrompter.expects( new InvokeOnceMatcher() ).method( "showMessage" );
@@ -217,7 +226,7 @@
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -233,7 +242,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -246,12 +255,12 @@
public void testSnapshotDependenciesInProjectOnlyMismatchedVersion()
throws Exception
{
- ReleaseDescriptor releaseDescriptor =
- createDescriptorFromProjects( "internal-differing-snapshot-dependencies" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "internal-differing-snapshot-dependencies" );
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -262,7 +271,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -275,11 +284,12 @@
public void testSnapshotManagedDependenciesInProjectOnly()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-managed-snapshot-dependency" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "internal-managed-snapshot-dependency" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -288,12 +298,12 @@
public void testSnapshotUnusedInternalManagedDependency()
throws Exception
{
- ReleaseDescriptor releaseDescriptor =
- createDescriptorFromProjects( "unused-internal-managed-snapshot-dependency" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "unused-internal-managed-snapshot-dependency" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -302,12 +312,12 @@
public void testSnapshotUnusedExternalManagedDependency()
throws Exception
{
- ReleaseDescriptor releaseDescriptor =
- createDescriptorFromProjects( "unused-external-managed-snapshot-dependency" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "unused-external-managed-snapshot-dependency" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -316,11 +326,12 @@
public void testSnapshotExternalManagedDependency()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-managed-snapshot-dependency" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "external-managed-snapshot-dependency" );
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -331,7 +342,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -344,11 +355,12 @@
public void testSnapshotDependenciesOutsideProjectOnly()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-snapshot-dependencies" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -359,7 +371,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -372,12 +384,12 @@
public void testSnapshotDependenciesInsideAndOutsideProject()
throws Exception
{
- ReleaseDescriptor releaseDescriptor =
- createDescriptorFromProjects( "internal-and-external-snapshot-dependencies" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "internal-and-external-snapshot-dependencies" );
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -388,7 +400,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -401,11 +413,12 @@
public void testNoSnapshotReportPlugins()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "no-snapshot-report-plugins" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "no-snapshot-report-plugins" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -414,11 +427,12 @@
public void testSnapshotReportPluginsInProjectOnly()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-snapshot-report-plugins" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "internal-snapshot-report-plugins" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -427,11 +441,12 @@
public void testSnapshotReportPluginsOutsideProjectOnly()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-snapshot-report-plugins" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "external-snapshot-report-plugins" );
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -442,7 +457,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -455,12 +470,12 @@
public void testSnapshotReportPluginsInsideAndOutsideProject()
throws Exception
{
- ReleaseDescriptor releaseDescriptor =
- createDescriptorFromProjects( "internal-and-external-snapshot-report-plugins" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "internal-and-external-snapshot-report-plugins" );
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -471,7 +486,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -484,11 +499,12 @@
public void testNoSnapshotPlugins()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "no-snapshot-plugins" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "no-snapshot-plugins" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -497,11 +513,12 @@
public void testSnapshotPluginsInProjectOnly()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-snapshot-plugins" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "internal-snapshot-plugins" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -510,11 +527,12 @@
public void testSnapshotManagedPluginInProjectOnly()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-managed-snapshot-plugin" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "internal-managed-snapshot-plugin" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -523,11 +541,12 @@
public void testSnapshotUnusedInternalManagedPlugin()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "unused-internal-managed-snapshot-plugin" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "unused-internal-managed-snapshot-plugin" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -536,11 +555,12 @@
public void testSnapshotUnusedExternalManagedPlugin()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "unused-external-managed-snapshot-plugin" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "unused-external-managed-snapshot-plugin" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -549,11 +569,12 @@
public void testSnapshotExternalManagedPlugin()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-managed-snapshot-plugin" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "external-managed-snapshot-plugin" );
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -564,7 +585,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -577,11 +598,12 @@
public void testSnapshotPluginsOutsideProjectOnly()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-snapshot-plugins" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "external-snapshot-plugins" );
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -592,7 +614,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -605,11 +627,12 @@
public void testSnapshotPluginsInsideAndOutsideProject()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-and-external-snapshot-plugins" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "internal-and-external-snapshot-plugins" );
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -620,7 +643,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -633,11 +656,12 @@
public void testSnapshotExternalParent()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-snapshot-parent/child" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "external-snapshot-parent/child" );
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -648,7 +672,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -661,11 +685,12 @@
public void testReleaseExternalParent()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-parent/child" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "external-parent/child" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -674,11 +699,12 @@
public void testSnapshotExternalExtension()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-snapshot-extension" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "external-snapshot-extension" );
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -689,7 +715,7 @@
try
{
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
fail( "Should have failed execution" );
}
@@ -702,11 +728,12 @@
public void testSnapshotInternalExtension()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "internal-snapshot-extension" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "internal-snapshot-extension" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
@@ -715,20 +742,21 @@
public void testReleaseExternalExtension()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "external-extension" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ List reactorProjects = createDescriptorFromProjects( "external-extension" );
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
- phase.simulate( releaseDescriptor, null, getReactorProjects() );
+ phase.simulate( releaseDescriptor, null, reactorProjects );
// successful execution is verification enough
assertTrue( true );
}
- private ReleaseDescriptor createDescriptorFromProjects( String path )
+ private List createDescriptorFromProjects( String path )
throws Exception
{
- return createDescriptorFromProjects( "check-dependencies/", path, true );
+ return createReactorProjects( "check-dependencies/", path, true );
}
}
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java?rev=438376&r1=438375&r2=438376&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForDevelopmentPhaseTest.java Tue Aug 29 22:23:04 2006
@@ -19,11 +19,11 @@
import org.apache.maven.model.Scm;
import org.apache.maven.plugins.release.ReleaseExecutionException;
import org.apache.maven.plugins.release.config.ReleaseDescriptor;
-import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
+import java.util.List;
/**
* Test the SCM modification check phase.
@@ -52,13 +52,14 @@
public void testSimulateRewrite()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
String expected = readTestProjectFile( "basic-pom/pom.xml" );
- phase.simulate( config, null, getReactorProjects() );
+ phase.simulate( config, null, reactorProjects );
String actual = readTestProjectFile( "basic-pom/pom.xml" );
assertEquals( "Check the original POM untouched", expected, actual );
@@ -71,7 +72,8 @@
public void testClean()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
@@ -79,7 +81,7 @@
testFile.delete();
assertFalse( testFile.exists() );
- phase.simulate( config, null, getReactorProjects() );
+ phase.simulate( config, null, reactorProjects );
assertTrue( testFile.exists() );
@@ -91,7 +93,8 @@
public void testCleanNotExists()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
@@ -107,13 +110,15 @@
public void testRewriteBasicPomUnmappedScm()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( "basic-pom", true );
+ List reactorProjects = createReactorProjects( "basic-pom", true );
+
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
try
{
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
fail( "Expected failure" );
}
@@ -129,31 +134,16 @@
return FileUtils.fileRead( getTestFile( "target/test-classes/projects/rewrite-for-development/" + fileName ) );
}
- protected ReleaseDescriptor createConfigurationFromProjects( String path, boolean copyFiles )
+ protected List createReactorProjects( String path, boolean copyFiles )
throws Exception
{
- ReleaseDescriptor releaseDescriptor =
- createDescriptorFromProjects( "rewrite-for-development/", path, copyFiles );
-
- MavenProject rootProject = (MavenProject) getReactorProjects().get( 0 );
- if ( rootProject.getScm() == null )
- {
- releaseDescriptor.setScmSourceUrl( "scm:svn:file://localhost/tmp/scm-repo/trunk" );
- }
- else
- {
- releaseDescriptor.setScmSourceUrl( rootProject.getScm().getConnection() );
- }
-
- releaseDescriptor.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
-
- return releaseDescriptor;
+ return createReactorProjects( "rewrite-for-development/", path, copyFiles );
}
- protected ReleaseDescriptor createConfigurationFromBasicPom( boolean copyFiles )
+ protected ReleaseDescriptor createDescriptorFromBasicPom( List reactorProjects )
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( "basic-pom", copyFiles );
+ ReleaseDescriptor config = super.createDescriptorFromBasicPom( reactorProjects );
mapScm( config );
@@ -186,10 +176,10 @@
config.mapReleaseVersion( projectId, RELEASE_VERSION );
}
- protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( String path )
+ protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List reactorProjects )
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( path );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
@@ -200,10 +190,10 @@
return config;
}
- protected ReleaseDescriptor createConfigurationForWithParentNextVersion( String path )
+ protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List reactorProjects )
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( path );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
@@ -217,7 +207,9 @@
public void testRewriteBasicPomWithCvs()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( "basic-pom-with-cvs" );
+
+ List reactorProjects = createReactorProjects( "basic-pom-with-cvs" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
Scm scm = new Scm();
@@ -226,15 +218,17 @@
scm.setUrl( "http://localhost/viewcvs.cgi/module" );
config.mapOriginalScmInfo( "groupId:artifactId", scm );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithCvsFromTag()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( "basic-pom-with-cvs-from-tag" );
+
+ List reactorProjects = createReactorProjects( "basic-pom-with-cvs-from-tag" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
Scm scm = new Scm();
@@ -244,15 +238,17 @@
scm.setTag( "original-label" );
config.mapOriginalScmInfo( "groupId:artifactId", scm );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithInheritedScm()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( "basic-pom-inherited-scm" );
+
+ List reactorProjects = createReactorProjects( "basic-pom-inherited-scm" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
@@ -264,8 +260,8 @@
config.mapOriginalScmInfo( "groupId:subproject1", null );
config.mapOriginalScmInfo( "groupId:subsubproject", null );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
}
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java?rev=438376&r1=438375&r2=438376&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/RewritePomsForReleasePhaseTest.java Tue Aug 29 22:23:04 2006
@@ -23,6 +23,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
+import java.util.List;
/**
* Test the SCM modification check phase.
@@ -44,25 +45,10 @@
phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "rewrite-poms-for-release" );
}
- protected ReleaseDescriptor createConfigurationFromProjects( String path, boolean copyFiles )
+ protected List createReactorProjects( String path, boolean copyFiles )
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createDescriptorFromProjects( "rewrite-for-release/", path, copyFiles );
-
- MavenProject rootProject = (MavenProject) getReactorProjects().get( 0 );
- if ( rootProject.getScm() == null )
- {
- releaseDescriptor.setScmSourceUrl( "scm:svn:file://localhost/tmp/scm-repo/trunk" );
- }
- else
- {
- releaseDescriptor.setScmSourceUrl( rootProject.getScm().getConnection() );
- }
-
- releaseDescriptor.setScmReleaseLabel( "release-label" );
- releaseDescriptor.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
-
- return releaseDescriptor;
+ return createReactorProjects( "rewrite-for-release/", path, copyFiles );
}
protected String readTestProjectFile( String fileName )
@@ -71,21 +57,16 @@
return FileUtils.fileRead( getTestFile( "target/test-classes/projects/rewrite-for-release/" + fileName ) );
}
- protected ReleaseDescriptor createConfigurationFromBasicPom( boolean copyFiles )
- throws Exception
- {
- return createConfigurationFromProjects( "basic-pom", copyFiles );
- }
-
public void testSimulateRewrite()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
String expected = readTestProjectFile( "basic-pom/pom.xml" );
- phase.simulate( config, null, getReactorProjects() );
+ phase.simulate( config, null, reactorProjects );
String actual = readTestProjectFile( "basic-pom/pom.xml" );
assertEquals( "Check the original POM untouched", expected, actual );
@@ -98,14 +79,15 @@
public void testClean()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
File testFile = getTestFile( "target/test-classes/projects/rewrite-for-release/basic-pom/pom.xml.tag" );
testFile.delete();
assertFalse( testFile.exists() );
- phase.simulate( config, null, getReactorProjects() );
+ phase.simulate( config, null, reactorProjects );
assertTrue( testFile.exists() );
@@ -117,7 +99,8 @@
public void testCleanNotExists()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromBasicPom();
+ List reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
File testFile = getTestFile( "target/test-classes/projects/rewrite-for-release/basic-pom/pom.xml.tag" );
@@ -151,20 +134,20 @@
config.mapReleaseVersion( projectId, NEXT_VERSION );
}
- protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( String path )
+ protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List reactorProjects )
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( path );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
config.mapReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
return config;
}
- protected ReleaseDescriptor createConfigurationForWithParentNextVersion( String path )
+ protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List reactorProjects )
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( path );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
config.mapReleaseVersion( "groupId:subproject1", NEXT_VERSION );
@@ -179,71 +162,80 @@
public void testRewriteBasicPomWithCvs()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( "basic-pom-with-cvs" );
+
+ List reactorProjects = createReactorProjects( "basic-pom-with-cvs" );
+ ReleaseDescriptor config = this.createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithTagBase()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( "basic-pom-with-tag-base" );
+
+ List reactorProjects = createReactorProjects( "basic-pom-with-tag-base" );
+ ReleaseDescriptor config = this.createDescriptorFromProjects( reactorProjects );
config.setScmTagBase( "file://localhost/tmp/scm-repo/releases" );
mapNextVersion( config, "groupId:artifactId" );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithCvsFromTag()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( "basic-pom-with-cvs-from-tag" );
+ List reactorProjects = createReactorProjects( "basic-pom-with-cvs-from-tag" );
+ ReleaseDescriptor config = this.createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteBasicPomWithEmptyScm()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( "basic-pom-with-empty-scm" );
+ List reactorProjects = createReactorProjects( "basic-pom-with-empty-scm" );
+ ReleaseDescriptor config = this.createDescriptorFromProjects( reactorProjects );
mapNextVersion( config, "groupId:artifactId" );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteInterpolatedVersions()
throws Exception
{
- ReleaseDescriptor config = createMappedConfiguration( "interpolated-versions" );
+ List reactorProjects = createReactorProjects( "interpolated-versions" );
+ ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
}
public void testRewriteInterpolatedVersionsDifferentVersion()
throws Exception
{
- ReleaseDescriptor config = createConfigurationFromProjects( "interpolated-versions" );
+
+ List reactorProjects = createReactorProjects( "interpolated-versions" );
+ ReleaseDescriptor config = this.createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
config.mapReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
config.mapReleaseVersion( "groupId:subproject2", NEXT_VERSION );
config.mapReleaseVersion( "groupId:subproject3", NEXT_VERSION );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- for ( Iterator i = getReactorProjects().iterator(); i.hasNext(); )
+ for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
{
MavenProject project = (MavenProject) i.next();
@@ -262,11 +254,20 @@
public void testRewriteBasicPomWithInheritedScm()
throws Exception
{
- ReleaseDescriptor config = createConfigurationForWithParentNextVersion( "basic-pom-inherited-scm" );
+ List reactorProjects = createReactorProjects( "basic-pom-inherited-scm" );
+ ReleaseDescriptor config = createConfigurationForWithParentNextVersion( reactorProjects );
config.mapReleaseVersion( "groupId:subsubproject", NEXT_VERSION );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( config, null, reactorProjects );
- assertTrue( compareFiles( getReactorProjects() ) );
+ assertTrue( compareFiles( reactorProjects ) );
+ }
+
+
+ protected ReleaseDescriptor createDescriptorFromProjects( List reactorProjects )
+ {
+ ReleaseDescriptor descriptor = super.createDescriptorFromProjects( reactorProjects );
+ descriptor.setScmReleaseLabel( "release-label" );
+ return descriptor;
}
}
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ScmCommitPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ScmCommitPhaseTest.java?rev=438376&r1=438375&r2=438376&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ScmCommitPhaseTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/phase/ScmCommitPhaseTest.java Tue Aug 29 22:23:04 2006
@@ -72,11 +72,12 @@
public void testCommit()
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" );
+ List reactorProjects = createReactorProjects();
+ ReleaseDescriptor descriptor = new ReleaseDescriptor();
+ 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(), rootProject.getFile() );
@@ -89,7 +90,7 @@
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( descriptor, null, reactorProjects );
assertTrue( true );
}
@@ -97,14 +98,15 @@
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" );
List poms = new ArrayList();
- for ( Iterator i = getReactorProjects().iterator(); i.hasNext(); )
+ for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
{
MavenProject project = (MavenProject) i.next();
poms.add( project.getFile() );
@@ -121,7 +123,7 @@
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( descriptor, null, reactorProjects );
assertTrue( true );
}
@@ -131,11 +133,12 @@
{
phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "scm-commit-development" );
- 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(), rootProject.getFile() );
@@ -148,7 +151,7 @@
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
- phase.execute( config, null, getReactorProjects() );
+ phase.execute( descriptor, null, reactorProjects );
assertTrue( true );
}
@@ -156,11 +159,12 @@
public void testCommitNoReleaseLabel()
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 )
@@ -172,11 +176,12 @@
public void testSimulateCommit()
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 checkIn" ) ).method( "checkIn" );
@@ -184,7 +189,7 @@
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
- phase.simulate( config, null, getReactorProjects() );
+ phase.simulate( descriptor, null, reactorProjects );
assertTrue( true );
}
@@ -192,11 +197,12 @@
public void testSimulateCommitNoReleaseLabel()
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 )
@@ -208,7 +214,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(
@@ -221,7 +228,7 @@
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Status check should have failed" );
}
@@ -234,7 +241,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(
@@ -247,7 +255,7 @@
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Status check should have failed" );
}
@@ -260,7 +268,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( "checkIn" ).will(
@@ -271,7 +280,7 @@
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Status check should have failed" );
}
@@ -284,7 +293,8 @@
public void testScmResultFailure()
throws Exception
{
- ReleaseDescriptor releaseDescriptor = createReleaseConfiguration();
+ List reactorProjects = createReactorProjects();
+ ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
ScmProviderStub providerStub =
@@ -294,7 +304,7 @@
try
{
- phase.execute( releaseDescriptor, null, getReactorProjects() );
+ phase.execute( releaseDescriptor, null, reactorProjects );
fail( "Commit should have failed" );
}
@@ -304,14 +314,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;
}
}