From 16a0ddd2fb10ecca20099ea82e86f4b305a191cf Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 7 Mar 2016 14:14:27 +0300 Subject: [PATCH] Merge boxMultiFile testData into box, delete BoxMultiFile test --- .../defaultArguments/simpleFromOtherFile.kt} | 0 ...allMultifileClassMemberFromOtherPackage.kt | 0 .../callsToMultifileClassFromOtherPackage.kt | 0 ...onstPropertyReferenceFromMultifileClass.kt | 0 ...ineMultifileClassMemberFromOtherPackage.kt | 0 .../multifileClassPartsInitialization.kt | 0 .../samePartNameDifferentFacades.kt | 0 .../package}/mainInFiles.kt | 0 ...eLocalClassNotImportedWithDefaultImport.kt | 0 .../mapping/topLevelFunctionOtherFile.kt} | 1 + .../internalTopLevelOtherPackage.kt} | 2 +- .../regressions}/kt1515.kt | 0 .../regressions}/kt1528.kt | 0 .../regressions}/kt1845.kt | 0 .../regressions}/kt2060.kt | 0 .../regressions}/kt5445.kt | 0 .../regressions}/kt5445_2.kt | 0 .../constructors}/comparator.kt | 0 .../constructors}/filenameFilter.kt | 0 .../constructors}/nonLiteralComparator.kt | 0 .../constructors}/nonLiteralFilenameFilter.kt | 0 .../constructors}/nonLiteralRunnable.kt | 0 .../constructors}/nonTrivialRunnable.kt | 0 .../constructors}/runnable.kt | 0 .../runnableAccessingClosure1.kt | 0 .../runnableAccessingClosure2.kt | 0 .../samWrappersDifferentFiles.kt | 0 .../constructors}/sameWrapperClass.kt | 0 .../constructors}/syntheticVsReal.kt | 0 .../accessorForProtected.kt | 0 .../accessorForProtectedInvokeVirtual.kt | 0 .../syntheticAccessors}/kt10047.kt | 0 .../syntheticAccessors}/kt9717.kt | 0 .../kt9717DifferentPackages.kt | 0 .../syntheticAccessors}/kt9958.kt | 0 .../syntheticAccessors}/kt9958Interface.kt | 0 .../protectedFromLambda.kt | 0 .../codegen/boxMultiFile/sameFileName.kt | 7 - .../codegen/BlackBoxCodegenTestGenerated.java | 290 ++++++++++++++---- ...BlackBoxMultiFileCodegenTestGenerated.java | 199 ------------ .../kotlin/generators/tests/GenerateTests.kt | 4 - 41 files changed, 234 insertions(+), 269 deletions(-) rename compiler/testData/codegen/{boxMultiFile/simple.kt => box/defaultArguments/simpleFromOtherFile.kt} (100%) rename compiler/testData/codegen/{boxMultiFile => box/multifileClasses}/callMultifileClassMemberFromOtherPackage.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/multifileClasses}/callsToMultifileClassFromOtherPackage.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/multifileClasses}/constPropertyReferenceFromMultifileClass.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/multifileClasses}/inlineMultifileClassMemberFromOtherPackage.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/multifileClasses}/multifileClassPartsInitialization.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/multifileClasses}/samePartNameDifferentFacades.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/package}/mainInFiles.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/package}/packageLocalClassNotImportedWithDefaultImport.kt (100%) rename compiler/testData/codegen/{boxMultiFile/kt10690.kt => box/reflection/mapping/topLevelFunctionOtherFile.kt} (82%) rename compiler/testData/codegen/{boxMultiFile/internalVisibility.kt => box/regressions/internalTopLevelOtherPackage.kt} (65%) rename compiler/testData/codegen/{boxMultiFile => box/regressions}/kt1515.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/regressions}/kt1528.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/regressions}/kt1845.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/regressions}/kt2060.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/regressions}/kt5445.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/regressions}/kt5445_2.kt (100%) rename compiler/testData/codegen/box/{samConstructors => sam/constructors}/comparator.kt (100%) rename compiler/testData/codegen/box/{samConstructors => sam/constructors}/filenameFilter.kt (100%) rename compiler/testData/codegen/box/{samConstructors => sam/constructors}/nonLiteralComparator.kt (100%) rename compiler/testData/codegen/box/{samConstructors => sam/constructors}/nonLiteralFilenameFilter.kt (100%) rename compiler/testData/codegen/box/{samConstructors => sam/constructors}/nonLiteralRunnable.kt (100%) rename compiler/testData/codegen/box/{samConstructors => sam/constructors}/nonTrivialRunnable.kt (100%) rename compiler/testData/codegen/box/{samConstructors => sam/constructors}/runnable.kt (100%) rename compiler/testData/codegen/box/{samConstructors => sam/constructors}/runnableAccessingClosure1.kt (100%) rename compiler/testData/codegen/box/{samConstructors => sam/constructors}/runnableAccessingClosure2.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/sam/constructors}/samWrappersDifferentFiles.kt (100%) rename compiler/testData/codegen/box/{samConstructors => sam/constructors}/sameWrapperClass.kt (100%) rename compiler/testData/codegen/box/{samConstructors => sam/constructors}/syntheticVsReal.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/syntheticAccessors}/accessorForProtected.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/syntheticAccessors}/accessorForProtectedInvokeVirtual.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/syntheticAccessors}/kt10047.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/syntheticAccessors}/kt9717.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/syntheticAccessors}/kt9717DifferentPackages.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/syntheticAccessors}/kt9958.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/syntheticAccessors}/kt9958Interface.kt (100%) rename compiler/testData/codegen/{boxMultiFile => box/syntheticAccessors}/protectedFromLambda.kt (100%) delete mode 100644 compiler/testData/codegen/boxMultiFile/sameFileName.kt delete mode 100644 compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxMultiFileCodegenTestGenerated.java diff --git a/compiler/testData/codegen/boxMultiFile/simple.kt b/compiler/testData/codegen/box/defaultArguments/simpleFromOtherFile.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/simple.kt rename to compiler/testData/codegen/box/defaultArguments/simpleFromOtherFile.kt diff --git a/compiler/testData/codegen/boxMultiFile/callMultifileClassMemberFromOtherPackage.kt b/compiler/testData/codegen/box/multifileClasses/callMultifileClassMemberFromOtherPackage.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/callMultifileClassMemberFromOtherPackage.kt rename to compiler/testData/codegen/box/multifileClasses/callMultifileClassMemberFromOtherPackage.kt diff --git a/compiler/testData/codegen/boxMultiFile/callsToMultifileClassFromOtherPackage.kt b/compiler/testData/codegen/box/multifileClasses/callsToMultifileClassFromOtherPackage.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/callsToMultifileClassFromOtherPackage.kt rename to compiler/testData/codegen/box/multifileClasses/callsToMultifileClassFromOtherPackage.kt diff --git a/compiler/testData/codegen/boxMultiFile/constPropertyReferenceFromMultifileClass.kt b/compiler/testData/codegen/box/multifileClasses/constPropertyReferenceFromMultifileClass.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/constPropertyReferenceFromMultifileClass.kt rename to compiler/testData/codegen/box/multifileClasses/constPropertyReferenceFromMultifileClass.kt diff --git a/compiler/testData/codegen/boxMultiFile/inlineMultifileClassMemberFromOtherPackage.kt b/compiler/testData/codegen/box/multifileClasses/inlineMultifileClassMemberFromOtherPackage.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/inlineMultifileClassMemberFromOtherPackage.kt rename to compiler/testData/codegen/box/multifileClasses/inlineMultifileClassMemberFromOtherPackage.kt diff --git a/compiler/testData/codegen/boxMultiFile/multifileClassPartsInitialization.kt b/compiler/testData/codegen/box/multifileClasses/multifileClassPartsInitialization.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/multifileClassPartsInitialization.kt rename to compiler/testData/codegen/box/multifileClasses/multifileClassPartsInitialization.kt diff --git a/compiler/testData/codegen/boxMultiFile/samePartNameDifferentFacades.kt b/compiler/testData/codegen/box/multifileClasses/samePartNameDifferentFacades.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/samePartNameDifferentFacades.kt rename to compiler/testData/codegen/box/multifileClasses/samePartNameDifferentFacades.kt diff --git a/compiler/testData/codegen/boxMultiFile/mainInFiles.kt b/compiler/testData/codegen/box/package/mainInFiles.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/mainInFiles.kt rename to compiler/testData/codegen/box/package/mainInFiles.kt diff --git a/compiler/testData/codegen/boxMultiFile/packageLocalClassNotImportedWithDefaultImport.kt b/compiler/testData/codegen/box/package/packageLocalClassNotImportedWithDefaultImport.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/packageLocalClassNotImportedWithDefaultImport.kt rename to compiler/testData/codegen/box/package/packageLocalClassNotImportedWithDefaultImport.kt diff --git a/compiler/testData/codegen/boxMultiFile/kt10690.kt b/compiler/testData/codegen/box/reflection/mapping/topLevelFunctionOtherFile.kt similarity index 82% rename from compiler/testData/codegen/boxMultiFile/kt10690.kt rename to compiler/testData/codegen/box/reflection/mapping/topLevelFunctionOtherFile.kt index db63d4306de..b310f519ab0 100644 --- a/compiler/testData/codegen/boxMultiFile/kt10690.kt +++ b/compiler/testData/codegen/box/reflection/mapping/topLevelFunctionOtherFile.kt @@ -5,6 +5,7 @@ fun test2() { } // FILE: main.kt +// See KT-10690 Exception in kotlin.reflect when trying to get kotlinFunction from javaMethod import kotlin.reflect.jvm.javaMethod import kotlin.reflect.jvm.kotlinFunction diff --git a/compiler/testData/codegen/boxMultiFile/internalVisibility.kt b/compiler/testData/codegen/box/regressions/internalTopLevelOtherPackage.kt similarity index 65% rename from compiler/testData/codegen/boxMultiFile/internalVisibility.kt rename to compiler/testData/codegen/box/regressions/internalTopLevelOtherPackage.kt index e35cdf1320a..8c51a9a2cf9 100644 --- a/compiler/testData/codegen/boxMultiFile/internalVisibility.kt +++ b/compiler/testData/codegen/box/regressions/internalTopLevelOtherPackage.kt @@ -6,4 +6,4 @@ fun box() = a.x package a -val x: String = "OK" +internal val x: String = "OK" diff --git a/compiler/testData/codegen/boxMultiFile/kt1515.kt b/compiler/testData/codegen/box/regressions/kt1515.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/kt1515.kt rename to compiler/testData/codegen/box/regressions/kt1515.kt diff --git a/compiler/testData/codegen/boxMultiFile/kt1528.kt b/compiler/testData/codegen/box/regressions/kt1528.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/kt1528.kt rename to compiler/testData/codegen/box/regressions/kt1528.kt diff --git a/compiler/testData/codegen/boxMultiFile/kt1845.kt b/compiler/testData/codegen/box/regressions/kt1845.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/kt1845.kt rename to compiler/testData/codegen/box/regressions/kt1845.kt diff --git a/compiler/testData/codegen/boxMultiFile/kt2060.kt b/compiler/testData/codegen/box/regressions/kt2060.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/kt2060.kt rename to compiler/testData/codegen/box/regressions/kt2060.kt diff --git a/compiler/testData/codegen/boxMultiFile/kt5445.kt b/compiler/testData/codegen/box/regressions/kt5445.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/kt5445.kt rename to compiler/testData/codegen/box/regressions/kt5445.kt diff --git a/compiler/testData/codegen/boxMultiFile/kt5445_2.kt b/compiler/testData/codegen/box/regressions/kt5445_2.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/kt5445_2.kt rename to compiler/testData/codegen/box/regressions/kt5445_2.kt diff --git a/compiler/testData/codegen/box/samConstructors/comparator.kt b/compiler/testData/codegen/box/sam/constructors/comparator.kt similarity index 100% rename from compiler/testData/codegen/box/samConstructors/comparator.kt rename to compiler/testData/codegen/box/sam/constructors/comparator.kt diff --git a/compiler/testData/codegen/box/samConstructors/filenameFilter.kt b/compiler/testData/codegen/box/sam/constructors/filenameFilter.kt similarity index 100% rename from compiler/testData/codegen/box/samConstructors/filenameFilter.kt rename to compiler/testData/codegen/box/sam/constructors/filenameFilter.kt diff --git a/compiler/testData/codegen/box/samConstructors/nonLiteralComparator.kt b/compiler/testData/codegen/box/sam/constructors/nonLiteralComparator.kt similarity index 100% rename from compiler/testData/codegen/box/samConstructors/nonLiteralComparator.kt rename to compiler/testData/codegen/box/sam/constructors/nonLiteralComparator.kt diff --git a/compiler/testData/codegen/box/samConstructors/nonLiteralFilenameFilter.kt b/compiler/testData/codegen/box/sam/constructors/nonLiteralFilenameFilter.kt similarity index 100% rename from compiler/testData/codegen/box/samConstructors/nonLiteralFilenameFilter.kt rename to compiler/testData/codegen/box/sam/constructors/nonLiteralFilenameFilter.kt diff --git a/compiler/testData/codegen/box/samConstructors/nonLiteralRunnable.kt b/compiler/testData/codegen/box/sam/constructors/nonLiteralRunnable.kt similarity index 100% rename from compiler/testData/codegen/box/samConstructors/nonLiteralRunnable.kt rename to compiler/testData/codegen/box/sam/constructors/nonLiteralRunnable.kt diff --git a/compiler/testData/codegen/box/samConstructors/nonTrivialRunnable.kt b/compiler/testData/codegen/box/sam/constructors/nonTrivialRunnable.kt similarity index 100% rename from compiler/testData/codegen/box/samConstructors/nonTrivialRunnable.kt rename to compiler/testData/codegen/box/sam/constructors/nonTrivialRunnable.kt diff --git a/compiler/testData/codegen/box/samConstructors/runnable.kt b/compiler/testData/codegen/box/sam/constructors/runnable.kt similarity index 100% rename from compiler/testData/codegen/box/samConstructors/runnable.kt rename to compiler/testData/codegen/box/sam/constructors/runnable.kt diff --git a/compiler/testData/codegen/box/samConstructors/runnableAccessingClosure1.kt b/compiler/testData/codegen/box/sam/constructors/runnableAccessingClosure1.kt similarity index 100% rename from compiler/testData/codegen/box/samConstructors/runnableAccessingClosure1.kt rename to compiler/testData/codegen/box/sam/constructors/runnableAccessingClosure1.kt diff --git a/compiler/testData/codegen/box/samConstructors/runnableAccessingClosure2.kt b/compiler/testData/codegen/box/sam/constructors/runnableAccessingClosure2.kt similarity index 100% rename from compiler/testData/codegen/box/samConstructors/runnableAccessingClosure2.kt rename to compiler/testData/codegen/box/sam/constructors/runnableAccessingClosure2.kt diff --git a/compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles.kt b/compiler/testData/codegen/box/sam/constructors/samWrappersDifferentFiles.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles.kt rename to compiler/testData/codegen/box/sam/constructors/samWrappersDifferentFiles.kt diff --git a/compiler/testData/codegen/box/samConstructors/sameWrapperClass.kt b/compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt similarity index 100% rename from compiler/testData/codegen/box/samConstructors/sameWrapperClass.kt rename to compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt diff --git a/compiler/testData/codegen/box/samConstructors/syntheticVsReal.kt b/compiler/testData/codegen/box/sam/constructors/syntheticVsReal.kt similarity index 100% rename from compiler/testData/codegen/box/samConstructors/syntheticVsReal.kt rename to compiler/testData/codegen/box/sam/constructors/syntheticVsReal.kt diff --git a/compiler/testData/codegen/boxMultiFile/accessorForProtected.kt b/compiler/testData/codegen/box/syntheticAccessors/accessorForProtected.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/accessorForProtected.kt rename to compiler/testData/codegen/box/syntheticAccessors/accessorForProtected.kt diff --git a/compiler/testData/codegen/boxMultiFile/accessorForProtectedInvokeVirtual.kt b/compiler/testData/codegen/box/syntheticAccessors/accessorForProtectedInvokeVirtual.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/accessorForProtectedInvokeVirtual.kt rename to compiler/testData/codegen/box/syntheticAccessors/accessorForProtectedInvokeVirtual.kt diff --git a/compiler/testData/codegen/boxMultiFile/kt10047.kt b/compiler/testData/codegen/box/syntheticAccessors/kt10047.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/kt10047.kt rename to compiler/testData/codegen/box/syntheticAccessors/kt10047.kt diff --git a/compiler/testData/codegen/boxMultiFile/kt9717.kt b/compiler/testData/codegen/box/syntheticAccessors/kt9717.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/kt9717.kt rename to compiler/testData/codegen/box/syntheticAccessors/kt9717.kt diff --git a/compiler/testData/codegen/boxMultiFile/kt9717DifferentPackages.kt b/compiler/testData/codegen/box/syntheticAccessors/kt9717DifferentPackages.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/kt9717DifferentPackages.kt rename to compiler/testData/codegen/box/syntheticAccessors/kt9717DifferentPackages.kt diff --git a/compiler/testData/codegen/boxMultiFile/kt9958.kt b/compiler/testData/codegen/box/syntheticAccessors/kt9958.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/kt9958.kt rename to compiler/testData/codegen/box/syntheticAccessors/kt9958.kt diff --git a/compiler/testData/codegen/boxMultiFile/kt9958Interface.kt b/compiler/testData/codegen/box/syntheticAccessors/kt9958Interface.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/kt9958Interface.kt rename to compiler/testData/codegen/box/syntheticAccessors/kt9958Interface.kt diff --git a/compiler/testData/codegen/boxMultiFile/protectedFromLambda.kt b/compiler/testData/codegen/box/syntheticAccessors/protectedFromLambda.kt similarity index 100% rename from compiler/testData/codegen/boxMultiFile/protectedFromLambda.kt rename to compiler/testData/codegen/box/syntheticAccessors/protectedFromLambda.kt diff --git a/compiler/testData/codegen/boxMultiFile/sameFileName.kt b/compiler/testData/codegen/boxMultiFile/sameFileName.kt deleted file mode 100644 index 0f029e220ce..00000000000 --- a/compiler/testData/codegen/boxMultiFile/sameFileName.kt +++ /dev/null @@ -1,7 +0,0 @@ -// FILE: 1/box.kt - -fun box() = box1() + "K" - -// FILE: 2/box2.kt - -fun box1() = "O" diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index 5259281068d..2c2591c6b2e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -4198,6 +4198,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("simpleFromOtherFile.kt") + public void testSimpleFromOtherFile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/simpleFromOtherFile.kt"); + doTest(fileName); + } + @TestMetadata("superCallCheck.kt") public void testSuperCallCheck() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/superCallCheck.kt"); @@ -8018,6 +8024,51 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } + @TestMetadata("compiler/testData/codegen/box/multifileClasses") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class MultifileClasses extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInMultifileClasses() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multifileClasses"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("callMultifileClassMemberFromOtherPackage.kt") + public void testCallMultifileClassMemberFromOtherPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multifileClasses/callMultifileClassMemberFromOtherPackage.kt"); + doTest(fileName); + } + + @TestMetadata("callsToMultifileClassFromOtherPackage.kt") + public void testCallsToMultifileClassFromOtherPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multifileClasses/callsToMultifileClassFromOtherPackage.kt"); + doTest(fileName); + } + + @TestMetadata("constPropertyReferenceFromMultifileClass.kt") + public void testConstPropertyReferenceFromMultifileClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multifileClasses/constPropertyReferenceFromMultifileClass.kt"); + doTest(fileName); + } + + @TestMetadata("inlineMultifileClassMemberFromOtherPackage.kt") + public void testInlineMultifileClassMemberFromOtherPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multifileClasses/inlineMultifileClassMemberFromOtherPackage.kt"); + doTest(fileName); + } + + @TestMetadata("multifileClassPartsInitialization.kt") + public void testMultifileClassPartsInitialization() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multifileClasses/multifileClassPartsInitialization.kt"); + doTest(fileName); + } + + @TestMetadata("samePartNameDifferentFacades.kt") + public void testSamePartNameDifferentFacades() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multifileClasses/samePartNameDifferentFacades.kt"); + doTest(fileName); + } + } + @TestMetadata("compiler/testData/codegen/box/nonLocalReturns") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -8491,12 +8542,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("mainInFiles.kt") + public void testMainInFiles() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/package/mainInFiles.kt"); + doTest(fileName); + } + @TestMetadata("nullablePrimitiveNoFieldInitializer.kt") public void testNullablePrimitiveNoFieldInitializer() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/package/nullablePrimitiveNoFieldInitializer.kt"); doTest(fileName); } + @TestMetadata("packageLocalClassNotImportedWithDefaultImport.kt") + public void testPackageLocalClassNotImportedWithDefaultImport() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/package/packageLocalClassNotImportedWithDefaultImport.kt"); + doTest(fileName); + } + @TestMetadata("packageQualifiedMethod.kt") public void testPackageQualifiedMethod() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/package/packageQualifiedMethod.kt"); @@ -10689,6 +10752,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("topLevelFunctionOtherFile.kt") + public void testTopLevelFunctionOtherFile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/mapping/topLevelFunctionOtherFile.kt"); + doTest(fileName); + } + @TestMetadata("topLevelProperty.kt") public void testTopLevelProperty() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/mapping/topLevelProperty.kt"); @@ -11197,6 +11266,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("internalTopLevelOtherPackage.kt") + public void testInternalTopLevelOtherPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/internalTopLevelOtherPackage.kt"); + doTest(fileName); + } + @TestMetadata("kt10934.kt") public void testKt10934() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt10934.kt"); @@ -11227,6 +11302,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("kt1515.kt") + public void testKt1515() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt1515.kt"); + doTest(fileName); + } + + @TestMetadata("kt1528.kt") + public void testKt1528() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt1528.kt"); + doTest(fileName); + } + @TestMetadata("kt1568.kt") public void testKt1568() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt1568.kt"); @@ -11251,6 +11338,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("kt1845.kt") + public void testKt1845() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt1845.kt"); + doTest(fileName); + } + @TestMetadata("kt1932.kt") public void testKt1932() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt1932.kt"); @@ -11263,6 +11356,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("kt2060.kt") + public void testKt2060() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt2060.kt"); + doTest(fileName); + } + @TestMetadata("kt2210.kt") public void testKt2210() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt2210.kt"); @@ -11413,6 +11512,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } + @TestMetadata("kt5445.kt") + public void testKt5445() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt5445.kt"); + doTest(fileName); + } + + @TestMetadata("kt5445_2.kt") + public void testKt5445_2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt5445_2.kt"); + doTest(fileName); + } + @TestMetadata("kt5786_privateWithDefault.kt") public void testKt5786_privateWithDefault() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt5786_privateWithDefault.kt"); @@ -11777,78 +11888,93 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @TestMetadata("compiler/testData/codegen/box/samConstructors") + @TestMetadata("compiler/testData/codegen/box/sam") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SamConstructors extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInSamConstructors() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/samConstructors"), Pattern.compile("^(.+)\\.kt$"), true); + public static class Sam extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInSam() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/sam"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("comparator.kt") - public void testComparator() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/comparator.kt"); - doTest(fileName); - } + @TestMetadata("compiler/testData/codegen/box/sam/constructors") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Constructors extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInConstructors() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/sam/constructors"), Pattern.compile("^(.+)\\.kt$"), true); + } - @TestMetadata("filenameFilter.kt") - public void testFilenameFilter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/filenameFilter.kt"); - doTest(fileName); - } + @TestMetadata("comparator.kt") + public void testComparator() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sam/constructors/comparator.kt"); + doTest(fileName); + } - @TestMetadata("nonLiteralComparator.kt") - public void testNonLiteralComparator() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonLiteralComparator.kt"); - doTest(fileName); - } + @TestMetadata("filenameFilter.kt") + public void testFilenameFilter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sam/constructors/filenameFilter.kt"); + doTest(fileName); + } - @TestMetadata("nonLiteralFilenameFilter.kt") - public void testNonLiteralFilenameFilter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonLiteralFilenameFilter.kt"); - doTest(fileName); - } + @TestMetadata("nonLiteralComparator.kt") + public void testNonLiteralComparator() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sam/constructors/nonLiteralComparator.kt"); + doTest(fileName); + } - @TestMetadata("nonLiteralRunnable.kt") - public void testNonLiteralRunnable() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonLiteralRunnable.kt"); - doTest(fileName); - } + @TestMetadata("nonLiteralFilenameFilter.kt") + public void testNonLiteralFilenameFilter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sam/constructors/nonLiteralFilenameFilter.kt"); + doTest(fileName); + } - @TestMetadata("nonTrivialRunnable.kt") - public void testNonTrivialRunnable() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonTrivialRunnable.kt"); - doTest(fileName); - } + @TestMetadata("nonLiteralRunnable.kt") + public void testNonLiteralRunnable() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sam/constructors/nonLiteralRunnable.kt"); + doTest(fileName); + } - @TestMetadata("runnable.kt") - public void testRunnable() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/runnable.kt"); - doTest(fileName); - } + @TestMetadata("nonTrivialRunnable.kt") + public void testNonTrivialRunnable() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sam/constructors/nonTrivialRunnable.kt"); + doTest(fileName); + } - @TestMetadata("runnableAccessingClosure1.kt") - public void testRunnableAccessingClosure1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/runnableAccessingClosure1.kt"); - doTest(fileName); - } + @TestMetadata("runnable.kt") + public void testRunnable() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sam/constructors/runnable.kt"); + doTest(fileName); + } - @TestMetadata("runnableAccessingClosure2.kt") - public void testRunnableAccessingClosure2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/runnableAccessingClosure2.kt"); - doTest(fileName); - } + @TestMetadata("runnableAccessingClosure1.kt") + public void testRunnableAccessingClosure1() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sam/constructors/runnableAccessingClosure1.kt"); + doTest(fileName); + } - @TestMetadata("sameWrapperClass.kt") - public void testSameWrapperClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/sameWrapperClass.kt"); - doTest(fileName); - } + @TestMetadata("runnableAccessingClosure2.kt") + public void testRunnableAccessingClosure2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sam/constructors/runnableAccessingClosure2.kt"); + doTest(fileName); + } - @TestMetadata("syntheticVsReal.kt") - public void testSyntheticVsReal() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/syntheticVsReal.kt"); - doTest(fileName); + @TestMetadata("samWrappersDifferentFiles.kt") + public void testSamWrappersDifferentFiles() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sam/constructors/samWrappersDifferentFiles.kt"); + doTest(fileName); + } + + @TestMetadata("sameWrapperClass.kt") + public void testSameWrapperClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); + doTest(fileName); + } + + @TestMetadata("syntheticVsReal.kt") + public void testSyntheticVsReal() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sam/constructors/syntheticVsReal.kt"); + doTest(fileName); + } } } @@ -12759,10 +12885,58 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class SyntheticAccessors extends AbstractBlackBoxCodegenTest { + @TestMetadata("accessorForProtected.kt") + public void testAccessorForProtected() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/syntheticAccessors/accessorForProtected.kt"); + doTest(fileName); + } + + @TestMetadata("accessorForProtectedInvokeVirtual.kt") + public void testAccessorForProtectedInvokeVirtual() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/syntheticAccessors/accessorForProtectedInvokeVirtual.kt"); + doTest(fileName); + } + public void testAllFilesPresentInSyntheticAccessors() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/syntheticAccessors"), Pattern.compile("^(.+)\\.kt$"), true); } + @TestMetadata("kt10047.kt") + public void testKt10047() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/syntheticAccessors/kt10047.kt"); + doTest(fileName); + } + + @TestMetadata("kt9717.kt") + public void testKt9717() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/syntheticAccessors/kt9717.kt"); + doTest(fileName); + } + + @TestMetadata("kt9717DifferentPackages.kt") + public void testKt9717DifferentPackages() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/syntheticAccessors/kt9717DifferentPackages.kt"); + doTest(fileName); + } + + @TestMetadata("kt9958.kt") + public void testKt9958() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/syntheticAccessors/kt9958.kt"); + doTest(fileName); + } + + @TestMetadata("kt9958Interface.kt") + public void testKt9958Interface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/syntheticAccessors/kt9958Interface.kt"); + doTest(fileName); + } + + @TestMetadata("protectedFromLambda.kt") + public void testProtectedFromLambda() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/syntheticAccessors/protectedFromLambda.kt"); + doTest(fileName); + } + @TestMetadata("syntheticAccessorNames.kt") public void testSyntheticAccessorNames() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/syntheticAccessors/syntheticAccessorNames.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxMultiFileCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxMultiFileCodegenTestGenerated.java deleted file mode 100644 index 53b01ebfb9a..00000000000 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxMultiFileCodegenTestGenerated.java +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.codegen; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/testData/codegen/boxMultiFile") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class BlackBoxMultiFileCodegenTestGenerated extends AbstractBlackBoxCodegenTest { - @TestMetadata("accessorForProtected.kt") - public void testAccessorForProtected() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/accessorForProtected.kt"); - doTest(fileName); - } - - @TestMetadata("accessorForProtectedInvokeVirtual.kt") - public void testAccessorForProtectedInvokeVirtual() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/accessorForProtectedInvokeVirtual.kt"); - doTest(fileName); - } - - public void testAllFilesPresentInBoxMultiFile() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxMultiFile"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("callMultifileClassMemberFromOtherPackage.kt") - public void testCallMultifileClassMemberFromOtherPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/callMultifileClassMemberFromOtherPackage.kt"); - doTest(fileName); - } - - @TestMetadata("callsToMultifileClassFromOtherPackage.kt") - public void testCallsToMultifileClassFromOtherPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/callsToMultifileClassFromOtherPackage.kt"); - doTest(fileName); - } - - @TestMetadata("constPropertyReferenceFromMultifileClass.kt") - public void testConstPropertyReferenceFromMultifileClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/constPropertyReferenceFromMultifileClass.kt"); - doTest(fileName); - } - - @TestMetadata("inlineMultifileClassMemberFromOtherPackage.kt") - public void testInlineMultifileClassMemberFromOtherPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/inlineMultifileClassMemberFromOtherPackage.kt"); - doTest(fileName); - } - - @TestMetadata("internalVisibility.kt") - public void testInternalVisibility() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/internalVisibility.kt"); - doTest(fileName); - } - - @TestMetadata("kt10047.kt") - public void testKt10047() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt10047.kt"); - doTest(fileName); - } - - @TestMetadata("kt10690.kt") - public void testKt10690() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt10690.kt"); - doTest(fileName); - } - - @TestMetadata("kt1515.kt") - public void testKt1515() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1515.kt"); - doTest(fileName); - } - - @TestMetadata("kt1528.kt") - public void testKt1528() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1528.kt"); - doTest(fileName); - } - - @TestMetadata("kt1845.kt") - public void testKt1845() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1845.kt"); - doTest(fileName); - } - - @TestMetadata("kt2060.kt") - public void testKt2060() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt2060.kt"); - doTest(fileName); - } - - @TestMetadata("kt5445.kt") - public void testKt5445() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt5445.kt"); - doTest(fileName); - } - - @TestMetadata("kt5445_2.kt") - public void testKt5445_2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt5445_2.kt"); - doTest(fileName); - } - - @TestMetadata("kt9717.kt") - public void testKt9717() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt9717.kt"); - doTest(fileName); - } - - @TestMetadata("kt9717DifferentPackages.kt") - public void testKt9717DifferentPackages() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt9717DifferentPackages.kt"); - doTest(fileName); - } - - @TestMetadata("kt9958.kt") - public void testKt9958() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt9958.kt"); - doTest(fileName); - } - - @TestMetadata("kt9958Interface.kt") - public void testKt9958Interface() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt9958Interface.kt"); - doTest(fileName); - } - - @TestMetadata("mainInFiles.kt") - public void testMainInFiles() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/mainInFiles.kt"); - doTest(fileName); - } - - @TestMetadata("multifileClassPartsInitialization.kt") - public void testMultifileClassPartsInitialization() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/multifileClassPartsInitialization.kt"); - doTest(fileName); - } - - @TestMetadata("packageLocalClassNotImportedWithDefaultImport.kt") - public void testPackageLocalClassNotImportedWithDefaultImport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/packageLocalClassNotImportedWithDefaultImport.kt"); - doTest(fileName); - } - - @TestMetadata("protectedFromLambda.kt") - public void testProtectedFromLambda() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/protectedFromLambda.kt"); - doTest(fileName); - } - - @TestMetadata("samWrappersDifferentFiles.kt") - public void testSamWrappersDifferentFiles() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles.kt"); - doTest(fileName); - } - - @TestMetadata("sameFileName.kt") - public void testSameFileName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/sameFileName.kt"); - doTest(fileName); - } - - @TestMetadata("samePartNameDifferentFacades.kt") - public void testSamePartNameDifferentFacades() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/samePartNameDifferentFacades.kt"); - doTest(fileName); - } - - @TestMetadata("simple.kt") - public void testSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/simple.kt"); - doTest(fileName); - } -} diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 069d4d34b1a..a0c2cf0cc80 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -204,10 +204,6 @@ fun main(args: Array) { model("codegen/boxInline") } - testClass("BlackBoxMultiFileCodegenTestGenerated") { - model("codegen/boxMultiFile") - } - testClass() { model("codegen/boxAgainstJava") }