diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverridden.java b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverridden.java new file mode 100644 index 00000000000..ef17826fed3 --- /dev/null +++ b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverridden.java @@ -0,0 +1,13 @@ +package test; + +public interface InheritedOverridden { + public class Super { + public void foo(Runnable r) { + } + } + + public class Sub extends Super { + public void foo(Runnable r) { + } + } +} diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverridden.txt b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverridden.txt new file mode 100644 index 00000000000..5a55c36f4b1 --- /dev/null +++ b/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverridden.txt @@ -0,0 +1,16 @@ +package test + +public trait InheritedOverridden : java.lang.Object { + + public open class Sub : test.InheritedOverridden.Super { + public constructor Sub() + public open override /*1*/ /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit + public open override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + } + + public open class Super : java.lang.Object { + public constructor Super() + public open /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit + public open fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit + } +} diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java index 412b26ca6b8..955087fbf79 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -1264,6 +1264,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/DeepSamLoop.java"); } + @TestMetadata("InheritedOverridden.java") + public void testInheritedOverridden() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverridden.java"); + } + @TestMetadata("InheritedSimple.java") public void testInheritedSimple() throws Exception { doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedSimple.java");