From 70d416cafd2476d8611d59f24753e2ffbad8fa7c Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Mon, 17 Feb 2020 11:41:48 +0300 Subject: [PATCH] Remove test that become useless after enabling NI everywhere It checked that with default settings new inference is enabled in IDE and SAM conversions are _disabled_. Now this is useless as NI is enabled everywhere --- .../standaloneSamConversionIsDisabledInIDE.kt | 24 ------------------- .../checkers/FirPsiCheckerTestGenerated.java | 5 ---- .../checkers/PsiCheckerTestGenerated.java | 5 ---- 3 files changed, 34 deletions(-) delete mode 100644 idea/testData/checker/diagnosticsMessage/standaloneSamConversionIsDisabledInIDE.kt diff --git a/idea/testData/checker/diagnosticsMessage/standaloneSamConversionIsDisabledInIDE.kt b/idea/testData/checker/diagnosticsMessage/standaloneSamConversionIsDisabledInIDE.kt deleted file mode 100644 index 7081d58f9c9..00000000000 --- a/idea/testData/checker/diagnosticsMessage/standaloneSamConversionIsDisabledInIDE.kt +++ /dev/null @@ -1,24 +0,0 @@ -object ForceSam : java.util.Comparator { - override fun compare(o1: Runnable, o2: Runnable): Int = 0 -} - -fun test(r: Runnable) { - ForceSam.compare(r, r) - ForceSam.compare({}, {}) - - ForceSam.compare(r, {}) - ForceSam.compare({}, r) -} - -// Check that new inference is enabled -object Scope { - interface A - interface B - class C - - fun foo(c: C) where K : A, K : B {} - - fun usage(c: C) { - foo(c) // should compile only in NI - } -} diff --git a/idea/tests/org/jetbrains/kotlin/checkers/FirPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/FirPsiCheckerTestGenerated.java index 6c0472fc280..e148096486d 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/FirPsiCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/FirPsiCheckerTestGenerated.java @@ -901,10 +901,5 @@ public class FirPsiCheckerTestGenerated extends AbstractFirPsiCheckerTest { public void testOperatorCallDiagnosticsOnInOperator() throws Exception { runTest("idea/testData/checker/diagnosticsMessage/operatorCallDiagnosticsOnInOperator.kt"); } - - @TestMetadata("standaloneSamConversionIsDisabledInIDE.kt") - public void testStandaloneSamConversionIsDisabledInIDE() throws Exception { - runTest("idea/testData/checker/diagnosticsMessage/standaloneSamConversionIsDisabledInIDE.kt"); - } } } diff --git a/idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java index 95d41cc5024..5dcc2c5fc6e 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java @@ -934,10 +934,5 @@ public class PsiCheckerTestGenerated extends AbstractPsiCheckerTest { public void testOperatorCallDiagnosticsOnInOperator() throws Exception { runTest("idea/testData/checker/diagnosticsMessage/operatorCallDiagnosticsOnInOperator.kt"); } - - @TestMetadata("standaloneSamConversionIsDisabledInIDE.kt") - public void testStandaloneSamConversionIsDisabledInIDE() throws Exception { - runTest("idea/testData/checker/diagnosticsMessage/standaloneSamConversionIsDisabledInIDE.kt"); - } } }