Move ignored tests to the bottom

uber · Sep 25, 2024 · c471082 · c471082
1 parent 1bf794c
commit c471082
Showing 1 changed file with 87 additions and 85 deletions.
diff --git a/nullaway/src/test/java/com/uber/nullaway/EnsuresNonNullIfTests.java b/nullaway/src/test/java/com/uber/nullaway/EnsuresNonNullIfTests.java
@@ -91,35 +91,6 @@ public void ensuresNonNullMethodWithMoreDataComplexFlow() {
         .doTest();
   }
 
-  @Test
-  @Ignore // fails as both stores in the Return data flow mark the field as nullable
-  public void ensuresNonNullMethodWithMoreDataComplexFlow_2() {
-    defaultCompilationHelper
-        .addSourceLines(
-            "Foo.java",
-            "package com.uber;",
-            "import javax.annotation.Nullable;",
-            "import com.uber.nullaway.annotations.EnsuresNonNullIf;",
-            "class Foo {",
-            "  @Nullable Item nullableItem;",
-            "  @EnsuresNonNullIf(\"nullableItem\")",
-            "  public boolean hasNullableItem() {",
-            "    var x = (nullableItem != null);",
-            "    return x;",
-            "  }",
-            "  public int runOk() {",
-            "    if(!hasNullableItem()) {",
-            "      return 1;",
-            "    }",
-            "    nullableItem.call();",
-            "    return 0;",
-            "  }",
-            "}")
-        .addSourceLines(
-            "Item.java", "package com.uber;", "class Item {", "  public void call() { }", "}")
-        .doTest();
-  }
-
   @Test
   public void catchesWrongReturnFlows() {
     defaultCompilationHelper
@@ -341,62 +312,6 @@ public void ensuresNonNullMethodUsingThis() {
         .doTest();
   }
 
-  @Test
-  @Ignore
-  public void ensuresNonNullMethodResultStoredInVariable() {
-    defaultCompilationHelper
-        .addSourceLines(
-            "Foo.java",
-            "package com.uber;",
-            "import javax.annotation.Nullable;",
-            "import com.uber.nullaway.annotations.EnsuresNonNullIf;",
-            "class Foo {",
-            "  @Nullable Item nullableItem;",
-            "  @EnsuresNonNullIf(\"nullableItem\")",
-            "  public boolean hasNullableItem() {",
-            "    return nullableItem != null;",
-            "  }",
-            "  public void runOk() {",
-            "    boolean check = hasNullableItem();",
-            "    if(!check) {",
-            "      return;",
-            "    }",
-            "    nullableItem.call();",
-            "  }",
-            "}")
-        .addSourceLines(
-            "Item.java", "package com.uber;", "class Item {", "  public void call() { }", "}")
-        .doTest();
-  }
-
-  @Test
-  @Ignore
-  public void ensuresNonNullMethodResultStoredInVariableInverse() {
-    defaultCompilationHelper
-        .addSourceLines(
-            "Foo.java",
-            "package com.uber;",
-            "import javax.annotation.Nullable;",
-            "import com.uber.nullaway.annotations.EnsuresNonNullIf;",
-            "class Foo {",
-            "  @Nullable Item nullableItem;",
-            "  @EnsuresNonNullIf(\"nullableItem\")",
-            "  public boolean hasNullableItem() {",
-            "    return nullableItem != null;",
-            "  }",
-            "  public void runOk() {",
-            "    boolean check = !hasNullableItem();",
-            "    if(check) {",
-            "      return;",
-            "    }",
-            "    nullableItem.call();",
-            "  }",
-            "}")
-        .addSourceLines(
-            "Item.java", "package com.uber;", "class Item {", "  public void call() { }", "}")
-        .doTest();
-  }
-
   @Test
   public void ensuresNonNullMethodNotCalled() {
     defaultCompilationHelper
@@ -610,4 +525,91 @@ public void setTrueIfNonNullToFalseMultipleElements_deferenceFound() {
             "Item.java", "package com.uber;", "class Item {", "  public void call() { }", "}")
         .doTest();
   }
+
+  // These tests are ignored because currently NullAway doesn't support data-flow of local variables
+
+  @Test
+  @Ignore // fails as both stores in the Return data flow mark the field as nullable
+  public void ensuresNonNullMethodWithMoreDataComplexFlow_2() {
+    defaultCompilationHelper
+        .addSourceLines(
+            "Foo.java",
+            "package com.uber;",
+            "import javax.annotation.Nullable;",
+            "import com.uber.nullaway.annotations.EnsuresNonNullIf;",
+            "class Foo {",
+            "  @Nullable Item nullableItem;",
+            "  @EnsuresNonNullIf(\"nullableItem\")",
+            "  public boolean hasNullableItem() {",
+            "    var x = (nullableItem != null);",
+            "    return x;",
+            "  }",
+            "  public int runOk() {",
+            "    if(!hasNullableItem()) {",
+            "      return 1;",
+            "    }",
+            "    nullableItem.call();",
+            "    return 0;",
+            "  }",
+            "}")
+        .addSourceLines(
+            "Item.java", "package com.uber;", "class Item {", "  public void call() { }", "}")
+        .doTest();
+  }
+
+  @Test
+  @Ignore
+  public void ensuresNonNullMethodResultStoredInVariable() {
+    defaultCompilationHelper
+        .addSourceLines(
+            "Foo.java",
+            "package com.uber;",
+            "import javax.annotation.Nullable;",
+            "import com.uber.nullaway.annotations.EnsuresNonNullIf;",
+            "class Foo {",
+            "  @Nullable Item nullableItem;",
+            "  @EnsuresNonNullIf(\"nullableItem\")",
+            "  public boolean hasNullableItem() {",
+            "    return nullableItem != null;",
+            "  }",
+            "  public void runOk() {",
+            "    boolean check = hasNullableItem();",
+            "    if(!check) {",
+            "      return;",
+            "    }",
+            "    nullableItem.call();",
+            "  }",
+            "}")
+        .addSourceLines(
+            "Item.java", "package com.uber;", "class Item {", "  public void call() { }", "}")
+        .doTest();
+  }
+
+  @Test
+  @Ignore
+  public void ensuresNonNullMethodResultStoredInVariableInverse() {
+    defaultCompilationHelper
+        .addSourceLines(
+            "Foo.java",
+            "package com.uber;",
+            "import javax.annotation.Nullable;",
+            "import com.uber.nullaway.annotations.EnsuresNonNullIf;",
+            "class Foo {",
+            "  @Nullable Item nullableItem;",
+            "  @EnsuresNonNullIf(\"nullableItem\")",
+            "  public boolean hasNullableItem() {",
+            "    return nullableItem != null;",
+            "  }",
+            "  public void runOk() {",
+            "    boolean check = !hasNullableItem();",
+            "    if(check) {",
+            "      return;",
+            "    }",
+            "    nullableItem.call();",
+            "  }",
+            "}")
+        .addSourceLines(
+            "Item.java", "package com.uber;", "class Item {", "  public void call() { }", "}")
+        .doTest();
+  }
 }