Browse Source

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
master
Matthew Jason Benson 16 years ago
parent
commit
db105dffc5
1 changed files with 7 additions and 6 deletions
  1. +7
    -6
      src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java

+ 7
- 6
src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java View File

@@ -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()));


Loading…
Cancel
Save