From 39e579db91c12921d412365b71259489ee50725f Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Wed, 23 Dec 2020 14:29:03 +0300 Subject: [PATCH] Move tests for builder inference into the corresponding directory --- .../callableReferenceAndCoercionToUnit.kt | 0 .../builderInference/kt41164.kt | 0 .../lackOfNullCheckOnNullableInsideBuild.kt | 0 .../substituteStubTypeIntoCR.kt | 0 ...teStubTypeIntolambdaParameterDescriptor.kt | 0 ...peVariableIntolambdaParameterDescriptor.kt | 0 ...thAnotherLambdaWithBuilderInference.fir.kt | 0 ...llWithAnotherLambdaWithBuilderInference.kt | 0 ...lWithAnotherLambdaWithBuilderInference.txt | 0 ...uilderInferenceWithStubReceiverType.fir.kt | 0 ...dInBuilderInferenceWithStubReceiverType.kt | 0 ...InBuilderInferenceWithStubReceiverType.txt | 0 .../codegen/BlackBoxCodegenTestGenerated.java | 43 +++++++++++++++++++ 13 files changed, 43 insertions(+) rename compiler/testData/codegen/box/{ => inference}/builderInference/callableReferenceAndCoercionToUnit.kt (100%) rename compiler/testData/codegen/box/{ => inference}/builderInference/kt41164.kt (100%) rename compiler/testData/codegen/box/{ => inference}/builderInference/lackOfNullCheckOnNullableInsideBuild.kt (100%) rename compiler/testData/codegen/box/{ => inference}/builderInference/substituteStubTypeIntoCR.kt (100%) rename compiler/testData/codegen/box/{ => inference}/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt (100%) rename compiler/testData/codegen/box/{ => inference}/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt (100%) rename compiler/testData/diagnostics/tests/inference/{ => builderInference}/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.fir.kt (100%) rename compiler/testData/diagnostics/tests/inference/{ => builderInference}/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt (100%) rename compiler/testData/diagnostics/tests/inference/{ => builderInference}/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt (100%) rename compiler/testData/diagnostics/tests/inference/{ => builderInference}/skipedUnresolvedInBuilderInferenceWithStubReceiverType.fir.kt (100%) rename compiler/testData/diagnostics/tests/inference/{ => builderInference}/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt (100%) rename compiler/testData/diagnostics/tests/inference/{ => builderInference}/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt (100%) diff --git a/compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt b/compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt similarity index 100% rename from compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt rename to compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt diff --git a/compiler/testData/codegen/box/builderInference/kt41164.kt b/compiler/testData/codegen/box/inference/builderInference/kt41164.kt similarity index 100% rename from compiler/testData/codegen/box/builderInference/kt41164.kt rename to compiler/testData/codegen/box/inference/builderInference/kt41164.kt diff --git a/compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt b/compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt similarity index 100% rename from compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt rename to compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt diff --git a/compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt b/compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntoCR.kt similarity index 100% rename from compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt rename to compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntoCR.kt diff --git a/compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt b/compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt similarity index 100% rename from compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt rename to compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt diff --git a/compiler/testData/codegen/box/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt b/compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt similarity index 100% rename from compiler/testData/codegen/box/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt rename to compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt diff --git a/compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.fir.kt similarity index 100% rename from compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.fir.kt rename to compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.fir.kt diff --git a/compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt b/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt similarity index 100% rename from compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt rename to compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt diff --git a/compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt b/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt similarity index 100% rename from compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt rename to compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt diff --git a/compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.fir.kt similarity index 100% rename from compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.fir.kt rename to compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.fir.kt diff --git a/compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt b/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt similarity index 100% rename from compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt rename to compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt diff --git a/compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt b/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt similarity index 100% rename from compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt rename to compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index 621f861fd3d..5a3536d7bea 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -13473,6 +13473,49 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testUnsafeVarianceCodegen() throws Exception { runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt"); } + + @TestMetadata("compiler/testData/codegen/box/inference/builderInference") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class BuilderInference extends AbstractBlackBoxCodegenTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); + } + + public void testAllFilesPresentInBuilderInference() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inference/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true); + } + + @TestMetadata("callableReferenceAndCoercionToUnit.kt") + public void testCallableReferenceAndCoercionToUnit() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt"); + } + + @TestMetadata("kt41164.kt") + public void testKt41164() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/kt41164.kt"); + } + + @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt") + public void testLackOfNullCheckOnNullableInsideBuild() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt"); + } + + @TestMetadata("substituteStubTypeIntoCR.kt") + public void testSubstituteStubTypeIntoCR() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntoCR.kt"); + } + + @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt") + public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt"); + } + + @TestMetadata("substituteTypeVariableIntolambdaParameterDescriptor.kt") + public void testSubstituteTypeVariableIntolambdaParameterDescriptor() throws Exception { + runTest("compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt"); + } + } } @TestMetadata("compiler/testData/codegen/box/inlineClasses")