Rollback of commit 69c98ab99563e0542cd6146de22a397679c67fdb.
--
MOS_MIGRATED_REVID=137506734
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 e179451..a25b498 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
@@ -604,15 +604,27 @@
protected Action getGeneratingAction(ConfiguredTarget target, String outputName) {
NestedSet<Artifact> filesToBuild = getFilesToBuild(target);
+ return getGeneratingAction(outputName, filesToBuild, "filesToBuild");
+ }
+
+ private Action getGeneratingAction(
+ String outputName, NestedSet<Artifact> filesToBuild, String providerName) {
Artifact artifact = Iterables.find(filesToBuild, artifactNamed(outputName), null);
if (artifact == null) {
fail(
String.format(
- "Artifact named '%s' not found in filesToBuild (%s)", outputName, filesToBuild));
+ "Artifact named '%s' not found in %s (%s)", outputName, providerName, filesToBuild));
}
return getGeneratingAction(artifact);
}
+ protected Action getGeneratingActionInOutputGroup(
+ ConfiguredTarget target, String outputName, String outputGroupName) {
+ NestedSet<Artifact> outputGroup =
+ target.getProvider(OutputGroupProvider.class).getOutputGroup(outputGroupName);
+ return getGeneratingAction(outputName, outputGroup, "outputGroup/" + outputGroupName);
+ }
+
/**
* Returns the SpawnAction that generates an artifact.
* Implicitly assumes the action is a SpawnAction.
