diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/cantCallInherited.java b/compiler/testData/codegen/boxWithJava/samAdapters/inheritedSimple.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/cantCallInherited.java rename to compiler/testData/codegen/boxWithJava/samAdapters/inheritedSimple.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/cantCallInherited.kt b/compiler/testData/codegen/boxWithJava/samAdapters/inheritedSimple.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/cantCallInherited.kt rename to compiler/testData/codegen/boxWithJava/samAdapters/inheritedSimple.kt diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java index 7459f66bff5..5b1c2e481f1 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java @@ -135,11 +135,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/samAdapters"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("cantCallInherited.kt") - public void testCantCallInherited() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/cantCallInherited.kt"); - } - @TestMetadata("comparator.kt") public void testComparator() throws Exception { doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/comparator.kt"); @@ -155,6 +150,11 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/fileFilter.kt"); } + @TestMetadata("inheritedSimple.kt") + public void testInheritedSimple() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/inheritedSimple.kt"); + } + @TestMetadata("nonLiteralAndLiteralRunnable.kt") public void testNonLiteralAndLiteralRunnable() throws Exception { doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralAndLiteralRunnable.kt");