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
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")
@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");
}
}