From e770467384f1e3f0a13adef6b8afb7e6603ed177 Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Mon, 21 Sep 2015 14:37:41 +0000 Subject: Pass the BuildConfigurationCollection into the BuildView testing methods. -- MOS_MIGRATED_REVID=103544466 --- .../google/devtools/build/lib/analysis/util/AnalysisTestCase.java | 4 ++++ .../google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/test') 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 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); } /** -- cgit v1.2.3