diff options
author | Ulf Adams <ulfjack@google.com> | 2015-09-28 13:21:45 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2015-09-28 14:35:36 +0000 |
commit | a385d3eb7b78d4d155b7218019a08e7457f2514c (patch) | |
tree | ac817b31a3c15d8bf2f62d8130aa721eb0e36555 /src/test/java | |
parent | 4e7ed50345f3a3037549f7c41f852b5d9db4a08d (diff) |
Refactor BuildView; clearly identify the ide_build_info and the testing API.
Also inject the EventHandler all the way through to the SkyframeExecutor.
--
MOS_MIGRATED_REVID=104094731
Diffstat (limited to 'src/test/java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java | 2 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 12 |
2 files changed, 7 insertions, 7 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 db183ce9ea..0ef5e14462 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 @@ -315,7 +315,7 @@ public abstract class AnalysisTestCase extends FoundationTestCase { } catch (LabelSyntaxException e) { throw new AssertionError(e); } - return skyframeExecutor.getConfiguredTargetForTesting(parsedLabel, configuration); + return skyframeExecutor.getConfiguredTargetForTesting(reporter, parsedLabel, configuration); } /** 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 f7021eb8d6..420f0adf7a 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 @@ -381,7 +381,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { */ protected Iterable<ConfiguredTarget> getDirectPrerequisites(ConfiguredTarget target) throws InterruptedException { - return view.getDirectPrerequisites(target, masterConfig); + return view.getDirectPrerequisitesForTesting(reporter, target, masterConfig); } /** @@ -431,7 +431,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { * given configured target. */ protected RuleContext getRuleContext(ConfiguredTarget target) throws InterruptedException { - return view.getRuleContextForTesting(target, new StubAnalysisEnvironment(), masterConfig); + return view.getRuleContextForTesting( + reporter, target, new StubAnalysisEnvironment(), masterConfig); } /** @@ -590,8 +591,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { protected ConfiguredTarget getConfiguredTarget(String label, BuildConfiguration config) throws NoSuchPackageException, NoSuchTargetException, LabelSyntaxException, InterruptedException { - ensureTargetsVisited(label); - return view.getConfiguredTargetForTesting(getTarget(label), config); + return getConfiguredTarget(Label.parseAbsolute(label), config); } /** @@ -601,7 +601,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { protected ConfiguredTarget getConfiguredTarget(Label label, BuildConfiguration config) throws NoSuchPackageException, NoSuchTargetException, InterruptedException { ensureTargetsVisited(label); - return view.getConfiguredTargetForTesting(getTarget(label), config); + return view.getConfiguredTargetForTesting(reporter, label, config); } /** @@ -690,7 +690,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { throws IOException, Exception { Target rule = scratchRule(packageName, ruleName, lines); if (ensureTargetsVisited(rule.getLabel())) { - return view.getConfiguredTargetForTesting(rule, config); + return view.getConfiguredTargetForTesting(reporter, rule.getLabel(), config); } else { return null; } |