Make EvalUtils.getDataTypeNameFromClass() look for @SkylarkModules in parent classes

This is needed to let subclasses of @SkylarkModules have the same type() string as their superclass, without requiring a second annotation for the subclass.

--
MOS_MIGRATED_REVID=135814343

1 files changed, 41 insertions, 1 deletions

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 4172024e2a..23fc0b39d3 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
@@ -81,6 +81,41 @@ public class SkylarkInterfaceUtilsTest {
     public void foo() {}
   }
 
+  /** MockClassZ */
+  public static class MockClassZ {
+  }
+
+  @Test
+  public void testGetSkylarkModuleBasic() throws Exception {
+    // Normal case.
+    SkylarkModule ann = SkylarkInterfaceUtils.getSkylarkModule(MockClassA.class);
+    assertThat(ann).isNotNull();
+    assertThat(ann.doc()).isEqualTo("MockClassA");
+  }
+
+  @Test
+  public void testGetSkylarkModuleSubclass() throws Exception {
+    // Subclass's annotation is used.
+    SkylarkModule ann = SkylarkInterfaceUtils.getSkylarkModule(MockClassC.class);
+    assertThat(ann).isNotNull();
+    assertThat(ann.doc()).isEqualTo("MockClassC");
+  }
+
+  @Test
+  public void testGetSkylarkModuleSubclassNoSubannotation() throws Exception {
+    // Falls back on superclass's annotation.
+    SkylarkModule ann = SkylarkInterfaceUtils.getSkylarkModule(MockClassD.class);
+    assertThat(ann).isNotNull();
+    assertThat(ann.doc()).isEqualTo("MockClassC");
+  }
+
+  @Test
+  public void testGetSkylarkModuleNotFound() throws Exception {
+    // Doesn't exist.
+    SkylarkModule ann = SkylarkInterfaceUtils.getSkylarkModule(MockClassZ.class);
+    assertThat(ann).isNull();
+  }
+
   @Test
   public void testGetSkylarkCallableBasic() throws Exception {
     // Normal case. Ensure two-arg form is consistent with one-arg form.
@@ -127,10 +162,15 @@ public class SkylarkInterfaceUtilsTest {
     SkylarkCallable ann = SkylarkInterfaceUtils.getSkylarkCallable(method);
     assertThat(ann).isNull();
 
-    // ... including when it's only present in a subclass that was bypassed.
+    // ... including when it's only present in a subclass that was bypassed...
     method = MockClassC.class.getMethod("baz");
     ann = SkylarkInterfaceUtils.getSkylarkCallable(MockClassA.class, method);
     assertThat(ann).isNull();
+
+    // ... or when the method itself is only in the subclass that was bypassed.
+    method = MockClassC.class.getMethod("qux");
+    ann = SkylarkInterfaceUtils.getSkylarkCallable(MockClassA.class, method);
+    assertThat(ann).isNull();
   }
 
   @Test