From abf7ae547eb0c8656f0e8cdcaff09c2a3ace06ee Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 12 Nov 2015 11:40:59 +0300 Subject: [PATCH] Minor. Move tests --- .../bridges.kt | 0 .../collectionImpl.kt | 0 .../enumAsOrdinaled.kt | 0 .../explicitSuperCall.kt | 0 .../irrelevantRemoveAtOverride.kt | 0 .../maps.kt | 0 .../throwable.kt | 0 .../valuesInsideEnum.kt | 0 .../BlackBoxCodegenTestGenerated.java | 114 +++++++++--------- 9 files changed, 57 insertions(+), 57 deletions(-) rename compiler/testData/codegen/box/{builtinsProperties => specialBuiltins}/bridges.kt (100%) rename compiler/testData/codegen/box/{builtinsProperties => specialBuiltins}/collectionImpl.kt (100%) rename compiler/testData/codegen/box/{builtinsProperties => specialBuiltins}/enumAsOrdinaled.kt (100%) rename compiler/testData/codegen/box/{builtinsProperties => specialBuiltins}/explicitSuperCall.kt (100%) rename compiler/testData/codegen/box/{builtinsProperties => specialBuiltins}/irrelevantRemoveAtOverride.kt (100%) rename compiler/testData/codegen/box/{builtinsProperties => specialBuiltins}/maps.kt (100%) rename compiler/testData/codegen/box/{builtinsProperties => specialBuiltins}/throwable.kt (100%) rename compiler/testData/codegen/box/{builtinsProperties => specialBuiltins}/valuesInsideEnum.kt (100%) diff --git a/compiler/testData/codegen/box/builtinsProperties/bridges.kt b/compiler/testData/codegen/box/specialBuiltins/bridges.kt similarity index 100% rename from compiler/testData/codegen/box/builtinsProperties/bridges.kt rename to compiler/testData/codegen/box/specialBuiltins/bridges.kt diff --git a/compiler/testData/codegen/box/builtinsProperties/collectionImpl.kt b/compiler/testData/codegen/box/specialBuiltins/collectionImpl.kt similarity index 100% rename from compiler/testData/codegen/box/builtinsProperties/collectionImpl.kt rename to compiler/testData/codegen/box/specialBuiltins/collectionImpl.kt diff --git a/compiler/testData/codegen/box/builtinsProperties/enumAsOrdinaled.kt b/compiler/testData/codegen/box/specialBuiltins/enumAsOrdinaled.kt similarity index 100% rename from compiler/testData/codegen/box/builtinsProperties/enumAsOrdinaled.kt rename to compiler/testData/codegen/box/specialBuiltins/enumAsOrdinaled.kt diff --git a/compiler/testData/codegen/box/builtinsProperties/explicitSuperCall.kt b/compiler/testData/codegen/box/specialBuiltins/explicitSuperCall.kt similarity index 100% rename from compiler/testData/codegen/box/builtinsProperties/explicitSuperCall.kt rename to compiler/testData/codegen/box/specialBuiltins/explicitSuperCall.kt diff --git a/compiler/testData/codegen/box/builtinsProperties/irrelevantRemoveAtOverride.kt b/compiler/testData/codegen/box/specialBuiltins/irrelevantRemoveAtOverride.kt similarity index 100% rename from compiler/testData/codegen/box/builtinsProperties/irrelevantRemoveAtOverride.kt rename to compiler/testData/codegen/box/specialBuiltins/irrelevantRemoveAtOverride.kt diff --git a/compiler/testData/codegen/box/builtinsProperties/maps.kt b/compiler/testData/codegen/box/specialBuiltins/maps.kt similarity index 100% rename from compiler/testData/codegen/box/builtinsProperties/maps.kt rename to compiler/testData/codegen/box/specialBuiltins/maps.kt diff --git a/compiler/testData/codegen/box/builtinsProperties/throwable.kt b/compiler/testData/codegen/box/specialBuiltins/throwable.kt similarity index 100% rename from compiler/testData/codegen/box/builtinsProperties/throwable.kt rename to compiler/testData/codegen/box/specialBuiltins/throwable.kt diff --git a/compiler/testData/codegen/box/builtinsProperties/valuesInsideEnum.kt b/compiler/testData/codegen/box/specialBuiltins/valuesInsideEnum.kt similarity index 100% rename from compiler/testData/codegen/box/builtinsProperties/valuesInsideEnum.kt rename to compiler/testData/codegen/box/specialBuiltins/valuesInsideEnum.kt diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java index 409dd2a9633..3a6e76c0408 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java @@ -896,63 +896,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } - @TestMetadata("compiler/testData/codegen/box/builtinsProperties") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class BuiltinsProperties extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInBuiltinsProperties() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/builtinsProperties"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("bridges.kt") - public void testBridges() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/bridges.kt"); - doTest(fileName); - } - - @TestMetadata("collectionImpl.kt") - public void testCollectionImpl() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/collectionImpl.kt"); - doTest(fileName); - } - - @TestMetadata("enumAsOrdinaled.kt") - public void testEnumAsOrdinaled() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/enumAsOrdinaled.kt"); - doTest(fileName); - } - - @TestMetadata("explicitSuperCall.kt") - public void testExplicitSuperCall() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/explicitSuperCall.kt"); - doTest(fileName); - } - - @TestMetadata("irrelevantRemoveAtOverride.kt") - public void testIrrelevantRemoveAtOverride() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/irrelevantRemoveAtOverride.kt"); - doTest(fileName); - } - - @TestMetadata("maps.kt") - public void testMaps() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/maps.kt"); - doTest(fileName); - } - - @TestMetadata("throwable.kt") - public void testThrowable() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/throwable.kt"); - doTest(fileName); - } - - @TestMetadata("valuesInsideEnum.kt") - public void testValuesInsideEnum() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/valuesInsideEnum.kt"); - doTest(fileName); - } - } - @TestMetadata("compiler/testData/codegen/box/casts") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -7364,6 +7307,63 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } } + @TestMetadata("compiler/testData/codegen/box/specialBuiltins") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class SpecialBuiltins extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInSpecialBuiltins() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/specialBuiltins"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("bridges.kt") + public void testBridges() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/bridges.kt"); + doTest(fileName); + } + + @TestMetadata("collectionImpl.kt") + public void testCollectionImpl() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/collectionImpl.kt"); + doTest(fileName); + } + + @TestMetadata("enumAsOrdinaled.kt") + public void testEnumAsOrdinaled() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/enumAsOrdinaled.kt"); + doTest(fileName); + } + + @TestMetadata("explicitSuperCall.kt") + public void testExplicitSuperCall() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/explicitSuperCall.kt"); + doTest(fileName); + } + + @TestMetadata("irrelevantRemoveAtOverride.kt") + public void testIrrelevantRemoveAtOverride() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/irrelevantRemoveAtOverride.kt"); + doTest(fileName); + } + + @TestMetadata("maps.kt") + public void testMaps() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/maps.kt"); + doTest(fileName); + } + + @TestMetadata("throwable.kt") + public void testThrowable() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/throwable.kt"); + doTest(fileName); + } + + @TestMetadata("valuesInsideEnum.kt") + public void testValuesInsideEnum() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/specialBuiltins/valuesInsideEnum.kt"); + doTest(fileName); + } + } + @TestMetadata("compiler/testData/codegen/box/staticFields") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)