From f9669596155690a35ce2554b9e6e3738bd7a6116 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 10 Jun 2022 12:04:53 +0200 Subject: [PATCH] [Analysis API] disable not passing new Analysis API tests for FE10 --- ...sisApiSignatureContractsTestGenerated.java | 60 -------------- ...ApiSignatureSubstitutionTestGenerated.java | 60 -------------- ...ysisApiSymbolAsSignatureTestGenerated.java | 78 ------------------- ...sisApiSymbolSubstitutionTestGenerated.java | 60 -------------- ...ModuleSubstitutorBuilderTestGenerated.java | 54 ------------- .../tests/analysis/api/analysisApi.kt | 4 +- 6 files changed, 2 insertions(+), 314 deletions(-) delete mode 100644 analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSignatureContractsTestGenerated.java delete mode 100644 analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSignatureSubstitutionTestGenerated.java delete mode 100644 analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSymbolAsSignatureTestGenerated.java delete mode 100644 analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSymbolSubstitutionTestGenerated.java delete mode 100644 analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/substututorFactory/Fe10IdeNormalAnalysisSourceModuleSubstitutorBuilderTestGenerated.java diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSignatureContractsTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSignatureContractsTestGenerated.java deleted file mode 100644 index b8066be80d9..00000000000 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSignatureContractsTestGenerated.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2010-2021 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.api.fe10.test.cases.generated.cases.components.signatureSubstitution; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.fe10.test.configurator.AnalysisApiFe10TestConfiguratorFactory; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.signatureSubstitution.AbstractAnalysisApiSignatureContractsTest; -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 GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/signatureSubstitution/signatureContracts") -@TestDataPath("$PROJECT_ROOT") -public class Fe10IdeNormalAnalysisSourceModuleAnalysisApiSignatureContractsTestGenerated extends AbstractAnalysisApiSignatureContractsTest { - @NotNull - @Override - public AnalysisApiTestConfigurator getConfigurator() { - return AnalysisApiFe10TestConfiguratorFactory.INSTANCE.createConfigurator( - new AnalysisApiTestConfiguratorFactoryData( - FrontendKind.Fe10, - TestModuleKind.Source, - AnalysisSessionMode.Normal, - AnalysisApiMode.Ide - ) - ); - } - - @Test - public void testAllFilesPresentInSignatureContracts() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/signatureSubstitution/signatureContracts"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("members.kt") - public void testMembers() throws Exception { - runTest("analysis/analysis-api/testData/components/signatureSubstitution/signatureContracts/members.kt"); - } - - @Test - @TestMetadata("topLevel.kt") - public void testTopLevel() throws Exception { - runTest("analysis/analysis-api/testData/components/signatureSubstitution/signatureContracts/topLevel.kt"); - } -} diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSignatureSubstitutionTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSignatureSubstitutionTestGenerated.java deleted file mode 100644 index 95f6faa2f05..00000000000 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSignatureSubstitutionTestGenerated.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2010-2021 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.api.fe10.test.cases.generated.cases.components.signatureSubstitution; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.fe10.test.configurator.AnalysisApiFe10TestConfiguratorFactory; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.signatureSubstitution.AbstractAnalysisApiSignatureSubstitutionTest; -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 GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/signatureSubstitution/signatureSubstitution") -@TestDataPath("$PROJECT_ROOT") -public class Fe10IdeNormalAnalysisSourceModuleAnalysisApiSignatureSubstitutionTestGenerated extends AbstractAnalysisApiSignatureSubstitutionTest { - @NotNull - @Override - public AnalysisApiTestConfigurator getConfigurator() { - return AnalysisApiFe10TestConfiguratorFactory.INSTANCE.createConfigurator( - new AnalysisApiTestConfiguratorFactoryData( - FrontendKind.Fe10, - TestModuleKind.Source, - AnalysisSessionMode.Normal, - AnalysisApiMode.Ide - ) - ); - } - - @Test - public void testAllFilesPresentInSignatureSubstitution() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/signatureSubstitution/signatureSubstitution"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("function.kt") - public void testFunction() throws Exception { - runTest("analysis/analysis-api/testData/components/signatureSubstitution/signatureSubstitution/function.kt"); - } - - @Test - @TestMetadata("property.kt") - public void testProperty() throws Exception { - runTest("analysis/analysis-api/testData/components/signatureSubstitution/signatureSubstitution/property.kt"); - } -} diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSymbolAsSignatureTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSymbolAsSignatureTestGenerated.java deleted file mode 100644 index 9b067b93c0e..00000000000 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSymbolAsSignatureTestGenerated.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2010-2021 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.api.fe10.test.cases.generated.cases.components.signatureSubstitution; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.fe10.test.configurator.AnalysisApiFe10TestConfiguratorFactory; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.signatureSubstitution.AbstractAnalysisApiSymbolAsSignatureTest; -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 GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/signatureSubstitution/symbolAsSignature") -@TestDataPath("$PROJECT_ROOT") -public class Fe10IdeNormalAnalysisSourceModuleAnalysisApiSymbolAsSignatureTestGenerated extends AbstractAnalysisApiSymbolAsSignatureTest { - @NotNull - @Override - public AnalysisApiTestConfigurator getConfigurator() { - return AnalysisApiFe10TestConfiguratorFactory.INSTANCE.createConfigurator( - new AnalysisApiTestConfiguratorFactoryData( - FrontendKind.Fe10, - TestModuleKind.Source, - AnalysisSessionMode.Normal, - AnalysisApiMode.Ide - ) - ); - } - - @Test - public void testAllFilesPresentInSymbolAsSignature() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/signatureSubstitution/symbolAsSignature"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("function.kt") - public void testFunction() throws Exception { - runTest("analysis/analysis-api/testData/components/signatureSubstitution/symbolAsSignature/function.kt"); - } - - @Test - @TestMetadata("propertyGetter.kt") - public void testPropertyGetter() throws Exception { - runTest("analysis/analysis-api/testData/components/signatureSubstitution/symbolAsSignature/propertyGetter.kt"); - } - - @Test - @TestMetadata("propertyNoAccessors.kt") - public void testPropertyNoAccessors() throws Exception { - runTest("analysis/analysis-api/testData/components/signatureSubstitution/symbolAsSignature/propertyNoAccessors.kt"); - } - - @Test - @TestMetadata("propertySetter.kt") - public void testPropertySetter() throws Exception { - runTest("analysis/analysis-api/testData/components/signatureSubstitution/symbolAsSignature/propertySetter.kt"); - } - - @Test - @TestMetadata("propertyWithAccessors.kt") - public void testPropertyWithAccessors() throws Exception { - runTest("analysis/analysis-api/testData/components/signatureSubstitution/symbolAsSignature/propertyWithAccessors.kt"); - } -} diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSymbolSubstitutionTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSymbolSubstitutionTestGenerated.java deleted file mode 100644 index 647d0fe041e..00000000000 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/signatureSubstitution/Fe10IdeNormalAnalysisSourceModuleAnalysisApiSymbolSubstitutionTestGenerated.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2010-2021 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.api.fe10.test.cases.generated.cases.components.signatureSubstitution; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.fe10.test.configurator.AnalysisApiFe10TestConfiguratorFactory; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.signatureSubstitution.AbstractAnalysisApiSymbolSubstitutionTest; -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 GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/signatureSubstitution/symbolSubstitution") -@TestDataPath("$PROJECT_ROOT") -public class Fe10IdeNormalAnalysisSourceModuleAnalysisApiSymbolSubstitutionTestGenerated extends AbstractAnalysisApiSymbolSubstitutionTest { - @NotNull - @Override - public AnalysisApiTestConfigurator getConfigurator() { - return AnalysisApiFe10TestConfiguratorFactory.INSTANCE.createConfigurator( - new AnalysisApiTestConfiguratorFactoryData( - FrontendKind.Fe10, - TestModuleKind.Source, - AnalysisSessionMode.Normal, - AnalysisApiMode.Ide - ) - ); - } - - @Test - public void testAllFilesPresentInSymbolSubstitution() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/signatureSubstitution/symbolSubstitution"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("function.kt") - public void testFunction() throws Exception { - runTest("analysis/analysis-api/testData/components/signatureSubstitution/symbolSubstitution/function.kt"); - } - - @Test - @TestMetadata("property.kt") - public void testProperty() throws Exception { - runTest("analysis/analysis-api/testData/components/signatureSubstitution/symbolSubstitution/property.kt"); - } -} diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/substututorFactory/Fe10IdeNormalAnalysisSourceModuleSubstitutorBuilderTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/substututorFactory/Fe10IdeNormalAnalysisSourceModuleSubstitutorBuilderTestGenerated.java deleted file mode 100644 index c26111347d9..00000000000 --- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/substututorFactory/Fe10IdeNormalAnalysisSourceModuleSubstitutorBuilderTestGenerated.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2010-2021 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.api.fe10.test.cases.generated.cases.components.substututorFactory; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.fe10.test.configurator.AnalysisApiFe10TestConfiguratorFactory; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfiguratorFactoryData; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.TestModuleKind; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.FrontendKind; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisSessionMode; -import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiMode; -import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.substututorFactory.AbstractSubstitutorBuilderTest; -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 GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("analysis/analysis-api/testData/components/substitutorFactory/substitutorBuilder") -@TestDataPath("$PROJECT_ROOT") -public class Fe10IdeNormalAnalysisSourceModuleSubstitutorBuilderTestGenerated extends AbstractSubstitutorBuilderTest { - @NotNull - @Override - public AnalysisApiTestConfigurator getConfigurator() { - return AnalysisApiFe10TestConfiguratorFactory.INSTANCE.createConfigurator( - new AnalysisApiTestConfiguratorFactoryData( - FrontendKind.Fe10, - TestModuleKind.Source, - AnalysisSessionMode.Normal, - AnalysisApiMode.Ide - ) - ); - } - - @Test - public void testAllFilesPresentInSubstitutorBuilder() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/substitutorFactory/substitutorBuilder"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("function.kt") - public void testFunction() throws Exception { - runTest("analysis/analysis-api/testData/components/substitutorFactory/substitutorBuilder/function.kt"); - } -} diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt index 02aa054788d..2ae9a858164 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt @@ -256,7 +256,7 @@ private fun AnalysisApiTestGroup.generateAnalysisApiComponentsTests() { } component("signatureSubstitution") { - group(filter = analysisSessionModeIs(AnalysisSessionMode.Normal)) { + group(filter = analysisSessionModeIs(AnalysisSessionMode.Normal) and frontendIs(FrontendKind.Fir)) { test(AbstractAnalysisApiSymbolAsSignatureTest::class) { model("symbolAsSignature") } @@ -276,7 +276,7 @@ private fun AnalysisApiTestGroup.generateAnalysisApiComponentsTests() { } component("substitutorFactory") { - group(filter = analysisSessionModeIs(AnalysisSessionMode.Normal)) { + group(filter = analysisSessionModeIs(AnalysisSessionMode.Normal) and frontendIs(FrontendKind.Fir)) { test(AbstractSubstitutorBuilderTest::class) { model("substitutorBuilder") }