Pass the BuildConfigurationCollection into the BuildView testing methods.

--
MOS_MIGRATED_REVID=103544466

2 files changed, 7 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index 12fd6cae3d..3d5cfb4c00 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -219,6 +219,10 @@ public abstract class AnalysisTestCase extends FoundationTestCase {
     return analysisResult.getActionGraph().getGeneratingAction(artifact);
   }
 
+  protected BuildConfigurationCollection getBuildConfigurationCollection() {
+    return masterConfig;
+  }
+
   protected BuildConfiguration getTargetConfiguration() {
     return Iterables.getOnlyElement(masterConfig.getTargetConfigurations());
   }
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 3b459ed433..38b73551ae 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
@@ -390,7 +390,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
    */
   protected Iterable<ConfiguredTarget> getDirectPrerequisites(ConfiguredTarget target)
       throws InterruptedException {
-    return view.getDirectPrerequisites(target);
+    return view.getDirectPrerequisites(target, masterConfig);
   }
 
   /**
@@ -440,7 +440,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
    * given configured target.
    */
   protected RuleContext getRuleContext(ConfiguredTarget target) throws InterruptedException {
-    return view.getRuleContextForTesting(target, new StubAnalysisEnvironment());
+    return view.getRuleContextForTesting(target, new StubAnalysisEnvironment(), masterConfig);
   }
 
   /**
@@ -460,7 +460,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
         reporter.handle(e);
       }
     };
-    return view.getRuleContextForTesting(target, eventHandler);
+    return view.getRuleContextForTesting(target, eventHandler, masterConfig);
   }
 
   /**