From 170978a4f1bc839e66111e86df4df12f77e31c06 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 16 Mar 2020 12:38:03 +0300 Subject: [PATCH] FIR: Move fixed tests from problems directory to common --- .../callableReferenceToLocalClass.kt | 0 .../callableReferenceToLocalClass.txt | 0 .../callableReferencesAndDefaultParameters.kt | 0 ...callableReferencesAndDefaultParameters.txt | 0 .../fir/FirDiagnosticsTestGenerated.java | 20 +++++++++---------- ...DiagnosticsWithLightTreeTestGenerated.java | 20 +++++++++---------- 6 files changed, 20 insertions(+), 20 deletions(-) rename compiler/fir/resolve/testData/resolve/{problems => inference}/callableReferenceToLocalClass.kt (100%) rename compiler/fir/resolve/testData/resolve/{problems => inference}/callableReferenceToLocalClass.txt (100%) rename compiler/fir/resolve/testData/resolve/{problems => inference}/callableReferencesAndDefaultParameters.kt (100%) rename compiler/fir/resolve/testData/resolve/{problems => inference}/callableReferencesAndDefaultParameters.txt (100%) diff --git a/compiler/fir/resolve/testData/resolve/problems/callableReferenceToLocalClass.kt b/compiler/fir/resolve/testData/resolve/inference/callableReferenceToLocalClass.kt similarity index 100% rename from compiler/fir/resolve/testData/resolve/problems/callableReferenceToLocalClass.kt rename to compiler/fir/resolve/testData/resolve/inference/callableReferenceToLocalClass.kt diff --git a/compiler/fir/resolve/testData/resolve/problems/callableReferenceToLocalClass.txt b/compiler/fir/resolve/testData/resolve/inference/callableReferenceToLocalClass.txt similarity index 100% rename from compiler/fir/resolve/testData/resolve/problems/callableReferenceToLocalClass.txt rename to compiler/fir/resolve/testData/resolve/inference/callableReferenceToLocalClass.txt diff --git a/compiler/fir/resolve/testData/resolve/problems/callableReferencesAndDefaultParameters.kt b/compiler/fir/resolve/testData/resolve/inference/callableReferencesAndDefaultParameters.kt similarity index 100% rename from compiler/fir/resolve/testData/resolve/problems/callableReferencesAndDefaultParameters.kt rename to compiler/fir/resolve/testData/resolve/inference/callableReferencesAndDefaultParameters.kt diff --git a/compiler/fir/resolve/testData/resolve/problems/callableReferencesAndDefaultParameters.txt b/compiler/fir/resolve/testData/resolve/inference/callableReferencesAndDefaultParameters.txt similarity index 100% rename from compiler/fir/resolve/testData/resolve/problems/callableReferencesAndDefaultParameters.txt rename to compiler/fir/resolve/testData/resolve/inference/callableReferencesAndDefaultParameters.txt diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java index f227a124522..89b91d1fff0 100644 --- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java +++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java @@ -1225,6 +1225,16 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest { runTest("compiler/fir/resolve/testData/resolve/inference/callableReferenceOnInstance.kt"); } + @TestMetadata("callableReferenceToLocalClass.kt") + public void testCallableReferenceToLocalClass() throws Exception { + runTest("compiler/fir/resolve/testData/resolve/inference/callableReferenceToLocalClass.kt"); + } + + @TestMetadata("callableReferencesAndDefaultParameters.kt") + public void testCallableReferencesAndDefaultParameters() throws Exception { + runTest("compiler/fir/resolve/testData/resolve/inference/callableReferencesAndDefaultParameters.kt"); + } + @TestMetadata("capturedTypeForJavaTypeParameter.kt") public void testCapturedTypeForJavaTypeParameter() throws Exception { runTest("compiler/fir/resolve/testData/resolve/inference/capturedTypeForJavaTypeParameter.kt"); @@ -1422,16 +1432,6 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/problems"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } - @TestMetadata("callableReferenceToLocalClass.kt") - public void testCallableReferenceToLocalClass() throws Exception { - runTest("compiler/fir/resolve/testData/resolve/problems/callableReferenceToLocalClass.kt"); - } - - @TestMetadata("callableReferencesAndDefaultParameters.kt") - public void testCallableReferencesAndDefaultParameters() throws Exception { - runTest("compiler/fir/resolve/testData/resolve/problems/callableReferencesAndDefaultParameters.kt"); - } - @TestMetadata("complexLambdaWithTypeVariableAsExpectedType.kt") public void testComplexLambdaWithTypeVariableAsExpectedType() throws Exception { runTest("compiler/fir/resolve/testData/resolve/problems/complexLambdaWithTypeVariableAsExpectedType.kt"); diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java index 857cb6f5813..7f9ce3b3f54 100644 --- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java @@ -1225,6 +1225,16 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos runTest("compiler/fir/resolve/testData/resolve/inference/callableReferenceOnInstance.kt"); } + @TestMetadata("callableReferenceToLocalClass.kt") + public void testCallableReferenceToLocalClass() throws Exception { + runTest("compiler/fir/resolve/testData/resolve/inference/callableReferenceToLocalClass.kt"); + } + + @TestMetadata("callableReferencesAndDefaultParameters.kt") + public void testCallableReferencesAndDefaultParameters() throws Exception { + runTest("compiler/fir/resolve/testData/resolve/inference/callableReferencesAndDefaultParameters.kt"); + } + @TestMetadata("capturedTypeForJavaTypeParameter.kt") public void testCapturedTypeForJavaTypeParameter() throws Exception { runTest("compiler/fir/resolve/testData/resolve/inference/capturedTypeForJavaTypeParameter.kt"); @@ -1422,16 +1432,6 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/problems"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } - @TestMetadata("callableReferenceToLocalClass.kt") - public void testCallableReferenceToLocalClass() throws Exception { - runTest("compiler/fir/resolve/testData/resolve/problems/callableReferenceToLocalClass.kt"); - } - - @TestMetadata("callableReferencesAndDefaultParameters.kt") - public void testCallableReferencesAndDefaultParameters() throws Exception { - runTest("compiler/fir/resolve/testData/resolve/problems/callableReferencesAndDefaultParameters.kt"); - } - @TestMetadata("complexLambdaWithTypeVariableAsExpectedType.kt") public void testComplexLambdaWithTypeVariableAsExpectedType() throws Exception { runTest("compiler/fir/resolve/testData/resolve/problems/complexLambdaWithTypeVariableAsExpectedType.kt");