diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
4 files changed, 15 insertions, 15 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessorTest.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessorTest.java index ae4a449854..28cca8ee31 100644 --- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessorTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessorTest.java @@ -272,8 +272,7 @@ public final class SkylarkCallableProcessorTest { .that(getFile("SelfCallWithNoName.java")) .processedWith(new SkylarkCallableProcessor()) .failsToCompile() - .withErrorContaining( - "@SkylarkCallable-annotated methods with selfCall=true must have a name"); + .withErrorContaining("@SkylarkCallable.name must be non-empty."); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/SelfCallWithNoName.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/SelfCallWithNoName.java index 0469227ebc..769600d8b1 100644 --- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/SelfCallWithNoName.java +++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/SelfCallWithNoName.java @@ -22,6 +22,7 @@ import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; public class SelfCallWithNoName { @SkylarkCallable( + name = "", selfCall = true, documented = false ) 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 68a6909304..c31cd277b6 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 @@ -120,16 +120,16 @@ public class SkylarkEvaluationTest extends EvaluationTest { return "I'm a mock named " + myName; } - @SkylarkCallable(documented = false) + @SkylarkCallable(name = "value_of", documented = false) public static Integer valueOf(String str) { return Integer.valueOf(str); } - @SkylarkCallable(documented = false) + @SkylarkCallable(name = "is_empty", documented = false) public Boolean isEmpty(String str) { return str.isEmpty(); } public void value() {} - @SkylarkCallable(documented = false) + @SkylarkCallable(name = "return_bad", documented = false) public Bad returnBad() { return new Bad(); } @@ -482,7 +482,7 @@ public class SkylarkEvaluationTest extends EvaluationTest { @SkylarkModule(name = "MockInterface", doc = "") static interface MockInterface { - @SkylarkCallable(documented = false) + @SkylarkCallable(name = "is_empty_interface", documented = false) public Boolean isEmptyInterface(String str); } diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkInterfaceUtilsTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkInterfaceUtilsTest.java index ad241cae78..f20be499f0 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkInterfaceUtilsTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkInterfaceUtilsTest.java @@ -34,9 +34,9 @@ public class SkylarkInterfaceUtilsTest { /** MockClassA */ @SkylarkModule(name = "MockClassA", doc = "MockClassA") public static class MockClassA { - @SkylarkCallable(doc = "MockClassA#foo") + @SkylarkCallable(name = "foo", doc = "MockClassA#foo") public void foo() {} - @SkylarkCallable(doc = "MockClassA#bar") + @SkylarkCallable(name = "bar", doc = "MockClassA#bar") public void bar() {} public void baz() {} } @@ -44,20 +44,20 @@ public class SkylarkInterfaceUtilsTest { /** MockInterfaceB1 */ @SkylarkModule(name = "MockInterfaceB1", doc = "MockInterfaceB1") public static interface MockInterfaceB1 { - @SkylarkCallable(doc = "MockInterfaceB1#foo") + @SkylarkCallable(name = "foo", doc = "MockInterfaceB1#foo") void foo(); - @SkylarkCallable(doc = "MockInterfaceB1#bar") + @SkylarkCallable(name = "bar", doc = "MockInterfaceB1#bar") void bar(); - @SkylarkCallable(doc = "MockInterfaceB1#baz") + @SkylarkCallable(name = "baz", doc = "MockInterfaceB1#baz") void baz(); } /** MockInterfaceB2 */ @SkylarkModule(name = "MockInterfaceB2", doc = "MockInterfaceB2") public static interface MockInterfaceB2 { - @SkylarkCallable(doc = "MockInterfaceB2#baz") + @SkylarkCallable(name = "baz", doc = "MockInterfaceB2#baz") void baz(); - @SkylarkCallable(doc = "MockInterfaceB2#qux") + @SkylarkCallable(name = "qux", doc = "MockInterfaceB2#qux") void qux(); } @@ -65,7 +65,7 @@ public class SkylarkInterfaceUtilsTest { @SkylarkModule(name = "MockClassC", doc = "MockClassC") public static class MockClassC extends MockClassA implements MockInterfaceB1, MockInterfaceB2 { @Override - @SkylarkCallable(doc = "MockClassC#foo") + @SkylarkCallable(name = "foo", doc = "MockClassC#foo") public void foo() {} @Override public void bar() {} @@ -78,7 +78,7 @@ public class SkylarkInterfaceUtilsTest { /** MockClassD */ public static class MockClassD extends MockClassC { @Override - @SkylarkCallable(doc = "MockClassD#foo") + @SkylarkCallable(name = "foo", doc = "MockClassD#foo") public void foo() {} } |