You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/05/21 08:40:38 UTC
svn commit: r1744874 [2/2] - in
/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release:
./ phase/
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=1744874&r1=1744873&r2=1744874&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 Sat May 21 08:40:38 2016
@@ -19,6 +19,8 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
import static org.mockito.Matchers.isNull;
@@ -32,24 +34,25 @@ import java.util.List;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
+import org.apache.maven.shared.release.PlexusJUnit4TestCase;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
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;
+import org.junit.Test;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
public class RunPerformGoalsPhaseTest
- extends PlexusTestCase
+ extends PlexusJUnit4TestCase
{
private RunPerformGoalsPhase phase;
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
@@ -57,6 +60,7 @@ public class RunPerformGoalsPhaseTest
phase = (RunPerformGoalsPhase) lookup( ReleasePhase.ROLE, "run-perform-goals" );
}
+ @Test
public void testExecuteException()
throws Exception
{
@@ -102,6 +106,7 @@ public class RunPerformGoalsPhaseTest
verifyNoMoreInteractions( mock );
}
+ @Test
public void testCustomPomFile() throws Exception
{
//prepare
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=1744874&r1=1744873&r2=1744874&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 Sat May 21 08:40:38 2016
@@ -19,6 +19,8 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
import static org.mockito.Matchers.isNull;
@@ -32,6 +34,7 @@ import java.util.List;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
+import org.apache.maven.shared.release.PlexusJUnit4TestCase;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.ReleaseResult;
@@ -40,7 +43,7 @@ import org.apache.maven.shared.release.e
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;
+import org.junit.Test;
/**
* Test the simple test running phase.
@@ -48,11 +51,11 @@ import org.codehaus.plexus.PlexusTestCas
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
public class RunPrepareGoalsPhaseTest
- extends PlexusTestCase
+ extends PlexusJUnit4TestCase
{
private RunPrepareGoalsPhase phase;
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
@@ -60,6 +63,7 @@ public class RunPrepareGoalsPhaseTest
phase = (RunPrepareGoalsPhase) lookup( ReleasePhase.ROLE, "run-preparation-goals" );
}
+ @Test
public void testExecute()
throws ReleaseExecutionException, ReleaseFailureException, MavenExecutorException
{
@@ -72,22 +76,19 @@ public class RunPrepareGoalsPhaseTest
MavenExecutor mock = mock( MavenExecutor.class );
- phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID, mock );
+ phase.setMavenExecutor( ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID, mock );
// execute
phase.execute( config, (Settings) null, (List<MavenProject>) null );
// verify
- verify( mock ).executeGoals( eq( testFile ),
- eq( "clean integration-test" ),
- isA( ReleaseEnvironment.class),
- eq( true),
- isNull( String.class ),
- isNull( String.class ),
+ verify( mock ).executeGoals( eq( testFile ), eq( "clean integration-test" ), isA( ReleaseEnvironment.class ),
+ eq( true ), isNull( String.class ), isNull( String.class ),
isA( ReleaseResult.class ) );
verifyNoMoreInteractions( mock );
}
+ @Test
public void testSimulate()
throws ReleaseExecutionException, MavenExecutorException
{
@@ -100,22 +101,19 @@ public class RunPrepareGoalsPhaseTest
MavenExecutor mock = mock( MavenExecutor.class );
- phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID, (MavenExecutor) mock );
+ phase.setMavenExecutor( ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID, (MavenExecutor) mock );
// execute
phase.simulate( config, new DefaultReleaseEnvironment(), null );
// verify
- verify( mock ).executeGoals( eq( testFile ),
- eq( "clean integration-test" ),
- isA( ReleaseEnvironment.class),
- eq( true),
- isNull( String.class ),
- isNull( String.class ),
+ verify( mock ).executeGoals( eq( testFile ), eq( "clean integration-test" ), isA( ReleaseEnvironment.class ),
+ eq( true ), isNull( String.class ), isNull( String.class ),
isA( ReleaseResult.class ) );
verifyNoMoreInteractions( mock );
}
+ @Test
public void testExecuteException()
throws ReleaseFailureException, MavenExecutorException
{
@@ -127,13 +125,14 @@ public class RunPrepareGoalsPhaseTest
config.setWorkingDirectory( testFile.getAbsolutePath() );
MavenExecutor mock = mock( MavenExecutor.class );
- doThrow( new MavenExecutorException( "...", new Exception() ) ).when( mock ).executeGoals( eq( testFile ),
- eq( "clean integration-test" ),
- isA( ReleaseEnvironment.class ),
- eq( true ),
- isNull( String.class ),
- isNull( String.class ),
- isA( ReleaseResult.class ) );
+ doThrow( new MavenExecutorException( "...",
+ new Exception() ) ).when( mock ).executeGoals( eq( testFile ),
+ eq( "clean integration-test" ),
+ isA( ReleaseEnvironment.class ),
+ eq( true ),
+ isNull( String.class ),
+ isNull( String.class ),
+ isA( ReleaseResult.class ) );
phase.setMavenExecutor( ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID, mock );
@@ -148,19 +147,17 @@ public class RunPrepareGoalsPhaseTest
{
assertEquals( "Check cause", MavenExecutorException.class, e.getCause().getClass() );
}
-
+
// verify
- verify( mock ).executeGoals( eq( testFile ),
- eq( "clean integration-test" ),
- isA( ReleaseEnvironment.class ),
- eq( true ),
- isNull( String.class ),
- isNull( String.class ),
+ verify( mock ).executeGoals( eq( testFile ), eq( "clean integration-test" ), isA( ReleaseEnvironment.class ),
+ eq( true ), isNull( String.class ), isNull( String.class ),
isA( ReleaseResult.class ) );
verifyNoMoreInteractions( mock );
}
- public void testSimulateException() throws MavenExecutorException
+ @Test
+ public void testSimulateException()
+ throws MavenExecutorException
{
// prepare
File testFile = getTestFile( "target/working-directory" );
@@ -170,13 +167,14 @@ public class RunPrepareGoalsPhaseTest
config.setWorkingDirectory( testFile.getAbsolutePath() );
MavenExecutor mock = mock( MavenExecutor.class );
- doThrow( new MavenExecutorException( "...", new Exception() ) ).when( mock ).executeGoals( eq( testFile ),
- eq( "clean integration-test" ),
- isA( ReleaseEnvironment.class ),
- eq( true ),
- isNull( String.class ),
- isNull( String.class ),
- isA( ReleaseResult.class ) );
+ doThrow( new MavenExecutorException( "...",
+ new Exception() ) ).when( mock ).executeGoals( eq( testFile ),
+ eq( "clean integration-test" ),
+ isA( ReleaseEnvironment.class ),
+ eq( true ),
+ isNull( String.class ),
+ isNull( String.class ),
+ isA( ReleaseResult.class ) );
phase.setMavenExecutor( ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID, mock );
@@ -191,19 +189,16 @@ public class RunPrepareGoalsPhaseTest
{
assertEquals( "Check cause", MavenExecutorException.class, e.getCause().getClass() );
}
-
+
// verify
- verify( mock ).executeGoals( eq( testFile ),
- eq( "clean integration-test" ),
- isA( ReleaseEnvironment.class ),
- eq( true ),
- isNull( String.class ),
- isNull( String.class ),
+ verify( mock ).executeGoals( eq( testFile ), eq( "clean integration-test" ), isA( ReleaseEnvironment.class ),
+ eq( true ), isNull( String.class ), isNull( String.class ),
isA( ReleaseResult.class ) );
verifyNoMoreInteractions( mock );
-
+
}
+ @Test
public void testEmptyGoals()
throws Exception
{
@@ -216,7 +211,7 @@ public class RunPrepareGoalsPhaseTest
MavenExecutor mock = mock( MavenExecutor.class );
- phase.setMavenExecutor(ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID, mock );
+ phase.setMavenExecutor( ReleaseEnvironment.DEFAULT_MAVEN_EXECUTOR_ID, mock );
// execute
phase.execute( config, (Settings) null, (List<MavenProject>) null );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java?rev=1744874&r1=1744873&r2=1744874&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java Sat May 21 08:40:38 2016
@@ -19,6 +19,10 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.mock;
@@ -45,6 +49,7 @@ import org.apache.maven.scm.provider.Scm
import org.apache.maven.scm.provider.ScmProviderStub;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
+import org.apache.maven.shared.release.PlexusJUnit4TestCase;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.ReleaseResult;
@@ -53,7 +58,7 @@ import org.apache.maven.shared.release.e
import org.apache.maven.shared.release.scm.DefaultScmRepositoryConfigurator;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
-import org.codehaus.plexus.PlexusTestCase;
+import org.junit.Test;
import org.mockito.internal.util.reflection.Whitebox;
/**
@@ -62,11 +67,11 @@ import org.mockito.internal.util.reflect
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
public class ScmCheckModificationsPhaseTest
- extends PlexusTestCase
+ extends PlexusJUnit4TestCase
{
private ReleasePhase phase;
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
@@ -74,6 +79,7 @@ public class ScmCheckModificationsPhaseT
phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "scm-check-modifications" );
}
+ @Test
public void testNoSuchScmProviderExceptionThrown()
throws Exception
{
@@ -111,12 +117,13 @@ public class ScmCheckModificationsPhaseT
{
assertEquals( "check cause", NoSuchScmProviderException.class, e.getCause().getClass() );
}
-
+
// verify
verify( scmManagerMock, times( 2 ) ).makeScmRepository( eq( "scm-url" ) );
verifyNoMoreInteractions( scmManagerMock );
}
+ @Test
public void testScmRepositoryExceptionThrown()
throws Exception
{
@@ -154,12 +161,13 @@ public class ScmCheckModificationsPhaseT
{
assertNull( "Check no additional cause", e.getCause() );
}
-
+
// verify
verify( scmManagerMock, times( 2 ) ).makeScmRepository( eq( "scm-url" ) );
verifyNoMoreInteractions( scmManagerMock );
}
+ @Test
public void testScmExceptionThrown()
throws Exception
{
@@ -169,7 +177,8 @@ public class ScmCheckModificationsPhaseT
releaseDescriptor.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
ScmProvider scmProviderMock = mock( ScmProvider.class );
- when( scmProviderMock.status( isA( ScmRepository.class ), isA( ScmFileSet.class ) ) ).thenThrow( new ScmException( "..." ) );
+ when( scmProviderMock.status( isA( ScmRepository.class ),
+ isA( ScmFileSet.class ) ) ).thenThrow( new ScmException( "..." ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( scmProviderMock );
@@ -196,12 +205,13 @@ public class ScmCheckModificationsPhaseT
{
assertEquals( "check cause", ScmException.class, e.getCause().getClass() );
}
-
+
// verify
verify( scmProviderMock, times( 2 ) ).status( isA( ScmRepository.class ), isA( ScmFileSet.class ) );
verifyNoMoreInteractions( scmProviderMock );
}
+ @Test
public void testScmResultFailure()
throws Exception
{
@@ -236,6 +246,7 @@ public class ScmCheckModificationsPhaseT
}
}
+ @Test
public void testNoModifications()
throws Exception
{
@@ -251,13 +262,14 @@ public class ScmCheckModificationsPhaseT
assertTrue( true );
}
+ @Test
public void testModificationsToExcludedFilesOnly()
throws Exception
{
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- setChangedFiles( releaseDescriptor, Arrays.asList( "release.properties", "pom.xml.backup",
- "pom.xml.tag", "pom.xml.next" ) );
+ setChangedFiles( releaseDescriptor,
+ Arrays.asList( "release.properties", "pom.xml.backup", "pom.xml.tag", "pom.xml.next" ) );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null );
@@ -266,23 +278,28 @@ public class ScmCheckModificationsPhaseT
// successful execution is verification enough
assertTrue( true );
}
-
+
// MRELEASE-645: Allow File/Directory Patterns for the checkModificationExcludes Option
+ @Test
public void testModificationsToCustomExcludedFilesOnly()
throws Exception
{
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
-
+
releaseDescriptor.setCheckModificationExcludes( Collections.singletonList( "**/keep.me" ) );
-
- setChangedFiles( releaseDescriptor, Arrays.asList( "release.properties", "pom.xml.backup",
- "pom.xml.tag", "pom.xml.next", "keep.me", "src/app/keep.me", "config\\keep.me" ) );
-
- assertEquals( ReleaseResult.SUCCESS, phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
-
- assertEquals( ReleaseResult.SUCCESS, phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
+
+ setChangedFiles( releaseDescriptor,
+ Arrays.asList( "release.properties", "pom.xml.backup", "pom.xml.tag", "pom.xml.next",
+ "keep.me", "src/app/keep.me", "config\\keep.me" ) );
+
+ assertEquals( ReleaseResult.SUCCESS,
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
+
+ assertEquals( ReleaseResult.SUCCESS,
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
}
+ @Test
public void testModificationsToPoms()
throws Exception
{
@@ -313,6 +330,7 @@ public class ScmCheckModificationsPhaseT
}
}
+ @Test
public void testModificationsToIncludedFilesOnly()
throws Exception
{
@@ -343,13 +361,14 @@ public class ScmCheckModificationsPhaseT
}
}
+ @Test
public void testModificationsToIncludedAndExcludedFiles()
throws Exception
{
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- setChangedFiles( releaseDescriptor, Arrays.asList( "release.properties", "pom.xml.backup",
- "pom.xml.tag", "pom.xml.release", "something.txt" ) );
+ setChangedFiles( releaseDescriptor, Arrays.asList( "release.properties", "pom.xml.backup", "pom.xml.tag",
+ "pom.xml.release", "something.txt" ) );
try
{
@@ -373,7 +392,8 @@ public class ScmCheckModificationsPhaseT
assertTrue( true );
}
}
-
+
+ @Test
public void testModificationsToAdditionalExcludedFiles()
throws Exception
{
@@ -382,23 +402,29 @@ public class ScmCheckModificationsPhaseT
setChangedFiles( releaseDescriptor, Collections.singletonList( "something.txt" ) );
- assertEquals( ReleaseResult.SUCCESS, phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
-
- assertEquals( ReleaseResult.SUCCESS, phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
+ assertEquals( ReleaseResult.SUCCESS,
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
+
+ assertEquals( ReleaseResult.SUCCESS,
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
}
// MRELEASE-775
- public void testMultipleExclusionPatternMatch() throws Exception
+ @Test
+ public void testMultipleExclusionPatternMatch()
+ throws Exception
{
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
-
+
releaseDescriptor.setCheckModificationExcludes( Collections.singletonList( "release.properties" ) );
-
+
setChangedFiles( releaseDescriptor, Arrays.asList( "release.properties" ) );
-
- assertEquals( ReleaseResult.SUCCESS, phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
-
- assertEquals( ReleaseResult.SUCCESS, phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
+
+ assertEquals( ReleaseResult.SUCCESS,
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
+
+ assertEquals( ReleaseResult.SUCCESS,
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), null ).getResultCode() );
}
private void setChangedFiles( ReleaseDescriptor releaseDescriptor, List<String> changedFiles )