--

MOS_MIGRATED_REVID=107071491

2 files changed, 12 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java
index 221fb2d5b0..4857c21d5e 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java
@@ -478,7 +478,7 @@ public class Artifact implements FileType.HasFilename, ActionInput, SkylarkValue
         }
       };
 
-  private static final Function<Artifact, String> ROOT_RELATIVE_PATH_STRING =
+  public static final Function<Artifact, String> ROOT_RELATIVE_PATH_STRING =
       new Function<Artifact, String>() {
         @Override
         public String apply(Artifact artifact) {
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index feda7c4e91..939915db53 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -506,6 +506,14 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
     return getActionGraph().getGeneratingAction(artifact);
   }
 
+  /**
+   * Returns the SpawnAction that generates an artifact.
+   * Implicitly assumes the action is a SpawnAction.
+   */
+  protected final SpawnAction getGeneratingSpawnAction(Artifact artifact) {
+    return (SpawnAction) getGeneratingAction(artifact);
+  }
+
   protected void simulateLoadingPhase() {
     try {
       ensureTargetsVisited(targetConfig.getAllLabels().values());
@@ -1356,11 +1364,9 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
     return result;
   }
 
-  protected SpawnAction getGeneratingAction(ConfiguredTarget target,
-      String outputName) {
-    Artifact found = Iterables.find(getFilesToBuild(target),
-        artifactNamed(outputName));
-    return (SpawnAction) getGeneratingAction(found);
+  protected SpawnAction getGeneratingAction(ConfiguredTarget target, String outputName) {
+    return getGeneratingSpawnAction(
+        Iterables.find(getFilesToBuild(target), artifactNamed(outputName)));
   }
 
   protected String getErrorMsgSingleFile(String attrName, String ruleType, String ruleName,