svn commit: r1341122 - in /maven/release/trunk/maven-release-manager/src: main/java/org/apache/maven/shared/release/DefaultReleaseManager.java test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java

[rf...@apache.org]

Author: rfscholte
Date: Mon May 21 17:36:55 2012
New Revision: 1341122

URL: http://svn.apache.org/viewvc?rev=1341122&view=rev
Log:
Fix MRELEASE-758: release:perform no longer removes release.properties
Consider null as true i.o.w. true is the default

Modified:
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
    maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java?rev=1341122&r1=1341121&r2=1341122&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java Mon May 21 17:36:55 2012
@@ -435,7 +435,7 @@ public class DefaultReleaseManager
             updateListener( performRequest.getReleaseManagerListener(), name, PHASE_END );
         }
 
-        if ( BooleanUtils.isTrue( performRequest.getClean() ) )
+        if ( BooleanUtils.isNotFalse( performRequest.getClean() ) )
         {
             // call release:clean so that resume will not be possible anymore after a perform
             clean( releaseDescriptor, performRequest.getReleaseManagerListener(), performRequest.getReactorProjects() );

Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java?rev=1341122&r1=1341121&r2=1341122&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java Mon May 21 17:36:55 2012
@@ -706,6 +706,38 @@ public class DefaultReleaseManagerTest
             assertTrue( true );
         }
     }
+    
+    // MRELEASE-758: release:perform no longer removes release.properties
+    public void testPerformWithDefaultClean()
+        throws Exception
+    {
+        // prepare
+        ReleasePerformRequest performRequest = new ReleasePerformRequest();
+        performRequest.setDryRun( true );
+        
+        ReleaseManagerListener managerListener = mock( ReleaseManagerListener.class );
+        performRequest.setReleaseManagerListener( managerListener );
+        
+        ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+        releaseDescriptor.setScmSourceUrl( "scm-url" );
+        releaseDescriptor.setWorkingDirectory( getTestFile( "target/working-directory" ).getAbsolutePath() );
+        performRequest.setReleaseDescriptor( releaseDescriptor );
+        
+        DefaultReleaseManager releaseManager = (DefaultReleaseManager) lookup( ReleaseManager.ROLE, "test" );
+        
+        // test
+        releaseManager.perform( performRequest );
+
+        // verify
+        verify( managerListener ).phaseStart( "verify-release-configuration" );
+        verify( managerListener ).phaseStart( "verify-completed-prepare-phases" );
+        verify( managerListener ).phaseStart( "checkout-project-from-scm" );
+        verify( managerListener ).phaseStart( "run-perform-goals" );
+        verify( managerListener ).phaseStart( "cleanup" );
+        verify( managerListener, times( 5 ) ).phaseEnd();
+        
+        // don't call 'verifyNoMoreInteractions( managerListener )', it's a long list
+    }
 
     public void testNoScmUrlPerform()
         throws Exception