--

MOS_MIGRATED_REVID=121896547

1 files changed, 19 insertions, 1 deletions

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 22fe2574de..64b706e6ce 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
@@ -927,6 +927,24 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
    */
   protected Artifact getBinArtifact(String packageRelativePath, ConfiguredTarget owner,
       NativeAspectClass creatingAspectFactory) {
+    return getBinArtifact(
+        packageRelativePath, owner, creatingAspectFactory, AspectParameters.EMPTY);
+  }
+
+  /**
+   * Gets a derived Artifact for testing in the subdirectory of the {@link
+   * BuildConfiguration#getBinDirectory()} corresponding to the package of {@code owner},
+   * where the given artifact belongs to the given ConfiguredTarget together with the given Aspect.
+   * So to specify a file foo/foo.o owned by target //foo:foo with an aspect from FooAspect,
+   * {@code packageRelativePath} should just be "foo.o", and aspectOfOwner should be
+   * FooAspect.class. This method is necessary when an Aspect of the target, not the target itself,
+   * is creating an Artifact.
+   */
+  protected Artifact getBinArtifact(
+      String packageRelativePath,
+      ConfiguredTarget owner,
+      NativeAspectClass creatingAspectFactory,
+      AspectParameters parameters) {
     return getPackageRelativeDerivedArtifact(
         packageRelativePath,
         owner.getConfiguration().getBinDirectory(),
@@ -936,7 +954,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
                     owner.getConfiguration(),
                     owner.getConfiguration(),
                     creatingAspectFactory,
-                    AspectParameters.EMPTY)
+                    parameters)
                 .argument());
   }