Author: krosenvold Date: Tue Oct 14 07:02:16 2014 New Revision: 1631645 URL: http://svn.apache.org/r1631645 Log: Disabled tests requiring symlinks in zip
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java?rev=1631645&r1=1631644&r2=1631645&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java (original) +++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java Tue Oct 14 07:02:16 2014 @@ -890,7 +890,7 @@ public class DirectoryScanner boolean isSymbolicLink( final File parent, final String name ) throws IOException { - if ( Java7Support.isJava7() ) + if ( Java7Support.isAtLeastJava7() ) { return Java7Support.isSymLink( parent ); } Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java?rev=1631645&r1=1631644&r2=1631645&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java (original) +++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java Tue Oct 14 07:02:16 2014 @@ -2005,7 +2005,7 @@ public class FileUtils public static boolean isSymbolicLink( final File file ) throws IOException { - if ( Java7Support.isJava7() ) + if ( Java7Support.isAtLeastJava7() ) { return Java7Support.isSymLink( file ); } @@ -2023,7 +2023,7 @@ public class FileUtils public static boolean isSymbolicLinkForSure( final File file ) throws IOException { - return Java7Support.isJava7() && Java7Support.isSymLink( file ); + return Java7Support.isAtLeastJava7() && Java7Support.isSymLink( file ); } /** Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java?rev=1631645&r1=1631644&r2=1631645&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java (original) +++ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java Tue Oct 14 07:02:16 2014 @@ -120,9 +120,10 @@ public class DirectoryScannerTest } @Test + @Ignore("Wait until we can run with assembly 2.5 which will support symlinks properly") public void followSymlinksFalse() { - if (!Java7Support.isJava7()) return; + if (!Java7Support.isAtLeastJava7()) return; DirectoryScanner ds = new DirectoryScanner(); ds.setBasedir( new File( "src/test/resources/symlinks/src/" ) ); ds.setFollowSymlinks( false ); @@ -155,7 +156,7 @@ public class DirectoryScannerTest @Test public void followSymlinks() { - if (!Java7Support.isJava7()) return; + if (!Java7Support.isAtLeastJava7()) return; DirectoryScanner ds = new DirectoryScanner(); ds.setBasedir( new File( "src/test/resources/symlinks/src/" ) ); ds.setFollowSymlinks( true ); Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java?rev=1631645&r1=1631644&r2=1631645&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java (original) +++ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java Tue Oct 14 07:02:16 2014 @@ -1369,6 +1369,7 @@ public class FileUtilsTest } @Test + @Ignore("Wait until we can run with assembly 2.5 which will support symlinks properly") public void isASymbolicLink() throws IOException { @@ -1381,6 +1382,7 @@ public class FileUtilsTest } @Test + @Ignore("Wait until we can run with assembly 2.5 which will support symlinks properly") public void notASymbolicLink() throws IOException { Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java?rev=1631645&r1=1631644&r2=1631645&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java (original) +++ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/Java7SupportTest.java Tue Oct 14 07:02:16 2014 @@ -34,7 +34,7 @@ public class Java7SupportTest { File file = new File( "." ); - if ( Java7Support.isJava7() ) + if ( Java7Support.isAtLeastJava7() ) { assertFalse( Java7Support.isSymLink( file ) ); } @@ -45,7 +45,7 @@ public class Java7SupportTest { File file = new File( "target/fzz" ); - if ( Java7Support.isJava7() ) + if ( Java7Support.isAtLeastJava7() ) { Java7Support.createSymbolicLink( file, new File("../target") );