diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe')
8 files changed, 31 insertions, 23 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java index 8e55e34e4c..f122174101 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunctionTest.java @@ -30,8 +30,8 @@ import com.google.devtools.build.lib.actions.Artifact.SpecialArtifactType; import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact; import com.google.devtools.build.lib.actions.ArtifactOwner; import com.google.devtools.build.lib.actions.ArtifactPrefixConflictException; +import com.google.devtools.build.lib.actions.ArtifactRoot; 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.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.SpawnActionTemplate; @@ -209,7 +209,7 @@ public final class ActionTemplateExpansionFunctionTest extends FoundationTestCas Path fullPath = rootDirectory.getRelative(execPath); return new SpecialArtifact( fullPath, - Root.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out")), + ArtifactRoot.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out")), execPath, ArtifactOwner.NULL_OWNER, SpecialArtifactType.TREE); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java index aba293108b..339ad4e7ec 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java @@ -31,8 +31,8 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact; import com.google.devtools.build.lib.actions.Artifact.SpecialArtifactType; import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact; +import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.actions.MissingInputFileException; -import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.actions.util.TestAction.DummyAction; import com.google.devtools.build.lib.events.NullEventHandler; @@ -245,7 +245,7 @@ public class ArtifactFunctionTest extends ArtifactFunctionTestCase { } private Artifact createSourceArtifact(String path) { - return new Artifact(PathFragment.create(path), Root.asSourceRoot(root)); + return new Artifact(PathFragment.create(path), ArtifactRoot.asSourceRoot(root)); } private Artifact createDerivedArtifact(String path) { @@ -253,13 +253,17 @@ public class ArtifactFunctionTest extends ArtifactFunctionTestCase { Path fullPath = root.getRelative(execPath); Artifact output = new Artifact( - fullPath, Root.asDerivedRoot(root, root.getRelative("out")), execPath, ALL_OWNER); + fullPath, + ArtifactRoot.asDerivedRoot(root, root.getRelative("out")), + execPath, + ALL_OWNER); actions.add(new DummyAction(ImmutableList.<Artifact>of(), output)); return output; } private Artifact createMiddlemanArtifact(String path) { - Root middlemanRoot = Root.middlemanRoot(middlemanPath, middlemanPath.getRelative("out")); + ArtifactRoot middlemanRoot = + ArtifactRoot.middlemanRoot(middlemanPath, middlemanPath.getRelative("out")); Path fullPath = middlemanRoot.getPath().getRelative(path); return new Artifact( fullPath, middlemanRoot, fullPath.relativeTo(middlemanRoot.getExecRoot()), ALL_OWNER); @@ -276,7 +280,7 @@ public class ArtifactFunctionTest extends ArtifactFunctionTestCase { Path fullPath = root.getRelative(execPath); return new SpecialArtifact( fullPath, - Root.asDerivedRoot(root, root.getRelative("out")), + ArtifactRoot.asDerivedRoot(root, root.getRelative("out")), execPath, ALL_OWNER, SpecialArtifactType.TREE); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java index 90ed181ad2..26712266f3 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java @@ -25,11 +25,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.actions.Artifact; +import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.actions.FilesetOutputSymlink; import com.google.devtools.build.lib.actions.FilesetTraversalParams; import com.google.devtools.build.lib.actions.FilesetTraversalParams.PackageBoundaryMode; import com.google.devtools.build.lib.actions.FilesetTraversalParamsFactory; -import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.cmdline.Label; @@ -129,7 +129,7 @@ public final class FilesetEntryFunctionTest extends FoundationTestCase { } private Artifact getSourceArtifact(String path) throws Exception { - return new Artifact(PathFragment.create(path), Root.asSourceRoot(rootDirectory)); + return new Artifact(PathFragment.create(path), ArtifactRoot.asSourceRoot(rootDirectory)); } private Artifact createSourceArtifact(String path) throws Exception { diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java index 50059107eb..01ed4fd6c1 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java @@ -29,7 +29,7 @@ import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact; import com.google.devtools.build.lib.actions.Artifact.SpecialArtifactType; import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact; import com.google.devtools.build.lib.actions.ArtifactOwner; -import com.google.devtools.build.lib.actions.Root; +import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.actions.util.TestAction; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ServerDirectories; @@ -608,14 +608,14 @@ public class FilesystemValueCheckerTest { Path outputPath = fs.getPath("/bin"); outputPath.createDirectory(); return new Artifact( - outputPath.getRelative(relPath), Root.asDerivedRoot(fs.getPath("/"), outputPath)); + outputPath.getRelative(relPath), ArtifactRoot.asDerivedRoot(fs.getPath("/"), outputPath)); } private Artifact createTreeArtifact(String relPath) throws IOException { Path outputDir = fs.getPath("/bin"); Path outputPath = outputDir.getRelative(relPath); outputDir.createDirectory(); - Root derivedRoot = Root.asDerivedRoot(fs.getPath("/"), outputDir); + ArtifactRoot derivedRoot = ArtifactRoot.asDerivedRoot(fs.getPath("/"), outputDir); return new SpecialArtifact(outputPath, derivedRoot, derivedRoot.getExecPath().getRelative(outputPath.relativeTo(derivedRoot.getPath())), ArtifactOwner.NULL_OWNER, SpecialArtifactType.TREE); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java index bb54b99d19..1779162f01 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java @@ -28,8 +28,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.devtools.build.lib.actions.Artifact; +import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.actions.FilesetTraversalParams.PackageBoundaryMode; -import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.analysis.BlazeDirectories; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ServerDirectories; @@ -150,12 +150,13 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe } private Artifact sourceArtifact(String path) { - return new Artifact(PathFragment.create(path), Root.asSourceRoot(rootDirectory)); + return new Artifact(PathFragment.create(path), ArtifactRoot.asSourceRoot(rootDirectory)); } private Artifact sourceArtifactUnderPackagePath(String path, String packagePath) { return new Artifact( - PathFragment.create(path), Root.asSourceRoot(rootDirectory.getRelative(packagePath))); + PathFragment.create(path), + ArtifactRoot.asSourceRoot(rootDirectory.getRelative(packagePath))); } private Artifact derivedArtifact(String path) { @@ -164,7 +165,7 @@ public final class RecursiveFilesystemTraversalFunctionTest extends FoundationTe Artifact output = new Artifact( fullPath, - Root.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out")), + ArtifactRoot.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out")), execPath); return output; } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index 8e569fc201..e5a2ade4dc 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java @@ -40,11 +40,11 @@ import com.google.devtools.build.lib.actions.ActionLookupData; import com.google.devtools.build.lib.actions.ActionLookupValue; import com.google.devtools.build.lib.actions.ActionResult; import com.google.devtools.build.lib.actions.Artifact; +import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.actions.BuildFailedException; import com.google.devtools.build.lib.actions.Executor; 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.TestExecException; import com.google.devtools.build.lib.actions.cache.ActionCache; import com.google.devtools.build.lib.actions.cache.Protos.ActionCacheStatistics; @@ -327,7 +327,7 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { Artifact createSourceArtifact(FileSystem fs, String name) { Path root = fs.getPath(TestUtils.tmpDir()); - return new Artifact(PathFragment.create(name), Root.asSourceRoot(root)); + return new Artifact(PathFragment.create(name), ArtifactRoot.asSourceRoot(root)); } protected Artifact createDerivedArtifact(String name) { @@ -340,7 +340,7 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { Path path = execRoot.getRelative(execPath); return new Artifact( path, - Root.asDerivedRoot(execRoot, execRoot.getRelative("out")), + ArtifactRoot.asDerivedRoot(execRoot, execRoot.getRelative("out")), execPath, ACTION_LOOKUP_KEY); } diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java index 3846003c8e..1a9063b33f 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactBuildTest.java @@ -40,8 +40,8 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact; import com.google.devtools.build.lib.actions.Artifact.SpecialArtifactType; import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact; +import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.actions.BuildFailedException; -import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.actions.cache.MetadataHandler; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.actions.util.TestAction; @@ -1183,7 +1183,7 @@ public class TreeArtifactBuildTest extends TimestampBuilderTestCase { Path path = execRoot.getRelative(execPath); return new SpecialArtifact( path, - Root.asDerivedRoot(execRoot, execRoot.getRelative("out")), + ArtifactRoot.asDerivedRoot(execRoot, execRoot.getRelative("out")), execPath, ACTION_LOOKUP_KEY, SpecialArtifactType.TREE); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java index 0f346d6fd8..3c32a9df3d 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java @@ -32,8 +32,8 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact; import com.google.devtools.build.lib.actions.Artifact.SpecialArtifactType; import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact; +import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.actions.MissingInputFileException; -import com.google.devtools.build.lib.actions.Root; import com.google.devtools.build.lib.actions.cache.DigestUtils; import com.google.devtools.build.lib.actions.cache.Metadata; import com.google.devtools.build.lib.actions.util.TestAction.DummyAction; @@ -207,7 +207,10 @@ public class TreeArtifactMetadataTest extends ArtifactFunctionTestCase { Path fullPath = root.getRelative(execPath); Artifact output = new SpecialArtifact( - fullPath, Root.asDerivedRoot(root, root.getRelative("out")), execPath, ALL_OWNER, + fullPath, + ArtifactRoot.asDerivedRoot(root, root.getRelative("out")), + execPath, + ALL_OWNER, SpecialArtifactType.TREE); actions.add(new DummyAction(ImmutableList.<Artifact>of(), output)); FileSystemUtils.createDirectoryAndParents(fullPath); |