From 4ce0d8800f1aaabe82f7a61faf1d5609b69c38cf Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Fri, 24 Apr 2015 16:10:16 +0000 Subject: Inline/remove some calls to FoundationTestCase.scratchFS(). -- MOS_MIGRATED_REVID=91987064 --- .../analysis/actions/TemplateExpansionActionTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java') diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java index 0dd7fff710..112e4b17d2 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java @@ -58,15 +58,15 @@ public class TemplateExpansionActionTest extends FoundationTestCase { outputRoot = Root.asDerivedRoot(scratch.dir("/workspace"), scratch.dir("/workspace/out")); Path input = scratchFile("/workspace/input.txt", TEMPLATE); inputArtifact = new Artifact(input, workspace); - output = scratchFS().getPath("/workspace/out/destination.txt"); + output = scratch.resolve("/workspace/out/destination.txt"); outputArtifact = new Artifact(output, outputRoot); substitutions = Lists.newArrayList(); substitutions.add(Substitution.of("%key%", "foo")); substitutions.add(Substitution.of("%value%", "bar")); directories = new BlazeDirectories( - scratchFS().getPath("/install"), - scratchFS().getPath("/base"), - scratchFS().getPath("/workspace")); + scratch.resolve("/install"), + scratch.resolve("/base"), + scratch.resolve("/workspace")); binTools = BinTools.empty(directories); } @@ -93,7 +93,7 @@ public class TemplateExpansionActionTest extends FoundationTestCase { } public void testKeySameIfSame() throws Exception { - Artifact outputArtifact2 = new Artifact(scratchFS().getPath("/workspace/out/destination.txt"), + Artifact outputArtifact2 = new Artifact(scratch.resolve("/workspace/out/destination.txt"), outputRoot); TemplateExpansionAction a = new TemplateExpansionAction(NULL_ACTION_OWNER, outputArtifact, Template.forString(TEMPLATE), @@ -105,7 +105,7 @@ public class TemplateExpansionActionTest extends FoundationTestCase { } public void testKeyDiffersForSubstitution() throws Exception { - Artifact outputArtifact2 = new Artifact(scratchFS().getPath("/workspace/out/destination.txt"), + Artifact outputArtifact2 = new Artifact(scratch.resolve("/workspace/out/destination.txt"), outputRoot); TemplateExpansionAction a = new TemplateExpansionAction(NULL_ACTION_OWNER, outputArtifact, Template.forString(TEMPLATE), @@ -117,7 +117,7 @@ public class TemplateExpansionActionTest extends FoundationTestCase { } public void testKeyDiffersForExecutable() throws Exception { - Artifact outputArtifact2 = new Artifact(scratchFS().getPath("/workspace/out/destination.txt"), + Artifact outputArtifact2 = new Artifact(scratch.resolve("/workspace/out/destination.txt"), outputRoot); TemplateExpansionAction a = new TemplateExpansionAction(NULL_ACTION_OWNER, outputArtifact, Template.forString(TEMPLATE), @@ -129,7 +129,7 @@ public class TemplateExpansionActionTest extends FoundationTestCase { } public void testKeyDiffersForTemplates() throws Exception { - Artifact outputArtifact2 = new Artifact(scratchFS().getPath("/workspace/out/destination.txt"), + Artifact outputArtifact2 = new Artifact(scratch.resolve("/workspace/out/destination.txt"), outputRoot); TemplateExpansionAction a = new TemplateExpansionAction(NULL_ACTION_OWNER, outputArtifact, Template.forString(TEMPLATE), -- cgit v1.2.3