From db105dffc51d91759c8e656226bc6c4a5855d0ef Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Fri, 10 Oct 2008 17:56:54 +0000 Subject: [PATCH] make symlink junit test pass on OS X git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@703537 13f79535-47bb-0310-9956-ffa450edef68 --- .../ant/taskdefs/optional/unix/SymlinkTest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 22e8c2694..89beb868b 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,13 +254,15 @@ 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); + f = getProject().resolveFile("test-working/file.notthere"); assertFalse(f.exists()); assertFalse(f.isDirectory()); assertFalse(f.isFile()); - assertFalse(su.isSymbolicLink(f.getAbsolutePath())); - assertFalse(su.isSymbolicLink(f.getParentFile(), - f.getName())); + assertTrue(su.isSymbolicLink(f.getAbsolutePath()) == mac); + assertTrue(su.isSymbolicLink(f.getParentFile(), f.getName()) == mac); assertTrue(su.isDanglingSymbolicLink(f.getAbsolutePath())); assertTrue(su.isDanglingSymbolicLink(f.getParentFile(), f.getName())); @@ -269,9 +271,8 @@ public class SymlinkTest extends BuildFileTest { assertFalse(f.exists()); assertFalse(f.isDirectory()); assertFalse(f.isFile()); - assertFalse(su.isSymbolicLink(f.getAbsolutePath())); - assertFalse(su.isSymbolicLink(f.getParentFile(), - f.getName())); + assertTrue(su.isSymbolicLink(f.getAbsolutePath()) == mac); + assertTrue(su.isSymbolicLink(f.getParentFile(), f.getName()) == mac); assertTrue(su.isDanglingSymbolicLink(f.getAbsolutePath())); assertTrue(su.isDanglingSymbolicLink(f.getParentFile(), f.getName()));