diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactMetadataTest.java | 13 |
1 files changed, 6 insertions, 7 deletions
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 4e3b242b5d..96bc4bed65 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 @@ -85,13 +85,12 @@ public class TreeArtifactMetadataTest extends ArtifactFunctionTestCase { } private TreeArtifactValue doTestTreeArtifacts(Iterable<PathFragment> children) throws Exception { - Artifact output = createTreeArtifact("output"); + SpecialArtifact output = createTreeArtifact("output"); return doTestTreeArtifacts(output, children); } - private TreeArtifactValue doTestTreeArtifacts(Artifact tree, - Iterable<PathFragment> children) - throws Exception { + private TreeArtifactValue doTestTreeArtifacts( + SpecialArtifact tree, Iterable<PathFragment> children) throws Exception { TreeArtifactValue value = evaluateTreeArtifact(tree, children); assertThat(value.getChildPaths()).containsExactlyElementsIn(ImmutableSet.copyOf(children)); assertThat(value.getChildren()).containsExactlyElementsIn( @@ -200,10 +199,10 @@ public class TreeArtifactMetadataTest extends ArtifactFunctionTestCase { writeFile(path, contents); } - private Artifact createTreeArtifact(String path) throws IOException { + private SpecialArtifact createTreeArtifact(String path) throws IOException { PathFragment execPath = PathFragment.create("out").getRelative(path); Path fullPath = root.getRelative(execPath); - Artifact output = + SpecialArtifact output = new SpecialArtifact( fullPath, ArtifactRoot.asDerivedRoot(root, root.getRelative("out")), @@ -254,7 +253,7 @@ public class TreeArtifactMetadataTest extends ArtifactFunctionTestCase { ActionLookupValue actionLookupValue = (ActionLookupValue) env.getValue(actionLookupData.getActionLookupNode()); Action action = actionLookupValue.getAction(actionLookupData.getActionIndex()); - Artifact output = Iterables.getOnlyElement(action.getOutputs()); + SpecialArtifact output = (SpecialArtifact) Iterables.getOnlyElement(action.getOutputs()); for (PathFragment subpath : testTreeArtifactContents) { try { TreeFileArtifact suboutput = ActionInputHelper.treeFileArtifact(output, subpath); |