Modify class hierarchy test to incorporate binder

Bug: 299048934
Test: ./gradlew
Change-Id: Idb3366674df9a452d3b44b3cb0e5e88579d4a175
diff --git a/metalava-model-testsuite/src/main/java/com/android/tools/metalava/model/testsuite/BootstrapSourceModelProviderTest.kt b/metalava-model-testsuite/src/main/java/com/android/tools/metalava/model/testsuite/BootstrapSourceModelProviderTest.kt
index e44c276..e823bc1 100644
--- a/metalava-model-testsuite/src/main/java/com/android/tools/metalava/model/testsuite/BootstrapSourceModelProviderTest.kt
+++ b/metalava-model-testsuite/src/main/java/com/android/tools/metalava/model/testsuite/BootstrapSourceModelProviderTest.kt
@@ -162,23 +162,33 @@
     @Test
     fun `090 - check class hierarchy`() {
         runSourceCodebaseTest(
-            java(
-                """
-                    package test.pkg;
+            inputSet(
+                java(
+                    """
+                        package test.pkg;
 
-                    interface SuperInterface{}
-                    abstract class SuperClass implements SuperInterface{}
+                        import test.parent.SuperInterface;
 
-                    interface SuperChildInterface{}
-                    interface ChildInterface extends SuperChildInterface,SuperInterface{}
+                        abstract class SuperClass implements SuperInterface {}
 
-                    class Test extends SuperClass implements ChildInterface{}
-                """
-            ),
+                        interface SuperChildInterface {}
+                        interface ChildInterface extends SuperChildInterface,SuperInterface {}
+
+                        class Test extends SuperClass implements ChildInterface {}
+                    """
+                ),
+                java(
+                    """
+                        package test.parent;
+
+                        public interface SuperInterface {}
+                     """
+                ),
+            )
         ) { codebase ->
             val classItem = codebase.assertClass("test.pkg.Test")
             val superClassItem = codebase.assertClass("test.pkg.SuperClass")
-            val superInterfaceItem = codebase.assertClass("test.pkg.SuperInterface")
+            val superInterfaceItem = codebase.assertClass("test.parent.SuperInterface")
             val childInterfaceItem = codebase.assertClass("test.pkg.ChildInterface")
             val superChildInterfaceItem = codebase.assertClass("test.pkg.SuperChildInterface")
             assertEquals(superClassItem, classItem.superClass())
@@ -200,7 +210,7 @@
                 """
                   package test.pkg;
 
-                  interface TestInterface{}
+                  interface TestInterface {}
                   enum TestEnum {}
                   @interface TestAnnotation {}
                 """
@@ -299,7 +309,7 @@
 
                     import java.util.Date;
 
-                    class Test extends Date{}
+                    class Test extends Date {}
                 """
             ),
         ) { codebase ->
@@ -319,7 +329,7 @@
                 """
                     package test.pkg;
 
-                    interface Interface{}
+                    interface Interface {}
                     class Test extends UnresolvedSuper implements Interface, UnresolvedInterface {}
                 """
             ),