Cover checkArgument and reversed null checks

PicnicSupermarket · Mar 7, 2023 · 4b8eb2c · 4b8eb2c
1 parent 5439540
commit 4b8eb2c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/...-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/PreconditionsRules.java b/...-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/PreconditionsRules.java
@@ -9,6 +9,7 @@
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Preconditions;
+import com.google.errorprone.refaster.Refaster;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
@@ -78,7 +79,7 @@ void after(int index, int size, String message) {
   static final class RequireNonNull<T> {
     @BeforeTemplate
     void before(T object) {
-      if (object == null) {
+      if (Refaster.anyOf(object == null, null == object)) {
         throw new NullPointerException();
       }
     }
@@ -88,6 +89,11 @@ void before2(T object) {
       checkNotNull(object);
     }
 
+    @BeforeTemplate
+    void before3(T object) {
+      checkArgument(Refaster.anyOf(object != null, null != object));
+    }
+
     @AfterTemplate
     @UseImportPolicy(STATIC_IMPORT_ALWAYS)
     void after(T object) {
@@ -99,7 +105,7 @@ void after(T object) {
   static final class RequireNonNullWithMessage<T> {
     @BeforeTemplate
     void before(T object, String message) {
-      if (object == null) {
+      if (Refaster.anyOf(object == null, null == object)) {
         throw new NullPointerException(message);
       }
     }
@@ -109,6 +115,11 @@ void before2(T object, String message) {
       checkNotNull(object, message);
     }
 
+    @BeforeTemplate
+    void before3(T object, String message) {
+      checkArgument(Refaster.anyOf(object != null, null != object), message);
+    }
+
     @AfterTemplate
     @UseImportPolicy(STATIC_IMPORT_ALWAYS)
     void after(T object, String message) {

diff --git a/.../src/test/resources/tech/picnic/errorprone/refasterrules/PreconditionsRulesTestInput.java b/.../src/test/resources/tech/picnic/errorprone/refasterrules/PreconditionsRulesTestInput.java
@@ -1,5 +1,6 @@
 package tech.picnic.errorprone.refasterrules;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.ImmutableSet;
@@ -33,14 +34,24 @@ void testRequireNonNull() {
     if ("foo" == null) {
       throw new NullPointerException();
     }
+    if (null == "foo") {
+      throw new NullPointerException();
+    }
     checkNotNull("foo");
+    checkArgument("foo" != null);
+    checkArgument(null != "foo");
   }
 
   void testRequireNonNullWithMessage() {
     if ("foo" == null) {
       throw new NullPointerException("The string is null");
     }
+    if (null == "foo") {
+      throw new NullPointerException("The string is null");
+    }
     checkNotNull("foo", "The string is null");
+    checkArgument("foo" != null, "The string is null");
+    checkArgument(null != "foo", "The string is null");
   }
 
   void testCheckPositionIndex() {

diff --git a/...src/test/resources/tech/picnic/errorprone/refasterrules/PreconditionsRulesTestOutput.java b/...src/test/resources/tech/picnic/errorprone/refasterrules/PreconditionsRulesTestOutput.java
@@ -31,11 +31,17 @@ void testCheckElementIndexWithMessage() {
   void testRequireNonNull() {
     requireNonNull("foo");
     requireNonNull("foo");
+    requireNonNull("foo");
+    requireNonNull("foo");
+    requireNonNull("foo");
   }
 
   void testRequireNonNullWithMessage() {
     requireNonNull("foo", "The string is null");
     requireNonNull("foo", "The string is null");
+    requireNonNull("foo", "The string is null");
+    requireNonNull("foo", "The string is null");
+    requireNonNull("foo", "The string is null");
   }
 
   void testCheckPositionIndex() {