From a2d101a755a99d4e44a259e98179993a81300912 Mon Sep 17 00:00:00 2001 From: brandjon Date: Tue, 1 Aug 2017 18:54:28 +0200 Subject: Make list EMPTY instance work like tuples I.e., use an accessor for type inference. The EMPTY field will be made private in a future CL. RELNOTES: None PiperOrigin-RevId: 163843569 --- .../devtools/build/lib/skylark/SkylarkIntegrationTest.java | 2 +- .../lib/skylark/SkylarkRuleImplementationFunctionsTest.java | 2 +- .../com/google/devtools/build/lib/syntax/EvaluationTest.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/test/java/com/google') diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java index 38792865a2..71e084da10 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java @@ -932,7 +932,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase { ConfiguredTarget target = getConfiguredTarget("//test/skylark:cr"); assertThat(target.get("o1")).isEqualTo(Runtime.NONE); - assertThat(target.get("o2")).isEqualTo(MutableList.EMPTY); + assertThat(target.get("o2")).isEqualTo(MutableList.empty()); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java index e23df8bd6c..075809f497 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java @@ -1538,7 +1538,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { public void testEmptyLabelListTypeAttrInCtx() throws Exception { SkylarkRuleContext ctx = createRuleContext("//foo:baz"); Object result = evalRuleContextCode(ctx, "ruleContext.attr.srcs"); - assertThat(result).isEqualTo(MutableList.EMPTY); + assertThat(result).isEqualTo(MutableList.empty()); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java index c722ab25da..d5cf1d2953 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java @@ -460,13 +460,13 @@ public class EvaluationTest extends EvaluationTestCase { .testStatement("[1, 2] * 3", MutableList.of(env, 1, 2, 1, 2, 1, 2)) .testStatement("[1, 2] * 4", MutableList.of(env, 1, 2, 1, 2, 1, 2, 1, 2)) .testStatement("[8] * 5", MutableList.of(env, 8, 8, 8, 8, 8)) - .testStatement("[ ] * 10", MutableList.EMPTY) - .testStatement("[1, 2] * 0", MutableList.EMPTY) - .testStatement("[1, 2] * -4", MutableList.EMPTY) + .testStatement("[ ] * 10", MutableList.empty()) + .testStatement("[1, 2] * 0", MutableList.empty()) + .testStatement("[1, 2] * -4", MutableList.empty()) .testStatement(" 2 * [1, 2]", MutableList.of(env, 1, 2, 1, 2)) - .testStatement("10 * []", MutableList.EMPTY) - .testStatement(" 0 * [1, 2]", MutableList.EMPTY) - .testStatement("-4 * [1, 2]", MutableList.EMPTY); + .testStatement("10 * []", MutableList.empty()) + .testStatement(" 0 * [1, 2]", MutableList.empty()) + .testStatement("-4 * [1, 2]", MutableList.empty()); } @SuppressWarnings("unchecked") -- cgit v1.2.3