From ae5a0530258b6990482fd612aca55d76f0dfb175 Mon Sep 17 00:00:00 2001 From: Marco Pennekamp Date: Tue, 12 Dec 2023 16:47:23 +0100 Subject: [PATCH] [LL] Disable modifiable PSI tests due to application sharing issues ^KT-63650 --- ...pressionCalleeResilienceTestGenerated.java | 44 ------------- ...essionReceiverResilienceTestGenerated.java | 44 ------------- ...essionSelectorResilienceTestGenerated.java | 44 ------------- ...ionInitializerResilienceTestGenerated.java | 32 ---------- ...tLowLevelApiModifiablePsiSingleFileTest.kt | 2 + .../tests/analysis/api/firLowLevel.kt | 63 ++++++++++--------- 6 files changed, 34 insertions(+), 195 deletions(-) delete mode 100644 analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServiceCallExpressionCalleeResilienceTestGenerated.java delete mode 100644 analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServiceDotQualifiedExpressionReceiverResilienceTestGenerated.java delete mode 100644 analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServiceDotQualifiedExpressionSelectorResilienceTestGenerated.java delete mode 100644 analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServicePropertyDeclarationInitializerResilienceTestGenerated.java diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServiceCallExpressionCalleeResilienceTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServiceCallExpressionCalleeResilienceTestGenerated.java deleted file mode 100644 index 2f121443baf..00000000000 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServiceCallExpressionCalleeResilienceTestGenerated.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/callExpression") -@TestDataPath("$PROJECT_ROOT") -public class DeclarationModificationServiceCallExpressionCalleeResilienceTestGenerated extends AbstractDeclarationModificationServiceCallExpressionCalleeResilienceTest { - @Test - public void testAllFilesPresentInCallExpression() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/callExpression"), Pattern.compile("^([^.]+)\\.kt$"), null, false); - } - - @Test - @TestMetadata("contractCall.kt") - public void testContractCall() throws Exception { - runTest("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/callExpression/contractCall.kt"); - } - - @Test - @TestMetadata("printlnFirstStatement.kt") - public void testPrintlnFirstStatement() throws Exception { - runTest("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/callExpression/printlnFirstStatement.kt"); - } - - @Test - @TestMetadata("printlnSecondStatement.kt") - public void testPrintlnSecondStatement() throws Exception { - runTest("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/callExpression/printlnSecondStatement.kt"); - } -} diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServiceDotQualifiedExpressionReceiverResilienceTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServiceDotQualifiedExpressionReceiverResilienceTestGenerated.java deleted file mode 100644 index 3394f1c157c..00000000000 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServiceDotQualifiedExpressionReceiverResilienceTestGenerated.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/dotQualifiedExpression") -@TestDataPath("$PROJECT_ROOT") -public class DeclarationModificationServiceDotQualifiedExpressionReceiverResilienceTestGenerated extends AbstractDeclarationModificationServiceDotQualifiedExpressionReceiverResilienceTest { - @Test - public void testAllFilesPresentInDotQualifiedExpression() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/dotQualifiedExpression"), Pattern.compile("^([^.]+)\\.kt$"), null, false); - } - - @Test - @TestMetadata("contractCall.kt") - public void testContractCall() throws Exception { - runTest("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/dotQualifiedExpression/contractCall.kt"); - } - - @Test - @TestMetadata("stringLengthFirstStatement.kt") - public void testStringLengthFirstStatement() throws Exception { - runTest("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/dotQualifiedExpression/stringLengthFirstStatement.kt"); - } - - @Test - @TestMetadata("stringLengthSecondStatement.kt") - public void testStringLengthSecondStatement() throws Exception { - runTest("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/dotQualifiedExpression/stringLengthSecondStatement.kt"); - } -} diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServiceDotQualifiedExpressionSelectorResilienceTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServiceDotQualifiedExpressionSelectorResilienceTestGenerated.java deleted file mode 100644 index e5ba03b3fe5..00000000000 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServiceDotQualifiedExpressionSelectorResilienceTestGenerated.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/dotQualifiedExpression") -@TestDataPath("$PROJECT_ROOT") -public class DeclarationModificationServiceDotQualifiedExpressionSelectorResilienceTestGenerated extends AbstractDeclarationModificationServiceDotQualifiedExpressionSelectorResilienceTest { - @Test - public void testAllFilesPresentInDotQualifiedExpression() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/dotQualifiedExpression"), Pattern.compile("^([^.]+)\\.kt$"), null, false); - } - - @Test - @TestMetadata("contractCall.kt") - public void testContractCall() throws Exception { - runTest("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/dotQualifiedExpression/contractCall.kt"); - } - - @Test - @TestMetadata("stringLengthFirstStatement.kt") - public void testStringLengthFirstStatement() throws Exception { - runTest("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/dotQualifiedExpression/stringLengthFirstStatement.kt"); - } - - @Test - @TestMetadata("stringLengthSecondStatement.kt") - public void testStringLengthSecondStatement() throws Exception { - runTest("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/dotQualifiedExpression/stringLengthSecondStatement.kt"); - } -} diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServicePropertyDeclarationInitializerResilienceTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServicePropertyDeclarationInitializerResilienceTestGenerated.java deleted file mode 100644 index 2d675d86d74..00000000000 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/DeclarationModificationServicePropertyDeclarationInitializerResilienceTestGenerated.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/propertyDeclaration") -@TestDataPath("$PROJECT_ROOT") -public class DeclarationModificationServicePropertyDeclarationInitializerResilienceTestGenerated extends AbstractDeclarationModificationServicePropertyDeclarationInitializerResilienceTest { - @Test - public void testAllFilesPresentInPropertyDeclaration() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/propertyDeclaration"), Pattern.compile("^([^.]+)\\.kt$"), null, false); - } - - @Test - @TestMetadata("simpleProperty.kt") - public void testSimpleProperty() throws Exception { - runTest("analysis/low-level-api-fir/testData/declarationModificationService/psiResilience/propertyDeclaration/simpleProperty.kt"); - } -} diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiModifiablePsiSingleFileTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiModifiablePsiSingleFileTest.kt index 5d9a3e44aa5..0581b1685c0 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiModifiablePsiSingleFileTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiModifiablePsiSingleFileTest.kt @@ -17,6 +17,8 @@ import org.jetbrains.kotlin.test.testFramework.runWriteAction /** * [AbstractLowLevelApiModifiablePsiSingleFileTest] applies additional configuration to support the modification of PSI during the test. + * + * NOTE: Modifiable PSI tests must not be used until KT-63650 is fixed. */ abstract class AbstractLowLevelApiModifiablePsiSingleFileTest : AbstractLowLevelApiSingleFileTest() { override val configurator: AnalysisApiTestConfigurator get() = AnalysisApiFirModifiablePsiSourceTestConfigurator diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/firLowLevel.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/firLowLevel.kt index e9238b489fa..b351e4de384 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/firLowLevel.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/firLowLevel.kt @@ -106,37 +106,38 @@ internal fun TestGroupSuite.generateFirLowLevelApiTests() { model("inBlockModification/codeFragments", recursive = false, pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) } - testClass { - model( - "declarationModificationService/psiResilience/callExpression", - recursive = false, - pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, - ) - } - - testClass { - model( - "declarationModificationService/psiResilience/dotQualifiedExpression", - recursive = false, - pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, - ) - } - - testClass { - model( - "declarationModificationService/psiResilience/dotQualifiedExpression", - recursive = false, - pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, - ) - } - - testClass { - model( - "declarationModificationService/psiResilience/propertyDeclaration", - recursive = false, - pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, - ) - } + // Modifiable PSI tests must not be generated until KT-63650 is fixed. +// testClass { +// model( +// "declarationModificationService/psiResilience/callExpression", +// recursive = false, +// pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, +// ) +// } +// +// testClass { +// model( +// "declarationModificationService/psiResilience/dotQualifiedExpression", +// recursive = false, +// pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, +// ) +// } +// +// testClass { +// model( +// "declarationModificationService/psiResilience/dotQualifiedExpression", +// recursive = false, +// pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, +// ) +// } +// +// testClass { +// model( +// "declarationModificationService/psiResilience/propertyDeclaration", +// recursive = false, +// pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, +// ) +// } testClass { model("fileStructure", pattern = TestGeneratorUtil.KT)