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 2012/07/07 19:29:42 UTC
svn commit: r1358603 -
/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
Author: rfscholte
Date: Sat Jul 7 17:29:42 2012
New Revision: 1358603
URL: http://svn.apache.org/viewvc?rev=1358603&view=rev
Log:
Another coverage test
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java?rev=1358603&r1=1358602&r2=1358603&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java Sat Jul 7 17:29:42 2012
@@ -1147,6 +1147,96 @@ public class MapVersionsPhaseTest
verify( mockPrompter ).prompt( startsWith( "What is the branch version for" ), eq( "1.2-SNAPSHOT" ) );
}
+ public void testExecuteReleaseBranchCreation_MapBranch()
+ throws Exception
+ {
+ // prepare
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, "test-map-branch-versions" );
+
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
+
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setBranchCreation( true );
+
+ // test
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
+
+ // verify
+ /*
+ * "By default, the POM in the new branch keeps the same version as the local working copy, and the local POM is incremented to the next revision."
+ * This is true for trunk, but when branching from a tag I would expect the next SNAPSHOT version. For now keep
+ * '1.2' instead of '1.3-SNAPSHOT' until further investigation.
+ */
+ assertEquals( "Check release versions", Collections.singletonMap( "groupId:artifactId", "1.2" ),
+ releaseDescriptor.getReleaseVersions() );
+ assertNull( "Check development versions", releaseDescriptor.getDevelopmentVersions().get( "groupId:artifactId" ) );
+ }
+
+ public void testSimulateReleaseBranchCreation_MapBranch()
+ throws Exception
+ {
+ // prepare
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, "test-map-branch-versions" );
+
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
+
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setBranchCreation( true );
+
+ // test
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
+
+ // verify
+ /*
+ * "By default, the POM in the new branch keeps the same version as the local working copy, and the local POM is incremented to the next revision."
+ * This is true for trunk, but when branching from a tag I would expect the next SNAPSHOT version. For now keep
+ * '1.2' instead of '1.3-SNAPSHOT' until further investigation.
+ */
+ assertEquals( "Check release versions", Collections.singletonMap( "groupId:artifactId", "1.2" ),
+ releaseDescriptor.getReleaseVersions() );
+ assertNull( "Check development versions", releaseDescriptor.getDevelopmentVersions().get( "groupId:artifactId" ) );
+ }
+
+ public void testExecuteSnapshotBranchCreation_MapBranch()
+ throws Exception
+ {
+ // prepare
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, "test-map-branch-versions" );
+
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
+
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setBranchCreation( true );
+
+ // test
+ phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
+
+ // verify
+ assertEquals( "Check release versions", Collections.singletonMap( "groupId:artifactId", "1.2-SNAPSHOT" ),
+ releaseDescriptor.getReleaseVersions() );
+ assertNull( "Check development versions", releaseDescriptor.getDevelopmentVersions().get( "groupId:artifactId" ) );
+ }
+
+ public void testSimulateSnapshotBranchCreation_MapBranch()
+ throws Exception
+ {
+ // prepare
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, "test-map-branch-versions" );
+
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
+
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setBranchCreation( true );
+
+ // test
+ phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
+
+ // verify
+ assertEquals( "Check release versions", Collections.singletonMap( "groupId:artifactId", "1.2-SNAPSHOT" ),
+ releaseDescriptor.getReleaseVersions() );
+ assertNull( "Check development versions", releaseDescriptor.getDevelopmentVersions().get( "groupId:artifactId" ) );
+ }
+
public void testExecuteReleaseBranchCreation_UpdateBranchVersions_MapBranch()
throws Exception
{