You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ol...@apache.org on 2011/03/01 00:15:35 UTC
svn commit: r1075580 -
/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
Author: olamy
Date: Mon Feb 28 23:15:35 2011
New Revision: 1075580
URL: http://svn.apache.org/viewvc?rev=1075580&view=rev
Log:
take care of symlink in test
Modified:
maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
Modified: maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java?rev=1075580&r1=1075579&r2=1075580&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java (original)
+++ maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java Mon Feb 28 23:15:35 2011
@@ -323,11 +323,18 @@ public abstract class ScmTestCase
}
public void assertCommandLine( String expectedCommand, File expectedWorkingDirectory, Commandline actualCommand )
+ throws IOException
{
Commandline cl = new Commandline( expectedCommand );
if ( expectedWorkingDirectory != null )
{
- cl.setWorkingDirectory( expectedWorkingDirectory.getAbsolutePath() );
+ // take of symlink
+ if (expectedWorkingDirectory.getCanonicalFile().equals( expectedWorkingDirectory.getAbsoluteFile() ))
+ {
+ cl.setWorkingDirectory( expectedWorkingDirectory.getAbsolutePath() );
+ } else {
+ cl.setWorkingDirectory( expectedWorkingDirectory.getCanonicalPath() );
+ }
}
assertEquals( cl.toString(), actualCommand.toString() );
}