From 056c3c95bb3e02a6c131a7c80d1afa6dc6f4d050 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 28 Jan 2020 13:13:59 +0300 Subject: [PATCH] [FIR-TEST] Remove unnecessary test --- .../problems/ambiguityOnExtensionFunctions.kt | 13 ------------- .../problems/ambiguityOnExtensionFunctions.txt | 16 ---------------- .../kotlin/fir/FirDiagnosticsTestGenerated.java | 5 ----- ...FirDiagnosticsWithLightTreeTestGenerated.java | 5 ----- 4 files changed, 39 deletions(-) delete mode 100644 compiler/fir/resolve/testData/resolve/problems/ambiguityOnExtensionFunctions.kt delete mode 100644 compiler/fir/resolve/testData/resolve/problems/ambiguityOnExtensionFunctions.txt diff --git a/compiler/fir/resolve/testData/resolve/problems/ambiguityOnExtensionFunctions.kt b/compiler/fir/resolve/testData/resolve/problems/ambiguityOnExtensionFunctions.kt deleted file mode 100644 index 3c72599aae3..00000000000 --- a/compiler/fir/resolve/testData/resolve/problems/ambiguityOnExtensionFunctions.kt +++ /dev/null @@ -1,13 +0,0 @@ -interface A - -interface B : A - -val A.name: String? - get() = "" - -val B?.name: String? - get() = "" - -fun test(b: B) { - val id = b.name -} diff --git a/compiler/fir/resolve/testData/resolve/problems/ambiguityOnExtensionFunctions.txt b/compiler/fir/resolve/testData/resolve/problems/ambiguityOnExtensionFunctions.txt deleted file mode 100644 index df045ccb742..00000000000 --- a/compiler/fir/resolve/testData/resolve/problems/ambiguityOnExtensionFunctions.txt +++ /dev/null @@ -1,16 +0,0 @@ -FILE: ambiguityOnExtensionFunctions.kt - public abstract interface A : R|kotlin/Any| { - } - public abstract interface B : R|A| { - } - public final val R|A|.name: R|kotlin/String?| - public get(): R|kotlin/String?| { - ^ String() - } - public final val R|B?|.name: R|kotlin/String?| - public get(): R|kotlin/String?| { - ^ String() - } - public final fun test(b: R|B|): R|kotlin/Unit| { - lval id: = R|/b|.# - } 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 52d8330971e..3b43bab9549 100644 --- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java +++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java @@ -1061,11 +1061,6 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest { KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/problems"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } - @TestMetadata("ambiguityOnExtensionFunctions.kt") - public void testAmbiguityOnExtensionFunctions() throws Exception { - runTest("compiler/fir/resolve/testData/resolve/problems/ambiguityOnExtensionFunctions.kt"); - } - @TestMetadata("asImports.kt") public void testAsImports() throws Exception { runTest("compiler/fir/resolve/testData/resolve/problems/asImports.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 a21aa7594b7..1f56633ba5e 100644 --- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java @@ -1061,11 +1061,6 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/resolve/testData/resolve/problems"), Pattern.compile("^([^.]+)\\.kt$"), null, true); } - @TestMetadata("ambiguityOnExtensionFunctions.kt") - public void testAmbiguityOnExtensionFunctions() throws Exception { - runTest("compiler/fir/resolve/testData/resolve/problems/ambiguityOnExtensionFunctions.kt"); - } - @TestMetadata("asImports.kt") public void testAsImports() throws Exception { runTest("compiler/fir/resolve/testData/resolve/problems/asImports.kt");