diff options
author | vladmos <vladmos@google.com> | 2017-07-06 17:19:32 -0400 |
---|---|---|
committer | John Cater <jcater@google.com> | 2017-07-07 07:08:02 -0400 |
commit | 7e0f3329834029c75a4057854f18e8443e72742e (patch) | |
tree | 5a535e23b0d56ec0d5223e51c24bf0514e3c6aa2 /src/test/java | |
parent | 58dc6b98f92c88bd788b6459a2e26101c99f245a (diff) |
Clean up string representations for select values
If --incompatible_descriptive_string_representations is passed, select values
are converted to strings using `str`, `repr` and `print` functions differently:
"select(...)" instead of "selector(...)".
PiperOrigin-RevId: 161129809
Diffstat (limited to 'src/test/java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java | 2 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java index 860f1d702f..5dde93b421 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java @@ -509,7 +509,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { "macro()", "cc_library(name = 'a', srcs = [])"); getConfiguredTarget("//test:a"); - assertContainsEvent("selector({Label(\"//foo:foo\"): [Label(\"//bar:bar\")]})"); + assertContainsEvent("selector({\"//foo:foo\": [\"//bar:bar\"]})"); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java index 35d4d1d0d4..ea68ddc9f6 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java @@ -239,6 +239,15 @@ public class SkylarkStringRepresentationsTest extends SkylarkTestCase { } @Test + public void testStringRepresentations_Select() throws Exception { + setSkylarkSemanticsOptions("--incompatible_descriptive_string_representations=true"); + + assertStringRepresentation( + "select({'//foo': ['//bar']}) + select({'//foo2': ['//bar2']})", + "select({\"//foo\": [\"//bar\"]}) + select({\"//foo2\": [\"//bar2\"]})"); + } + + @Test public void testLegacyStringRepresentations_Labels() throws Exception { setSkylarkSemanticsOptions("--incompatible_descriptive_string_representations=false"); |