commit 140c04bbaf0d07eb88abd1e40c1ee4f79cc84c57
author laurentlb <laurentlb@google.com> Tue May 21 06:56:28 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 21 06:57:50 2019 -0700
tree 850074c7feab91ef00567ab12330d04f92796234
parent d654510664a7359680e952b8cd5b77ee6e8bad8c

Update tests to avoid deprecated attr params

This is in preparation of flipping --incompatible_disable_deprecated_attr_params

https://github.com/bazelbuild/bazel/issues/5818

RELNOTES: None.
PiperOrigin-RevId: 249241398

src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
index aa45082..bfd2684 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
@@ -968,7 +968,7 @@
         "java_custom_library = rule(",
         "  implementation = _impl,",
         "  attrs = {",
-        "    'jar': attr.label(allow_files = True, single_file = True),",
+        "    'jar': attr.label(allow_single_file = True),",
         "    '_java_toolchain': attr.label(default = Label('//java/com/google/test:toolchain')),",
         "    '_host_javabase': attr.label(",
         "        default = Label('" + HOST_JAVA_RUNTIME_LABEL + "'))",
@@ -2111,7 +2111,7 @@
         "java_custom_library = rule(",
         "  implementation = _impl,",
         "  attrs = {",
-        "    'jar': attr.label(allow_files = True, single_file = True),",
+        "    'jar': attr.label(allow_single_file = True),",
         "  }",
         ")");
     scratch.file(
@@ -2142,7 +2142,7 @@
         "custom_rule = rule(",
         "  implementation = _impl,",
         "  attrs = {",
-        "    'jar': attr.label(allow_files = True, single_file = True),",
+        "    'jar': attr.label(allow_single_file = True),",
         "  }",
         ")");
     scratch.file(
@@ -2177,7 +2177,7 @@
         "custom_rule = rule(",
         "  implementation = _impl,",
         "  attrs = {",
-        "    'jar': attr.label(allow_files = True, single_file = True),",
+        "    'jar': attr.label(allow_single_file = True),",
         "  }",
         ")");
     scratch.file(

src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
index 9e24e14..d280b3a 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
@@ -557,6 +557,13 @@
 
   @Test
   public void testAttrNonEmpty() throws Exception {
+    ev =
+        createEvaluationTestCase(
+            StarlarkSemantics.DEFAULT_SEMANTICS.toBuilder()
+                .incompatibleDisableDeprecatedAttrParams(false)
+                .build());
+    ev.initialize();
+
     Attribute attr = buildAttribute("a1", "attr.string_list(non_empty=True)");
     assertThat(attr.isNonEmpty()).isTrue();
     assertThat(attr.isMandatory()).isFalse();