From 8cc5dcf34cf5156db78ccf5f936ca3c8b893c36f Mon Sep 17 00:00:00 2001 From: tomlu Date: Fri, 19 Jan 2018 09:28:06 -0800 Subject: Rename relativePath -> rootRelativePath in Root and friends. This makes it clearer that the path fragments in question are relative *to the root*. Confusingly, when the root is absolute, the root relative fragment is also absolute. This makes it a tiny bit clearer that the path fragment may be absolute. PiperOrigin-RevId: 182544893 --- .../com/google/devtools/build/lib/skyframe/FileFunctionTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java') diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java index c472b26896..268a9f3c9c 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java @@ -752,7 +752,8 @@ public class FileFunctionTest { FileValue value = (FileValue) result.get(key); assertThat(value).isNotNull(); assertThat(value.exists()).isTrue(); - assertThat(value.realRootedPath().getRelativePath().getPathString()).isEqualTo("insideroot"); + assertThat(value.realRootedPath().getRootRelativePath().getPathString()) + .isEqualTo("insideroot"); } @SuppressWarnings({"rawtypes", "unchecked"}) @@ -1201,7 +1202,8 @@ public class FileFunctionTest { if (absoluteSymlink) { FileSystemUtils.ensureSymbolicLink(intermediatePath, ancestorPath); } else { - FileSystemUtils.ensureSymbolicLink(intermediatePath, ancestorRootedPath.getRelativePath()); + FileSystemUtils.ensureSymbolicLink( + intermediatePath, ancestorRootedPath.getRootRelativePath()); } } else { FileSystemUtils.ensureSymbolicLink(ancestorPath, intermediatePath); @@ -1209,7 +1211,7 @@ public class FileFunctionTest { FileSystemUtils.ensureSymbolicLink(intermediatePath, descendantPath); } else { FileSystemUtils.ensureSymbolicLink( - intermediatePath, descendantRootedPath.getRelativePath()); + intermediatePath, descendantRootedPath.getRootRelativePath()); } } StoredEventHandler eventHandler = new StoredEventHandler(); -- cgit v1.2.3