3 files changed, 19 insertions, 2 deletions
diff --git a/java/java-tests/testData/inspection/nullableProblems/GetterSetterProblems.java b/java/java-tests/testData/inspection/nullableProblems/GetterSetterProblems.java
index d49cd9ca6fd0..c8a5816ec741 100644
--- a/java/java-tests/testData/inspection/nullableProblems/GetterSetterProblems.java
+++ b/java/java-tests/testData/inspection/nullableProblems/GetterSetterProblems.java
@@ -2,7 +2,7 @@ import org.jetbrains.annotations.NotNull;
 
 class B {
      @NotNull
-     B b;
+     B b = new B();
 
     public B <warning descr="Getter for @NotNull field might be annotated @NotNull itself">getB</warning>() {
         return b;
@@ -39,7 +39,7 @@ class C {
     this.c = c;
   }
 
-  @NotNull C c1;
+  @NotNull C c1 = new C(null);
   @org.jetbrains.annotations.Nullable
   public C getC1() {
     if (c1 != null) {
diff --git a/java/java-tests/testData/inspection/nullableProblems/NotNullCustomException.java b/java/java-tests/testData/inspection/nullableProblems/NotNullCustomException.java
new file mode 100644
index 000000000000..42e2798ed1ab
--- /dev/null
+++ b/java/java-tests/testData/inspection/nullableProblems/NotNullCustomException.java
@@ -0,0 +1,8 @@
+import org.jetbrains.annotations.*;
+
+class Test {
+      public void foo(@NotNull(exception = NullPointerException.class) String a) { }
+      public void foo2(@NotNull(exception = <warning descr="Custom exception class should have a constructor with a single message parameter of String type">CustomException.class</warning>) String a) { }
+}
+
+class CustomException extends Exception {}
+\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/nullableProblems/NotNullFieldNotInitialized.java b/java/java-tests/testData/inspection/nullableProblems/NotNullFieldNotInitialized.java
new file mode 100644
index 000000000000..918d5db30fd2
--- /dev/null
+++ b/java/java-tests/testData/inspection/nullableProblems/NotNullFieldNotInitialized.java
@@ -0,0 +1,9 @@
+import org.jetbrains.annotations.*;
+
+class Test {
+  <warning descr="Not-null fields must be initialized">@NotNull</warning> Object member;
+
+  private void accessMember() {
+    member = new Object();
+  }
+}
+\ No newline at end of file