commit 17cb02dc4dad4a6bad59bc08d9789a3a0e5a17fe
author jcater <jcater@google.com> Thu Nov 16 10:09:13 2017 -0800
committer Copybara-Service <copybara-piper@google.com> Thu Nov 16 10:10:42 2017 -0800
tree 927de42af2ef83f0a3ff0229c0f2501c125aac3b
parent f241929014afa80a99be572275464ea126bac94e

Fix Skylark outputs to properly report errors in template placeholders.

Fixes #1479.

PiperOrigin-RevId: 175979487

src/test/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunctionTest.java b/src/test/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunctionTest.java
index c0e098a..b0a3a23 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunctionTest.java
@@ -136,13 +136,17 @@
       String[] expectedSubstitutions,
       String[] expectedFoundPlaceholders)
       throws Exception {
-    List<String> foundAttributes = new ArrayList<>();
-    List<String> substitutions =
-        ImplicitOutputsFunction.substitutePlaceholderIntoTemplate(
-            template, null, attrValues, foundAttributes);
-    assertThat(foundAttributes)
+    // Directly call into ParsedTemplate in order to access the attribute names.
+    ImplicitOutputsFunction.ParsedTemplate parsedTemplate =
+        ImplicitOutputsFunction.ParsedTemplate.parse(template);
+
+    assertThat(parsedTemplate.attributeNames())
         .containsExactlyElementsIn(Arrays.asList(expectedFoundPlaceholders))
         .inOrder();
+
+    // Test the actual substitution code.
+    List<String> substitutions =
+        ImplicitOutputsFunction.substitutePlaceholderIntoTemplate(template, null, attrValues);
     assertThat(substitutions)
         .containsExactlyElementsIn(Arrays.asList(expectedSubstitutions));
   }