improve test coverage

uber · Aug 24, 2023 · eece8d7 · eece8d7
1 parent b84a4f7
commit eece8d7
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 2 deletions.
diff --git a/nullaway/src/main/java/com/uber/nullaway/ErrorBuilder.java b/nullaway/src/main/java/com/uber/nullaway/ErrorBuilder.java
@@ -395,8 +395,8 @@ private Description.Builder removeCastToNonNullFix(
   }
 
   /**
-   * Reports initialization errors where a constructor fails to guarantee non-fields are initialized
-   * along all paths at exit points.
+   * Reports initialization errors where a constructor fails to guarantee non-null fields are
+   * initialized along all paths at exit points.
    *
    * @param methodSymbol Constructor symbol.
    * @param message Error message.

diff --git a/nullaway/src/test/java/com/uber/nullaway/NullAwayAutoSuggestTest.java b/nullaway/src/test/java/com/uber/nullaway/NullAwayAutoSuggestTest.java
@@ -134,10 +134,15 @@ public void suppressInsteadOfCastToNonNull() throws IOException {
             "  void test3() {",
             "    f = null;",
             "  }",
+            "  @Nullable Object m() { return null; }",
+            "  Object shouldAddCast() {",
+            "    return m();",
+            "  }",
             "}")
         .addOutputLines(
             "out/Test.java",
             "package com.uber;",
+            "import static com.uber.nullaway.testdata.Util.castToNonNull;",
             "import javax.annotation.Nullable;",
             "class Test {",
             "  Object f = new Object();",
@@ -150,6 +155,10 @@ public void suppressInsteadOfCastToNonNull() throws IOException {
             "  @SuppressWarnings(\"NullAway\") void test3() {",
             "    f = null;",
             "  }",
+            "  @Nullable Object m() { return null; }",
+            "  Object shouldAddCast() {",
+            "    return castToNonNull(m());",
+            "  }",
             "}")
         .doTest();
   }
@@ -247,4 +256,68 @@ public void suggestSuppressionOnMethodRef() throws IOException {
             "}")
         .doTest();
   }
+
+  @Test
+  public void suggestInitSuppressionOnConstructor() throws IOException {
+    makeTestHelper()
+        .addInputLines(
+            "Test.java",
+            "package com.uber;",
+            "import javax.annotation.Nullable;",
+            "class Test {",
+            "  Object f;",
+            "  Object g;",
+            "  Test() {}",
+            "}")
+        .addOutputLines(
+            "out/Test.java",
+            "package com.uber;",
+            "import javax.annotation.Nullable;",
+            "class Test {",
+            "  Object f;",
+            "  Object g;",
+            "  @SuppressWarnings(\"NullAway.Init\") Test() {}",
+            "}")
+        .doTest();
+  }
+
+  @Test
+  public void suggestInitSuppressionOnField() throws IOException {
+    makeTestHelper()
+        .addInputLines(
+            "Test.java",
+            "package com.uber;",
+            "import javax.annotation.Nullable;",
+            "class Test {",
+            "  Object f;",
+            "}")
+        .addOutputLines(
+            "out/Test.java",
+            "package com.uber;",
+            "import javax.annotation.Nullable;",
+            "class Test {",
+            "  @SuppressWarnings(\"NullAway.Init\") Object f;",
+            "}")
+        .doTest();
+  }
+
+  @Test
+  public void updateExtantSuppressWarnings() throws IOException {
+    makeTestHelper()
+        .addInputLines(
+            "Test.java",
+            "package com.uber;",
+            "import javax.annotation.Nullable;",
+            "class Test {",
+            "  @SuppressWarnings(\"unused\") Object f;",
+            "}")
+        .addOutputLines(
+            "out/Test.java",
+            "package com.uber;",
+            "import javax.annotation.Nullable;",
+            "class Test {",
+            "  @SuppressWarnings({\"unused\",\"NullAway.Init\"}) Object f;",
+            "}")
+        .doTest();
+  }
 }