1 files changed, 25 insertions, 9 deletions
diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java
index ab6d92263162..8cde2d7f1bc2 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java
@@ -133,22 +133,37 @@ public class BytecodeAnalysisIntegrationTest extends JavaCodeInsightFixtureTestC
       return;
     }
 
-    // not null-result
-    String externalOutAnnotation =
-      myExternalAnnotationsManager.findExternalAnnotation(method, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull";
-    String inferredOutAnnotation =
-      myInferredAnnotationsManager.findInferredAnnotation(method, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull";
     String methodKey = PsiFormatUtil.getExternalName(method, false, Integer.MAX_VALUE);
 
-    if (!externalOutAnnotation.equals(inferredOutAnnotation)) {
-      diffs.add(methodKey + ": " + externalOutAnnotation + " != " + inferredOutAnnotation);
+    {
+      // @NotNull method
+      String externalNotNullMethodAnnotation =
+        myExternalAnnotationsManager.findExternalAnnotation(method, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull";
+      String inferredNotNullMethodAnnotation =
+        myInferredAnnotationsManager.findInferredAnnotation(method, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull";
+
+      if (!externalNotNullMethodAnnotation.equals(inferredNotNullMethodAnnotation)) {
+        diffs.add(methodKey + ": " + externalNotNullMethodAnnotation + " != " + inferredNotNullMethodAnnotation);
+      }
+    }
+
+    {
+      // @Nullable method
+      String externalNullableMethodAnnotation =
+        myExternalAnnotationsManager.findExternalAnnotation(method, AnnotationUtil.NULLABLE) == null ? "null" : "@Nullable";
+      String inferredNullableMethodAnnotation =
+        myInferredAnnotationsManager.findInferredAnnotation(method, AnnotationUtil.NULLABLE) == null ? "null" : "@Nullable";
+
+      if (!externalNullableMethodAnnotation.equals(inferredNullableMethodAnnotation)) {
+        diffs.add(methodKey + ": " + externalNullableMethodAnnotation + " != " + inferredNullableMethodAnnotation);
+      }
     }
 
     for (PsiParameter parameter : method.getParameterList().getParameters()) {
       String parameterKey = PsiFormatUtil.getExternalName(parameter, false, Integer.MAX_VALUE);
 
       {
-        // @NotNull
+        // @NotNull parameter
         String externalNotNull =
           myExternalAnnotationsManager.findExternalAnnotation(parameter, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull";
         String inferredNotNull =
@@ -159,7 +174,7 @@ public class BytecodeAnalysisIntegrationTest extends JavaCodeInsightFixtureTestC
       }
 
       {
-        // @Nullable
+        // @Nullable parameter
         String externalNullable =
           myExternalAnnotationsManager.findExternalAnnotation(parameter, AnnotationUtil.NULLABLE) == null ? "null" : "@Nullable";
         String inferredNullable =
@@ -170,6 +185,7 @@ public class BytecodeAnalysisIntegrationTest extends JavaCodeInsightFixtureTestC
       }
     }
 
+    // @Contract
     PsiAnnotation externalContractAnnotation =
       myExternalAnnotationsManager.findExternalAnnotation(method, ORG_JETBRAINS_ANNOTATIONS_CONTRACT);
     PsiAnnotation inferredContractAnnotation =