From 732b17bc67e26564bed49e3bab8a8f74e1e09ce0 Mon Sep 17 00:00:00 2001 From: Mikhail Pyltsin Date: Wed, 24 Sep 2025 13:26:25 +0200 Subject: [PATCH] [java-inspections] IDEA-377301 improve jspecify nullability tests - conformance tests, update to the last jspecify tests GitOrigin-RevId: 4c743ceb61fe0bdd9ff90867163a37555c25c2cf --- .../irrelevantannotations/notnullmarked/Other.java | 2 +- .../irrelevantannotations/nullmarked/Other.java | 2 +- .../irrelevantannotations/nullunmarked/Other.java | 2 +- .../JSpecifyConformanceAnnotationTest.java | 9 --------- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/java/java-tests/testData/inspection/dataFlow/jspecifyConformance/irrelevantannotations/notnullmarked/Other.java b/java/java-tests/testData/inspection/dataFlow/jspecifyConformance/irrelevantannotations/notnullmarked/Other.java index 4a41fe5d3f98..96e4839ca093 100644 --- a/java/java-tests/testData/inspection/dataFlow/jspecifyConformance/irrelevantannotations/notnullmarked/Other.java +++ b/java/java-tests/testData/inspection/dataFlow/jspecifyConformance/irrelevantannotations/notnullmarked/Other.java @@ -87,7 +87,7 @@ public class Other { try (@Nullable AutoCloseable a = () -> {}) {} // test:name:NonNull try-with-resources // test:irrelevant-annotation:NonNull - try (@Nullable AutoCloseable a = () -> {}) {} + try (@NonNull AutoCloseable a = () -> {}) {} } /** diff --git a/java/java-tests/testData/inspection/dataFlow/jspecifyConformance/irrelevantannotations/nullmarked/Other.java b/java/java-tests/testData/inspection/dataFlow/jspecifyConformance/irrelevantannotations/nullmarked/Other.java index e6b77e8045cd..46561336577c 100644 --- a/java/java-tests/testData/inspection/dataFlow/jspecifyConformance/irrelevantannotations/nullmarked/Other.java +++ b/java/java-tests/testData/inspection/dataFlow/jspecifyConformance/irrelevantannotations/nullmarked/Other.java @@ -87,7 +87,7 @@ public class Other { try (@Nullable AutoCloseable a = () -> {}) {} // test:name:NonNull try-with-resources // test:irrelevant-annotation:NonNull - try (@Nullable AutoCloseable a = () -> {}) {} + try (@NonNull AutoCloseable a = () -> {}) {} } /** diff --git a/java/java-tests/testData/inspection/dataFlow/jspecifyConformance/irrelevantannotations/nullunmarked/Other.java b/java/java-tests/testData/inspection/dataFlow/jspecifyConformance/irrelevantannotations/nullunmarked/Other.java index a813f768c723..9d0b868d4826 100644 --- a/java/java-tests/testData/inspection/dataFlow/jspecifyConformance/irrelevantannotations/nullunmarked/Other.java +++ b/java/java-tests/testData/inspection/dataFlow/jspecifyConformance/irrelevantannotations/nullunmarked/Other.java @@ -89,7 +89,7 @@ public class Other { try (@Nullable AutoCloseable a = () -> {}) {} // test:name:NonNull try-with-resources // test:irrelevant-annotation:NonNull - try (@Nullable AutoCloseable a = () -> {}) {} + try (@NonNull AutoCloseable a = () -> {}) {} } /** diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/JSpecifyConformanceAnnotationTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/JSpecifyConformanceAnnotationTest.java index a77afcf02d1a..ea9719dd1277 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/JSpecifyConformanceAnnotationTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/JSpecifyConformanceAnnotationTest.java @@ -178,15 +178,6 @@ public class JSpecifyConformanceAnnotationTest extends LightJavaCodeInsightFixtu Pattern.compile("// test:irrelevant[^\\r\\n]*\n *// test:irrelevant.*\n"); private static @NotNull String clean(@NotNull String text, String fileName) { - //it is a bug in tests - text = text.replaceAll(Pattern.quote(""" - // test:irrelevant-annotation:NonNull - try (@Nullable AutoCloseable a = () -> {}) {} - """), - """ - // test:irrelevant-annotation:NonNull - try (@NonNull AutoCloseable a = () -> {}) {} - """); text = JOIN_TEST_IRRELEVANT_ANNOTATIONS.matcher(text) .replaceAll("// test:irrelevant-annotation:Nullable & test:irrelevant-annotation:NonNull\n"); text = CANNOT_CONVERT.matcher(text).replaceAll("// jspecify_nullness_mismatch\n");