diff --git a/compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper_16.kt b/compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper_16.kt deleted file mode 100644 index 60d21ec3d1d..00000000000 --- a/compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper_16.kt +++ /dev/null @@ -1,47 +0,0 @@ -// SKIP_JDK6 -// TARGET_BACKEND: JVM -// FILE: Test.java - -public interface Test { - default String test() { - return "OK"; - } -} - -// FILE: test.kt - -interface KInterface : Test { - -} - -class KClass : Test { - @kotlin.Suppress("DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR") - fun ktest(): String { - return super.test() + test() - } -} - -class KTClass : KInterface { - @kotlin.Suppress("DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR") - fun ktest(): String { - return super.test() + test() - } -} - - -fun box(): String { - val p = object : KInterface { - @kotlin.Suppress("DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR") - fun ktest(): String { - return super.test() + test() - } - }.ktest() - - if (p != "OKOK") return "fail1: $p" - - if (KClass().ktest() != "OKOK") return "fail 2: ${KClass().ktest()}" - - if (KTClass().ktest() != "OKOK") return "fail 3: ${KTClass().ktest()}" - - return "OK" -} diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index a2edfa6527c..6b9fc879b9e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -14269,11 +14269,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper.kt"); } - @TestMetadata("invokeDefaultViaSuper_16.kt") - public void testInvokeDefaultViaSuper_16() throws Exception { - runTest("compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper_16.kt"); - } - @TestMetadata("longChainOfKotlinExtendsFromJavaWithDefault.kt") public void testLongChainOfKotlinExtendsFromJavaWithDefault() throws Exception { runTest("compiler/testData/codegen/box/jvm8/javaDefaults/longChainOfKotlinExtendsFromJavaWithDefault.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 4f053e7692a..bc939be4f14 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -14269,11 +14269,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper.kt"); } - @TestMetadata("invokeDefaultViaSuper_16.kt") - public void testInvokeDefaultViaSuper_16() throws Exception { - runTest("compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper_16.kt"); - } - @TestMetadata("longChainOfKotlinExtendsFromJavaWithDefault.kt") public void testLongChainOfKotlinExtendsFromJavaWithDefault() throws Exception { runTest("compiler/testData/codegen/box/jvm8/javaDefaults/longChainOfKotlinExtendsFromJavaWithDefault.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java index 5483381da1e..fa7e5fe3bb4 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java @@ -14274,11 +14274,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper.kt"); } - @TestMetadata("invokeDefaultViaSuper_16.kt") - public void testInvokeDefaultViaSuper_16() throws Exception { - runTest("compiler/testData/codegen/box/jvm8/javaDefaults/invokeDefaultViaSuper_16.kt"); - } - @TestMetadata("longChainOfKotlinExtendsFromJavaWithDefault.kt") public void testLongChainOfKotlinExtendsFromJavaWithDefault() throws Exception { runTest("compiler/testData/codegen/box/jvm8/javaDefaults/longChainOfKotlinExtendsFromJavaWithDefault.kt");