svn commit: r1083350 - /maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java

[olamy]

Author: olamy
Date: Sun Mar 20 00:10:13 2011
New Revision: 1083350

URL: http://svn.apache.org/viewvc?rev=1083350&view=rev
Log:
use canonicalPath for testing file equal instead of file.equals to prevent 
issue with symlink

Modified:
    
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java

Modified: 
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java?rev=1083350&r1=1083349&r2=1083350&view=diff
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
 Sun Mar 20 00:10:13 2011
@@ -19,6 +19,8 @@ package org.apache.maven.shared.release.
  * under the License.
  */
 
+import java.io.IOException;
+
 import org.apache.maven.scm.ScmFileSet;
 import org.jmock.core.Constraint;
 
@@ -42,13 +44,16 @@ public class IsScmFileSetEquals
     {
         ScmFileSet fs = (ScmFileSet) object;
         
-        System.out.println( "fs.getBasedir " + fs.getBasedir() );
-        System.out.println( "fileSet.getBasedir " + fs.getBasedir() );
-        System.out.println( "equals " + fs.getBasedir().equals( 
fileSet.getBasedir() ) );
-        
-        
-        return fs.getBasedir().equals( fileSet.getBasedir() ) &&
-         fs.getFileList().equals( fileSet.getFileList() );
+        try
+        {
+            return fs.getBasedir().getCanonicalPath().equals( 
fileSet.getBasedir().getCanonicalPath() )
+                && fs.getFileList().equals( fileSet.getFileList() );
+        }
+        catch ( IOException e )
+        {
+            // should not happened so RuntimeException
+            throw new RuntimeException(e.getMessage(), e);
+        }
     }
 
     public StringBuffer describeTo( StringBuffer stringBuffer )