Enforce @SkylarkCallable methods are non-static.
This will lead to simplification of some of the build API code.
RELNOTES: None.
PiperOrigin-RevId: 219551591
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
index d733836..732c4e8 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
@@ -127,19 +127,22 @@
@SkylarkModule(name = "Mock", doc = "")
static class Mock {
- @SkylarkCallable(name = "MockFn", selfCall = true, documented = false,
+ @SkylarkCallable(
+ name = "MockFn",
+ selfCall = true,
+ documented = false,
parameters = {
- @Param(name = "pos", positional = true, type = String.class),
- }
- )
- public static String selfCall(String myName) {
+ @Param(name = "pos", positional = true, type = String.class),
+ })
+ public String selfCall(String myName) {
return "I'm a mock named " + myName;
}
- @SkylarkCallable(name = "value_of",
- parameters = { @Param(name = "str", type = String.class) },
+ @SkylarkCallable(
+ name = "value_of",
+ parameters = {@Param(name = "str", type = String.class)},
documented = false)
- public static Integer valueOf(String str) {
+ public Integer valueOf(String str) {
return Integer.valueOf(str);
}
@SkylarkCallable(name = "is_empty",
@@ -1610,19 +1613,6 @@
}
@Test
- public void testStaticDirectJavaCall() throws Exception {
- new SkylarkTest().update("Mock", Mock.class).setUp("val = Mock.value_of('8')")
- .testLookup("val", 8);
- }
-
- @Test
- public void testStaticDirectJavaCallMethodIsNonStatic() throws Exception {
- new SkylarkTest()
- .update("Mock", Mock.class)
- .testIfExactError("method 'is_empty' is not static", "val = Mock.is_empty('a')");
- }
-
- @Test
public void testDictComprehensions_IterationOrder() throws Exception {
new SkylarkTest().setUp("def foo():",
" d = {x : x for x in ['c', 'a', 'b']}",
