From c9568c074494c6459f559852faad369d93056488 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Fri, 30 Apr 2021 16:49:16 +0300 Subject: [PATCH] Fix FIR tests --- .../inference/capturedTypesInSelfType.fir.kt | 8 ----- .../inference/capturedTypesInSelfType.kt | 1 + ...anyConstraintsDueToFlexibleRawTypes.fir.kt | 31 ------------------- .../manyConstraintsDueToFlexibleRawTypes.kt | 1 + 4 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 compiler/testData/diagnostics/tests/inference/capturedTypesInSelfType.fir.kt delete mode 100644 compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.fir.kt diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypesInSelfType.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypesInSelfType.fir.kt deleted file mode 100644 index 1d3d9961b31..00000000000 --- a/compiler/testData/diagnostics/tests/inference/capturedTypesInSelfType.fir.kt +++ /dev/null @@ -1,8 +0,0 @@ -// WITH_RUNTIME -// !DIAGNOSTICS: -UNUSED_VARIABLE - -class Foo>(val values: Array) - -fun foo(x: Array>) { - val y = Foo(x) -} diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypesInSelfType.kt b/compiler/testData/diagnostics/tests/inference/capturedTypesInSelfType.kt index 429a229c0c3..9f98d9373b1 100644 --- a/compiler/testData/diagnostics/tests/inference/capturedTypesInSelfType.kt +++ b/compiler/testData/diagnostics/tests/inference/capturedTypesInSelfType.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // WITH_RUNTIME // !DIAGNOSTICS: -UNUSED_VARIABLE diff --git a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.fir.kt deleted file mode 100644 index 4f4dc1ec881..00000000000 --- a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.fir.kt +++ /dev/null @@ -1,31 +0,0 @@ -// SKIP_JAVAC - -// FILE: MySettings.java - -import java.util.Collection; - -public class MySettings< - SS extends MySettings, - PS extends MyComparableSettings, - L extends MySettingsListener - > -{ - public Collection getLinkedProjectsSettings() { - return null; - } - - public static MySettings getSettings() { - return null; - } -} - -abstract class MyComparableSettings implements Comparable {} -abstract class MySettingsListener {} - -// FILE: test.kt - -fun test() { - val a = MySettings.getSettings() - a.getLinkedProjectsSettings() - a.linkedProjectsSettings -} diff --git a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.kt b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.kt index 4f4dc1ec881..bd4506c948c 100644 --- a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.kt +++ b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // SKIP_JAVAC // FILE: MySettings.java