From 5479b3cde81186a40e9d4106c7c672a77cc3abcd Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Fri, 11 Jul 2025 13:22:05 +0200 Subject: [PATCH] [java-dfa] Tests: remove addJetBrainsNotNullByDefault Unnecessary, as we bumped jetbrains-annotation version (see fcc63bf20b9ce20640d8484fadd820bf39a0a27e [java-dfa] IDEA-375755 Suggest adding Nullable annotation when we are under NotNull scope Tagir Valeev), so it's available by default GitOrigin-RevId: 158b4e0697b4c408915b947be850d3db1aaa1b7c --- .../java/codeInspection/DataFlowInspection21Test.java | 1 - .../codeInspection/DataFlowInspectionTestCase.java | 10 ---------- .../codeInspection/NullableStuffInspectionTest.java | 2 -- 3 files changed, 13 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspection21Test.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspection21Test.java index a1435d35627e..67cca2c0d47e 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspection21Test.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspection21Test.java @@ -142,7 +142,6 @@ public class DataFlowInspection21Test extends DataFlowInspectionTestCase { public void testSwitchBooleanWhen() { doTest(); } public void testJetBrainsNotNullByDefault() { - addJetBrainsNotNullByDefault(myFixture); doTest(); } diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspectionTestCase.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspectionTestCase.java index bf393b7bfd46..9cf3a3d2fd02 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspectionTestCase.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspectionTestCase.java @@ -48,16 +48,6 @@ public abstract class DataFlowInspectionTestCase extends LightJavaCodeInsightFix "}"); } - static void addJetBrainsNotNullByDefault(JavaCodeInsightTestFixture fixture) { - fixture.addClass(""" - package org.jetbrains.annotations; - - import java.lang.annotation.*; - - @Target({ElementType.TYPE, ElementType.PACKAGE})\s - public @interface NotNullByDefault {}"""); - } - static void addJSpecifyNullMarked(JavaCodeInsightTestFixture fixture) { @Language("JAVA") String nullMarked = """ diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/NullableStuffInspectionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/NullableStuffInspectionTest.java index e2759a2b3498..0c2c821c2e7d 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/NullableStuffInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/NullableStuffInspectionTest.java @@ -449,12 +449,10 @@ public class NullableStuffInspectionTest extends LightJavaCodeInsightFixtureTest } public void testParameterUnderDefaultNotNull() { - DataFlowInspectionTestCase.addJetBrainsNotNullByDefault(myFixture); doTest(); } public void testRedundantNotNull() { - DataFlowInspectionTestCase.addJetBrainsNotNullByDefault(myFixture); doTest(); }