Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 25 insertions, 0 deletions

diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/CustomTypeQualifierDefault.java b/java/java-tests/testData/inspection/dataFlow/fixture/CustomTypeQualifierDefault.java
new file mode 100644
index 000000000000..e9ec6b1dbe11
--- /dev/null
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/CustomTypeQualifierDefault.java
@@ -0,0 +1,25 @@
+import foo.*;
+import org.jetbrains.annotations.NotNull;
+
+class Some {
+  void foo(@NotNull String s) {
+    NotNullClass.foo(null);
+    if (<warning descr="Condition 'NotNullClass.foo(s) == null' is always 'false'">NotNullClass.foo(s) == null</warning>) {}
+    
+    NullableClass.foo(null);
+    if (NullableClass.foo("a") == null) {}
+    
+    AnotherPackageNotNull.foo(null);
+    if (<warning descr="Condition 'AnotherPackageNotNull.foo(s) == null' is always 'false'">AnotherPackageNotNull.foo(s) == null</warning>) {}
+  }
+
+}
+
+@bar.MethodsAreNotNullByDefault
+class NotNullClass {
+  static native Object foo(String s);
+
+}
+class NullableClass {
+  static native Object foo(String s);
+}
\ No newline at end of file