From 7fe0839f2206a6214201acee122871c89eeb2af4 Mon Sep 17 00:00:00 2001 From: Antoine Levy-Lambert Date: Mon, 22 Feb 2010 02:48:27 +0000 Subject: [PATCH] Fixing SymlinkTest#testSymbolicLinkUtilsMethods on Mac. Removing special handling of the Mac platform in this test case. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@912470 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 5 ++++- .../ant/taskdefs/optional/unix/SymlinkTest.java | 17 ++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index 2d6a7d077..3dbdba6e4 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -34,7 +34,10 @@ Fixed bugs: Bugzilla Report 48782 * Fix for exec task sometimes inserts extraneous newlines - Bugzilla Report 48746 + Bugzilla Report 48746 + +* SymlinkTest#testSymbolicLinkUtilsMethods failing on MacOS + Bugzilla Report 48785. Other changes: -------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java index 89beb868b..31dbeef32 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java @@ -254,15 +254,18 @@ public class SymlinkTest extends BuildFileTest { assertFalse(su.isDanglingSymbolicLink(f.getParentFile(), f.getName())); - //apparently OS X knows a symlink is a symlink even if the target is missing: - boolean mac = Os.isFamily(Os.FAMILY_MAC); - + // it is not possible to find out that symbolic links pointing + // to inexistent files or directories are symbolic links + // it used to be possible to detect this on Mac + // this is not true under Snow Leopard and JDK 1.5 + // Removing special handling of MacOS until someone shouts + // Antoine f = getProject().resolveFile("test-working/file.notthere"); assertFalse(f.exists()); assertFalse(f.isDirectory()); assertFalse(f.isFile()); - assertTrue(su.isSymbolicLink(f.getAbsolutePath()) == mac); - assertTrue(su.isSymbolicLink(f.getParentFile(), f.getName()) == mac); + assertTrue(su.isSymbolicLink(f.getAbsolutePath()) == false); + assertTrue(su.isSymbolicLink(f.getParentFile(), f.getName()) == false); assertTrue(su.isDanglingSymbolicLink(f.getAbsolutePath())); assertTrue(su.isDanglingSymbolicLink(f.getParentFile(), f.getName())); @@ -271,8 +274,8 @@ public class SymlinkTest extends BuildFileTest { assertFalse(f.exists()); assertFalse(f.isDirectory()); assertFalse(f.isFile()); - assertTrue(su.isSymbolicLink(f.getAbsolutePath()) == mac); - assertTrue(su.isSymbolicLink(f.getParentFile(), f.getName()) == mac); + assertTrue(su.isSymbolicLink(f.getAbsolutePath()) == false); + assertTrue(su.isSymbolicLink(f.getParentFile(), f.getName()) == false); assertTrue(su.isDanglingSymbolicLink(f.getAbsolutePath())); assertTrue(su.isDanglingSymbolicLink(f.getParentFile(), f.getName()));