FIR: dump nested classes in loadJava tests

Because those test are single Java files, many of them use a top-level
class as a container for multiple classes to be tested. Such tests do
almost nothing if those nested classes aren't handled.
This commit is contained in:
pyos
2021-08-14 11:12:28 +02:00
committed by TeamCityServer
parent c2b575505a
commit a12e31daf1
149 changed files with 1787 additions and 16 deletions
@@ -1,4 +1,18 @@
public final class DifferentParametersCount : R|kotlin/Any| {
public constructor(): R|test/DifferentParametersCount|
public open class A : R|kotlin/Any| {
public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|, y: R|kotlin/Int|): R|kotlin/Unit|
public constructor(): R|test/DifferentParametersCount.A|
}
public open class B : R|test/DifferentParametersCount.A| {
public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|, y: R|kotlin/Int|): R|kotlin/Unit|
public constructor(): R|test/DifferentParametersCount.B|
}
}
@@ -1,4 +1,22 @@
public final class FakeStaticOverrides : R|kotlin/Any| {
public constructor(): R|test/FakeStaticOverrides|
public open class A : R|kotlin/Any| {
public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
public constructor(): R|test/FakeStaticOverrides.A|
}
public open class B : R|test/FakeStaticOverrides.A| {
public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
public constructor(): R|test/FakeStaticOverrides.B|
}
public open class C : R|test/FakeStaticOverrides.B| {
public constructor(): R|test/FakeStaticOverrides.C|
}
}
@@ -1,2 +1,20 @@
public abstract interface Nested : R|kotlin/Any| {
public abstract interface Deeper1 : R|kotlin/Any| {
public abstract interface Runnable : R|kotlin/Any| {
public abstract fun run(): R|kotlin/Unit|
public abstract fun run2(): R|kotlin/Unit|
}
}
public abstract interface Deeper2 : R|kotlin/Any| {
public abstract interface Runnable : R|kotlin/Any| {
public abstract fun run(): R|kotlin/Unit|
}
}
public abstract interface Runnable : R|kotlin/Any| {
public abstract fun run(): R|kotlin/Unit|
}
}
@@ -1,2 +1,12 @@
public abstract interface SamSubinterfaceOfTwo : R|kotlin/Any| {
public abstract interface Sub : R|test/SamSubinterfaceOfTwo.Super1|, R|test/SamSubinterfaceOfTwo.Super2<ft<kotlin/String, kotlin/String?>>| {
}
public abstract interface Super1 : R|kotlin/Any| {
public abstract fun f(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
}
public abstract interface Super2<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun f(): R|ft<T, T?>|
}
}
@@ -1,4 +1,18 @@
public final class StaticOverrides : R|kotlin/Any| {
public constructor(): R|test/StaticOverrides|
public open class A : R|kotlin/Any| {
public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
public constructor(): R|test/StaticOverrides.A|
}
public open class B : R|test/StaticOverrides.A| {
public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
public constructor(): R|test/StaticOverrides.B|
}
}
@@ -1,2 +1,10 @@
public abstract interface DeepSamLoop : R|kotlin/Any| {
public abstract interface Bar : R|kotlin/Any| {
public abstract fun foo(p: R|ft<test/DeepSamLoop.Foo, test/DeepSamLoop.Foo?>|): R|kotlin/Unit|
}
public abstract interface Foo : R|kotlin/Any| {
public abstract fun foo(p: R|ft<test/DeepSamLoop.Bar, test/DeepSamLoop.Bar?>|): R|kotlin/Unit|
}
}
@@ -3,4 +3,8 @@ public open class PrivateSamAdapter : R|kotlin/Any| {
public constructor(): R|test/PrivateSamAdapter|
private abstract interface SamInterface : R|kotlin/Any| {
public abstract fun foo(): R|kotlin/Unit|
}
}
@@ -1,4 +1,10 @@
public open class TypeParameterOfOuterClass<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/TypeParameterOfOuterClass<T>|
public open inner class Inner<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public open fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|): R|kotlin/Unit|
public constructor(): R|test/TypeParameterOfOuterClass.Inner<T>|
}
}
@@ -1,2 +1,12 @@
public abstract interface AdapterDoesntOverrideDeclaration : R|kotlin/Any| {
public abstract interface Sub : R|test/AdapterDoesntOverrideDeclaration.Super| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
}
}
@@ -1,2 +1,10 @@
public abstract interface InheritedAdapterAndDeclaration : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritedAdapterAndDeclaration.Super| {
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
}
}
@@ -1,2 +1,10 @@
public abstract interface InheritedAmbiguousAdapters : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritedAmbiguousAdapters.Super| {
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
}
}
@@ -1,2 +1,14 @@
public abstract interface InheritedAndOverriddenAmbiguousAdapters : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritedAndOverriddenAmbiguousAdapters.Super| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
}
}
@@ -1,2 +1,14 @@
public abstract interface InheritedOverridden : R|kotlin/Any| {
public open class Sub : R|test/InheritedOverridden.Super| {
public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public constructor(): R|test/InheritedOverridden.Sub|
}
public open class Super : R|kotlin/Any| {
public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public constructor(): R|test/InheritedOverridden.Super|
}
}
@@ -1,2 +1,16 @@
public abstract interface InheritedOverriddenAdapter : R|kotlin/Any| {
public open class Sub : R|test/InheritedOverriddenAdapter.Super| {
public open fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public constructor(): R|test/InheritedOverriddenAdapter.Sub|
}
public open class Super : R|kotlin/Any| {
public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public constructor(): R|test/InheritedOverriddenAdapter.Super|
}
}
@@ -1,2 +1,12 @@
public abstract interface InheritedSameAdapters : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritedSameAdapters.Super1|, R|test/InheritedSameAdapters.Super2| {
}
public abstract interface Super1 : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
}
public abstract interface Super2 : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
}
}
@@ -1,2 +1,14 @@
public abstract interface InheritedSameAdaptersWithSubstitution : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritedSameAdaptersWithSubstitution.Super1|, R|test/InheritedSameAdaptersWithSubstitution.Super2Substituted| {
}
public abstract interface Super1 : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
}
public abstract interface Super2<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|): R|kotlin/Unit|
}
public abstract interface Super2Substituted : R|test/InheritedSameAdaptersWithSubstitution.Super2<ft<kotlin/String, kotlin/String?>>| {
}
}
@@ -1,2 +1,8 @@
public abstract interface InheritedSimple : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritedSimple.Super| {
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
}
}
@@ -1,2 +1,16 @@
public abstract interface OverriddenAmbiguousAdapters : R|kotlin/Any| {
public abstract interface Sub : R|test/OverriddenAmbiguousAdapters.Super| {
public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
}
}