diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 39aaa06c45b..1567698f827 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -947,11 +947,10 @@ fun main(args: Array) { model("checker/regression") model("checker/recovery") model("checker/rendering") - model("checker/duplicateJvmSignature") model("checker/infos") - model("checker/diagnosticsMessage") - } + model("checker/diagnosticsMessage") } + } testGroup("idea/scripting-support/test", "idea/scripting-support/testData") { testClass { diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/checkers/FirPsiCheckerTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/checkers/FirPsiCheckerTestGenerated.java index e148096486d..92071ef3f9f 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/checkers/FirPsiCheckerTestGenerated.java +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/checkers/FirPsiCheckerTestGenerated.java @@ -650,118 +650,6 @@ public class FirPsiCheckerTestGenerated extends AbstractFirPsiCheckerTest { } } - @TestMetadata("idea/testData/checker/duplicateJvmSignature") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class DuplicateJvmSignature extends AbstractFirPsiCheckerTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInDuplicateJvmSignature() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("idea/testData/checker/duplicateJvmSignature/fields") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Fields extends AbstractFirPsiCheckerTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInFields() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/fields"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("classObjectCopiedFieldObject.kt") - public void testClassObjectCopiedFieldObject() throws Exception { - runTest("idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt"); - } - } - - @TestMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class FunctionAndProperty extends AbstractFirPsiCheckerTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInFunctionAndProperty() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("ambiguous.kt") - public void testAmbiguous() throws Exception { - runTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/ambiguous.kt"); - } - - @TestMetadata("class.kt") - public void testClass() throws Exception { - runTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt"); - } - - @TestMetadata("classObject.kt") - public void testClassObject() throws Exception { - runTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt"); - } - - @TestMetadata("localClass.kt") - public void testLocalClass() throws Exception { - runTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt"); - } - - @TestMetadata("nestedClass.kt") - public void testNestedClass() throws Exception { - runTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt"); - } - - @TestMetadata("object.kt") - public void testObject() throws Exception { - runTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt"); - } - - @TestMetadata("objectExpression.kt") - public void testObjectExpression() throws Exception { - runTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt"); - } - - @TestMetadata("topLevel.kt") - public void testTopLevel() throws Exception { - runTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt"); - } - - @TestMetadata("topLevelMultifileRuntime.kt") - public void testTopLevelMultifileRuntime() throws Exception { - runTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt"); - } - - @TestMetadata("trait.kt") - public void testTrait() throws Exception { - runTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt"); - } - } - - @TestMetadata("idea/testData/checker/duplicateJvmSignature/traitImpl") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class TraitImpl extends AbstractFirPsiCheckerTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInTraitImpl() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @TestMetadata("twoTraits.kt") - public void testTwoTraits() throws Exception { - runTest("idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt"); - } - } - } - @TestMetadata("idea/testData/checker/infos") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)