From 11d86992c518a4f8064c932c5a777e1e2e860428 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 24 Jul 2023 15:16:51 +0200 Subject: [PATCH] [SLC] update test data for 2.0 version * disable compiled tests for scripts because they are not supported yet * fix test data ^KT-60590 Fixed --- ...htClassesByPsiForLibraryTestGenerated.java | 30 +------------------ ...sEqualityByPsiForLibraryTestGenerated.java | 30 +------------------ ...ParentingByPsiForLibraryTestGenerated.java | 30 +------------------ .../lightClasses/lightClassByPsi/jvmRecord.kt | 2 -- .../tests/analysis/api/lightClasses.kt | 25 +++++++++------- 5 files changed, 18 insertions(+), 99 deletions(-) diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java index e90288dfb15..612a8f5a230 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java @@ -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"); - } - } } diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByPsiForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByPsiForLibraryTestGenerated.java index 4a546fe4cf0..265b87d84da 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByPsiForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByPsiForLibraryTestGenerated.java @@ -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"); - } - } } diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByPsiForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByPsiForLibraryTestGenerated.java index 1bea799779f..7cef521bdcb 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByPsiForLibraryTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByPsiForLibraryTestGenerated.java @@ -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"); - } - } } diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.kt b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.kt index ec3e8ad265c..141df400ce6 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.kt +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmRecord.kt @@ -7,5 +7,3 @@ package pkg @JvmRecord data class MyRec(val name: String) -// JDK 15 should be used to compile this file -// COMPILATION_ERRORS diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt index 319ae038d94..1362d91ef32 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt @@ -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(init = lightClassesByPsiTestsInit()) + testClass(init = lightClassesByPsiTestsInit(isLibrary = true)) - testClass(init = modelInit) - testClass(init = modelInit) + testClass(init = lightClassesByPsiTestsInit()) + testClass(init = lightClassesByPsiTestsInit(isLibrary = true)) - testClass(init = modelInit) - testClass(init = modelInit) - - testClass(init = modelInit) - testClass(init = modelInit) + testClass(init = lightClassesByPsiTestsInit()) + testClass(init = lightClassesByPsiTestsInit(isLibrary = true)) } private fun TestGroup.lightClassesByFqNameTests() {