Address some PrimitiveComparisons warnings.

RELNOTES=n/a
PiperOrigin-RevId: 746145356

Author: cpovirk

android/guava-testlib/src/com/google/common/collect/testing/UnhashableObject.java

@@ -54,6 +54,6 @@ public String toString() {
 
   @Override
   public int compareTo(UnhashableObject o) {
-    return (this.value < o.value) ? -1 : (this.value > o.value) ? 1 : 0;
+    return Integer.compare(this.value, o.value);
   }
 }

android/guava-tests/test/com/google/common/base/ObjectsTest.java

@@ -32,7 +32,14 @@
 @NullUnmarked
 public class ObjectsTest extends TestCase {
 
-  @SuppressWarnings("YodaCondition") // test of reversed call
+  @SuppressWarnings({
+    "ObjectEqualsForPrimitives", // test of a trivial call
+    "EqualsInteger", // test of a trivial call
+    "EqualsLong", // b/273939864
+    "EqualsDouble", // b/273939864
+    "EqualsFloat", // b/273939864
+    "YodaCondition", // test of reversed call
+  })
   public void testEqual() throws Exception {
     assertTrue(Objects.equal(1, 1));
     assertTrue(Objects.equal(null, null));

android/guava-tests/test/com/google/common/primitives/CharsTest.java

@@ -99,7 +99,7 @@ public void testCompare() {
       for (char y : VALUES) {
         assertWithMessage(x + ", " + y)
             .that(Math.signum(Chars.compare(x, y)))
-            .isEqualTo(Math.signum(Character.valueOf(x).compareTo(y)));
+            .isEqualTo(Math.signum(Character.compare(x, y)));
       }
     }
   }

android/guava-tests/test/com/google/common/primitives/DoublesTest.java

@@ -101,9 +101,7 @@ public void testCompare() {
     for (double x : VALUES) {
       for (double y : VALUES) {
         // note: spec requires only that the sign is the same
-        assertWithMessage(x + ", " + y)
-            .that(Doubles.compare(x, y))
-            .isEqualTo(Double.valueOf(x).compareTo(y));
+        assertWithMessage(x + ", " + y).that(Doubles.compare(x, y)).isEqualTo(Double.compare(x, y));
       }
     }
   }

android/guava-tests/test/com/google/common/primitives/FloatsTest.java

@@ -96,9 +96,7 @@ public void testCompare() {
     for (float x : VALUES) {
       for (float y : VALUES) {
         // note: spec requires only that the sign is the same
-        assertWithMessage(x + ", " + y)
-            .that(Floats.compare(x, y))
-            .isEqualTo(Float.valueOf(x).compareTo(y));
+        assertWithMessage(x + ", " + y).that(Floats.compare(x, y)).isEqualTo(Float.compare(x, y));
       }
     }
   }

android/guava-tests/test/com/google/common/primitives/IntsTest.java

@@ -100,9 +100,7 @@ public void testCompare() {
     for (int x : VALUES) {
       for (int y : VALUES) {
         // note: spec requires only that the sign is the same
-        assertWithMessage(x + ", " + y)
-            .that(Ints.compare(x, y))
-            .isEqualTo(Integer.valueOf(x).compareTo(y));
+        assertWithMessage(x + ", " + y).that(Ints.compare(x, y)).isEqualTo(Integer.compare(x, y));
       }
     }
   }

android/guava-tests/test/com/google/common/primitives/LongsTest.java

@@ -71,9 +71,7 @@ public void testCompare() {
     for (long x : VALUES) {
       for (long y : VALUES) {
         // note: spec requires only that the sign is the same
-        assertWithMessage(x + ", " + y)
-            .that(Longs.compare(x, y))
-            .isEqualTo(Long.valueOf(x).compareTo(y));
+        assertWithMessage(x + ", " + y).that(Longs.compare(x, y)).isEqualTo(Long.compare(x, y));
       }
     }
   }

android/guava-tests/test/com/google/common/primitives/ShortsTest.java

@@ -98,8 +98,8 @@ private static void assertCastFails(long value) {
   public void testCompare() {
     for (short x : VALUES) {
       for (short y : VALUES) {
-        // Only compare the sign of the result of compareTo().
-        int expected = Short.valueOf(x).compareTo(y);
+        // Only compare the sign of the result of compare().
+        int expected = Short.compare(x, y);
         int actual = Shorts.compare(x, y);
         if (expected == 0) {
           assertWithMessage(x + ", " + y).that(actual).isEqualTo(expected);

android/guava-tests/test/com/google/common/primitives/SignedBytesTest.java

@@ -84,8 +84,8 @@ private static void assertCastFails(long value) {
   public void testCompare() {
     for (byte x : VALUES) {
       for (byte y : VALUES) {
-        // Only compare the sign of the result of compareTo().
-        int expected = Byte.valueOf(x).compareTo(y);
+        // Only compare the sign of the result of compare().
+        int expected = Byte.compare(x, y);
         int actual = SignedBytes.compare(x, y);
         if (expected == 0) {
           assertWithMessage(x + ", " + y).that(actual).isEqualTo(expected);

guava-testlib/src/com/google/common/collect/testing/UnhashableObject.java

@@ -54,6 +54,6 @@ public String toString() {
 
   @Override
   public int compareTo(UnhashableObject o) {
-    return (this.value < o.value) ? -1 : (this.value > o.value) ? 1 : 0;
+    return Integer.compare(this.value, o.value);
   }
 }