diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/util')
3 files changed, 24 insertions, 24 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 8e3f7555f5..1a5c6ea467 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 @@ -29,11 +29,11 @@ import com.google.devtools.build.lib.actions.ActionResult; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactFactory; import com.google.devtools.build.lib.actions.ArtifactOwner; +import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.actions.ExecutionStrategy; import com.google.devtools.build.lib.actions.MiddlemanFactory; import com.google.devtools.build.lib.actions.MutableActionGraph; import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; -import com.google.devtools.build.lib.actions.Root; 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; @@ -120,22 +120,22 @@ public final class AnalysisTestUtil { } @Override - public Artifact getDerivedArtifact(PathFragment rootRelativePath, Root root) { + public Artifact getDerivedArtifact(PathFragment rootRelativePath, ArtifactRoot root) { return original.getDerivedArtifact(rootRelativePath, root); } @Override - public Artifact getConstantMetadataArtifact(PathFragment rootRelativePath, Root root) { + public Artifact getConstantMetadataArtifact(PathFragment rootRelativePath, ArtifactRoot root) { return original.getConstantMetadataArtifact(rootRelativePath, root); } @Override - public Artifact getTreeArtifact(PathFragment rootRelativePath, Root root) { + public Artifact getTreeArtifact(PathFragment rootRelativePath, ArtifactRoot root) { return null; } @Override - public Artifact getFilesetArtifact(PathFragment rootRelativePath, Root root) { + public Artifact getFilesetArtifact(PathFragment rootRelativePath, ArtifactRoot root) { return original.getFilesetArtifact(rootRelativePath, root); } @@ -326,12 +326,12 @@ public final class AnalysisTestUtil { } @Override - public Artifact getConstantMetadataArtifact(PathFragment rootRelativePath, Root root) { + public Artifact getConstantMetadataArtifact(PathFragment rootRelativePath, ArtifactRoot root) { return null; } @Override - public Artifact getTreeArtifact(PathFragment rootRelativePath, Root root) { + public Artifact getTreeArtifact(PathFragment rootRelativePath, ArtifactRoot root) { return null; } @@ -366,12 +366,12 @@ public final class AnalysisTestUtil { } @Override - public Artifact getFilesetArtifact(PathFragment rootRelativePath, Root root) { + public Artifact getFilesetArtifact(PathFragment rootRelativePath, ArtifactRoot root) { return null; } @Override - public Artifact getDerivedArtifact(PathFragment rootRelativePath, Root root) { + public Artifact getDerivedArtifact(PathFragment rootRelativePath, ArtifactRoot root) { return null; } @@ -462,7 +462,7 @@ public final class AnalysisTestUtil { Set<String> files = new LinkedHashSet<>(); for (Artifact artifact : artifacts) { - Root root = artifact.getRoot(); + ArtifactRoot root = artifact.getRoot(); if (root.isSourceRoot()) { files.add("src " + artifact.getRootRelativePath()); } else { 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 457d184a92..a448942f75 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 @@ -36,13 +36,13 @@ import com.google.devtools.build.lib.actions.ActionInput; import com.google.devtools.build.lib.actions.ActionKeyContext; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactOwner; +import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.actions.CommandLineExpansionException; import com.google.devtools.build.lib.actions.MapBasedActionGraph; import com.google.devtools.build.lib.actions.MiddlemanFactory; import com.google.devtools.build.lib.actions.MutableActionGraph; import com.google.devtools.build.lib.actions.ResourceManager; import com.google.devtools.build.lib.actions.ResourceSet; -import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.analysis.AnalysisEnvironment; import com.google.devtools.build.lib.analysis.AnalysisUtils; @@ -970,12 +970,12 @@ public abstract class BuildViewTestCase extends FoundationTestCase { .isSameAs(getGeneratingActionForLabel(labelA)); } - protected Artifact getSourceArtifact(PathFragment rootRelativePath, Root root) { + protected Artifact getSourceArtifact(PathFragment rootRelativePath, ArtifactRoot root) { return view.getArtifactFactory().getSourceArtifact(rootRelativePath, root); } protected Artifact getSourceArtifact(String name) { - return getSourceArtifact(PathFragment.create(name), Root.asSourceRoot(rootDirectory)); + return getSourceArtifact(PathFragment.create(name), ArtifactRoot.asSourceRoot(rootDirectory)); } /** @@ -985,7 +985,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { * #getBinArtifactWithNoOwner} or {@link #getGenfilesArtifactWithNoOwner} should be used instead. */ protected Artifact getDerivedArtifact( - PathFragment rootRelativePath, Root root, ArtifactOwner owner) { + PathFragment rootRelativePath, ArtifactRoot root, ArtifactOwner owner) { return view.getArtifactFactory().getDerivedArtifact(rootRelativePath, root, owner); } @@ -993,10 +993,10 @@ public abstract class BuildViewTestCase extends FoundationTestCase { * Gets a derived Artifact for testing with path of the form * root/owner.getPackageFragment()/packageRelativePath. * - * @see #getDerivedArtifact(PathFragment, Root, ArtifactOwner) + * @see #getDerivedArtifact(PathFragment, ArtifactRoot, ArtifactOwner) */ - private Artifact getPackageRelativeDerivedArtifact(String packageRelativePath, Root root, - ArtifactOwner owner) { + private Artifact getPackageRelativeDerivedArtifact( + String packageRelativePath, ArtifactRoot root, ArtifactOwner owner) { return getDerivedArtifact( owner.getLabel().getPackageFragment().getRelative(packageRelativePath), root, owner); @@ -1708,12 +1708,12 @@ public abstract class BuildViewTestCase extends FoundationTestCase { } @Override - public Artifact getConstantMetadataArtifact(PathFragment rootRelativePath, Root root) { + public Artifact getConstantMetadataArtifact(PathFragment rootRelativePath, ArtifactRoot root) { throw new UnsupportedOperationException(); } @Override - public Artifact getTreeArtifact(PathFragment rootRelativePath, Root root) { + public Artifact getTreeArtifact(PathFragment rootRelativePath, ArtifactRoot root) { throw new UnsupportedOperationException(); } @@ -1748,12 +1748,12 @@ public abstract class BuildViewTestCase extends FoundationTestCase { } @Override - public Artifact getFilesetArtifact(PathFragment rootRelativePath, Root root) { + public Artifact getFilesetArtifact(PathFragment rootRelativePath, ArtifactRoot root) { throw new UnsupportedOperationException(); } @Override - public Artifact getDerivedArtifact(PathFragment rootRelativePath, Root root) { + public Artifact getDerivedArtifact(PathFragment rootRelativePath, ArtifactRoot root) { throw new UnsupportedOperationException(); } @@ -1925,7 +1925,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase { Rule associatedRule = target.getTarget().getAssociatedRule(); RepositoryName repository = associatedRule.getRepository(); - Root root; + ArtifactRoot root; if (associatedRule.hasBinaryOutput()) { root = configuration.getBinDirectory(repository); } else { diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java index c142337717..7953c33e71 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java @@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.ActionKeyContext; -import com.google.devtools.build.lib.actions.Root; +import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ServerDirectories; @@ -201,7 +201,7 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { public void assertConfigurationsHaveUniqueOutputDirectories( BuildConfigurationCollection configCollection) throws Exception { - Map<Root, BuildConfiguration> outputPaths = new HashMap<>(); + Map<ArtifactRoot, BuildConfiguration> outputPaths = new HashMap<>(); for (BuildConfiguration config : configCollection.getTargetConfigurations()) { if (config.isActionsEnabled()) { BuildConfiguration otherConfig = outputPaths.get( |