maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1074729 - in /maven/surefire/trunk/surefire-integration-tests: pom.xml src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
Date Fri, 25 Feb 2011 22:44:55 GMT
Author: olamy
Date: Fri Feb 25 22:44:55 2011
New Revision: 1074729

URL: http://svn.apache.org/viewvc?rev=1074729&view=rev
Log:
more debug for symlink in ci

Modified:
    maven/surefire/trunk/surefire-integration-tests/pom.xml
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java

Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=1074729&r1=1074728&r2=1074729&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Fri Feb 25 22:44:55 2011
@@ -97,6 +97,11 @@
       <version>2.8</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.0.1</version>
+    </dependency>
   </dependencies>
 
   <profiles>

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java?rev=1074729&r1=1074728&r2=1074729&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
Fri Feb 25 22:44:55 2011
@@ -24,9 +24,9 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
-import org.codehaus.plexus.util.FileUtils;
 
 /**
  * Test working directory configuration, SUREFIRE-416
@@ -79,13 +79,13 @@ public class WorkingDirectoryIT
         assertNotNull( "user.dir was null in property file", userDirPath );
         File userDir = new File( userDirPath );
         // test if not a symlink
-        if ( userDir.getAbsolutePath().equals( userDir.getCanonicalPath() ) )
+        if ( ! FileUtils.isSymlink( userDir) )
         {
-            assertEquals( "wrong user.dir", childTestDir.getAbsolutePath(), userDir.getAbsolutePath()
);
+            assertEquals( "wrong user.dir ! symlink", childTestDir.getAbsolutePath(), userDir.getAbsolutePath()
);
         }
         else
         {
-            assertEquals( "wrong user.dir", childTestDir.getCanonicalPath(), userDir.getCanonicalPath()
);
+            assertEquals( "wrong user.dir symlink", childTestDir.getCanonicalPath(), userDir.getCanonicalPath()
);
         }
     }
 



Mime
View raw message