diff options
author | 2016-07-25 17:25:02 +0000 | |
---|---|---|
committer | 2016-07-26 09:30:10 +0000 | |
commit | 2c7d7b3db78484706fd62f926452eb8d1c86e317 (patch) | |
tree | 3f3f091ba77c925e1f698f36212f5217ab482ee3 /src/test/java/com/google/devtools/build/lib | |
parent | 79aa7796b957c864e8ee7f5ce4c361bc1c4347e7 (diff) |
Rename TreeFileArtifact-related functions to make them more self-explanatory and some minor clean-ups.
--
MOS_MIGRATED_REVID=128371398
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java | 23 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java | 4 |
2 files changed, 12 insertions, 15 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java b/src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java index 531baefda5..21b4b30f45 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/CustomCommandLineTest.java @@ -181,8 +181,8 @@ public class CustomCommandLineTest { Artifact treeArtifactTwo = createTreeArtifact("myArtifact/treeArtifact2"); CustomCommandLine commandLineTemplate = CustomCommandLine.builder() - .addTreeFileArtifactExecPath("--argOne", treeArtifactOne) - .addTreeFileArtifactExecPath("--argTwo", treeArtifactTwo) + .addPlaceholderTreeArtifactExecPath("--argOne", treeArtifactOne) + .addPlaceholderTreeArtifactExecPath("--argTwo", treeArtifactTwo) .build(); TreeFileArtifact treeFileArtifactOne = createTreeFileArtifact( @@ -204,23 +204,20 @@ public class CustomCommandLineTest { @Test public void testTreeFileArtifactExecPathWithTemplateArgs() { - Artifact treeArtifactOne = createTreeArtifact("myArtifact/treeArtifact1"); - Artifact treeArtifactTwo = createTreeArtifact("myArtifact/treeArtifact2"); + Artifact treeArtifact = createTreeArtifact("myArtifact/treeArtifact1"); CustomCommandLine commandLineTemplate = CustomCommandLine.builder() - .addTreeFileArtifactExecPaths("%s:%s", treeArtifactOne, treeArtifactTwo) + .addPlaceholderTreeArtifactFormattedExecPath("path:%s", treeArtifact) .build(); - TreeFileArtifact treeFileArtifactOne = createTreeFileArtifact( - treeArtifactOne, "children/child1"); - TreeFileArtifact treeFileArtifactTwo = createTreeFileArtifact( - treeArtifactTwo, "children/child2"); + TreeFileArtifact treeFileArtifact = createTreeFileArtifact( + treeArtifact, "children/child1"); CustomCommandLine commandLine = commandLineTemplate.evaluateTreeFileArtifacts( - ImmutableList.of(treeFileArtifactOne, treeFileArtifactTwo)); + ImmutableList.of(treeFileArtifact)); assertThat(commandLine.arguments()).containsExactly( - "myArtifact/treeArtifact1/children/child1:myArtifact/treeArtifact2/children/child2"); + "path:myArtifact/treeArtifact1/children/child1"); } @Test @@ -229,8 +226,8 @@ public class CustomCommandLineTest { Artifact treeArtifactTwo = createTreeArtifact("myArtifact/treeArtifact2"); CustomCommandLine commandLineTemplate = CustomCommandLine.builder() - .addTreeFileArtifactExecPath("--argOne", treeArtifactOne) - .addTreeFileArtifactExecPath("--argTwo", treeArtifactTwo) + .addPlaceholderTreeArtifactExecPath("--argOne", treeArtifactOne) + .addPlaceholderTreeArtifactExecPath("--argTwo", treeArtifactTwo) .build(); try { diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java index 036a7d2c9a..cb6fe32c80 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTemplateTest.java @@ -413,8 +413,8 @@ public class SpawnActionTemplateTest { private CustomCommandLine createSimpleCommandLineTemplate( Artifact inputTreeArtifact, Artifact outputTreeArtifact) { return CustomCommandLine.builder() - .addTreeFileArtifactExecPath(inputTreeArtifact) - .addTreeFileArtifactExecPath(outputTreeArtifact) + .addPlaceholderTreeArtifactExecPath(inputTreeArtifact) + .addPlaceholderTreeArtifactExecPath(outputTreeArtifact) .build(); } |