Index: maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
===================================================================
--- maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java (revision 728739)
+++ maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java (working copy)
@@ -55,7 +55,7 @@
* @author Brett Porter
*/
public class ScmCheckModificationsPhaseTest
- extends PlexusTestCase
+ extends AbstractReleaseTestCase
{
private ReleasePhase phase;
@@ -161,7 +161,7 @@
try
{
- phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
fail( "Status check should have failed" );
}
@@ -172,7 +172,7 @@
try
{
- phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
fail( "Status check should have failed" );
}
@@ -195,7 +195,7 @@
try
{
- phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
fail( "Status check should have failed" );
}
@@ -206,7 +206,7 @@
try
{
- phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
fail( "Status check should have failed" );
}
@@ -223,9 +223,9 @@
setChangedFiles( releaseDescriptor, Collections.EMPTY_LIST );
- phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
- phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -239,9 +239,9 @@
setChangedFiles( releaseDescriptor, Arrays.asList( new String[] { "release.properties", "pom.xml.backup",
"pom.xml.tag", "pom.xml.next" } ) );
- phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
- phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
// successful execution is verification enough
assertTrue( true );
@@ -256,7 +256,7 @@
try
{
- phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
fail( "Status check should have failed" );
}
@@ -267,7 +267,7 @@
try
{
- phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
fail( "Status check should have failed" );
}
@@ -286,7 +286,7 @@
try
{
- phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
fail( "Status check should have failed" );
}
@@ -297,7 +297,7 @@
try
{
- phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
fail( "Status check should have failed" );
}
@@ -317,7 +317,7 @@
try
{
- phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects( "scm-commit/", "single-pom", false ) );
fail( "Status check should have failed" );
}
@@ -328,7 +328,7 @@
try
{
- phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
fail( "Status check should have failed" );
}
@@ -366,4 +366,10 @@
releaseDescriptor.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
return releaseDescriptor;
}
+
+ private List createReactorProjects()
+ throws Exception
+ {
+ return createReactorProjects( "scm-commit/", "single-pom", false );
+ }
}
Index: maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
===================================================================
--- maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java (revision 728739)
+++ maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java (working copy)
@@ -35,6 +35,7 @@
import org.apache.maven.shared.release.config.ReleaseDescriptorStoreStub;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.exec.MavenExecutor;
+import org.apache.maven.shared.release.phase.AbstractReleaseTestCase;
import org.apache.maven.shared.release.phase.IsScmFileSetEquals;
import org.apache.maven.shared.release.phase.ReleasePhase;
import org.apache.maven.shared.release.phase.ReleasePhaseStub;
@@ -59,6 +60,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.ArrayList;
@@ -68,7 +70,7 @@
* @author Brett Porter
*/
public class DefaultReleaseManagerTest
- extends PlexusTestCase
+ extends AbstractReleaseTestCase
{
private ReleaseDescriptorStoreStub configStore;
@@ -414,7 +416,7 @@
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
- releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
assertTrue( true );
}
@@ -432,7 +434,7 @@
ReleaseResult result = new ReleaseResult();
result = releaseManager.performWithResult( releaseDescriptor, new DefaultReleaseEnvironment(),
- new ArrayList(), null );
+ createReactorProjects(), null );
assert( result.getOutput().length() > 0 );
}
@@ -464,7 +466,7 @@
releaseDescriptor.setUseReleaseProfile( false );
- releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
assertTrue( true );
}
@@ -497,7 +499,7 @@
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( (ScmProvider) scmProviderMock.proxy() );
- releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
assertTrue( true );
}
@@ -531,7 +533,7 @@
releaseDescriptor.setUseReleaseProfile( false );
- releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
assertTrue( true );
}
@@ -566,7 +568,7 @@
configStore.getReleaseConfiguration().setCompletedPhase( "end-release" );
releaseManager.setConfigStore( configStore );
- releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), null );
+ releaseManager.perform( releaseDescriptor, new DefaultReleaseEnvironment(), createReactorProjects() );
assertTrue( true );
}
@@ -795,4 +797,10 @@
FileUtils.forceDelete( checkoutDir );
}
+
+ private List createReactorProjects()
+ throws Exception
+{
+ return createReactorProjects( "scm-commit/", "single-pom", false );
}
+}