diff options
Diffstat (limited to 'src/test/java/com/google')
3 files changed, 11 insertions, 13 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 7ab868ba66..b5bf2b8698 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 @@ -498,6 +498,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { @Test public void existingRuleWithSelect() throws Exception { + setSkylarkSemanticsOptions("--incompatible_descriptive_string_representations=true"); scratch.file( "test/existing_rule.bzl", "def macro():", @@ -510,7 +511,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { "macro()", "cc_library(name = 'a', srcs = [])"); getConfiguredTarget("//test:a"); - assertContainsEvent("selector({\"//foo:foo\": [\"//bar:bar\"]})"); + assertContainsEvent("select({Label(\"//foo:foo\"): [Label(\"//bar:bar\")]})"); } @Test @@ -670,13 +671,6 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { } @Test - public void testSkylarkRuleContextStr() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); - Object result = evalRuleContextCode(ruleContext, "'%s' % ruleContext"); - assertThat(result).isEqualTo("//foo:foo"); - } - - @Test public void testSkylarkRuleContextGetDefaultShellEnv() throws Exception { SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); Object result = evalRuleContextCode(ruleContext, "ruleContext.configuration.default_shell_env"); diff --git a/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java b/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java index dd6a46af76..a373ba7ade 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java @@ -1602,14 +1602,14 @@ public class MethodLibraryTest extends EvaluationTestCase { @Test public void testStr() throws Exception { - new BothModesTest() + new BothModesTest("--incompatible_descriptive_string_representations=true") .testStatement("str(1)", "1") .testStatement("str(-2)", "-2") .testStatement("str([1, 2])", "[1, 2]") .testStatement("str(True)", "True") .testStatement("str(False)", "False") .testStatement("str(None)", "None") - .testStatement("str(str)", "<function str>"); + .testStatement("str(str)", "<built-in function str>"); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java index 4d52f6f51c..e903cfbef3 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java @@ -550,21 +550,25 @@ public class EvaluationTestCase { * A class that executes each separate test in both modes (Build and Skylark) */ protected class BothModesTest extends ModalTestCase { - public BothModesTest() {} + private final String[] skylarkOptions; + + public BothModesTest(String... skylarkOptions) { + this.skylarkOptions = skylarkOptions; + } /** * Executes the given Testable in both Build and Skylark mode */ @Override protected void run(Testable testable) throws Exception { - enableSkylarkMode(); + enableSkylarkMode(skylarkOptions); try { testable.run(); } catch (Exception e) { throw new Exception("While in Skylark mode", e); } - enableBuildMode(); + enableBuildMode(skylarkOptions); try { testable.run(); } catch (Exception e) { |