commit 1cdcdf9a72458850f8a0f40c7cab1699685ed6cc
author tomlu <tomlu@google.com> Tue Jan 16 11:07:51 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Tue Jan 16 11:09:25 2018 -0800
tree 888c68cd1fc59cc4608ac178ae633c1f40e22230
parent 644ada0444a9db285eb4e6c2511fc9581cc69880

Rename Root to ArtifactRoot.

This is slightly more descriptive, and we will potentially want to use the name Root for a broader concept shared between ArtifactRoot and RootedPath.

PiperOrigin-RevId: 182082367

src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
index bb54b99..1779162 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
@@ -28,8 +28,8 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.ArtifactRoot;
 import com.google.devtools.build.lib.actions.FilesetTraversalParams.PackageBoundaryMode;
-import com.google.devtools.build.lib.actions.Root;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.ServerDirectories;
@@ -150,12 +150,13 @@
   }
 
   private Artifact sourceArtifact(String path) {
-    return new Artifact(PathFragment.create(path), Root.asSourceRoot(rootDirectory));
+    return new Artifact(PathFragment.create(path), ArtifactRoot.asSourceRoot(rootDirectory));
   }
 
   private Artifact sourceArtifactUnderPackagePath(String path, String packagePath) {
     return new Artifact(
-        PathFragment.create(path), Root.asSourceRoot(rootDirectory.getRelative(packagePath)));
+        PathFragment.create(path),
+        ArtifactRoot.asSourceRoot(rootDirectory.getRelative(packagePath)));
   }
 
   private Artifact derivedArtifact(String path) {
@@ -164,7 +165,7 @@
     Artifact output =
         new Artifact(
             fullPath,
-            Root.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out")),
+            ArtifactRoot.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out")),
             execPath);
     return output;
   }