diff options
author | 2015-03-03 10:59:21 +0000 | |
---|---|---|
committer | 2015-03-05 14:24:35 +0000 | |
commit | 1e79b96be40d4a31d2da89ff7320ddf077494a77 (patch) | |
tree | 44d8259c310f9629e6585d95ad372df54dfaf396 /src/test/java/com/google/devtools/build/lib/analysis/util | |
parent | cefec05931b9e602238eab3201a1d780dd5de268 (diff) |
Rename TopLevelArtifactProvider to OutputGroupProvider.
--
MOS_MIGRATED_REVID=87596401
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util')
3 files changed, 8 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java index a801f0eb0d..41793bfaf0 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java @@ -41,9 +41,9 @@ import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.analysis.AnalysisEnvironment; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.BuildInfoHelper; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.TopLevelArtifactContext; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; import com.google.devtools.build.lib.analysis.WorkspaceStatusAction; import com.google.devtools.build.lib.analysis.WorkspaceStatusAction.Key; import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory.BuildInfoKey; @@ -72,7 +72,7 @@ public final class AnalysisTestUtil { public static final TopLevelArtifactContext TOP_LEVEL_ARTIFACT_CONTEXT = new TopLevelArtifactContext( /*runTestsExclusively=*/false, - /*outputGroups=*/ImmutableSortedSet.of(TopLevelArtifactProvider.DEFAULT)); + /*outputGroups=*/ImmutableSortedSet.of(OutputGroupProvider.DEFAULT)); /** * An {@link AnalysisEnvironment} implementation that collects the actions registered. 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 2e316b9004..d1b99e7067 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 @@ -51,12 +51,12 @@ import com.google.devtools.build.lib.analysis.FileConfiguredTarget; import com.google.devtools.build.lib.analysis.FileProvider; import com.google.devtools.build.lib.analysis.FilesToRunProvider; import com.google.devtools.build.lib.analysis.LabelAndConfiguration; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.Runfiles; import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.analysis.RunfilesSupport; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.analysis.WorkspaceStatusAction; @@ -1091,7 +1091,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { protected NestedSet<Artifact> getOutputGroup( TransitiveInfoCollection target, String outputGroup) { - TopLevelArtifactProvider provider = target.getProvider(TopLevelArtifactProvider.class); + OutputGroupProvider provider = target.getProvider(OutputGroupProvider.class); return provider == null ? NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER) : provider.getOutputGroup(outputGroup); @@ -1364,8 +1364,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { protected Iterable<String> baselineCoverageArtifactBasenames(ConfiguredTarget target) throws Exception { Artifact baselineCoverage = Iterables.getOnlyElement(target - .getProvider(TopLevelArtifactProvider.class) - .getOutputGroup(TopLevelArtifactProvider.BASELINE_COVERAGE)); + .getProvider(OutputGroupProvider.class) + .getOutputGroup(OutputGroupProvider.BASELINE_COVERAGE)); BaselineCoverageAction baselineAction = (BaselineCoverageAction) getGeneratingAction(baselineCoverage); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java index 0d931f4b63..ce7bb412c3 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java @@ -15,7 +15,7 @@ package com.google.devtools.build.lib.analysis.util; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.ConfiguredTarget; -import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; /** * Common code for unit tests that validate --compile_only behavior. @@ -23,7 +23,7 @@ import com.google.devtools.build.lib.analysis.TopLevelArtifactProvider; public abstract class CompileOnlyTestCase extends BuildViewTestCase { protected Artifact getArtifactByExecPathSuffix(ConfiguredTarget target, String path) { - for (Artifact artifact : getOutputGroup(target, TopLevelArtifactProvider.FILES_TO_COMPILE)) { + for (Artifact artifact : getOutputGroup(target, OutputGroupProvider.FILES_TO_COMPILE)) { if (artifact.getExecPathString().endsWith(path)) { return artifact; } |