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

[SLC] update test data for 2.0 version

Browse Source 
* disable compiled tests for scripts because they are not supported yet
* fix test data

^KT-60590 Fixed
This commit is contained in:
Dmitrii Gridin
2023-07-24 15:16:51 +02:00
committed by Space Team
parent 2a8b655294
commit 11d86992c5
5 changed files with 18 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java
Generated
+1 -29
View File
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
public class SymbolLightClassesByPsiForLibraryTestGenerated extends AbstractSymbolLightClassesByPsiForLibraryTest {
@Test
public void testAllFilesPresentInLightClassByPsi() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true, "scripts");
}
@Test
@@ -525,32 +525,4 @@ public class SymbolLightClassesByPsiForLibraryTestGenerated extends AbstractSymb
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.kt");
}
}
@Nested
@TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts")
@TestDataPath("$PROJECT_ROOT")
public class Scripts {
@Test
public void testAllFilesPresentInScripts() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
}
@Test
@TestMetadata("FunsPropsAndFields.kts")
public void testFunsPropsAndFields() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.kts");
}
@Test
@TestMetadata("HelloWorld.kts")
public void testHelloWorld() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.kts");
}
@Test
@TestMetadata("InnerClasses.kts")
public void testInnerClasses() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.kts");
}
}
}
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByPsiForLibraryTestGenerated.java
Generated
+1 -29
View File
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
public class SymbolLightClassesEqualityByPsiForLibraryTestGenerated extends AbstractSymbolLightClassesEqualityByPsiForLibraryTest {
@Test
public void testAllFilesPresentInLightClassByPsi() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true, "scripts");
}
@Test
@@ -525,32 +525,4 @@ public class SymbolLightClassesEqualityByPsiForLibraryTestGenerated extends Abst
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.kt");
}
}
@Nested
@TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts")
@TestDataPath("$PROJECT_ROOT")
public class Scripts {
@Test
public void testAllFilesPresentInScripts() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
}
@Test
@TestMetadata("FunsPropsAndFields.kts")
public void testFunsPropsAndFields() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.kts");
}
@Test
@TestMetadata("HelloWorld.kts")
public void testHelloWorld() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.kts");
}
@Test
@TestMetadata("InnerClasses.kts")
public void testInnerClasses() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.kts");
}
}
}
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByPsiForLibraryTestGenerated.java
Generated
+1 -29
View File
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
public class SymbolLightClassesParentingByPsiForLibraryTestGenerated extends AbstractSymbolLightClassesParentingByPsiForLibraryTest {
@Test
public void testAllFilesPresentInLightClassByPsi() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true, "scripts");
}
@Test
@@ -525,32 +525,4 @@ public class SymbolLightClassesParentingByPsiForLibraryTestGenerated extends Abs
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/facades/wildcardOptimization.kt");
}
}
@Nested
@TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts")
@TestDataPath("$PROJECT_ROOT")
public class Scripts {
@Test
public void testAllFilesPresentInScripts() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
}
@Test
@TestMetadata("FunsPropsAndFields.kts")
public void testFunsPropsAndFields() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.kts");
}
@Test
@TestMetadata("HelloWorld.kts")
public void testHelloWorld() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.kts");
}
@Test
@TestMetadata("InnerClasses.kts")
public void testInnerClasses() throws Exception {
runTest("compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.kts");
}
}
}
compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.kt
Vendored
-2
View File
@@ -7,5 +7,3 @@ package pkg
@JvmRecord
data class MyRec(val name: String)
// JDK 15 should be used to compile this file
// COMPILATION_ERRORS
generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt
+15 -10
View File
@@ -70,19 +70,24 @@ private fun TestGroupSuite.generateCompilerTestDataBasedLightClassesTests() {
}
}
private fun lightClassesByPsiTestsInit(isLibrary: Boolean = false): TestGroup.TestClass.() -> Unit = {
model(
relativeRootPath = "asJava/lightClasses/lightClassByPsi",
// Compiled scripts are not yet supported
excludeDirs = if (isLibrary) listOf("scripts") else emptyList(),
pattern = TestGeneratorUtil.KT_OR_KTS
)
}
private fun TestGroup.lightClassesByPsiTests() {
val modelInit: TestGroup.TestClass.() -> Unit = {
model("asJava/lightClasses/lightClassByPsi", pattern = TestGeneratorUtil.KT_OR_KTS)
}
testClass<AbstractSymbolLightClassesByPsiForSourceTest>(init = lightClassesByPsiTestsInit())
testClass<AbstractSymbolLightClassesByPsiForLibraryTest>(init = lightClassesByPsiTestsInit(isLibrary = true))
testClass<AbstractSymbolLightClassesByPsiForSourceTest>(init = modelInit)
testClass<AbstractSymbolLightClassesByPsiForLibraryTest>(init = modelInit)
testClass<AbstractSymbolLightClassesParentingByPsiForSourceTest>(init = lightClassesByPsiTestsInit())
testClass<AbstractSymbolLightClassesParentingByPsiForLibraryTest>(init = lightClassesByPsiTestsInit(isLibrary = true))
testClass<AbstractSymbolLightClassesParentingByPsiForSourceTest>(init = modelInit)
testClass<AbstractSymbolLightClassesParentingByPsiForLibraryTest>(init = modelInit)
testClass<AbstractSymbolLightClassesEqualityByPsiForSourceTest>(init = modelInit)
testClass<AbstractSymbolLightClassesEqualityByPsiForLibraryTest>(init = modelInit)
testClass<AbstractSymbolLightClassesEqualityByPsiForSourceTest>(init = lightClassesByPsiTestsInit())
testClass<AbstractSymbolLightClassesEqualityByPsiForLibraryTest>(init = lightClassesByPsiTestsInit(isLibrary = true))
}
private fun TestGroup.lightClassesByFqNameTests() {