azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FE Test] Rename nested directory in testdata into nestedClasses

Browse Source 
This is needed to avoid clash between generated test class `Nested` and
  `@Nested` annotation from JUnit 5
This commit is contained in:
Dmitriy Novozhilov
2023-04-17 12:11:36 +03:00
committed by Space Team
parent 0ca86c86be
commit de33a21fd1
12 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java
Generated
+7 -7
View File
@@ -2296,31 +2296,31 @@ public class FirLoadCompiledKotlinGenerated extends AbstractFirLoadCompiledKotli
} }
} }
@TestMetadata("compiler/testData/loadJava/compiledKotlin/nested") @TestMetadata("compiler/testData/loadJava/compiledKotlin/nestedClasses")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Nested extends AbstractFirLoadCompiledKotlin { public static class NestedClasses extends AbstractFirLoadCompiledKotlin {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
} }
public void testAllFilesPresentInNested() throws Exception { public void testAllFilesPresentInNestedClasses() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), null, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true);
} }
@TestMetadata("deepInnerGeneric.kt") @TestMetadata("deepInnerGeneric.kt")
public void testDeepInnerGeneric() throws Exception { public void testDeepInnerGeneric() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt");
} }
@TestMetadata("innerClassReferencesOuterTP.kt") @TestMetadata("innerClassReferencesOuterTP.kt")
public void testInnerClassReferencesOuterTP() throws Exception { public void testInnerClassReferencesOuterTP() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt");
} }
@TestMetadata("membersReferenceOuterTP.kt") @TestMetadata("membersReferenceOuterTP.kt")
public void testMembersReferenceOuterTP() throws Exception { public void testMembersReferenceOuterTP() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt");
} }
} }
compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt → compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt
Vendored
View File
compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.txt → compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.txt
Vendored
View File
compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt → compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt
Vendored
View File
compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.txt → compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.txt
Vendored
View File
compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt → compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt
Vendored
View File
compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.txt → compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.txt
Vendored
View File
compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java
Generated
+7 -7
View File
@@ -3984,31 +3984,31 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
} }
} }
@TestMetadata("compiler/testData/loadJava/compiledKotlin/nested") @TestMetadata("compiler/testData/loadJava/compiledKotlin/nestedClasses")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Nested extends AbstractLoadJavaTest { public static class NestedClasses extends AbstractLoadJavaTest {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTestCompiledKotlin, this, testDataFilePath); KotlinTestUtils.runTest(this::doTestCompiledKotlin, this, testDataFilePath);
} }
public void testAllFilesPresentInNested() throws Exception { public void testAllFilesPresentInNestedClasses() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), null, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true);
} }
@TestMetadata("deepInnerGeneric.kt") @TestMetadata("deepInnerGeneric.kt")
public void testDeepInnerGeneric() throws Exception { public void testDeepInnerGeneric() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt");
} }
@TestMetadata("innerClassReferencesOuterTP.kt") @TestMetadata("innerClassReferencesOuterTP.kt")
public void testInnerClassReferencesOuterTP() throws Exception { public void testInnerClassReferencesOuterTP() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt");
} }
@TestMetadata("membersReferenceOuterTP.kt") @TestMetadata("membersReferenceOuterTP.kt")
public void testMembersReferenceOuterTP() throws Exception { public void testMembersReferenceOuterTP() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt");
} }
} }
compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java
Generated
+7 -7
View File
@@ -2296,31 +2296,31 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith
} }
} }
@TestMetadata("compiler/testData/loadJava/compiledKotlin/nested") @TestMetadata("compiler/testData/loadJava/compiledKotlin/nestedClasses")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Nested extends AbstractLoadKotlinWithTypeTableTest { public static class NestedClasses extends AbstractLoadKotlinWithTypeTableTest {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
} }
public void testAllFilesPresentInNested() throws Exception { public void testAllFilesPresentInNestedClasses() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), null, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true);
} }
@TestMetadata("deepInnerGeneric.kt") @TestMetadata("deepInnerGeneric.kt")
public void testDeepInnerGeneric() throws Exception { public void testDeepInnerGeneric() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt");
} }
@TestMetadata("innerClassReferencesOuterTP.kt") @TestMetadata("innerClassReferencesOuterTP.kt")
public void testInnerClassReferencesOuterTP() throws Exception { public void testInnerClassReferencesOuterTP() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt");
} }
@TestMetadata("membersReferenceOuterTP.kt") @TestMetadata("membersReferenceOuterTP.kt")
public void testMembersReferenceOuterTP() throws Exception { public void testMembersReferenceOuterTP() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt");
} }
} }
compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/ir/IrLoadJavaTestGenerated.java
Generated
+7 -7
View File
@@ -3985,31 +3985,31 @@ public class IrLoadJavaTestGenerated extends AbstractIrLoadJavaTest {
} }
} }
@TestMetadata("compiler/testData/loadJava/compiledKotlin/nested") @TestMetadata("compiler/testData/loadJava/compiledKotlin/nestedClasses")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Nested extends AbstractIrLoadJavaTest { public static class NestedClasses extends AbstractIrLoadJavaTest {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTestCompiledKotlin, TargetBackend.JVM_IR, testDataFilePath); KotlinTestUtils.runTest(this::doTestCompiledKotlin, TargetBackend.JVM_IR, testDataFilePath);
} }
public void testAllFilesPresentInNested() throws Exception { public void testAllFilesPresentInNestedClasses() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
} }
@TestMetadata("deepInnerGeneric.kt") @TestMetadata("deepInnerGeneric.kt")
public void testDeepInnerGeneric() throws Exception { public void testDeepInnerGeneric() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt");
} }
@TestMetadata("innerClassReferencesOuterTP.kt") @TestMetadata("innerClassReferencesOuterTP.kt")
public void testInnerClassReferencesOuterTP() throws Exception { public void testInnerClassReferencesOuterTP() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt");
} }
@TestMetadata("membersReferenceOuterTP.kt") @TestMetadata("membersReferenceOuterTP.kt")
public void testMembersReferenceOuterTP() throws Exception { public void testMembersReferenceOuterTP() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt");
} }
} }
compiler/tests-gen/org/jetbrains/kotlin/jvm/compiler/javac/LoadJavaUsingJavacTestGenerated.java
Generated
+7 -7
View File
@@ -3984,31 +3984,31 @@ public class LoadJavaUsingJavacTestGenerated extends AbstractLoadJavaUsingJavacT
} }
} }
@TestMetadata("compiler/testData/loadJava/compiledKotlin/nested") @TestMetadata("compiler/testData/loadJava/compiledKotlin/nestedClasses")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Nested extends AbstractLoadJavaUsingJavacTest { public static class NestedClasses extends AbstractLoadJavaUsingJavacTest {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTestCompiledKotlin, this, testDataFilePath); KotlinTestUtils.runTest(this::doTestCompiledKotlin, this, testDataFilePath);
} }
public void testAllFilesPresentInNested() throws Exception { public void testAllFilesPresentInNestedClasses() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), null, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true);
} }
@TestMetadata("deepInnerGeneric.kt") @TestMetadata("deepInnerGeneric.kt")
public void testDeepInnerGeneric() throws Exception { public void testDeepInnerGeneric() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt");
} }
@TestMetadata("innerClassReferencesOuterTP.kt") @TestMetadata("innerClassReferencesOuterTP.kt")
public void testInnerClassReferencesOuterTP() throws Exception { public void testInnerClassReferencesOuterTP() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt");
} }
@TestMetadata("membersReferenceOuterTP.kt") @TestMetadata("membersReferenceOuterTP.kt")
public void testMembersReferenceOuterTP() throws Exception { public void testMembersReferenceOuterTP() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt");
} }
} }
core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java
Generated
+7 -7
View File
@@ -2298,31 +2298,31 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD
} }
} }
@TestMetadata("compiler/testData/loadJava/compiledKotlin/nested") @TestMetadata("compiler/testData/loadJava/compiledKotlin/nestedClasses")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Nested extends AbstractJvmRuntimeDescriptorLoaderTest { public static class NestedClasses extends AbstractJvmRuntimeDescriptorLoaderTest {
private void runTest(String testDataFilePath) throws Exception { private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
} }
public void testAllFilesPresentInNested() throws Exception { public void testAllFilesPresentInNestedClasses() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), null, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nestedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true);
} }
@TestMetadata("deepInnerGeneric.kt") @TestMetadata("deepInnerGeneric.kt")
public void testDeepInnerGeneric() throws Exception { public void testDeepInnerGeneric() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/deepInnerGeneric.kt");
} }
@TestMetadata("innerClassReferencesOuterTP.kt") @TestMetadata("innerClassReferencesOuterTP.kt")
public void testInnerClassReferencesOuterTP() throws Exception { public void testInnerClassReferencesOuterTP() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/innerClassReferencesOuterTP.kt");
} }
@TestMetadata("membersReferenceOuterTP.kt") @TestMetadata("membersReferenceOuterTP.kt")
public void testMembersReferenceOuterTP() throws Exception { public void testMembersReferenceOuterTP() throws Exception {
runTest("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); runTest("compiler/testData/loadJava/compiledKotlin/nestedClasses/membersReferenceOuterTP.kt");
} }
} }