From 439e8faf9437f89776d3013efa2f9cd7798cc465 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Fri, 27 Sep 2019 17:19:55 +0300
Subject: [PATCH] [NI] Remove outdated intention test according to fixed
 consistency of OI and NI

---
 .../liftOut/ifToAssignment/typeMismatch2.kt          |  1 -
 .../liftOut/ifToAssignment/typeMismatch2_ni.kt       | 12 ------------
 .../liftOut/ifToAssignment/typeMismatch2_ni.kt.after | 12 ------------
 .../inspections/LocalInspectionTestGenerated.java    |  5 -----
 4 files changed, 30 deletions(-)
 delete mode 100644 idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2_ni.kt
 delete mode 100644 idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2_ni.kt.after

diff --git a/idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2.kt b/idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2.kt
index 6de308e6750..a922662bdb9 100644
--- a/idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2.kt
+++ b/idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2.kt
@@ -1,4 +1,3 @@
-// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 // PROBLEM: none
 // ERROR: Type mismatch: inferred type is Long? but Long was expected
 fun test(b: Boolean, x: Long, y: Long?) {
diff --git a/idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2_ni.kt b/idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2_ni.kt
deleted file mode 100644
index 4d62e6b68e6..00000000000
--- a/idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2_ni.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// COMPILER_ARGUMENTS: -XXLanguage:+NewInference
-// PROBLEM: Assignment should be lifted out of 'if'
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public final operator fun plus(other: Byte): Long defined in kotlin.Long<br>public final operator fun plus(other: Double): Double defined in kotlin.Long<br>public final operator fun plus(other: Float): Float defined in kotlin.Long<br>public final operator fun plus(other: Int): Long defined in kotlin.Long<br>public final operator fun plus(other: Long): Long defined in kotlin.Long<br>public final operator fun plus(other: Short): Long defined in kotlin.Long
-
-fun test(b: Boolean, x: Long, y: Long?) {
-    var num: Long = 0L
-    <caret>if (b) {
-        num += x
-    } else {
-        num += y
-    }
-}
\ No newline at end of file
diff --git a/idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2_ni.kt.after b/idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2_ni.kt.after
deleted file mode 100644
index b2b1148c823..00000000000
--- a/idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2_ni.kt.after
+++ /dev/null
@@ -1,12 +0,0 @@
-// COMPILER_ARGUMENTS: -XXLanguage:+NewInference
-// PROBLEM: Assignment should be lifted out of 'if'
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public final operator fun plus(other: Byte): Long defined in kotlin.Long<br>public final operator fun plus(other: Double): Double defined in kotlin.Long<br>public final operator fun plus(other: Float): Float defined in kotlin.Long<br>public final operator fun plus(other: Int): Long defined in kotlin.Long<br>public final operator fun plus(other: Long): Long defined in kotlin.Long<br>public final operator fun plus(other: Short): Long defined in kotlin.Long
-
-fun test(b: Boolean, x: Long, y: Long?) {
-    var num: Long = 0L
-    num += if (b) {
-        x
-    } else {
-        y
-    }
-}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
index 1d3a93c964c..0a42020fa58 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
@@ -5178,11 +5178,6 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
                 runTest("idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2.kt");
             }
 
-            @TestMetadata("typeMismatch2_ni.kt")
-            public void testTypeMismatch2_ni() throws Exception {
-                runTest("idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch2_ni.kt");
-            }
-
             @TestMetadata("typeMismatch3.kt")
             public void testTypeMismatch3() throws Exception {
                 runTest("idea/testData/inspectionsLocal/liftOut/ifToAssignment/typeMismatch3.kt");