diff options
2 files changed, 2 insertions, 2 deletions
diff --git a/testing/src/test/java/org/aspectj/testing/util/FileUtil.java b/testing/src/test/java/org/aspectj/testing/util/FileUtil.java index 03b29a85a..103eba59b 100644 --- a/testing/src/test/java/org/aspectj/testing/util/FileUtil.java +++ b/testing/src/test/java/org/aspectj/testing/util/FileUtil.java @@ -477,7 +477,7 @@ public class FileUtil { throws IOException { String path = in.getCanonicalPath(); String parentPath = parent.getCanonicalPath(); - if (!path.startsWith(parentPath)) { + if (!in.getCanonicalFile().toPath().startsWith(parentPath)) { throw new Error("not parent: " + parentPath + " of " + path); } else { path = path.substring(1+parentPath.length()); diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java index d9858ce42..827710b26 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AbstractMultiProjectIncrementalAjdeInteractionTestbed.java @@ -159,7 +159,7 @@ public class AbstractMultiProjectIncrementalAjdeInteractionTestbed extends AjdeI try { fileFound = f.getCanonicalPath(); String toRemove = base.getCanonicalPath(); - if (!fileFound.startsWith(toRemove)) { + if (!f.getCanonicalFile().toPath().startsWith(toRemove)) { throw new RuntimeException("eh? " + fileFound + " " + toRemove); } collectionPoint.add(fileFound.substring(toRemove.length() + 1));// +1 captures extra separator |