From de33a21fd1520064066499c060b60ad00e1b9e9c Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 17 Apr 2023 12:11:36 +0300 Subject: [PATCH] [FE Test] Rename `nested` directory in testdata into `nestedClasses` This is needed to avoid clash between generated test class `Nested` and `@Nested` annotation from JUnit 5 --- .../kotlin/fir/FirLoadCompiledKotlinGenerated.java | 14 +++++++------- .../{nested => nestedClasses}/deepInnerGeneric.kt | 0 .../{nested => nestedClasses}/deepInnerGeneric.txt | 0 .../innerClassReferencesOuterTP.kt | 0 .../innerClassReferencesOuterTP.txt | 0 .../membersReferenceOuterTP.kt | 0 .../membersReferenceOuterTP.txt | 0 .../kotlin/jvm/compiler/LoadJavaTestGenerated.java | 14 +++++++------- .../LoadKotlinWithTypeTableTestGenerated.java | 14 +++++++------- .../jvm/compiler/ir/IrLoadJavaTestGenerated.java | 14 +++++++------- .../javac/LoadJavaUsingJavacTestGenerated.java | 14 +++++++------- .../JvmRuntimeDescriptorLoaderTestGenerated.java | 14 +++++++------- 12 files changed, 42 insertions(+), 42 deletions(-) rename compiler/testData/loadJava/compiledKotlin/{nested => nestedClasses}/deepInnerGeneric.kt (100%) rename compiler/testData/loadJava/compiledKotlin/{nested => nestedClasses}/deepInnerGeneric.txt (100%) rename compiler/testData/loadJava/compiledKotlin/{nested => nestedClasses}/innerClassReferencesOuterTP.kt (100%) rename compiler/testData/loadJava/compiledKotlin/{nested => nestedClasses}/innerClassReferencesOuterTP.txt (100%) rename compiler/testData/loadJava/compiledKotlin/{nested => nestedClasses}/membersReferenceOuterTP.kt (100%) rename compiler/testData/loadJava/compiledKotlin/{nested => nestedClasses}/membersReferenceOuterTP.txt (100%) diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java b/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java index 48296af50c7..94367326796 100644 --- a/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java +++ b/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java @@ -2296,31 +2296,31 @@ public class FirLoadCompiledKotlinGenerated extends AbstractFirLoadCompiledKotli } } - @TestMetadata("compiler/testData/loadJava/compiledKotlin/nested") + @TestMetadata("compiler/testData/loadJava/compiledKotlin/nestedClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Nested extends AbstractFirLoadCompiledKotlin { + public static class NestedClasses extends AbstractFirLoadCompiledKotlin { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - public void testAllFilesPresentInNested() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInNestedClasses() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true); } @TestMetadata("deepInnerGeneric.kt") public void testDeepInnerGeneric() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt"); } @TestMetadata("innerClassReferencesOuterTP.kt") public void testInnerClassReferencesOuterTP() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt"); } @TestMetadata("membersReferenceOuterTP.kt") public void testMembersReferenceOuterTP() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt"); } } diff --git a/compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt b/compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt rename to compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt diff --git a/compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.txt b/compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.txt rename to compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.txt diff --git a/compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt b/compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt rename to compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt diff --git a/compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.txt b/compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.txt rename to compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.txt diff --git a/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt b/compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt rename to compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt diff --git a/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.txt b/compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.txt similarity index 100% rename from compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.txt rename to compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.txt diff --git a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java index 77c942128d3..627d97e8058 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java @@ -3984,31 +3984,31 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } } - @TestMetadata("compiler/testData/loadJava/compiledKotlin/nested") + @TestMetadata("compiler/testData/loadJava/compiledKotlin/nestedClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Nested extends AbstractLoadJavaTest { + public static class NestedClasses extends AbstractLoadJavaTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledKotlin, this, testDataFilePath); } - public void testAllFilesPresentInNested() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInNestedClasses() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true); } @TestMetadata("deepInnerGeneric.kt") public void testDeepInnerGeneric() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt"); } @TestMetadata("innerClassReferencesOuterTP.kt") public void testInnerClassReferencesOuterTP() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt"); } @TestMetadata("membersReferenceOuterTP.kt") public void testMembersReferenceOuterTP() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt"); } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java index 2dbd5ef9c19..0bf0814a693 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java @@ -2296,31 +2296,31 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith } } - @TestMetadata("compiler/testData/loadJava/compiledKotlin/nested") + @TestMetadata("compiler/testData/loadJava/compiledKotlin/nestedClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Nested extends AbstractLoadKotlinWithTypeTableTest { + public static class NestedClasses extends AbstractLoadKotlinWithTypeTableTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - public void testAllFilesPresentInNested() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInNestedClasses() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true); } @TestMetadata("deepInnerGeneric.kt") public void testDeepInnerGeneric() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt"); } @TestMetadata("innerClassReferencesOuterTP.kt") public void testInnerClassReferencesOuterTP() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt"); } @TestMetadata("membersReferenceOuterTP.kt") public void testMembersReferenceOuterTP() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt"); } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrLoadJavaTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrLoadJavaTestGenerated.java index f55bc8f8042..0a5eeb85801 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrLoadJavaTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrLoadJavaTestGenerated.java @@ -3985,31 +3985,31 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest { } } - @TestMetadata("compiler/testData/loadJava/compiledKotlin/nested") + @TestMetadata("compiler/testData/loadJava/compiledKotlin/nestedClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Nested extends AbstractIrLoadJavaTest { + public static class NestedClasses extends AbstractIrLoadJavaTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledKotlin, TargetBackend.JVM_IR, testDataFilePath); } - public void testAllFilesPresentInNested() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); + public void testAllFilesPresentInNestedClasses() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("deepInnerGeneric.kt") public void testDeepInnerGeneric() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt"); } @TestMetadata("innerClassReferencesOuterTP.kt") public void testInnerClassReferencesOuterTP() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt"); } @TestMetadata("membersReferenceOuterTP.kt") public void testMembersReferenceOuterTP() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt"); } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/javac/LoadJavaUsingJavacTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/javac/LoadJavaUsingJavacTestGenerated.java index f1008179c45..318511b453e 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/javac/LoadJavaUsingJavacTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/javac/LoadJavaUsingJavacTestGenerated.java @@ -3984,31 +3984,31 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT } } - @TestMetadata("compiler/testData/loadJava/compiledKotlin/nested") + @TestMetadata("compiler/testData/loadJava/compiledKotlin/nestedClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Nested extends AbstractLoadJavaUsingJavacTest { + public static class NestedClasses extends AbstractLoadJavaUsingJavacTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTestCompiledKotlin, this, testDataFilePath); } - public void testAllFilesPresentInNested() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInNestedClasses() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true); } @TestMetadata("deepInnerGeneric.kt") public void testDeepInnerGeneric() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt"); } @TestMetadata("innerClassReferencesOuterTP.kt") public void testInnerClassReferencesOuterTP() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt"); } @TestMetadata("membersReferenceOuterTP.kt") public void testMembersReferenceOuterTP() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt"); } } diff --git a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java index cfbe74541e7..36ba58bfab1 100644 --- a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java +++ b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java @@ -2298,31 +2298,31 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD } } - @TestMetadata("compiler/testData/loadJava/compiledKotlin/nested") + @TestMetadata("compiler/testData/loadJava/compiledKotlin/nestedClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Nested extends AbstractJvmRuntimeDescriptorLoaderTest { + public static class NestedClasses extends AbstractJvmRuntimeDescriptorLoaderTest { private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } - public void testAllFilesPresentInNested() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), null, true); + public void testAllFilesPresentInNestedClasses() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true); } @TestMetadata("deepInnerGeneric.kt") public void testDeepInnerGeneric() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt"); } @TestMetadata("innerClassReferencesOuterTP.kt") public void testInnerClassReferencesOuterTP() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt"); } @TestMetadata("membersReferenceOuterTP.kt") public void testMembersReferenceOuterTP() throws Exception { - runTest("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); + runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt"); } }