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 [3/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/PerformReleaseMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java?rev=438341&r1=438340&r2=438341&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java Tue Aug 29 21:03:46 2006
@@ -22,11 +22,13 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugins.release.config.ReleaseConfiguration;
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
import org.jmock.Mock;
import org.jmock.core.Constraint;
import org.jmock.core.constraint.IsEqual;
+import org.jmock.core.constraint.IsNull;
import org.jmock.core.matcher.InvokeOnceMatcher;
import org.jmock.core.stub.ThrowStub;
@@ -41,18 +43,21 @@
public class PerformReleaseMojoTest
extends AbstractMojoTestCase
{
+ private File workingDirectory;
+
public void testPerform()
throws Exception
{
PerformReleaseMojo mojo = getMojoWithProjectSite( "perform.xml" );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setSettings( mojo.getSettings() );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+ Settings settings = mojo.getSettings();
Mock mock = new Mock( ReleaseManager.class );
- Constraint[] constraints = new Constraint[]{new IsEqual( releaseConfiguration ),
- new IsEqual( new File( getBasedir(), "target/checkout" ) ), new IsEqual( "deploy site-deploy" ),
- new IsEqual( Boolean.TRUE )};
+ Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ),
+ new IsNull(), new IsEqual( new File( getBasedir(), "target/checkout" ) ),
+ new IsEqual( "deploy site-deploy" ), new IsEqual( Boolean.TRUE )};
mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints );
mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
@@ -64,15 +69,18 @@
public void testPerformWithoutSite()
throws Exception
{
- PerformReleaseMojo mojo = (PerformReleaseMojo) lookupMojo( "perform", getTestFile(
- "target/test-classes/mojos/perform/" + "perform.xml" ) );
-
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setSettings( mojo.getSettings() );
+ File testFileDirectory = getTestFile( "target/test-classes/mojos/perform/" );
+ PerformReleaseMojo mojo =
+ (PerformReleaseMojo) lookupMojo( "perform", new File( testFileDirectory, "perform.xml" ) );
+ mojo.setBasedir( testFileDirectory );
+
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+ Settings settings = mojo.getSettings();
Mock mock = new Mock( ReleaseManager.class );
- Constraint[] constraints = new Constraint[]{new IsEqual( releaseConfiguration ),
- new IsEqual( new File( getBasedir(), "target/checkout" ) ), new IsEqual( "deploy" ),
+ Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ),
+ new IsNull(), new IsEqual( new File( getBasedir(), "target/checkout" ) ), new IsEqual( "deploy" ),
new IsEqual( Boolean.TRUE )};
mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints );
mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
@@ -85,8 +93,8 @@
private PerformReleaseMojo getMojoWithProjectSite( String fileName )
throws Exception
{
- PerformReleaseMojo mojo = (PerformReleaseMojo) lookupMojo( "perform", getTestFile(
- "target/test-classes/mojos/perform/" + fileName ) );
+ PerformReleaseMojo mojo = (PerformReleaseMojo) lookupMojo( "perform", new File( workingDirectory, fileName ) );
+ mojo.setBasedir( workingDirectory );
MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
DistributionManagement distributionManagement = new DistributionManagement();
@@ -101,13 +109,14 @@
{
PerformReleaseMojo mojo = getMojoWithProjectSite( "perform.xml" );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setSettings( mojo.getSettings() );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+ Settings settings = mojo.getSettings();
Mock mock = new Mock( ReleaseManager.class );
- Constraint[] constraints = new Constraint[]{new IsEqual( releaseConfiguration ),
- new IsEqual( new File( getBasedir(), "target/checkout" ) ), new IsEqual( "deploy site-deploy" ),
- new IsEqual( Boolean.TRUE )};
+ Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ),
+ new IsNull(), new IsEqual( new File( getBasedir(), "target/checkout" ) ),
+ new IsEqual( "deploy site-deploy" ), new IsEqual( Boolean.TRUE )};
mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints ).will(
new ThrowStub( new ReleaseExecutionException( "..." ) ) );
mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
@@ -129,13 +138,14 @@
{
PerformReleaseMojo mojo = getMojoWithProjectSite( "perform.xml" );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setSettings( mojo.getSettings() );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+ Settings settings = mojo.getSettings();
Mock mock = new Mock( ReleaseManager.class );
- Constraint[] constraints = new Constraint[]{new IsEqual( releaseConfiguration ),
- new IsEqual( new File( getBasedir(), "target/checkout" ) ), new IsEqual( "deploy site-deploy" ),
- new IsEqual( Boolean.TRUE )};
+ Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ),
+ new IsNull(), new IsEqual( new File( getBasedir(), "target/checkout" ) ),
+ new IsEqual( "deploy site-deploy" ), new IsEqual( Boolean.TRUE )};
mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints ).will(
new ThrowStub( new ReleaseFailureException( "..." ) ) );
mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
@@ -157,14 +167,15 @@
{
PerformReleaseMojo mojo = getMojoWithProjectSite( "perform-with-scm.xml" );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setSettings( mojo.getSettings() );
- releaseConfiguration.setUrl( "scm-url" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+ Settings settings = mojo.getSettings();
+ releaseDescriptor.setScmSourceUrl( "scm-url" );
Mock mock = new Mock( ReleaseManager.class );
- Constraint[] constraints = new Constraint[]{new IsEqual( releaseConfiguration ),
- new IsEqual( new File( getBasedir(), "target/checkout" ) ), new IsEqual( "deploy site-deploy" ),
- new IsEqual( Boolean.TRUE )};
+ Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ),
+ new IsNull(), new IsEqual( new File( getBasedir(), "target/checkout" ) ),
+ new IsEqual( "deploy site-deploy" ), new IsEqual( Boolean.TRUE )};
mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints );
mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
@@ -178,9 +189,10 @@
{
PerformReleaseMojo mojo = getMojoWithProjectSite( "perform.xml" );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setSettings( mojo.getSettings() );
- releaseConfiguration.setAdditionalArguments( "-P prof1,2prof" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+ Settings settings = mojo.getSettings();
+ releaseDescriptor.setAdditionalArguments( "-P prof1,2prof" );
MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
Profile profile1 = new Profile();
@@ -190,9 +202,9 @@
project.setActiveProfiles( Arrays.asList( new Profile[]{profile1, profile2} ) );
Mock mock = new Mock( ReleaseManager.class );
- Constraint[] constraints = new Constraint[]{new IsEqual( releaseConfiguration ),
- new IsEqual( new File( getBasedir(), "target/checkout" ) ), new IsEqual( "deploy site-deploy" ),
- new IsEqual( Boolean.TRUE )};
+ Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ),
+ new IsNull(), new IsEqual( new File( getBasedir(), "target/checkout" ) ),
+ new IsEqual( "deploy site-deploy" ), new IsEqual( Boolean.TRUE )};
mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints );
mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
@@ -206,9 +218,10 @@
{
PerformReleaseMojo mojo = getMojoWithProjectSite( "perform-with-args.xml" );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setSettings( mojo.getSettings() );
- releaseConfiguration.setAdditionalArguments( "-Dmaven.test.skip=true -P prof1,2prof" );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+ Settings settings = mojo.getSettings();
+ releaseDescriptor.setAdditionalArguments( "-Dmaven.test.skip=true -P prof1,2prof" );
MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
Profile profile1 = new Profile();
@@ -218,14 +231,21 @@
project.setActiveProfiles( Arrays.asList( new Profile[]{profile1, profile2} ) );
Mock mock = new Mock( ReleaseManager.class );
- Constraint[] constraints = new Constraint[]{new IsEqual( releaseConfiguration ),
- new IsEqual( new File( getBasedir(), "target/checkout" ) ), new IsEqual( "deploy site-deploy" ),
- new IsEqual( Boolean.TRUE )};
+ Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( settings ),
+ new IsNull(), new IsEqual( new File( getBasedir(), "target/checkout" ) ),
+ new IsEqual( "deploy site-deploy" ), new IsEqual( Boolean.TRUE )};
mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints );
mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
mojo.execute();
assertTrue( true );
+ }
+
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ workingDirectory = getTestFile( "target/test-classes/mojos/perform" );
}
}
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java?rev=438341&r1=438340&r2=438341&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java Tue Aug 29 21:03:46 2006
@@ -19,13 +19,16 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugins.release.config.ReleaseConfiguration;
+import org.apache.maven.plugins.release.config.ReleaseDescriptor;
import org.jmock.Mock;
import org.jmock.core.Constraint;
import org.jmock.core.constraint.IsEqual;
+import org.jmock.core.constraint.IsNull;
import org.jmock.core.matcher.InvokeOnceMatcher;
import org.jmock.core.stub.ThrowStub;
+import java.io.File;
+
/**
* Test release:prepare.
*
@@ -37,15 +40,15 @@
public void testPrepare()
throws Exception
{
- PrepareReleaseMojo mojo = (PrepareReleaseMojo) lookupMojo( "prepare", getTestFile(
- "target/test-classes/mojos/prepare/prepare.xml" ) );
-
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setSettings( mojo.getSettings() );
+ File testFile = getTestFile( "target/test-classes/mojos/prepare/prepare.xml" );
+ PrepareReleaseMojo mojo = (PrepareReleaseMojo) lookupMojo( "prepare", testFile );
+ mojo.setBasedir( testFile.getParentFile() );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setWorkingDirectory( testFile.getParentFile().getAbsolutePath() );
Mock mock = new Mock( ReleaseManager.class );
- Constraint[] constraints = new Constraint[]{new IsEqual( releaseConfiguration ), new IsEqual( Boolean.TRUE ),
- new IsEqual( Boolean.FALSE )};
+ Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( mojo.getSettings() ),
+ new IsNull(), new IsEqual( Boolean.TRUE ), new IsEqual( Boolean.FALSE )};
mock.expects( new InvokeOnceMatcher() ).method( "prepare" ).with( constraints );
mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
@@ -57,15 +60,15 @@
public void testPrepareWithExecutionException()
throws Exception
{
- PrepareReleaseMojo mojo = (PrepareReleaseMojo) lookupMojo( "prepare", getTestFile(
- "target/test-classes/mojos/prepare/prepare.xml" ) );
-
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setSettings( mojo.getSettings() );
+ File testFile = getTestFile( "target/test-classes/mojos/prepare/prepare.xml" );
+ PrepareReleaseMojo mojo = (PrepareReleaseMojo) lookupMojo( "prepare", testFile );
+ mojo.setBasedir( testFile.getParentFile() );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setWorkingDirectory( testFile.getParentFile().getAbsolutePath() );
Mock mock = new Mock( ReleaseManager.class );
- Constraint[] constraints = new Constraint[]{new IsEqual( releaseConfiguration ), new IsEqual( Boolean.TRUE ),
- new IsEqual( Boolean.FALSE )};
+ Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( mojo.getSettings() ),
+ new IsNull(), new IsEqual( Boolean.TRUE ), new IsEqual( Boolean.FALSE )};
mock.expects( new InvokeOnceMatcher() ).method( "prepare" ).with( constraints ).will(
new ThrowStub( new ReleaseExecutionException( "..." ) ) );
mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
@@ -85,15 +88,15 @@
public void testPrepareWithExecutionFailure()
throws Exception
{
- PrepareReleaseMojo mojo = (PrepareReleaseMojo) lookupMojo( "prepare", getTestFile(
- "target/test-classes/mojos/prepare/prepare.xml" ) );
-
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setSettings( mojo.getSettings() );
+ File testFile = getTestFile( "target/test-classes/mojos/prepare/prepare.xml" );
+ PrepareReleaseMojo mojo = (PrepareReleaseMojo) lookupMojo( "prepare", testFile );
+ mojo.setBasedir( testFile.getParentFile() );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setWorkingDirectory( testFile.getParentFile().getAbsolutePath() );
Mock mock = new Mock( ReleaseManager.class );
- Constraint[] constraints = new Constraint[]{new IsEqual( releaseConfiguration ), new IsEqual( Boolean.TRUE ),
- new IsEqual( Boolean.FALSE )};
+ Constraint[] constraints = new Constraint[]{new IsEqual( releaseDescriptor ), new IsEqual( mojo.getSettings() ),
+ new IsNull(), new IsEqual( Boolean.TRUE ), new IsEqual( Boolean.FALSE )};
mock.expects( new InvokeOnceMatcher() ).method( "prepare" ).with( constraints ).will(
new ThrowStub( new ReleaseFailureException( "..." ) ) );
mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
@@ -117,7 +120,7 @@
PerformReleaseMojo mojo = (PerformReleaseMojo) lookupMojo( "perform", getTestFile(
"target/test-classes/mojos/perform/perform-with-scm.xml" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
+ ReleaseDescriptor releaseConfiguration = new ReleaseDescriptor();
releaseConfiguration.setSettings( mojo.getSettings() );
releaseConfiguration.setUrl( "scm-url" );
@@ -139,7 +142,7 @@
PerformReleaseMojo mojo = (PerformReleaseMojo) lookupMojo( "perform", getTestFile(
"target/test-classes/mojos/perform/perform.xml" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
+ ReleaseDescriptor releaseConfiguration = new ReleaseDescriptor();
releaseConfiguration.setSettings( mojo.getSettings() );
releaseConfiguration.setAdditionalArguments( "-P prof1,2prof" );
@@ -168,7 +171,7 @@
PerformReleaseMojo mojo = (PerformReleaseMojo) lookupMojo( "perform", getTestFile(
"target/test-classes/mojos/perform/perform-with-args.xml" ) );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
+ ReleaseDescriptor releaseConfiguration = new ReleaseDescriptor();
releaseConfiguration.setSettings( mojo.getSettings() );
releaseConfiguration.setAdditionalArguments( "-Dmaven.test.skip=true -P prof1,2prof" );
Copied: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/PropertiesReleaseDescriptorStoreTest.java (from r438319, maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStoreTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/PropertiesReleaseDescriptorStoreTest.java?p2=maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/PropertiesReleaseDescriptorStoreTest.java&p1=maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStoreTest.java&r1=438319&r2=438341&rev=438341&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStoreTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/PropertiesReleaseDescriptorStoreTest.java Tue Aug 29 21:03:46 2006
@@ -27,148 +27,148 @@
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class PropertiesReleaseConfigurationStoreTest
+public class PropertiesReleaseDescriptorStoreTest
extends PlexusTestCase
{
- private PropertiesReleaseConfigurationStore store;
+ private PropertiesReleaseDescriptorStore store;
protected void setUp()
throws Exception
{
super.setUp();
- store = (PropertiesReleaseConfigurationStore) lookup( ReleaseConfigurationStore.ROLE, "properties" );
+ store = (PropertiesReleaseDescriptorStore) lookup( ReleaseDescriptorStore.ROLE, "properties" );
}
public void testReadFromFile()
- throws ReleaseConfigurationStoreException
+ throws ReleaseDescriptorStoreException
{
File file = getTestFile( "target/test-classes/release.properties" );
- ReleaseConfiguration config = store.read( file );
+ ReleaseDescriptor config = store.read( file );
- ReleaseConfiguration expected = createExcpectedReleaseConfiguration();
+ ReleaseDescriptor expected = createExcpectedReleaseConfiguration();
assertEquals( "check matches", expected, config );
}
public void testReadFromFileUsingWorkingDirectory()
- throws ReleaseConfigurationStoreException
+ throws ReleaseDescriptorStoreException
{
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setWorkingDirectory( getTestFile( "target/test-classes" ) );
- ReleaseConfiguration config = store.read( releaseConfiguration );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setWorkingDirectory( getTestFile( "target/test-classes" ).getAbsolutePath() );
+ ReleaseDescriptor config = store.read( releaseDescriptor );
- ReleaseConfiguration expected = createExcpectedReleaseConfiguration();
- expected.setWorkingDirectory( releaseConfiguration.getWorkingDirectory() );
+ ReleaseDescriptor expected = createExcpectedReleaseConfiguration();
+ expected.setWorkingDirectory( releaseDescriptor.getWorkingDirectory() );
assertEquals( "check matches", expected, config );
}
public void testReadFromEmptyFile()
- throws ReleaseConfigurationStoreException
+ throws ReleaseDescriptorStoreException
{
File file = getTestFile( "target/test-classes/empty-release.properties" );
- ReleaseConfiguration config = store.read( file );
+ ReleaseDescriptor config = store.read( file );
assertDefaultReleaseConfiguration( config );
}
public void testReadMissingFile()
- throws ReleaseConfigurationStoreException
+ throws ReleaseDescriptorStoreException
{
File file = getTestFile( "target/test-classes/no-release.properties" );
- ReleaseConfiguration config = store.read( file );
+ ReleaseDescriptor config = store.read( file );
assertDefaultReleaseConfiguration( config );
}
public void testMergeFromEmptyFile()
- throws ReleaseConfigurationStoreException
+ throws ReleaseDescriptorStoreException
{
File file = getTestFile( "target/test-classes/empty-release.properties" );
- ReleaseConfiguration mergeConfiguration = createMergeConfiguration();
- ReleaseConfiguration config = store.read( mergeConfiguration, file );
+ ReleaseDescriptor mergeDescriptor = createMergeConfiguration();
+ ReleaseDescriptor config = store.read( mergeDescriptor, file );
- assertEquals( "Check configurations merged", mergeConfiguration, config );
+ assertEquals( "Check configurations merged", mergeDescriptor, config );
}
public void testMergeFromMissingFile()
- throws ReleaseConfigurationStoreException
+ throws ReleaseDescriptorStoreException
{
File file = getTestFile( "target/test-classes/no-release.properties" );
- ReleaseConfiguration mergeConfiguration = createMergeConfiguration();
- ReleaseConfiguration config = store.read( mergeConfiguration, file );
+ ReleaseDescriptor mergeDescriptor = createMergeConfiguration();
+ ReleaseDescriptor config = store.read( mergeDescriptor, file );
- assertEquals( "Check configurations merged", mergeConfiguration, config );
+ assertEquals( "Check configurations merged", mergeDescriptor, config );
}
public void testWriteToNewFile()
- throws ReleaseConfigurationStoreException
+ throws ReleaseDescriptorStoreException
{
File file = getTestFile( "target/test-classes/new-release.properties" );
file.delete();
assertFalse( "Check file doesn't exist", file.exists() );
- ReleaseConfiguration config = createReleaseConfigurationForWriting();
+ ReleaseDescriptor config = createReleaseConfigurationForWriting();
store.write( config, file );
- ReleaseConfiguration rereadConfiguration = store.read( file );
+ ReleaseDescriptor rereadDescriptor = store.read( file );
- assertEquals( "compare configuration", config, rereadConfiguration );
+ assertEquals( "compare configuration", config, rereadDescriptor );
}
public void testWriteToWorkingDirectory()
- throws ReleaseConfigurationStoreException
+ throws ReleaseDescriptorStoreException
{
File file = getTestFile( "target/test-classes/new/release.properties" );
file.delete();
assertFalse( "Check file doesn't exist", file.exists() );
file.getParentFile().mkdirs();
- ReleaseConfiguration config = createReleaseConfigurationForWriting();
- config.setWorkingDirectory( file.getParentFile() );
+ ReleaseDescriptor config = createReleaseConfigurationForWriting();
+ config.setWorkingDirectory( file.getParentFile().getAbsolutePath() );
store.write( config );
- ReleaseConfiguration rereadConfiguration = store.read( file );
- rereadConfiguration.setWorkingDirectory( file.getParentFile() );
+ ReleaseDescriptor rereadDescriptor = store.read( file );
+ rereadDescriptor.setWorkingDirectory( file.getParentFile().getAbsolutePath() );
- assertEquals( "compare configuration", config, rereadConfiguration );
+ assertEquals( "compare configuration", config, rereadDescriptor );
}
public void testWriteToNewFileRequiredOnly()
- throws ReleaseConfigurationStoreException
+ throws ReleaseDescriptorStoreException
{
File file = getTestFile( "target/test-classes/new-release.properties" );
file.delete();
assertFalse( "Check file doesn't exist", file.exists() );
- ReleaseConfiguration config = new ReleaseConfiguration();
+ ReleaseDescriptor config = new ReleaseDescriptor();
config.setCompletedPhase( "completed-phase-write" );
- config.setUrl( "url-write" );
+ config.setScmSourceUrl( "url-write" );
store.write( config, file );
- ReleaseConfiguration rereadConfiguration = store.read( file );
+ ReleaseDescriptor rereadDescriptor = store.read( file );
- assertEquals( "compare configuration", config, rereadConfiguration );
+ assertEquals( "compare configuration", config, rereadDescriptor );
}
public void testWriteToNewFileDottedIds()
- throws ReleaseConfigurationStoreException
+ throws ReleaseDescriptorStoreException
{
File file = getTestFile( "target/test-classes/new-release.properties" );
file.delete();
assertFalse( "Check file doesn't exist", file.exists() );
- ReleaseConfiguration config = new ReleaseConfiguration();
+ ReleaseDescriptor config = new ReleaseDescriptor();
config.setCompletedPhase( "completed-phase-write" );
- config.setUrl( "url-write" );
+ config.setScmSourceUrl( "url-write" );
config.mapReleaseVersion( "group.id:artifact.id", "1.1" );
config.mapDevelopmentVersion( "group.id:artifact.id", "1.2-SNAPSHOT" );
@@ -182,21 +182,21 @@
store.write( config, file );
- ReleaseConfiguration rereadConfiguration = store.read( file );
+ ReleaseDescriptor rereadDescriptor = store.read( file );
- assertEquals( "compare configuration", config, rereadConfiguration );
+ assertEquals( "compare configuration", config, rereadDescriptor );
}
public void testWriteToNewFileNullMappedScm()
- throws ReleaseConfigurationStoreException
+ throws ReleaseDescriptorStoreException
{
File file = getTestFile( "target/test-classes/new-release.properties" );
file.delete();
assertFalse( "Check file doesn't exist", file.exists() );
- ReleaseConfiguration config = new ReleaseConfiguration();
+ ReleaseDescriptor config = new ReleaseDescriptor();
config.setCompletedPhase( "completed-phase-write" );
- config.setUrl( "url-write" );
+ config.setScmSourceUrl( "url-write" );
config.mapReleaseVersion( "group.id:artifact.id", "1.1" );
config.mapDevelopmentVersion( "group.id:artifact.id", "1.2-SNAPSHOT" );
@@ -205,39 +205,39 @@
store.write( config, file );
- ReleaseConfiguration rereadConfiguration = store.read( file );
+ ReleaseDescriptor rereadDescriptor = store.read( file );
assertNull( "check null scm is mapped correctly",
- rereadConfiguration.getOriginalScmInfo().get( "group.id:artifact.id" ) );
+ rereadDescriptor.getOriginalScmInfo().get( "group.id:artifact.id" ) );
- assertEquals( "compare configuration", config, rereadConfiguration );
+ assertEquals( "compare configuration", config, rereadDescriptor );
}
public void testOverwriteFile()
- throws ReleaseConfigurationStoreException
+ throws ReleaseDescriptorStoreException
{
File file = getTestFile( "target/test-classes/rewrite-release.properties" );
assertTrue( "Check file already exists", file.exists() );
- ReleaseConfiguration config = createReleaseConfigurationForWriting();
+ ReleaseDescriptor config = createReleaseConfigurationForWriting();
store.write( config, file );
- ReleaseConfiguration rereadConfiguration = store.read( file );
+ ReleaseDescriptor rereadDescriptor = store.read( file );
- assertEquals( "compare configuration", config, rereadConfiguration );
+ assertEquals( "compare configuration", config, rereadDescriptor );
}
public void testDeleteFile()
- throws ReleaseConfigurationStoreException, IOException
+ throws ReleaseDescriptorStoreException, IOException
{
File file = getTestFile( "target/test-classes/delete/release.properties" );
file.getParentFile().mkdirs();
file.createNewFile();
assertTrue( "Check file already exists", file.exists() );
- ReleaseConfiguration config = createReleaseConfigurationForWriting();
- config.setWorkingDirectory( file.getParentFile() );
+ ReleaseDescriptor config = createReleaseConfigurationForWriting();
+ config.setWorkingDirectory( file.getParentFile().getAbsolutePath() );
store.delete( config );
@@ -245,32 +245,32 @@
}
public void testMissingDeleteFile()
- throws ReleaseConfigurationStoreException, IOException
+ throws ReleaseDescriptorStoreException, IOException
{
File file = getTestFile( "target/test-classes/delete/release.properties" );
file.getParentFile().mkdirs();
file.delete();
assertFalse( "Check file already exists", file.exists() );
- ReleaseConfiguration config = createReleaseConfigurationForWriting();
- config.setWorkingDirectory( file.getParentFile() );
+ ReleaseDescriptor config = createReleaseConfigurationForWriting();
+ config.setWorkingDirectory( file.getParentFile().getAbsolutePath() );
store.delete( config );
assertFalse( "Check file already exists", file.exists() );
}
- private ReleaseConfiguration createReleaseConfigurationForWriting()
+ private ReleaseDescriptor createReleaseConfigurationForWriting()
{
- ReleaseConfiguration config = new ReleaseConfiguration();
+ ReleaseDescriptor config = new ReleaseDescriptor();
config.setCompletedPhase( "completed-phase-write" );
- config.setUrl( "url-write" );
- config.setUsername( "username-write" );
- config.setPassword( "password-write" );
- config.setPrivateKey( "private-key-write" );
- config.setPassphrase( "passphrase-write" );
- config.setTagBase( "tag-base-write" );
- config.setReleaseLabel( "tag-write" );
+ config.setScmSourceUrl( "url-write" );
+ config.setScmUsername( "username-write" );
+ config.setScmPassword( "password-write" );
+ config.setScmPrivateKey( "private-key-write" );
+ config.setScmPrivateKeyPassPhrase( "passphrase-write" );
+ config.setScmTagBase( "tag-base-write" );
+ config.setScmReleaseLabel( "tag-write" );
config.setAdditionalArguments( "additional-args-write" );
config.setPreparationGoals( "preparation-goals-write" );
config.setPomFileName( "pom-file-name-write" );
@@ -293,25 +293,23 @@
return config;
}
- private static void assertDefaultReleaseConfiguration( ReleaseConfiguration config )
+ private static void assertDefaultReleaseConfiguration( ReleaseDescriptor config )
{
assertNull( "Expected no completedPhase", config.getCompletedPhase() );
- assertNull( "Expected no url", config.getUrl() );
- assertNull( "Expected no username", config.getUsername() );
- assertNull( "Expected no password", config.getPassword() );
- assertNull( "Expected no privateKey", config.getPrivateKey() );
- assertNull( "Expected no passphrase", config.getPassphrase() );
- assertNull( "Expected no tagBase", config.getTagBase() );
- assertNull( "Expected no tag", config.getReleaseLabel() );
+ assertNull( "Expected no url", config.getScmSourceUrl() );
+ assertNull( "Expected no username", config.getScmUsername() );
+ assertNull( "Expected no password", config.getScmPassword() );
+ assertNull( "Expected no privateKey", config.getScmPrivateKey() );
+ assertNull( "Expected no passphrase", config.getScmPrivateKeyPassPhrase() );
+ assertNull( "Expected no tagBase", config.getScmTagBase() );
+ assertNull( "Expected no tag", config.getScmReleaseLabel() );
assertNull( "Expected no additional arguments", config.getAdditionalArguments() );
assertNull( "Expected no preparation goals", config.getPreparationGoals() );
assertNull( "Expected no pom file name", config.getPomFileName() );
assertNull( "Expected no workingDirectory", config.getWorkingDirectory() );
- assertNull( "Expected no settings", config.getSettings() );
-
assertFalse( "Expected no generateReleasePoms", config.isGenerateReleasePoms() );
- assertFalse( "Expected no useEditMode", config.isUseEditMode() );
+ assertFalse( "Expected no useEditMode", config.isScmUseEditMode() );
assertTrue( "Expected default interactive", config.isInteractive() );
assertFalse( "Expected no addScema", config.isAddSchema() );
@@ -320,37 +318,36 @@
assertTrue( "Expected no scm mappings", config.getOriginalScmInfo().isEmpty() );
}
- public ReleaseConfiguration createMergeConfiguration()
+ public ReleaseDescriptor createMergeConfiguration()
{
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- releaseConfiguration.setUrl( "scm-url" );
- releaseConfiguration.setUsername( "username" );
+ releaseDescriptor.setScmSourceUrl( "scm-url" );
+ releaseDescriptor.setScmUsername( "username" );
// Not setting other optional SCM settings for brevity
- releaseConfiguration.setWorkingDirectory( getTestFile( "target/test-working-directory" ) );
+ releaseDescriptor.setWorkingDirectory( getTestFile( "target/test-working-directory" ).getAbsolutePath() );
// Not setting non-override setting completedPhase
- return releaseConfiguration;
+ return releaseDescriptor;
}
- private ReleaseConfiguration createExcpectedReleaseConfiguration()
+ private ReleaseDescriptor createExcpectedReleaseConfiguration()
{
- ReleaseConfiguration expected = new ReleaseConfiguration();
+ ReleaseDescriptor expected = new ReleaseDescriptor();
expected.setCompletedPhase( "step1" );
- expected.setUrl( "scm-url" );
- expected.setUsername( "username" );
- expected.setPassword( "password" );
- expected.setPrivateKey( "private-key" );
- expected.setPassphrase( "passphrase" );
- expected.setTagBase( "tagBase" );
- expected.setReleaseLabel( "tag" );
+ expected.setScmSourceUrl( "scm-url" );
+ expected.setScmUsername( "username" );
+ expected.setScmPassword( "password" );
+ expected.setScmPrivateKey( "private-key" );
+ expected.setScmPrivateKeyPassPhrase( "passphrase" );
+ expected.setScmTagBase( "tagBase" );
+ expected.setScmReleaseLabel( "tag" );
expected.setAdditionalArguments( "additional-arguments" );
expected.setPreparationGoals( "preparation-goals" );
expected.setPomFileName( "pom-file-name" );
expected.setWorkingDirectory( null );
- expected.setSettings( null );
expected.setGenerateReleasePoms( false );
- expected.setUseEditMode( false );
+ expected.setScmUseEditMode( false );
expected.setInteractive( true );
expected.setAddSchema( false );
expected.mapReleaseVersion( "groupId:artifactId1", "2.0" );
Copied: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorStoreStub.java (from r438319, maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseConfigurationStoreStub.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorStoreStub.java?p2=maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorStoreStub.java&p1=maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseConfigurationStoreStub.java&r1=438319&r2=438341&rev=438341&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseConfigurationStoreStub.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorStoreStub.java Tue Aug 29 21:03:46 2006
@@ -21,31 +21,31 @@
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class ReleaseConfigurationStoreStub
- implements ReleaseConfigurationStore
+public class ReleaseDescriptorStoreStub
+ implements ReleaseDescriptorStore
{
/**
* The release configuration to use.
*/
- private ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
+ private ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- public ReleaseConfiguration read( ReleaseConfiguration mergeConfiguration )
+ public ReleaseDescriptor read( ReleaseDescriptor mergeDescriptor )
{
- releaseConfiguration.merge( mergeConfiguration );
- return releaseConfiguration;
+ ReleaseUtils.merge( releaseDescriptor, mergeDescriptor );
+ return releaseDescriptor;
}
- public void write( ReleaseConfiguration config )
+ public void write( ReleaseDescriptor config )
{
- this.releaseConfiguration = config;
+ this.releaseDescriptor = config;
}
- public void delete( ReleaseConfiguration config )
+ public void delete( ReleaseDescriptor config )
{
}
- public ReleaseConfiguration getReleaseConfiguration()
+ public ReleaseDescriptor getReleaseConfiguration()
{
- return releaseConfiguration;
+ return releaseDescriptor;
}
}
Copied: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorTest.java (from r438319, maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseConfigurationTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorTest.java?p2=maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorTest.java&p1=maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseConfigurationTest.java&r1=438319&r2=438341&rev=438341&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseConfigurationTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/ReleaseDescriptorTest.java Tue Aug 29 21:03:46 2006
@@ -17,95 +17,97 @@
*/
import junit.framework.TestCase;
-import org.apache.maven.model.Model;
import org.apache.maven.model.Scm;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.Settings;
import java.io.File;
-import java.util.Collections;
-import java.util.List;
/**
- * ReleaseConfiguration Tester.
+ * ReleaseDescriptor Tester.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class ReleaseConfigurationTest
+public class ReleaseDescriptorTest
extends TestCase
{
public void testMergeConfigurationSourceEmpty()
{
- ReleaseConfiguration mergeConfiguration = createReleaseConfiguration();
+ ReleaseDescriptor mergeDescriptor = createReleaseDescriptor();
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ ReleaseDescriptor mergedReleaseDescriptor = ReleaseUtils.merge( releaseDescriptor, mergeDescriptor );
+ ReleaseDescriptor mergedMergeDescriptor = ReleaseUtils.merge( mergeDescriptor, releaseDescriptor );
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.merge( mergeConfiguration );
-
- assertEquals( "Check merge", mergeConfiguration, releaseConfiguration );
+ assertEquals( "Check merge", mergedReleaseDescriptor, mergedMergeDescriptor );
}
public void testMergeConfigurationDestEmpty()
{
- ReleaseConfiguration releaseConfiguration = createReleaseConfiguration();
-
- releaseConfiguration.merge( new ReleaseConfiguration() );
+ ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
+ ReleaseDescriptor mergedReleaseDescriptor = ReleaseUtils.merge( releaseDescriptor, new ReleaseDescriptor() );
+ ReleaseDescriptor expectedDescriptor = copyReleaseDescriptor( mergedReleaseDescriptor );
- ReleaseConfiguration expectedConfiguration = copyReleaseConfiguration( releaseConfiguration );
- assertEquals( "Check merge", expectedConfiguration, releaseConfiguration );
+ assertEquals( "Check merge", expectedDescriptor, releaseDescriptor );
}
public void testMergeConfiguration()
{
- Settings settings = new Settings();
+/*
+ File workingDirectory = new File( "." );
+
+ ReleaseDescriptor mergeDescriptor =
+ createMergeDescriptor( workingDirectory.getAbsolutePath(), "completed-phase-merge" );
+ ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
+ ReleaseDescriptor mergedReleaseDescriptor = ReleaseUtils.merge( releaseDescriptor, mergeDescriptor );
+ ReleaseDescriptor expectedDescriptor =
+ createMergeDescriptor( releaseDescriptor.getWorkingDirectory(), releaseDescriptor.getCompletedPhase() );
+ ReleaseDescriptor mergedExpectedDescriptor = ReleaseUtils.merge( expectedDescriptor, releaseDescriptor );
+
+ assertEquals( "Check merge", mergedExpectedDescriptor, mergedReleaseDescriptor );
+*/
+
File workingDirectory = new File( "." );
- ReleaseConfiguration mergeConfiguration =
- createMergeConfiguration( settings, workingDirectory, "completed-phase-merge" );
+ ReleaseDescriptor mergeDescriptor =
+ createMergeDescriptor( workingDirectory.getAbsolutePath(), "completed-phase-merge" );
- ReleaseConfiguration releaseConfiguration = createReleaseConfiguration();
- releaseConfiguration.merge( mergeConfiguration );
+ ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
+ releaseDescriptor = ReleaseUtils.merge( releaseDescriptor, mergeDescriptor );
- ReleaseConfiguration expectedConfiguration = createMergeConfiguration( releaseConfiguration.getSettings(),
- releaseConfiguration.getWorkingDirectory(),
- releaseConfiguration.getCompletedPhase() );
- expectedConfiguration.setReactorProjects( releaseConfiguration.getReactorProjects() );
- assertEquals( "Check merge", expectedConfiguration, releaseConfiguration );
+ ReleaseDescriptor expected =
+ createMergeDescriptor( releaseDescriptor.getWorkingDirectory(), releaseDescriptor.getCompletedPhase() );
+ assertEquals( "Check merge", expected, releaseDescriptor );
}
public void testEquals()
{
- ReleaseConfiguration originalReleaseConfiguration = createReleaseConfiguration();
- ReleaseConfiguration releaseConfiguration = copyReleaseConfiguration( originalReleaseConfiguration );
- doEqualsAssertions( releaseConfiguration, originalReleaseConfiguration, "other", Collections.EMPTY_LIST,
- new File( "f" ), new Settings() );
- originalReleaseConfiguration = createReleaseConfiguration();
- releaseConfiguration = copyReleaseConfiguration( originalReleaseConfiguration );
- doEqualsAssertions( originalReleaseConfiguration, releaseConfiguration, "other", Collections.EMPTY_LIST,
- new File( "f" ), new Settings() );
-
- originalReleaseConfiguration = createReleaseConfiguration();
- releaseConfiguration = copyReleaseConfiguration( originalReleaseConfiguration );
- doEqualsAssertions( releaseConfiguration, originalReleaseConfiguration, null, null, null, null );
- originalReleaseConfiguration = createReleaseConfiguration();
- releaseConfiguration = copyReleaseConfiguration( originalReleaseConfiguration );
- doEqualsAssertions( originalReleaseConfiguration, releaseConfiguration, null, null, null, null );
+ ReleaseDescriptor originalReleaseDescriptor = createReleaseDescriptor();
+ ReleaseDescriptor releaseDescriptor = copyReleaseDescriptor( originalReleaseDescriptor );
+ doEqualsAssertions( releaseDescriptor, originalReleaseDescriptor, "other", new File( "f" ) );
+ originalReleaseDescriptor = createReleaseDescriptor();
+ releaseDescriptor = copyReleaseDescriptor( originalReleaseDescriptor );
+ doEqualsAssertions( originalReleaseDescriptor, releaseDescriptor, "other", new File( "f" ) );
+
+ originalReleaseDescriptor = createReleaseDescriptor();
+ releaseDescriptor = copyReleaseDescriptor( originalReleaseDescriptor );
+ doEqualsAssertions( releaseDescriptor, originalReleaseDescriptor, null, null );
+ originalReleaseDescriptor = createReleaseDescriptor();
+ releaseDescriptor = copyReleaseDescriptor( originalReleaseDescriptor );
+ doEqualsAssertions( originalReleaseDescriptor, releaseDescriptor, null, null );
- assertEquals( "test ==", releaseConfiguration, releaseConfiguration );
+ assertEquals( "test ==", releaseDescriptor, releaseDescriptor );
Object obj = this;
- assertFalse( "test class instance", releaseConfiguration.equals( obj ) );
+ assertFalse( "test class instance", releaseDescriptor.equals( obj ) );
}
- private static void doEqualsAssertions( ReleaseConfiguration releaseConfiguration,
- ReleaseConfiguration originalReleaseConfiguration, String other,
- List reactorProjects, File otherFile, Settings otherSettings )
+ private static void doEqualsAssertions( ReleaseDescriptor releaseDescriptor,
+ ReleaseDescriptor originalReleaseDescriptor, String other, File otherFile )
{
- ReleaseConfiguration origConfig = originalReleaseConfiguration;
- ReleaseConfiguration config = releaseConfiguration;
+ ReleaseDescriptor origConfig = originalReleaseDescriptor;
+ ReleaseDescriptor config = releaseDescriptor;
assertEquals( "Check original comparison", config, origConfig );
- config.setUrl( other );
+ config.setScmSourceUrl( other );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- config.setUrl( origConfig.getUrl() );
+ config.setScmSourceUrl( origConfig.getScmSourceUrl() );
config.setAdditionalArguments( other );
assertFalse( "Check original comparison", config.equals( origConfig ) );
@@ -119,9 +121,9 @@
assertFalse( "Check original comparison", config.equals( origConfig ) );
config.setGenerateReleasePoms( origConfig.isGenerateReleasePoms() );
- config.setUseEditMode( !origConfig.isUseEditMode() );
+ config.setScmUseEditMode( !origConfig.isScmUseEditMode() );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- config.setUseEditMode( origConfig.isUseEditMode() );
+ config.setScmUseEditMode( origConfig.isScmUseEditMode() );
config.setInteractive( !origConfig.isInteractive() );
assertFalse( "Check original comparison", config.equals( origConfig ) );
@@ -131,21 +133,21 @@
assertFalse( "Check original comparison", config.equals( origConfig ) );
config.setCompletedPhase( origConfig.getCompletedPhase() );
- config.setPassphrase( other );
+ config.setScmPrivateKeyPassPhrase( other );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- config.setPassphrase( origConfig.getPassphrase() );
+ config.setScmPrivateKeyPassPhrase( origConfig.getScmPrivateKeyPassPhrase() );
- config.setPassword( other );
+ config.setScmPassword( other );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- config.setPassword( origConfig.getPassword() );
+ config.setScmPassword( origConfig.getScmPassword() );
- config.setUsername( other );
+ config.setScmUsername( other );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- config.setUsername( origConfig.getUsername() );
+ config.setScmUsername( origConfig.getScmUsername() );
- config.setPrivateKey( other );
+ config.setScmPrivateKey( other );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- config.setPrivateKey( origConfig.getPrivateKey() );
+ config.setScmPrivateKey( origConfig.getScmPrivateKey() );
config.setPomFileName( other );
assertFalse( "Check original comparison", config.equals( origConfig ) );
@@ -155,24 +157,20 @@
assertFalse( "Check original comparison", config.equals( origConfig ) );
config.setPreparationGoals( origConfig.getPreparationGoals() );
- config.setReactorProjects( reactorProjects );
+ config.setScmReleaseLabel( other );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- config.setReactorProjects( origConfig.getReactorProjects() );
+ config.setScmReleaseLabel( origConfig.getScmReleaseLabel() );
- config.setSettings( otherSettings );
+ config.setScmTagBase( other );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- config.setSettings( origConfig.getSettings() );
+ config.setScmTagBase( origConfig.getScmTagBase() );
- config.setReleaseLabel( other );
- assertFalse( "Check original comparison", config.equals( origConfig ) );
- config.setReleaseLabel( origConfig.getReleaseLabel() );
-
- config.setTagBase( other );
- assertFalse( "Check original comparison", config.equals( origConfig ) );
- config.setTagBase( origConfig.getTagBase() );
+ if ( otherFile != null )
+ {
+ config.setWorkingDirectory( otherFile.getAbsolutePath() );
+ assertFalse( "Check original comparison", config.equals( origConfig ) );
+ }
- config.setWorkingDirectory( otherFile );
- assertFalse( "Check original comparison", config.equals( origConfig ) );
config.setWorkingDirectory( origConfig.getWorkingDirectory() );
// sanity check the test was resetting correctly
@@ -180,51 +178,51 @@
config.mapDevelopmentVersion( "groupId:artifactId", "1.0-SNAPSHOT" );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- config = copyReleaseConfiguration( origConfig );
+ config = copyReleaseDescriptor( origConfig );
config.mapReleaseVersion( "groupId:artifactId", "1.0" );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- config = copyReleaseConfiguration( origConfig );
+ config = copyReleaseDescriptor( origConfig );
config.mapOriginalScmInfo( "groupId:artifactId", new Scm() );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- config = copyReleaseConfiguration( origConfig );
+ config = copyReleaseDescriptor( origConfig );
config.mapOriginalScmInfo( "groupId:artifactId", new Scm() );
origConfig.mapOriginalScmInfo( "foo", new Scm() );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- origConfig = createReleaseConfiguration();
- config = copyReleaseConfiguration( origConfig );
+ origConfig = createReleaseDescriptor();
+ config = copyReleaseDescriptor( origConfig );
config.mapOriginalScmInfo( "groupId:artifactId", new Scm() );
origConfig.mapOriginalScmInfo( "groupId:artifactId", new Scm() );
assertEquals( "Check original comparison", config, origConfig );
- origConfig = createReleaseConfiguration();
- config = copyReleaseConfiguration( origConfig );
+ origConfig = createReleaseDescriptor();
+ config = copyReleaseDescriptor( origConfig );
config.mapOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) );
origConfig.mapOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) );
assertEquals( "Check original comparison", config, origConfig );
- origConfig = createReleaseConfiguration();
- config = copyReleaseConfiguration( origConfig );
+ origConfig = createReleaseDescriptor();
+ config = copyReleaseDescriptor( origConfig );
config.mapOriginalScmInfo( "groupId:artifactId", getScm( "-", "dev", "url", "tag" ) );
origConfig.mapOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- origConfig = createReleaseConfiguration();
- config = copyReleaseConfiguration( origConfig );
+ origConfig = createReleaseDescriptor();
+ config = copyReleaseDescriptor( origConfig );
config.mapOriginalScmInfo( "groupId:artifactId", getScm( "conn", "-", "url", "tag" ) );
origConfig.mapOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- origConfig = createReleaseConfiguration();
- config = copyReleaseConfiguration( origConfig );
+ origConfig = createReleaseDescriptor();
+ config = copyReleaseDescriptor( origConfig );
config.mapOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "-", "tag" ) );
origConfig.mapOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) );
assertFalse( "Check original comparison", config.equals( origConfig ) );
- origConfig = createReleaseConfiguration();
- config = copyReleaseConfiguration( origConfig );
+ origConfig = createReleaseDescriptor();
+ config = copyReleaseDescriptor( origConfig );
config.mapOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "-" ) );
origConfig.mapOriginalScmInfo( "groupId:artifactId", getScm( "conn", "dev", "url", "tag" ) );
@@ -233,17 +231,15 @@
public void testHashCode()
{
- ReleaseConfiguration releaseConfiguration = createReleaseConfiguration();
- assertEquals( "Check hash code", releaseConfiguration.hashCode(), createReleaseConfiguration(
- releaseConfiguration.getSettings(), releaseConfiguration.getWorkingDirectory(),
- releaseConfiguration.getReactorProjects() ).hashCode() );
+ ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
+
+ assertEquals( "Check hash code", releaseDescriptor.hashCode(),
+ createReleaseDescriptor( releaseDescriptor.getWorkingDirectory() ).hashCode() );
}
- private static ReleaseConfiguration copyReleaseConfiguration( ReleaseConfiguration originalReleaseConfiguration )
+ private static ReleaseDescriptor copyReleaseDescriptor( ReleaseDescriptor originalReleaseDescriptor )
{
- return createReleaseConfiguration( originalReleaseConfiguration.getSettings(),
- originalReleaseConfiguration.getWorkingDirectory(),
- originalReleaseConfiguration.getReactorProjects() );
+ return createReleaseDescriptor( originalReleaseDescriptor.getWorkingDirectory() );
}
private static Scm getScm( String connection, String developerConnection, String url, String tag )
@@ -256,53 +252,47 @@
return scm;
}
- private static ReleaseConfiguration createMergeConfiguration( Settings settings, File workingDirectory,
- String completedPhase )
+ private static ReleaseDescriptor createMergeDescriptor( String workingDirectory, String completedPhase )
{
- ReleaseConfiguration mergeConfiguration = new ReleaseConfiguration();
- mergeConfiguration.setUrl( "scm-url-merge" );
- mergeConfiguration.setCompletedPhase( completedPhase );
- mergeConfiguration.setPassphrase( "passphrase-merge" );
- mergeConfiguration.setPassword( "password-merge" );
- mergeConfiguration.setPrivateKey( "private-key-merge" );
- mergeConfiguration.setSettings( settings );
- mergeConfiguration.setTagBase( "tag-base-merge" );
- mergeConfiguration.setReleaseLabel( "tag-merge" );
- mergeConfiguration.setUsername( "username-merge" );
- mergeConfiguration.setAdditionalArguments( "additional-arguments-merge" );
- mergeConfiguration.setPomFileName( "pom-file-name-merge" );
- mergeConfiguration.setPreparationGoals( "preparation-goals-merge" );
- mergeConfiguration.setWorkingDirectory( workingDirectory );
- return mergeConfiguration;
+ ReleaseDescriptor mergeDescriptor = new ReleaseDescriptor();
+ mergeDescriptor.setScmSourceUrl( "scm-url-merge" );
+ mergeDescriptor.setCompletedPhase( completedPhase );
+ mergeDescriptor.setScmPrivateKeyPassPhrase( "passphrase-merge" );
+ mergeDescriptor.setScmPassword( "password-merge" );
+ mergeDescriptor.setScmPrivateKey( "private-key-merge" );
+ mergeDescriptor.setScmTagBase( "tag-base-merge" );
+ mergeDescriptor.setScmReleaseLabel( "tag-merge" );
+ mergeDescriptor.setScmUsername( "username-merge" );
+ mergeDescriptor.setAdditionalArguments( "additional-arguments-merge" );
+ mergeDescriptor.setPomFileName( "pom-file-name-merge" );
+ mergeDescriptor.setPreparationGoals( "preparation-goals-merge" );
+ mergeDescriptor.setWorkingDirectory( workingDirectory );
+ return mergeDescriptor;
}
- private static ReleaseConfiguration createReleaseConfiguration()
+ private static ReleaseDescriptor createReleaseDescriptor()
{
- Settings settings = new Settings();
File workingDirectory = new File( "." );
- MavenProject project = new MavenProject( new Model() );
- return createReleaseConfiguration( settings, workingDirectory, Collections.singletonList( project ) );
+ return createReleaseDescriptor( workingDirectory.getAbsolutePath() );
}
- private static ReleaseConfiguration createReleaseConfiguration( Settings settings, File workingDirectory,
- List list )
+ private static ReleaseDescriptor createReleaseDescriptor( String workingDirectory )
{
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setUrl( "scm-url" );
- releaseConfiguration.setCompletedPhase( "completed-phase" );
- releaseConfiguration.setPassphrase( "passphrase" );
- releaseConfiguration.setPassword( "password" );
- releaseConfiguration.setPrivateKey( "private-key" );
- releaseConfiguration.setSettings( settings );
- releaseConfiguration.setTagBase( "tag-base" );
- releaseConfiguration.setReleaseLabel( "tag" );
- releaseConfiguration.setUsername( "username" );
- releaseConfiguration.setWorkingDirectory( workingDirectory );
- releaseConfiguration.setAdditionalArguments( "additional-arguments" );
- releaseConfiguration.setPomFileName( "pom-file-name" );
- releaseConfiguration.setPreparationGoals( "preparation-goals" );
- releaseConfiguration.setReactorProjects( list );
- return releaseConfiguration;
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setScmSourceUrl( "scm-url" );
+ releaseDescriptor.setCompletedPhase( "completed-phase" );
+ releaseDescriptor.setScmPrivateKeyPassPhrase( "passphrase" );
+ releaseDescriptor.setScmPassword( "password" );
+ releaseDescriptor.setScmPrivateKey( "private-key" );
+ releaseDescriptor.setScmTagBase( "tag-base" );
+ releaseDescriptor.setScmReleaseLabel( "tag" );
+ releaseDescriptor.setScmUsername( "username" );
+ releaseDescriptor.setWorkingDirectory( workingDirectory );
+ releaseDescriptor.setAdditionalArguments( "additional-arguments" );
+ releaseDescriptor.setPomFileName( "pom-file-name" );
+ releaseDescriptor.setPreparationGoals( "preparation-goals" );
+
+ return releaseDescriptor;
}
}
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=438341&r1=438340&r2=438341&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 21:03:46 2006
@@ -32,7 +32,7 @@
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.ReleaseConfiguration;
+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,6 +70,18 @@
protected ReleasePhase phase;
+ protected List reactorProjects;
+
+ public List getReactorProjects()
+ {
+ return reactorProjects;
+ }
+
+ public void setReactorProjects( List reactorProjects )
+ {
+ this.reactorProjects = reactorProjects;
+ }
+
protected void setUp()
throws Exception
{
@@ -116,7 +128,7 @@
return map;
}
- protected ReleaseConfiguration createConfigurationFromProjects( String path, String subpath, boolean copyFiles )
+ protected ReleaseDescriptor createDescriptorFromProjects( String path, String subpath, boolean copyFiles )
throws Exception
{
File testFile = getTestFile( "target/test-classes/projects/" + path + subpath + "/pom.xml" );
@@ -138,7 +150,7 @@
profileManager.addProfile( profile );
profileManager.activateAsDefault( profile.getId() );
- List projects = new ArrayList();
+ reactorProjects = new ArrayList();
while ( !projectFiles.isEmpty() )
{
File file = (File) projectFiles.pop();
@@ -160,19 +172,19 @@
projectFiles.push( new File( file.getParentFile(), module + "/pom.xml" ) );
}
- projects.add( project );
+ reactorProjects.add( project );
}
- ProjectSorter sorter = new ProjectSorter( projects );
+ ProjectSorter sorter = new ProjectSorter( reactorProjects );
- projects = sorter.getSortedProjects();
+ reactorProjects = sorter.getSortedProjects();
ArtifactFactory artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
ArtifactCollector artifactCollector = (ArtifactCollector) lookup( ArtifactCollector.class.getName() );
ArtifactMetadataSource artifactMetadataSource = (ArtifactMetadataSource) lookup( ArtifactMetadataSource.ROLE );
// pass back over and resolve dependencies - can't be done earlier as the order may not be correct
- for ( Iterator i = projects.iterator(); i.hasNext(); )
+ for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
{
MavenProject project = (MavenProject) i.next();
@@ -195,10 +207,9 @@
project.setArtifacts( result.getArtifacts() );
}
- ReleaseConfiguration releaseConfiguration = new ReleaseConfiguration();
- releaseConfiguration.setReactorProjects( projects );
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- return releaseConfiguration;
+ return releaseDescriptor;
}
protected void setMockScmManager( Mock scmManagerMock )