Author: olamy
Date: Tue Feb 1 13:48:03 2011
New Revision: 1066045
URL: http://svn.apache.org/viewvc?rev=1066045&view=rev
Log:
some cosmetic cleanup (remove some deprecated use)
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java?rev=1066045&r1=1066044&r2=1066045&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
Tue Feb 1 13:48:03 2011
@@ -19,8 +19,6 @@ package org.apache.maven.shared.release.
* under the License.
*/
-import java.util.Arrays;
-
import org.apache.maven.scm.ScmFileSet;
import org.jmock.core.Constraint;
@@ -45,7 +43,7 @@ public class IsScmFileSetEquals
ScmFileSet fs = (ScmFileSet) object;
return fs.getBasedir().equals( fileSet.getBasedir() ) &&
- Arrays.asList( fs.getFiles() ).equals( Arrays.asList(
fileSet.getFiles() ) );
+ fs.getFileList().equals( fileSet.getFileList() );
}
public StringBuffer describeTo( StringBuffer stringBuffer )
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java?rev=1066045&r1=1066044&r2=1066045&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
Tue Feb 1 13:48:03 2011
@@ -22,11 +22,13 @@ package org.apache.maven.shared.release.
import java.io.File;
import java.util.List;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.exec.MavenExecutor;
import org.apache.maven.shared.release.exec.MavenExecutorException;
import org.codehaus.plexus.PlexusTestCase;
@@ -72,9 +74,9 @@ public class RunCompleteGoalsPhaseTest
mock.expects( new InvokeOnceMatcher() ).method( "executeGoals" ).with(
constraints );
- phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+ phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
- phase.execute( config, (Settings) null, (List) null );
+ phase.execute( config, (Settings) null, (List<MavenProject>) null );
// just needs to survive the mock
assertTrue( true );
@@ -94,7 +96,7 @@ public class RunCompleteGoalsPhaseTest
new IsAnything(), new IsEqual( Boolean.TRUE ), new IsAnything(),
new IsAnything()};
mock.expects( new InvokeOnceMatcher() ).method( "executeGoals" ).with(
constraints );
- phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+ phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
phase.simulate( config, new DefaultReleaseEnvironment(), null );
@@ -117,11 +119,11 @@ public class RunCompleteGoalsPhaseTest
mock.expects( new InvokeOnceMatcher() ).method( "executeGoals" ).with(
constraints ).will(
new ThrowStub( new MavenExecutorException( "...", new Exception()
) ) );
- phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+ phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
try
{
- phase.execute( config, (Settings) null, (List) null );
+ phase.execute( config, (Settings) null, (List<MavenProject>) null
);
fail( "Should have thrown an exception" );
}
@@ -145,7 +147,7 @@ public class RunCompleteGoalsPhaseTest
mock.expects( new InvokeOnceMatcher() ).method( "executeGoals" ).with(
constraints ).will(
new ThrowStub( new MavenExecutorException( "...", new Exception()
) ) );
- phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+ phase.setMavenExecutor( ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
try
{
@@ -171,9 +173,9 @@ public class RunCompleteGoalsPhaseTest
Mock mock = new Mock( MavenExecutor.class );
mock.expects( new TestFailureMatcher( "Shouldn't invoke executeGoals"
) ).method( "executeGoals" );
- phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+ phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
- phase.execute( config, (Settings) null, (List) null );
+ phase.execute( config, (Settings) null, (List<MavenProject>) null );
// just needs to survive the mock
assertTrue( true );
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java?rev=1066045&r1=1066044&r2=1066045&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
Tue Feb 1 13:48:03 2011
@@ -4,6 +4,7 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.settings.Settings;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.exec.MavenExecutor;
import org.apache.maven.shared.release.exec.MavenExecutorException;
import org.codehaus.plexus.PlexusTestCase;
@@ -57,7 +58,7 @@ public class RunPerformGoalsPhaseTest
mock.expects( new InvokeOnceMatcher() ).method( "executeGoals" ).with(
constraints ).will(
new ThrowStub( new MavenExecutorException( "...", new Exception()
) ) );
- phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+ phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
try
{
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java?rev=1066045&r1=1066044&r2=1066045&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java
Tue Feb 1 13:48:03 2011
@@ -25,6 +25,7 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.exec.MavenExecutor;
import org.apache.maven.shared.release.exec.MavenExecutorException;
import org.codehaus.plexus.PlexusTestCase;
@@ -73,7 +74,7 @@ public class RunPrepareGoalsPhaseTest
mock.expects( new InvokeOnceMatcher() ).method( "executeGoals" ).with(
constraints );
- phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+ phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
phase.execute( config, (Settings) null, (List<MavenProject>) null );
@@ -95,7 +96,7 @@ public class RunPrepareGoalsPhaseTest
new IsAnything(), new IsEqual( Boolean.TRUE ), new IsAnything(),
new IsAnything()};
mock.expects( new InvokeOnceMatcher() ).method( "executeGoals" ).with(
constraints );
- phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+ phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
phase.simulate( config, new DefaultReleaseEnvironment(), null );
@@ -103,6 +104,7 @@ public class RunPrepareGoalsPhaseTest
assertTrue( true );
}
+ @SuppressWarnings("deprecation")
public void testExecuteException()
throws ReleaseFailureException
{
@@ -146,7 +148,7 @@ public class RunPrepareGoalsPhaseTest
mock.expects( new InvokeOnceMatcher() ).method( "executeGoals" ).with(
constraints ).will(
new ThrowStub( new MavenExecutorException( "...", new Exception()
) ) );
- phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+ phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
try
{
@@ -172,7 +174,7 @@ public class RunPrepareGoalsPhaseTest
Mock mock = new Mock( MavenExecutor.class );
mock.expects( new TestFailureMatcher( "Shouldn't invoke executeGoals"
) ).method( "executeGoals" );
- phase.setMavenExecutor( (MavenExecutor) mock.proxy() );
+ phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID,
(MavenExecutor) mock.proxy() );
phase.execute( config, (Settings) null, (List<MavenProject>) null );
