From 85a2a3255dea644ff7cd00abec9d559ae858dad3 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Mon, 9 Aug 2021 15:12:33 +0300
Subject: [PATCH] Add new SENSELESS_COMPARISON in FIR foreign annotation tests

---
 .../nullabilityWarnings/localInference.fir.kt |  4 +-
 .../equalsOnNonNull.fir.kt                    | 46 -------------------
 .../typeQualifierDefault/equalsOnNonNull.kt   |  1 +
 3 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 compiler/testData/diagnostics/foreignAnnotationsTests/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.fir.kt

diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/jsr305/nullabilityWarnings/localInference.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/jsr305/nullabilityWarnings/localInference.fir.kt
index 840dbdf2103..56e0ec47fe8 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/jsr305/nullabilityWarnings/localInference.fir.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/jsr305/nullabilityWarnings/localInference.fir.kt
@@ -83,11 +83,11 @@ fun evlis() {
 
 fun ifChecksAndSmartCasts() {
     // JSR
-    val r1 = if (a == null) 42 else a.length
+    val r1 = if (<!SENSELESS_COMPARISON!>a == null<!>) 42 else a.length
     val r2 = if (b == null) 42 else b.length
 
     // JB
-    val r3 = if (c == null) 42 else c.length
+    val r3 = if (<!SENSELESS_COMPARISON!>c == null<!>) 42 else c.length
     val r4 = if (d == null) 42 else d.length
 
     // Platform
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.fir.kt
deleted file mode 100644
index 0832e8ff6cb..00000000000
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.fir.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT: warn
-
-// FILE: spr/NonNullApi.java
-package spr;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import javax.annotation.Nonnull;
-import javax.annotation.meta.TypeQualifierDefault;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Nonnull
-@TypeQualifierDefault({ElementType.METHOD, ElementType.PARAMETER})
-public @interface NonNullApi {
-}
-
-// FILE: A.java
-import spr.*;
-
-@NonNullApi
-public class A {
-    public String getBar() {
-        return "";
-    }
-}
-
-// FILE: main.kt
-fun main(a: A) {
-    if (a.getBar() == "1" && a.hashCode() != 0) return
-    if (a.getBar() != "2" && a.hashCode() != 0) return
-
-    if (a.getBar() == null && a.hashCode() != 0) return
-    if (a.getBar() != null && a.hashCode() != 0) return
-
-    if (a.bar == "1" && a.hashCode() != 0) return
-    if (a.bar != "2" && a.hashCode() != 0) return
-
-    if (a.bar == null && a.hashCode() != 0) return
-    if (a.bar != null && a.hashCode() != 0) return
-}
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt
index 3200835dfb5..a1307079a1a 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // JSR305_GLOBAL_REPORT: warn