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 09:08:48 UTC
svn commit: r1744879 [1/2] -
/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/
Author: rfscholte
Date: Sat May 21 09:08:48 2016
New Revision: 1744879
URL: http://svn.apache.org/viewvc?rev=1744879&view=rev
Log:
Migrate all PhaseTests to PlexusJUnit4TestCase
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java?rev=1744879&r1=1744878&r2=1744879&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java Sat May 21 09:08:48 2016
@@ -64,7 +64,7 @@ public abstract class AbstractBackupPoms
reactorProjects.add( mainProject );
- for( Iterator modules = mainProject.getModel().getModules().iterator(); modules.hasNext(); )
+ for ( Iterator modules = mainProject.getModel().getModules().iterator(); modules.hasNext(); )
{
String module = modules.next().toString();
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java?rev=1744879&r1=1744878&r2=1744879&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java Sat May 21 09:08:48 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.isA;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -41,6 +45,7 @@ import org.apache.maven.shared.release.c
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.scm.DefaultScmRepositoryConfigurator;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
+import org.junit.Test;
import org.mockito.internal.util.reflection.Whitebox;
/**
@@ -51,6 +56,7 @@ import org.mockito.internal.util.reflect
public abstract class AbstractEditModeRewritingReleasePhaseTestCase
extends AbstractRewritingReleasePhaseTestCase
{
+ @Test
public void testRewriteBasicPomWithEditMode()
throws Exception
{
@@ -64,6 +70,7 @@ public abstract class AbstractEditModeRe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteBasicPomWithEditModeFailure()
throws Exception
{
@@ -92,6 +99,7 @@ public abstract class AbstractEditModeRe
}
}
+ @Test
public void testRewriteBasicPomWithEditModeException()
throws Exception
{
@@ -102,7 +110,8 @@ public abstract class AbstractEditModeRe
mapNextVersion( config, "groupId:artifactId" );
ScmProvider scmProviderMock = mock( ScmProvider.class );
- when( scmProviderMock.edit( isA( ScmRepository.class ), isA( ScmFileSet.class) ) ).thenThrow( new ScmException( "..." ) );
+ when( scmProviderMock.edit( isA( ScmRepository.class ),
+ isA( ScmFileSet.class ) ) ).thenThrow( new ScmException( "..." ) );
ScmManagerStub scmManager = new ScmManagerStub();
DefaultScmRepositoryConfigurator configurator =
@@ -126,6 +135,7 @@ public abstract class AbstractEditModeRe
verifyNoMoreInteractions( scmProviderMock );
}
+ @Test
public void testRewritePomPluginDependencies()
throws Exception
{
@@ -137,6 +147,7 @@ public abstract class AbstractEditModeRe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomUnmappedPluginDependencies()
throws Exception
{
@@ -155,6 +166,7 @@ public abstract class AbstractEditModeRe
}
}
+ @Test
public void testRewritePomProfile()
throws Exception
{
@@ -166,6 +178,7 @@ public abstract class AbstractEditModeRe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomUnmappedProfile()
throws Exception
{
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java?rev=1744879&r1=1744878&r2=1744879&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java Sat May 21 09:08:48 2016
@@ -19,6 +19,8 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.io.IOException;
import java.io.Reader;
@@ -54,8 +56,8 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectSorter;
+import org.apache.maven.shared.release.PlexusJUnit4TestCase;
import org.apache.maven.shared.release.util.ReleaseUtil;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.context.DefaultContext;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
@@ -77,7 +79,7 @@ import org.xml.sax.SAXException;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
public abstract class AbstractReleaseTestCase
- extends PlexusTestCase
+ extends PlexusJUnit4TestCase
{
protected MavenProjectBuilder projectBuilder;
@@ -94,7 +96,7 @@ public abstract class AbstractReleaseTes
}
};
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
@@ -106,7 +108,7 @@ public abstract class AbstractReleaseTes
localRepository = new DefaultArtifactRepository( "local", "file://" + localRepoPath, layout );
}
- protected void tearDown()
+ public void tearDown()
throws Exception
{
// unhook circular references to the container that would avoid memory being cleaned up
@@ -124,10 +126,8 @@ public abstract class AbstractReleaseTes
if ( dependencyManagement != null && dependencyManagement.getDependencies() != null )
{
map = new HashMap<String,Artifact>();
- for ( Iterator i = dependencyManagement.getDependencies().iterator(); i.hasNext(); )
+ for ( Dependency d : dependencyManagement.getDependencies() )
{
- Dependency d = (Dependency) i.next();
-
try
{
VersionRange versionRange = VersionRange.createFromVersionSpec( d.getVersion() );
@@ -211,16 +211,14 @@ public abstract class AbstractReleaseTes
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 = reactorProjects.iterator(); i.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = (MavenProject) i.next();
-
project.setRemoteArtifactRepositories( repos );
project.setPluginArtifactRepositories( repos );
Artifact projectArtifact = project.getArtifact();
- Map managedVersions = createManagedVersionMap(
+ Map<String, Artifact> managedVersions = createManagedVersionMap(
ArtifactUtils.versionlessKey( projectArtifact.getGroupId(), projectArtifact.getArtifactId() ),
project.getDependencyManagement(), artifactFactory );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java?rev=1744879&r1=1744878&r2=1744879&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java Sat May 21 09:08:48 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.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -43,6 +47,7 @@ import org.apache.maven.shared.release.s
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.junit.Test;
import org.mockito.internal.util.reflection.Whitebox;
/**
@@ -53,6 +58,7 @@ import org.mockito.internal.util.reflect
public abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTestCase
{
+ @Test
public void testRewriteBasicPom()
throws Exception
{
@@ -65,6 +71,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteBasicPomEntities()
throws Exception
{
@@ -77,6 +84,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteBasicPomNamespace()
throws Exception
{
@@ -89,6 +97,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteBasicPomWithEncoding()
throws Exception
{
@@ -101,6 +110,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomWithParent()
throws Exception
{
@@ -112,6 +122,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomWithUnmappedParent()
throws Exception
{
@@ -137,6 +148,7 @@ public abstract class AbstractRewritingR
}
}
+ @Test
public void testRewritePomWithReleasedParent()
throws Exception
{
@@ -155,6 +167,7 @@ public abstract class AbstractRewritingR
protected abstract void mapAlternateNextVersion( ReleaseDescriptor config, String projectId );
+ @Test
public void testRewritePomWithInheritedVersion()
throws Exception
{
@@ -166,6 +179,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomWithChangedInheritedVersion()
throws Exception
{
@@ -181,6 +195,7 @@ public abstract class AbstractRewritingR
protected abstract ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List<MavenProject> reactorProjects )
throws Exception;
+ @Test
public void testRewritePomDependencies()
throws Exception
{
@@ -193,6 +208,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomUnmappedDependencies()
throws Exception
{
@@ -211,6 +227,7 @@ public abstract class AbstractRewritingR
}
}
+ @Test
public void testRewritePomDependenciesDifferentVersion()
throws Exception
{
@@ -222,6 +239,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteManagedPomDependencies()
throws Exception
{
@@ -233,6 +251,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteManagedPomUnmappedDependencies()
throws Exception
{
@@ -251,6 +270,7 @@ public abstract class AbstractRewritingR
}
}
+ @Test
public void testRewritePomPlugins()
throws Exception
{
@@ -262,6 +282,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomUnmappedPlugins()
throws Exception
{
@@ -280,6 +301,7 @@ public abstract class AbstractRewritingR
}
}
+ @Test
public void testRewritePomPluginsDifferentVersion()
throws Exception
{
@@ -291,6 +313,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteManagedPomPlugins()
throws Exception
{
@@ -302,6 +325,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteManagedPomUnmappedPlugins()
throws Exception
{
@@ -320,6 +344,7 @@ public abstract class AbstractRewritingR
}
}
+ @Test
public void testRewritePomReportPlugins()
throws Exception
{
@@ -331,6 +356,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomUnmappedReportPlugins()
throws Exception
{
@@ -349,6 +375,7 @@ public abstract class AbstractRewritingR
}
}
+ @Test
public void testRewritePomReportPluginsDifferentVersion()
throws Exception
{
@@ -360,6 +387,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomExtension()
throws Exception
{
@@ -371,6 +399,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomUnmappedExtension()
throws Exception
{
@@ -389,6 +418,7 @@ public abstract class AbstractRewritingR
}
}
+ @Test
public void testRewritePomExtensionDifferentVersion()
throws Exception
{
@@ -400,6 +430,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomExtensionUndefinedVersion()
throws Exception
{
@@ -411,6 +442,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteAddSchema()
throws Exception
{
@@ -430,11 +462,12 @@ public abstract class AbstractRewritingR
comparePomFiles( reactorProjects, "-with-schema" );
copyFiles = false;
-
+
verifyReactorProjects( path, copyFiles );
}
}
+ @Test
public void testSimulateRewriteEditModeSkipped()
throws Exception
{
@@ -453,12 +486,13 @@ public abstract class AbstractRewritingR
scmManager.setScmProvider( scmProviderMock );
// execute
- phase.simulate( config, new DefaultReleaseEnvironment(), reactorProjects );
+ phase.simulate( config, new DefaultReleaseEnvironment(), reactorProjects );
// verify
verifyNoMoreInteractions( scmProviderMock );
}
+ @Test
public void testRewriteUnmappedPom()
throws Exception
{
@@ -477,6 +511,7 @@ public abstract class AbstractRewritingR
}
}
+ @Test
public void testRewriteBasicPomWithScmRepoException()
throws Exception
{
@@ -503,11 +538,12 @@ public abstract class AbstractRewritingR
{
assertNull( "Check no additional cause", e.getCause() );
}
-
+
verify( scmManagerMock ).makeScmRepository( config.getScmSourceUrl() );
verifyNoMoreInteractions( scmManagerMock );
}
+ @Test
public void testRewriteBasicPomWithNoSuchProviderException()
throws Exception
{
@@ -535,12 +571,13 @@ public abstract class AbstractRewritingR
{
assertEquals( "Check cause", NoSuchScmProviderException.class, e.getCause().getClass() );
}
-
+
// verify
verify( scmManagerMock ).makeScmRepository( config.getScmSourceUrl() );
verifyNoMoreInteractions( scmManagerMock );
}
+ @Test
public void testRewriteWhitespaceAroundValues()
throws Exception
{
@@ -553,6 +590,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteCommentsAroundValues()
throws Exception
{
@@ -565,6 +603,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteCDataAroundValues()
throws Exception
{
@@ -577,6 +616,7 @@ public abstract class AbstractRewritingR
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testCleanNoProjects()
throws Exception
{
@@ -657,6 +697,7 @@ public abstract class AbstractRewritingR
protected abstract String readTestProjectFile( String fileName )
throws IOException;
+ @Test
public void testRewritePomDependenciesWithNamespace()
throws Exception
{
@@ -670,8 +711,9 @@ public abstract class AbstractRewritingR
protected abstract List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
throws Exception;
-
- protected void verifyReactorProjects( String path, boolean copyFiles ) throws Exception
+
+ protected void verifyReactorProjects( String path, boolean copyFiles )
+ throws Exception
{
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java?rev=1744879&r1=1744878&r2=1744879&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java Sat May 21 09:08:48 2016
@@ -19,6 +19,20 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
@@ -26,12 +40,7 @@ import org.apache.maven.shared.release.c
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
-import static org.mockito.Mockito.*;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import org.junit.Test;
/**
* Test the dependency snapshot check phase.
@@ -51,7 +60,7 @@ public class CheckDependencySnapshotsPha
private static final List<String> CHOICE_ARRAY = Arrays.asList( "0", DEFAULT_CHOICE, "2", "3" );
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
@@ -59,6 +68,7 @@ public class CheckDependencySnapshotsPha
phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
}
+ @Test
public void testNoSnapshotDependencies()
throws Exception
{
@@ -73,6 +83,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testNoSnapshotRangeDependencies()
throws Exception
{
@@ -93,7 +104,8 @@ public class CheckDependencySnapshotsPha
// successful execution is verification enough
assertTrue( true );
}
-
+
+ @Test
public void testSnapshotDependenciesInProjectOnly()
throws Exception
{
@@ -108,6 +120,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotReleasePluginNonInteractive()
throws Exception
{
@@ -138,6 +151,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotReleasePluginInteractiveDeclined()
throws Exception
{
@@ -174,6 +188,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotReleasePluginInteractiveAcceptedForExecution()
throws Exception
{
@@ -190,6 +205,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotReleasePluginInteractiveAcceptedForSimulation()
throws Exception
{
@@ -206,6 +222,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotReleasePluginInteractiveInvalid()
throws Exception
{
@@ -242,6 +259,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotReleasePluginInteractiveException()
throws Exception
{
@@ -252,8 +270,8 @@ public class CheckDependencySnapshotsPha
List<MavenProject> reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
Prompter mockPrompter = mock( Prompter.class );
- when( mockPrompter.prompt( anyString(), eq( YES_NO_ARRAY ), eq( NO ) ) ).thenThrow( new PrompterException(
- "..." ) );
+ when( mockPrompter.prompt( anyString(), eq( YES_NO_ARRAY ),
+ eq( NO ) ) ).thenThrow( new PrompterException( "..." ) );
phase.setPrompter( mockPrompter );
try
@@ -268,8 +286,8 @@ public class CheckDependencySnapshotsPha
}
mockPrompter = mock( Prompter.class );
- when( mockPrompter.prompt( anyString(), eq( YES_NO_ARRAY ), eq( NO ) ) ).thenThrow( new PrompterException(
- "..." ) );
+ when( mockPrompter.prompt( anyString(), eq( YES_NO_ARRAY ),
+ eq( NO ) ) ).thenThrow( new PrompterException( "..." ) );
try
{
@@ -283,6 +301,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotDependenciesInProjectOnlyMismatchedVersion()
throws Exception
{
@@ -319,6 +338,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotManagedDependenciesInProjectOnly()
throws Exception
{
@@ -333,11 +353,13 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotUnusedInternalManagedDependency()
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List<MavenProject> reactorProjects = createDescriptorFromProjects( "unused-internal-managed-snapshot-dependency" );
+ List<MavenProject> reactorProjects =
+ createDescriptorFromProjects( "unused-internal-managed-snapshot-dependency" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -347,11 +369,13 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotUnusedExternalManagedDependency()
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List<MavenProject> reactorProjects = createDescriptorFromProjects( "unused-external-managed-snapshot-dependency" );
+ List<MavenProject> reactorProjects =
+ createDescriptorFromProjects( "unused-external-managed-snapshot-dependency" );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -361,6 +385,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotExternalManagedDependency()
throws Exception
{
@@ -392,6 +417,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotDependenciesOutsideProjectOnlyNonInteractive()
throws Exception
{
@@ -423,6 +449,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testRangeSnapshotDependenciesOutsideProjectOnlyNonInteractive()
throws Exception
{
@@ -454,6 +481,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotDependenciesOutsideProjectOnlyInteractiveWithSnapshotsResolved()
throws Exception
{
@@ -476,7 +504,7 @@ public class CheckDependencySnapshotsPha
}
// validate
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings( "rawtypes" )
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId" );
assertNotNull( versionsMap );
@@ -497,6 +525,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotDependenciesSelectOlderRelease()
throws Exception
{
@@ -519,7 +548,7 @@ public class CheckDependencySnapshotsPha
}
// validate
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings( "rawtypes" )
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId" );
assertNotNull( versionsMap );
@@ -527,6 +556,7 @@ public class CheckDependencySnapshotsPha
assertEquals( "0.9", versionsMap.get( ReleaseDescriptor.RELEASE_KEY ) );
}
+ @Test
public void testSnapshotDependenciesSelectDefaults()
throws Exception
{
@@ -548,7 +578,7 @@ public class CheckDependencySnapshotsPha
}
// validate
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings( "rawtypes" )
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId" );
assertNotNull( versionsMap );
@@ -556,6 +586,7 @@ public class CheckDependencySnapshotsPha
assertEquals( "1.0", versionsMap.get( ReleaseDescriptor.RELEASE_KEY ) );
}
+ @Test
public void testSnapshotDependenciesUpdateAllOnlyDependenciesNeeded()
throws Exception
{
@@ -577,7 +608,7 @@ public class CheckDependencySnapshotsPha
}
// validate
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings( "rawtypes" )
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId" );
assertNotNull( versionsMap );
@@ -585,7 +616,7 @@ public class CheckDependencySnapshotsPha
assertEquals( "1.0", versionsMap.get( ReleaseDescriptor.RELEASE_KEY ) );
}
-
+ @Test
public void testSnapshotDependenciesUpdateAll()
throws Exception
{
@@ -595,10 +626,10 @@ public class CheckDependencySnapshotsPha
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-all" );
- Prompter mockPrompter = createMockPrompter( YES, "0", Arrays.asList( new VersionPair( "1.0", "1.0" ),
- new VersionPair( "1.1", "1.1" ),
- new VersionPair( "1.2", "1.2" ),
- new VersionPair( "1.3", "1.3" ) ) );
+ Prompter mockPrompter =
+ createMockPrompter( YES, "0",
+ Arrays.asList( new VersionPair( "1.0", "1.0" ), new VersionPair( "1.1", "1.1" ),
+ new VersionPair( "1.2", "1.2" ), new VersionPair( "1.3", "1.3" ) ) );
phase.setPrompter( mockPrompter );
try
@@ -611,7 +642,7 @@ public class CheckDependencySnapshotsPha
}
// validate
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings( "rawtypes" )
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId" );
assertNotNull( versionsMap );
@@ -620,6 +651,7 @@ public class CheckDependencySnapshotsPha
}
// MRELEASE-589
+ @Test
public void testSnapshotDependenciesOutsideMultimoduleProjectOnlyInteractiveWithSnapshotsResolved()
throws Exception
{
@@ -627,12 +659,13 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List<MavenProject> reactorProjects = createDescriptorFromProjects( "multimodule-external-snapshot-dependencies" );
+ List<MavenProject> reactorProjects =
+ createDescriptorFromProjects( "multimodule-external-snapshot-dependencies" );
VersionPair pair = new VersionPair( "1.0", "1.1-SNAPSHOT" );
VersionPair defaultPair = new VersionPair( "1.0", "1.0" );
- Prompter mockPrompter = createMockPrompter( "yes", "1", Arrays.asList( pair, pair ), Arrays.asList( defaultPair,
- defaultPair ) );
+ Prompter mockPrompter =
+ createMockPrompter( "yes", "1", Arrays.asList( pair, pair ), Arrays.asList( defaultPair, defaultPair ) );
phase.setPrompter( mockPrompter );
try
@@ -644,16 +677,16 @@ public class CheckDependencySnapshotsPha
fail( e.getMessage() );
}
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings( "rawtypes" )
Map resolvedDependencies = releaseDescriptor.getResolvedSnapshotDependencies();
assertNotNull( resolvedDependencies );
assertEquals( 2, resolvedDependencies.size() );
assertTrue( resolvedDependencies.containsKey( "external:artifactId" ) );
- assertTrue( resolvedDependencies.containsKey( "external:artifactId2") );
+ assertTrue( resolvedDependencies.containsKey( "external:artifactId2" ) );
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings( "rawtypes" )
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "external:artifactId" );
assertNotNull( versionsMap );
@@ -667,6 +700,7 @@ public class CheckDependencySnapshotsPha
assertEquals( "1.0", versionsMap.get( ReleaseDescriptor.RELEASE_KEY ) );
}
+ @Test
public void testSnapshotDependenciesInsideAndOutsideProject()
throws Exception
{
@@ -674,7 +708,8 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-and-external-snapshot-dependencies" );
+ List<MavenProject> reactorProjects =
+ createDescriptorFromProjects( "internal-and-external-snapshot-dependencies" );
phase.setPrompter( createNoMockPrompter() );
@@ -703,6 +738,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testNoSnapshotReportPlugins()
throws Exception
{
@@ -717,6 +753,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotReportPluginsInProjectOnly()
throws Exception
{
@@ -731,6 +768,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotReportPluginsOutsideProjectOnly()
throws Exception
{
@@ -767,6 +805,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotReportPluginsInsideAndOutsideProject()
throws Exception
{
@@ -774,7 +813,8 @@ public class CheckDependencySnapshotsPha
(CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-and-external-snapshot-report-plugins" );
+ List<MavenProject> reactorProjects =
+ createDescriptorFromProjects( "internal-and-external-snapshot-report-plugins" );
phase.setPrompter( createNoMockPrompter() );
@@ -803,6 +843,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testNoSnapshotPlugins()
throws Exception
{
@@ -817,6 +858,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotPluginsInProjectOnly()
throws Exception
{
@@ -831,6 +873,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotManagedPluginInProjectOnly()
throws Exception
{
@@ -845,6 +888,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotUnusedInternalManagedPlugin()
throws Exception
{
@@ -859,6 +903,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotUnusedExternalManagedPlugin()
throws Exception
{
@@ -873,6 +918,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotExternalManagedPlugin()
throws Exception
{
@@ -909,6 +955,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotPluginsOutsideProjectOnly()
throws Exception
{
@@ -945,6 +992,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotPluginsInsideAndOutsideProject()
throws Exception
{
@@ -981,6 +1029,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotExternalParent()
throws Exception
{
@@ -1017,6 +1066,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotExternalParentAdjusted()
throws Exception
{
@@ -1040,7 +1090,7 @@ public class CheckDependencySnapshotsPha
}
// validate
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings( "rawtypes" )
Map versionsMap = (Map) releaseDescriptor.getResolvedSnapshotDependencies().get( "groupId:parent-external" );
assertNotNull( versionsMap );
@@ -1048,6 +1098,7 @@ public class CheckDependencySnapshotsPha
assertEquals( "1.0-test", versionsMap.get( ReleaseDescriptor.RELEASE_KEY ) );
}
+ @Test
public void testReleaseExternalParent()
throws Exception
{
@@ -1062,6 +1113,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testSnapshotExternalExtension()
throws Exception
{
@@ -1098,6 +1150,7 @@ public class CheckDependencySnapshotsPha
}
}
+ @Test
public void testSnapshotInternalExtension()
throws Exception
{
@@ -1112,6 +1165,7 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testReleaseExternalExtension()
throws Exception
{
@@ -1126,11 +1180,13 @@ public class CheckDependencySnapshotsPha
assertTrue( true );
}
+ @Test
public void testAllowTimestampedSnapshots()
throws Exception
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
- List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-timestamped-snapshot-dependencies" );
+ List<MavenProject> reactorProjects =
+ createDescriptorFromProjects( "external-timestamped-snapshot-dependencies" );
releaseDescriptor.setInteractive( false );
@@ -1147,7 +1203,7 @@ public class CheckDependencySnapshotsPha
}
// check whether flag allows
- releaseDescriptor.setAllowTimestampedSnapshots(true);
+ releaseDescriptor.setAllowTimestampedSnapshots( true );
phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -1225,16 +1281,15 @@ public class CheckDependencySnapshotsPha
Prompter mockPrompter = mock( Prompter.class );
when( mockPrompter.prompt( anyString(), eq( YES_NO_ARRAY ), eq( NO ) ) ).thenReturn( resolveSnapshots );
- when( mockPrompter.prompt( anyString(), eq( CHOICE_ARRAY ), eq( DEFAULT_CHOICE ) ) ).thenReturn(
- resolutionType );
+ when( mockPrompter.prompt( anyString(), eq( CHOICE_ARRAY ),
+ eq( DEFAULT_CHOICE ) ) ).thenReturn( resolutionType );
for ( int i = 0; i < resolvedVersions.size(); i++ )
{
- when( mockPrompter.prompt( "Which release version should it be set to?", defaultVersions.get(
- i ).releaseVersion ) ).thenReturn( resolvedVersions.get( i ).releaseVersion );
+ when( mockPrompter.prompt( "Which release version should it be set to?",
+ defaultVersions.get( i ).releaseVersion ) ).thenReturn( resolvedVersions.get( i ).releaseVersion );
when( mockPrompter.prompt( "What version should the dependency be reset to for development?",
- defaultVersions.get( i ).developmentVersion ) ).thenReturn( resolvedVersions.get(
- i ).developmentVersion );
+ defaultVersions.get( i ).developmentVersion ) ).thenReturn( resolvedVersions.get( i ).developmentVersion );
}
return mockPrompter;
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java?rev=1744879&r1=1744878&r2=1744879&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java Sat May 21 09:08:48 2016
@@ -19,6 +19,7 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
@@ -40,6 +41,7 @@ import org.apache.maven.scm.repository.S
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.stubs.ScmManagerStub;
+import org.junit.Test;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
@@ -49,7 +51,7 @@ public class CheckoutProjectFromScmTest
{
private CheckoutProjectFromScm phase;
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
@@ -57,6 +59,7 @@ public class CheckoutProjectFromScmTest
phase = (CheckoutProjectFromScm) lookup( ReleasePhase.ROLE, "checkout-project-from-scm" );
}
+ @Test
public void testExecuteStandard()
throws Exception
{
@@ -72,28 +75,30 @@ public class CheckoutProjectFromScmTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
SvnScmProviderRepository scmProviderRepository = new SvnScmProviderRepository( sourceUrl );
ScmRepository repository = new ScmRepository( "svn", scmProviderRepository );
- when( scmProviderMock.checkOut( eq( repository),
- argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
- argThat( new IsScmTagEquals( new ScmTag( "release-label" ) ) ) ) ).thenReturn( new CheckOutScmResult( "", null ) );
+ when( scmProviderMock.checkOut( eq( repository ),
+ argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
+ argThat( new IsScmTagEquals( new ScmTag( "release-label" ) ) ) ) ).thenReturn( new CheckOutScmResult( "",
+ null ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( scmProviderMock );
stub.addScmRepositoryForUrl( scmUrl, repository );
List<MavenProject> reactorProjects = createReactorProjects( "scm-commit", "/single-pom" );
-
+
// execute
phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects );
// prepare
assertEquals( "", descriptor.getScmRelativePathProjectDirectory() );
-
- verify( scmProviderMock ).checkOut( eq( repository),
- argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
+
+ verify( scmProviderMock ).checkOut( eq( repository ),
+ argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
argThat( new IsScmTagEquals( new ScmTag( "release-label" ) ) ) );
verifyNoMoreInteractions( scmProviderMock );
}
+ @Test
public void testExecuteMultiModuleWithDeepSubprojects()
throws Exception
{
@@ -109,28 +114,31 @@ public class CheckoutProjectFromScmTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
SvnScmProviderRepository scmProviderRepository = new SvnScmProviderRepository( sourceUrl );
ScmRepository repository = new ScmRepository( "svn", scmProviderRepository );
- when( scmProviderMock.checkOut( eq( repository ),
+ when( scmProviderMock.checkOut( eq( repository ),
argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
- argThat( new IsScmTagEquals( new ScmTag( "release-label" ) ) ) ) ).thenReturn( new CheckOutScmResult( "", null ) );
+ argThat( new IsScmTagEquals( new ScmTag( "release-label" ) ) ) ) ).thenReturn( new CheckOutScmResult( "",
+ null ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( scmProviderMock );
stub.addScmRepositoryForUrl( scmUrl, repository );
- List<MavenProject> reactorProjects = createReactorProjects( "scm-commit", "/multimodule-with-deep-subprojects" );
-
+ List<MavenProject> reactorProjects =
+ createReactorProjects( "scm-commit", "/multimodule-with-deep-subprojects" );
+
// execute
phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects );
// verify
assertEquals( "", descriptor.getScmRelativePathProjectDirectory() );
-
- verify( scmProviderMock ).checkOut( eq( repository ),
+
+ verify( scmProviderMock ).checkOut( eq( repository ),
argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
argThat( new IsScmTagEquals( new ScmTag( "release-label" ) ) ) );
verifyNoMoreInteractions( scmProviderMock );
}
+ @Test
public void testExecuteFlatMultiModule()
throws Exception
{
@@ -146,24 +154,26 @@ public class CheckoutProjectFromScmTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
SvnScmProviderRepository scmProviderRepository = new SvnScmProviderRepository( sourceUrl );
ScmRepository repository = new ScmRepository( "svn", scmProviderRepository );
- when( scmProviderMock.checkOut( eq( repository ),
+ when( scmProviderMock.checkOut( eq( repository ),
argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
- argThat( new IsScmTagEquals( new ScmTag( "release-label" ) ) ) ) ).thenReturn( new CheckOutScmResult( "", null ) );
+ argThat( new IsScmTagEquals( new ScmTag( "release-label" ) ) ) ) ).thenReturn( new CheckOutScmResult( "",
+ null ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( scmProviderMock );
stub.addScmRepositoryForUrl( scmUrl, repository );
- List<MavenProject> reactorProjects = createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "/root-project" );
-
+ List<MavenProject> reactorProjects =
+ createReactorProjects( "rewrite-for-release/pom-with-parent-flat", "/root-project" );
+
// execute
phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects );
// verify
assertEquals( "not found root-project but " + descriptor.getScmRelativePathProjectDirectory(), "root-project",
descriptor.getScmRelativePathProjectDirectory() );
-
- verify( scmProviderMock ).checkOut( eq( repository ),
+
+ verify( scmProviderMock ).checkOut( eq( repository ),
argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
argThat( new IsScmTagEquals( new ScmTag( "release-label" ) ) ) );
verifyNoMoreInteractions( scmProviderMock );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java?rev=1744879&r1=1744878&r2=1744879&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java Sat May 21 09:08:48 2016
@@ -19,6 +19,8 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import static org.junit.Assert.assertTrue;
+
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.mock;
@@ -38,7 +40,6 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
-import org.apache.maven.scm.ScmTagParameters;
import org.apache.maven.scm.command.add.AddScmResult;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.manager.ScmManagerStub;
@@ -47,6 +48,7 @@ import org.apache.maven.scm.repository.S
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.junit.Test;
/**
* Test the generate release POMs phase.
@@ -62,7 +64,7 @@ public class GenerateReleasePomsPhaseTes
private ScmProvider scmProviderMock;
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
@@ -72,17 +74,19 @@ public class GenerateReleasePomsPhaseTes
}
// TODO: MRELEASE-262
-// public void testRewriteInternalRangeDependency() throws Exception
-// {
-// List reactorProjects = createReactorProjects( "internal-snapshot-range-dependency" );
-// ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
-//
-// phase.execute( config, null, reactorProjects );
-//
-// compareFiles( reactorProjects );
-// }
+ // @Test public void testRewriteInternalRangeDependency() throws Exception
+ // {
+ // List reactorProjects = createReactorProjects( "internal-snapshot-range-dependency" );
+ // ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
+ //
+ // phase.execute( config, null, reactorProjects );
+ //
+ // compareFiles( reactorProjects );
+ // }
- public void testRewriteExternalRangeDependency() throws Exception
+ @Test
+ public void testRewriteExternalRangeDependency()
+ throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( "external-range-dependency" );
ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
@@ -93,7 +97,9 @@ public class GenerateReleasePomsPhaseTes
}
// MRELEASE-787
- public void testSuppressCommitBeforeTagOrBranch() throws Exception
+ @Test
+ public void testSuppressCommitBeforeTagOrBranch()
+ throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptor config = new ReleaseDescriptor();
@@ -103,13 +109,15 @@ public class GenerateReleasePomsPhaseTes
mapNextVersion( config, "groupId:artifactId" );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
-
- verify( scmProviderMock ).add( isA(ScmRepository.class), isA(ScmFileSet.class) );
+
+ verify( scmProviderMock ).add( isA( ScmRepository.class ), isA( ScmFileSet.class ) );
verifyNoMoreInteractions( scmProviderMock );
}
-
- public void testSuppressCommitBeforeTagOrBranchAndReomoteTagging() throws Exception
+
+ @Test
+ public void testSuppressCommitBeforeTagOrBranchAndReomoteTagging()
+ throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
ReleaseDescriptor config = new ReleaseDescriptor();
@@ -120,25 +128,29 @@ public class GenerateReleasePomsPhaseTes
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
- verify( scmProviderMock ).add( isA(ScmRepository.class), isA(ScmFileSet.class) );
+ verify( scmProviderMock ).add( isA( ScmRepository.class ), isA( ScmFileSet.class ) );
verifyNoMoreInteractions( scmProviderMock );
}
// MRELEASE-808
- public void testFinalName() throws Exception
+ @Test
+ public void testFinalName()
+ throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( "pom-with-finalname" );
ReleaseDescriptor config = createConfigurationForWithParentNextVersion( reactorProjects );
config.setGenerateReleasePoms( true );
-
+
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
assertTrue( comparePomFiles( reactorProjects ) );
}
/*
- * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createDescriptorFromProjects(java.util.List)
+ * @see
+ * org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createDescriptorFromProjects(java.
+ * util.List)
*/
protected ReleaseDescriptor createDescriptorFromProjects( List<MavenProject> reactorProjects )
{
@@ -149,10 +161,11 @@ public class GenerateReleasePomsPhaseTes
}
/*
- * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createReactorProjects(java.lang.String,
- * boolean)
+ * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createReactorProjects(java.lang.
+ * String, boolean)
*/
- protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles ) throws Exception
+ protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
+ throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( "generate-release-poms/", path );
@@ -170,23 +183,23 @@ public class GenerateReleasePomsPhaseTes
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
ScmFileSet fileSet = new ScmFileSet( rootProject.getFile().getParentFile(), releasePoms );
- when( scmProviderMock.add( isA( ScmRepository.class ),
- argThat( new IsScmFileSetEquals( fileSet ) ) ) ).
- thenReturn( new AddScmResult( "...",
- Collections.singletonList( new ScmFile( Maven.RELEASE_POMv4, ScmFileStatus.ADDED ) ) ) );
-
-
+ when( scmProviderMock.add( isA( ScmRepository.class ),
+ argThat( new IsScmFileSetEquals( fileSet ) ) ) ).thenReturn( new AddScmResult( "...",
+ Collections.singletonList( new ScmFile( Maven.RELEASE_POMv4,
+ ScmFileStatus.ADDED ) ) ) );
+
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( scmProviderMock );
return reactorProjects;
}
-
+
@Override
- protected void verifyReactorProjects( String path, boolean copyFiles ) throws Exception
+ protected void verifyReactorProjects( String path, boolean copyFiles )
+ throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( "generate-release-poms/", path );
-
+
List<File> releasePoms = new ArrayList<File>();
for ( Iterator<MavenProject> iterator = reactorProjects.iterator(); iterator.hasNext(); )
@@ -195,18 +208,17 @@ public class GenerateReleasePomsPhaseTes
releasePoms.add( ReleaseUtil.getReleasePom( project ) );
}
-
+
MavenProject rootProject = ReleaseUtil.getRootProject( reactorProjects );
ScmFileSet fileSet = new ScmFileSet( rootProject.getFile().getParentFile(), releasePoms );
-
- verify( scmProviderMock ).add( isA( ScmRepository.class ),
- argThat( new IsScmFileSetEquals( fileSet ) ) );
+
+ verify( scmProviderMock ).add( isA( ScmRepository.class ), argThat( new IsScmFileSetEquals( fileSet ) ) );
verifyNoMoreInteractions( scmProviderMock );
}
/*
- * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#mapNextVersion(org.apache.maven.shared.release.config.ReleaseDescriptor,
- * java.lang.String)
+ * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#mapNextVersion(org.apache.maven.
+ * shared.release.config.ReleaseDescriptor, java.lang.String)
*/
protected void mapNextVersion( ReleaseDescriptor config, String projectId )
{
@@ -214,8 +226,9 @@ public class GenerateReleasePomsPhaseTes
}
/*
- * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#mapAlternateNextVersion(org.apache.maven.shared.release.config.ReleaseDescriptor,
- * java.lang.String)
+ * @see
+ * org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#mapAlternateNextVersion(org.apache.
+ * maven.shared.release.config.ReleaseDescriptor, java.lang.String)
*/
protected void mapAlternateNextVersion( ReleaseDescriptor config, String projectId )
{
@@ -223,8 +236,9 @@ public class GenerateReleasePomsPhaseTes
}
/*
- * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#unmapNextVersion(org.apache.maven.shared.release.config.ReleaseDescriptor,
- * java.lang.String)
+ * @see
+ * org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#unmapNextVersion(org.apache.maven.
+ * shared.release.config.ReleaseDescriptor, java.lang.String)
*/
protected void unmapNextVersion( ReleaseDescriptor config, String projectId )
{
@@ -232,7 +246,8 @@ public class GenerateReleasePomsPhaseTes
}
/*
- * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createConfigurationForPomWithParentAlternateNextVersion(java.util.List)
+ * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#
+ * createConfigurationForPomWithParentAlternateNextVersion(java.util.List)
*/
protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List<MavenProject> reactorProjects )
throws Exception
@@ -246,9 +261,11 @@ public class GenerateReleasePomsPhaseTes
}
/*
- * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createConfigurationForWithParentNextVersion(java.util.List)
+ * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#
+ * createConfigurationForWithParentNextVersion(java.util.List)
*/
- protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List<MavenProject> reactorProjects ) throws Exception
+ protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List<MavenProject> reactorProjects )
+ throws Exception
{
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
@@ -259,22 +276,28 @@ public class GenerateReleasePomsPhaseTes
}
/*
- * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#readTestProjectFile(java.lang.String)
+ * @see
+ * org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#readTestProjectFile(java.lang.String)
*/
- protected String readTestProjectFile( String fileName ) throws IOException
+ protected String readTestProjectFile( String fileName )
+ throws IOException
{
- return ReleaseUtil.readXmlFile( getTestFile( "target/test-classes/projects/generate-release-poms/" + fileName ) );
+ return ReleaseUtil.readXmlFile( getTestFile( "target/test-classes/projects/generate-release-poms/"
+ + fileName ) );
}
/*
- * @see org.apache.maven.shared.release.phase.AbstractReleaseTestCase#compareFiles(org.apache.maven.project.MavenProject, java.lang.String)
+ * @see
+ * org.apache.maven.shared.release.phase.AbstractReleaseTestCase#compareFiles(org.apache.maven.project.MavenProject,
+ * java.lang.String)
*/
// @Override
protected void comparePomFiles( MavenProject project, String expectedFileSuffix, boolean normalizeLineEndings )
throws IOException
{
File actualFile = ReleaseUtil.getReleasePom( project );
- File expectedFile = new File( actualFile.getParentFile(), "expected-release-pom" + expectedFileSuffix + ".xml" );
+ File expectedFile =
+ new File( actualFile.getParentFile(), "expected-release-pom" + expectedFileSuffix + ".xml" );
comparePomFiles( expectedFile, actualFile, normalizeLineEndings );
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java?rev=1744879&r1=1744878&r2=1744879&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java Sat May 21 09:08:48 2016
@@ -19,6 +19,7 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.mock;
@@ -49,6 +50,7 @@ import org.apache.maven.shared.release.c
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.util.ReleaseUtil;
import org.codehaus.plexus.util.IOUtil;
+import org.junit.Test;
/**
* Test the remove release POMs phase.
@@ -58,7 +60,7 @@ import org.codehaus.plexus.util.IOUtil;
public class RemoveReleasePomsPhaseTest
extends AbstractReleaseTestCase
{
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
@@ -66,6 +68,7 @@ public class RemoveReleasePomsPhaseTest
phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "remove-release-poms" );
}
+ @Test
public void testExecuteBasicPom()
throws Exception
{
@@ -78,24 +81,24 @@ public class RemoveReleasePomsPhaseTest
ScmFileSet fileSet = new ScmFileSet( new File( config.getWorkingDirectory() ), releasePom );
ScmProvider scmProviderMock = mock( ScmProvider.class );
- when( scmProviderMock.remove( isA( ScmRepository.class ),
- argThat( new IsScmFileSetEquals( fileSet ) ),
- isA( String.class ) ) ).thenReturn( new RemoveScmResult( "...", Collections
- .singletonList( new ScmFile( Maven.RELEASE_POMv4, ScmFileStatus.DELETED ) ) ) );
-
+ when( scmProviderMock.remove( isA( ScmRepository.class ), argThat( new IsScmFileSetEquals( fileSet ) ),
+ isA( String.class ) ) ).thenReturn( new RemoveScmResult( "...",
+ Collections.singletonList( new ScmFile( Maven.RELEASE_POMv4,
+ ScmFileStatus.DELETED ) ) ) );
+
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( scmProviderMock );
// execute
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
- //verify
- verify( scmProviderMock ).remove( isA( ScmRepository.class ),
- argThat( new IsScmFileSetEquals( fileSet ) ),
+ // verify
+ verify( scmProviderMock ).remove( isA( ScmRepository.class ), argThat( new IsScmFileSetEquals( fileSet ) ),
isA( String.class ) );
verifyNoMoreInteractions( scmProviderMock );
}
+ @Test
public void testExecutePomWithModules()
throws Exception
{
@@ -114,10 +117,10 @@ public class RemoveReleasePomsPhaseTest
ScmFileSet fileSet = new ScmFileSet( new File( config.getWorkingDirectory() ), releasePoms );
ScmProvider scmProviderMock = mock( ScmProvider.class );
- when( scmProviderMock.remove( isA( ScmRepository.class ),
- argThat( new IsScmFileSetEquals( fileSet ) ),
- isA( String.class ) ) ).thenReturn( new RemoveScmResult( "...", Collections
- .singletonList( new ScmFile( Maven.RELEASE_POMv4, ScmFileStatus.DELETED ) ) ) );
+ when( scmProviderMock.remove( isA( ScmRepository.class ), argThat( new IsScmFileSetEquals( fileSet ) ),
+ isA( String.class ) ) ).thenReturn( new RemoveScmResult( "...",
+ Collections.singletonList( new ScmFile( Maven.RELEASE_POMv4,
+ ScmFileStatus.DELETED ) ) ) );
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( scmProviderMock );
@@ -126,12 +129,12 @@ public class RemoveReleasePomsPhaseTest
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
// verify
- verify( scmProviderMock ).remove( isA( ScmRepository.class ),
- argThat( new IsScmFileSetEquals( fileSet ) ),
+ verify( scmProviderMock ).remove( isA( ScmRepository.class ), argThat( new IsScmFileSetEquals( fileSet ) ),
isA( String.class ) );
verifyNoMoreInteractions( scmProviderMock );
}
+ @Test
public void testSimulateBasicPom()
throws Exception
{
@@ -150,8 +153,10 @@ public class RemoveReleasePomsPhaseTest
// never invoke scmProviderMock
verifyNoMoreInteractions( scmProviderMock );
}
-
- public void testExecuteWithSuppressCommitBeforeTag() throws Exception
+
+ @Test
+ public void testExecuteWithSuppressCommitBeforeTag()
+ throws Exception
{
// prepare
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
@@ -163,17 +168,18 @@ public class RemoveReleasePomsPhaseTest
ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
stub.setScmProvider( scmProviderMock );
-
+
// execute
ReleaseResult result = phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
-
+
BufferedReader reader = null;
- try
+ try
{
reader = new BufferedReader( new StringReader( result.getOutput() ) );
-
- assertEquals( "[INFO] Removing release POM for 'Unnamed - groupId:artifactId:jar:1.0-SNAPSHOT'..." , reader.readLine() );
- assertEquals( "Expected EOF", null, reader.readLine() );
+
+ assertEquals( "[INFO] Removing release POM for 'Unnamed - groupId:artifactId:jar:1.0-SNAPSHOT'...",
+ reader.readLine() );
+ assertEquals( "Expected EOF", null, reader.readLine() );
}
finally
{
@@ -184,7 +190,9 @@ public class RemoveReleasePomsPhaseTest
verifyNoMoreInteractions( scmProviderMock );
}
- public void testSimulateWithSuppressCommitBeforeTag() throws Exception
+ @Test
+ public void testSimulateWithSuppressCommitBeforeTag()
+ throws Exception
{
// prepare
List<MavenProject> reactorProjects = createReactorProjects( "basic-pom" );
@@ -201,13 +209,15 @@ public class RemoveReleasePomsPhaseTest
ReleaseResult result = phase.simulate( config, new DefaultReleaseEnvironment(), reactorProjects );
BufferedReader reader = null;
- try
+ try
{
reader = new BufferedReader( new StringReader( result.getOutput() ) );
-
- assertEquals( "[INFO] Removing release POM for 'Unnamed - groupId:artifactId:jar:1.0-SNAPSHOT'..." , reader.readLine() );
- assertEquals( "[INFO] Full run would be removing [" + reactorProjects.get( 0 ).getFile().getParent() + File.separator + "release-pom.xml]", reader.readLine() );
- assertEquals( "Expected EOF", null, reader.readLine() );
+
+ assertEquals( "[INFO] Removing release POM for 'Unnamed - groupId:artifactId:jar:1.0-SNAPSHOT'...",
+ reader.readLine() );
+ assertEquals( "[INFO] Full run would be removing [" + reactorProjects.get( 0 ).getFile().getParent()
+ + File.separator + "release-pom.xml]", reader.readLine() );
+ assertEquals( "Expected EOF", null, reader.readLine() );
}
finally
{
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java?rev=1744879&r1=1744878&r2=1744879&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java Sat May 21 09:08:48 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.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
@@ -28,6 +32,7 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.junit.Test;
/**
* Test the SCM modification check phase.
@@ -41,7 +46,7 @@ public class RewritePomsForBranchPhaseTe
private static final String ALTERNATIVE_NEXT_VERSION = "2.0-SNAPSHOT";
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
@@ -61,6 +66,7 @@ public class RewritePomsForBranchPhaseTe
return ReleaseUtil.readXmlFile( getTestFile( "target/test-classes/projects/rewrite-for-branch/" + fileName ) );
}
+ @Test
public void testSimulateRewrite()
throws Exception
{
@@ -80,10 +86,11 @@ public class RewritePomsForBranchPhaseTe
assertEquals( "Check the transformed POM", expected, actual );
}
+ @Test
public void testRewriteWithDashedComments()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjects("basic-pom-with-dashes-in-comment");
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-dashes-in-comment" );
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
@@ -99,6 +106,7 @@ public class RewritePomsForBranchPhaseTe
assertEquals( "Check the transformed POM", expected, actual );
}
+ @Test
public void testClean()
throws Exception
{
@@ -119,6 +127,7 @@ public class RewritePomsForBranchPhaseTe
assertFalse( testFile.exists() );
}
+ @Test
public void testCleanNotExists()
throws Exception
{
@@ -135,7 +144,8 @@ public class RewritePomsForBranchPhaseTe
assertFalse( testFile.exists() );
}
- //MRELEASE-116
+ // MRELEASE-116
+ @Test
public void testScmOverridden()
throws Exception
{
@@ -183,6 +193,7 @@ public class RewritePomsForBranchPhaseTe
// nothing to do
}
+ @Test
public void testRewriteBasicPomWithCvs()
throws Exception
{
@@ -196,6 +207,7 @@ public class RewritePomsForBranchPhaseTe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteBasicPomWithScmExpression()
throws Exception
{
@@ -209,6 +221,7 @@ public class RewritePomsForBranchPhaseTe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteBasicPomWithTagBase()
throws Exception
{
@@ -223,6 +236,7 @@ public class RewritePomsForBranchPhaseTe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteBasicPomWithTagBaseAndVaryingScmUrls()
throws Exception
{
@@ -236,6 +250,7 @@ public class RewritePomsForBranchPhaseTe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteBasicPomWithCvsFromTag()
throws Exception
{
@@ -248,6 +263,7 @@ public class RewritePomsForBranchPhaseTe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteBasicPomWithEmptyScm()
throws Exception
{
@@ -260,6 +276,7 @@ public class RewritePomsForBranchPhaseTe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteInterpolatedVersions()
throws Exception
{
@@ -271,6 +288,7 @@ public class RewritePomsForBranchPhaseTe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteInterpolatedVersionsDifferentVersion()
throws Exception
{
@@ -296,6 +314,7 @@ public class RewritePomsForBranchPhaseTe
}
}
+ @Test
public void testRewriteBasicPomWithInheritedScm()
throws Exception
{
@@ -308,6 +327,7 @@ public class RewritePomsForBranchPhaseTe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomWithParentAndProperties()
throws Exception
{
@@ -324,6 +344,7 @@ public class RewritePomsForBranchPhaseTe
}
// MRELEASE-311
+ @Test
public void testRewritePomWithDependencyPropertyCoordinate()
throws Exception
{
@@ -340,6 +361,7 @@ public class RewritePomsForBranchPhaseTe
}
// MRELEASE-305
+ @Test
public void testRewritePomWithScmOfParentEndingWithASlash()
throws Exception
{
@@ -354,6 +376,7 @@ public class RewritePomsForBranchPhaseTe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomWithDeepSubprojects()
throws Exception
{
@@ -369,10 +392,12 @@ public class RewritePomsForBranchPhaseTe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomForFlatMultiModule()
throws Exception
{
- List<MavenProject> reactorProjects = createReactorProjects( "rewrite-for-branch/pom-with-parent-flat", "/root-project" );
+ List<MavenProject> reactorProjects =
+ createReactorProjects( "rewrite-for-branch/pom-with-parent-flat", "/root-project" );
ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
@@ -381,6 +406,7 @@ public class RewritePomsForBranchPhaseTe
}
// MRELEASE-383
+ @Test
public void testRewritePomWithCDATASectionOnWindows()
throws Exception
{
@@ -404,6 +430,7 @@ public class RewritePomsForBranchPhaseTe
}
// MRELEASE-454
+ @Test
public void testRewritePomWithImportedDependencyManagementInReactor()
throws Exception
{
@@ -415,6 +442,7 @@ public class RewritePomsForBranchPhaseTe
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomWithDifferentVersionsAcrossModules()
throws Exception
{
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java?rev=1744879&r1=1744878&r2=1744879&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java Sat May 21 09:08:48 2016
@@ -19,6 +19,17 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Scm;
import org.apache.maven.project.MavenProject;
@@ -26,12 +37,7 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.util.ReleaseUtil;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
+import org.junit.Test;
/**
* Test the SCM modification check phase.
@@ -49,7 +55,7 @@ public class RewritePomsForDevelopmentPh
private static final String ALTERNATIVE_RELEASE_VERSION = "2.0";
- protected void setUp()
+ public void setUp()
throws Exception
{
super.setUp();
@@ -57,6 +63,7 @@ public class RewritePomsForDevelopmentPh
phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "rewrite-poms-for-development" );
}
+ @Test
public void testSimulateRewrite()
throws Exception
{
@@ -83,10 +90,12 @@ public class RewritePomsForDevelopmentPh
return createReactorProjects( "rewrite-for-release/", "rewrite-for-development/", name );
}
+ @Test
public void testSimulateRewriteEjbClientDeps()
throws Exception
{
- List<MavenProject> reactorProjects = new LinkedList<MavenProject>( createReactorProjects( "basic-pom-ejb-client-dep/project" ) );
+ List<MavenProject> reactorProjects =
+ new LinkedList<MavenProject>( createReactorProjects( "basic-pom-ejb-client-dep/project" ) );
reactorProjects.addAll( createReactorProjects( "basic-pom-ejb-client-dep/ejb" ) );
ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
@@ -106,6 +115,7 @@ public class RewritePomsForDevelopmentPh
assertEquals( "Check the transformed POM", expected, actual );
}
+ @Test
public void testClean()
throws Exception
{
@@ -127,6 +137,7 @@ public class RewritePomsForDevelopmentPh
assertFalse( testFile.exists() );
}
+ @Test
public void testCleanNotExists()
throws Exception
{
@@ -144,6 +155,7 @@ public class RewritePomsForDevelopmentPh
assertFalse( testFile.exists() );
}
+ @Test
public void testRewriteBasicPomUnmappedScm()
throws Exception
{
@@ -174,7 +186,7 @@ public class RewritePomsForDevelopmentPh
protected String readTestProjectFile( String fileName, String subpath )
throws IOException
{
- return ReleaseUtil.readXmlFile( getTestFile( "target/test-classes/projects/"+ subpath + fileName ) );
+ return ReleaseUtil.readXmlFile( getTestFile( "target/test-classes/projects/" + subpath + fileName ) );
}
protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
@@ -247,6 +259,7 @@ public class RewritePomsForDevelopmentPh
return config;
}
+ @Test
public void testRewriteBasicPomWithCvs()
throws Exception
{
@@ -266,6 +279,7 @@ public class RewritePomsForDevelopmentPh
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteBasicPomWithCvsFromTag()
throws Exception
{
@@ -286,6 +300,7 @@ public class RewritePomsForDevelopmentPh
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewriteBasicPomWithInheritedScm()
throws Exception
{
@@ -303,7 +318,7 @@ public class RewritePomsForDevelopmentPh
Scm scm = new Scm();
scm.setConnection( "scm:svn:file://localhost/tmp/scm-repo/trunk/subproject1" );
scm.setDeveloperConnection( "scm:svn:file://localhost/tmp/scm-repo/trunk/subproject1" );
- //MRELEASE-107
+ // MRELEASE-107
scm.setUrl( "http://localhost/viewvc/mypath/trunk/subproject1" );
config.mapOriginalScmInfo( "groupId:subproject1", scm );
config.mapOriginalScmInfo( "groupId:subsubproject", null );
@@ -313,20 +328,23 @@ public class RewritePomsForDevelopmentPh
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomWithParentAndProperties()
throws Exception
{
performTestRewritePomWithParentAndProperties( "pom-with-parent-and-properties" );
}
- //MRELEASE-454
+ // MRELEASE-454
+ @Test
public void testRewritePomWithParentAndPropertiesInDependencyManagement()
throws Exception
{
performTestRewritePomWithParentAndProperties( "pom-with-parent-and-properties-in-dependency-management" );
}
- //MRELEASE-454
+ // MRELEASE-454
+ @Test
public void testRewritePomWithParentAndPropertiesInDependencyManagementImport()
throws Exception
{
@@ -337,7 +355,7 @@ public class RewritePomsForDevelopmentPh
throws Exception
{
List<MavenProject> reactorProjects = createReactorProjects( path );
-
+
ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
config.mapDevelopmentVersion( "groupId:artifactId", NEXT_VERSION );
@@ -353,6 +371,7 @@ public class RewritePomsForDevelopmentPh
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testSimulateRewritePomWithParentAndProperties()
throws Exception
{
@@ -384,6 +403,7 @@ public class RewritePomsForDevelopmentPh
}
// MRELEASE-311
+ @Test
public void testRewritePomWithDependencyPropertyCoordinate()
throws Exception
{
@@ -404,6 +424,7 @@ public class RewritePomsForDevelopmentPh
assertTrue( comparePomFiles( reactorProjects ) );
}
+ @Test
public void testRewritePomDependenciesWithoutDependenciesVersionUpdate()
throws Exception
{