Add regressiont test for b/77473436.

RELNOTES: n/a.
PiperOrigin-RevId: 192836316

8 files changed, 61 insertions, 10 deletions

diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/AbstractClassCacheTest.java b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/AbstractClassCacheTest.java
index 3d2e171262..2432c70b33 100644
--- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/AbstractClassCacheTest.java
+++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/AbstractClassCacheTest.java
@@ -79,7 +79,11 @@ public abstract class AbstractClassCacheTest {
 
   final Path libraryInterfaceJar = getPathFromSystemProperty("classcache.test.LibraryInterface");
   final ImmutableList<String> libraryInterfacePositives =
-      ImmutableList.of(PACKAGE_NAME + "LibraryInterface", PACKAGE_NAME + "LibraryInterface$Func");
+      ImmutableList.of(
+          PACKAGE_NAME + "LibraryInterface",
+          PACKAGE_NAME + "LibraryInterface$Func",
+          PACKAGE_NAME + "LibraryInterface$One",
+          PACKAGE_NAME + "LibraryInterface$Two");
 
   static Path getPathFromSystemProperty(String propertyName) {
     String path =
diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_bootclasspath_missing.stderr.txt b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_bootclasspath_missing.stderr.txt
index b7e6289752..da7aebba5b 100644
--- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_bootclasspath_missing.stderr.txt
+++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_bootclasspath_missing.stderr.txt
@@ -96,9 +96,15 @@ Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.
 Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.LibraryInterface$Func
     missing ancestor: java.lang.Object
     resolution failure path: java.lang.Object
+Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.LibraryInterface$One
+    missing ancestor: java.lang.Object
+    resolution failure path: java.lang.Object
+Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.LibraryInterface$Two
+    missing ancestor: java.lang.Object
+    resolution failure path: java.lang.Object
 Missing member 'name' in class com.google.devtools.build.importdeps.testdata.Client$EnumTest : name=name, descriptor=()Ljava/lang/String;
 Missing member 'ordinal' in class com.google.devtools.build.importdeps.testdata.Client$EnumTest : name=ordinal, descriptor=()I
 ===Total===
 missing=20
-incomplete=25
+incomplete=27
 missing_members=2
diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_bootclasspath_missing.stderr.warning.txt b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_bootclasspath_missing.stderr.warning.txt
index a9f3158947..dcc20af897 100644
--- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_bootclasspath_missing.stderr.warning.txt
+++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_bootclasspath_missing.stderr.warning.txt
@@ -96,9 +96,15 @@ Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.
 Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.LibraryInterface$Func
     missing ancestor: java.lang.Object
     resolution failure path: java.lang.Object
+Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.LibraryInterface$One
+    missing ancestor: java.lang.Object
+    resolution failure path: java.lang.Object
+Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.LibraryInterface$Two
+    missing ancestor: java.lang.Object
+    resolution failure path: java.lang.Object
 Missing member 'name' in class com.google.devtools.build.importdeps.testdata.Client$EnumTest : name=name, descriptor=()Ljava/lang/String;
 Missing member 'ordinal' in class com.google.devtools.build.importdeps.testdata.Client$EnumTest : name=ordinal, descriptor=()I
 ===Total===
 missing=20
-incomplete=25
+incomplete=27
 missing_members=2
diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_bootclasspath_missing.txt b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_bootclasspath_missing.txt
index b98187cf15..c7b0c4959f 100644
--- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_bootclasspath_missing.txt
+++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_bootclasspath_missing.txt
@@ -93,9 +93,15 @@ Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.
 Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.LibraryInterface$Func
     missing ancestor: java.lang.Object
     resolution failure path: java.lang.Object
+Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.LibraryInterface$One
+    missing ancestor: java.lang.Object
+    resolution failure path: java.lang.Object
+Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.LibraryInterface$Two
+    missing ancestor: java.lang.Object
+    resolution failure path: java.lang.Object
 Missing member 'name' in class com.google.devtools.build.importdeps.testdata.Client$EnumTest : name=name, descriptor=()Ljava/lang/String;
 Missing member 'ordinal' in class com.google.devtools.build.importdeps.testdata.Client$EnumTest : name=ordinal, descriptor=()I
 ===Total===
 missing=20
-incomplete=25
+incomplete=27
 missing_members=2
diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_library_interface_missing.stderr.txt b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_library_interface_missing.stderr.txt
index a75d95a45b..9dfb028a60 100644
--- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_library_interface_missing.stderr.txt
+++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_library_interface_missing.stderr.txt
@@ -3,10 +3,12 @@ ERROR: The dependencies for the following 1 jar(s) are not complete.
 The details are listed below:
 Missing com.google.devtools.build.importdeps.testdata.LibraryInterface
 Missing com.google.devtools.build.importdeps.testdata.LibraryInterface$Func
+Missing com.google.devtools.build.importdeps.testdata.LibraryInterface$One
+Missing com.google.devtools.build.importdeps.testdata.LibraryInterface$Two
 Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.Client
     missing ancestor: com.google.devtools.build.importdeps.testdata.LibraryInterface
     resolution failure path: com.google.devtools.build.importdeps.testdata.LibraryInterface
 ===Total===
-missing=2
+missing=4
 incomplete=1
 missing_members=0
diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_library_interface_missing.txt b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_library_interface_missing.txt
index 6cf5dc8b79..98e939e08e 100644
--- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_library_interface_missing.txt
+++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/golden_library_interface_missing.txt
@@ -1,9 +1,11 @@
 Missing com.google.devtools.build.importdeps.testdata.LibraryInterface
 Missing com.google.devtools.build.importdeps.testdata.LibraryInterface$Func
+Missing com.google.devtools.build.importdeps.testdata.LibraryInterface$One
+Missing com.google.devtools.build.importdeps.testdata.LibraryInterface$Two
 Incomplete ancestor classpath for com.google.devtools.build.importdeps.testdata.Client
     missing ancestor: com.google.devtools.build.importdeps.testdata.LibraryInterface
     resolution failure path: com.google.devtools.build.importdeps.testdata.LibraryInterface
 ===Total===
-missing=2
+missing=4
 incomplete=1
 missing_members=0
diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata/Client.java b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata/Client.java
index 392096e5ec..724ca82dbe 100644
--- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata/Client.java
+++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata/Client.java
@@ -29,17 +29,18 @@ import java.util.Objects;
 
 /** Client class that uses several libraries. */
 @ClassAnnotation(
-    friends = { Library.class, LibraryException.class },
-    nested = @SuppressWarnings({"unused", "unchecked"})
+  friends = {Library.class, LibraryException.class},
+  nested = @SuppressWarnings({"unused", "unchecked"})
 )
-public class Client<@TypeAnnotation T> extends Library implements LibraryInterface {
+public class Client<@TypeAnnotation T> extends Library
+    implements LibraryInterface, LibraryInterface.One, LibraryInterface.Two {
 
   @SuppressWarnings("unused")
   @FieldAnnotation
   private Library.Class1 field;
 
   @SuppressWarnings("unused")
-  @FieldAnnotation({ 1, 2, 3 })
+  @FieldAnnotation({1, 2, 3})
   private LibraryAnnotations annotations;
 
   public static final Class1 I = Class1.I;
@@ -79,6 +80,16 @@ public class Client<@TypeAnnotation T> extends Library implements LibraryInterfa
   @AnnotationAnnotation(AnnotationFlag.Y)
   public @interface NestedAnnotation {}
 
+  @Override
+  public void callOne() {
+    // Do nothing.
+  }
+
+  @Override
+  public void callTwo() {
+    // Do nothing.
+  }
+
   public enum EnumTest {
     A,
     B,
diff --git a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata/LibraryInterface.java b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata/LibraryInterface.java
index 649adc105a..c4e6e07459 100644
--- a/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata/LibraryInterface.java
+++ b/src/java_tools/import_deps_checker/javatests/com/google/devtools/build/importdeps/testdata/LibraryInterface.java
@@ -20,4 +20,18 @@ public interface LibraryInterface {
   interface Func<T> {
     T get();
   }
+
+  /**
+   * A nested interface for testing.
+   */
+  interface One {
+    void callOne();
+  }
+
+  /**
+   * A nested interface for testing.
+   */
+  interface Two {
+    void callTwo();
+  }
 }