Miscellaneous followup from cl/687404334.

cpovirk · Google Java Core Libraries · commit 309365e2bb54 · 2024-10-25T08:34:52.000-07:00
RELNOTES=n/a
PiperOrigin-RevId: 689798353
diff --git a/android/guava-tests/test/com/google/common/collect/ComparatorsTest.java b/android/guava-tests/test/com/google/common/collect/ComparatorsTest.java
@@ -22,6 +22,7 @@
 import static java.util.Arrays.asList;
 import static java.util.Comparator.comparing;
 import static java.util.Comparator.naturalOrder;
+import static java.util.Comparator.reverseOrder;
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.collect.testing.Helpers;
@@ -118,8 +119,7 @@ public void testMinMaxNatural_equalInstances() {
   }
 
   public void testMinMaxComparator() {
-    Comparator<Integer> natural = Ordering.natural();
-    Comparator<Integer> reverse = Collections.reverseOrder(natural);
+    Comparator<Integer> reverse = reverseOrder();
     assertThat(min(1, 2, reverse)).isEqualTo(2);
     assertThat(min(2, 1, reverse)).isEqualTo(2);
     assertThat(max(1, 2, reverse)).isEqualTo(1);
@@ -131,14 +131,7 @@ public void testMinMaxComparator() {
    * instead of {@code Comparator<? super T>}.
    */
   public void testMinMaxWithSupertypeComparator() {
-    Comparator<Number> numberComparator =
-        // Can't use Comparator.comparing(Number::intValue) due to Java 7 compatibility.
-        new Comparator<Number>() {
-          @Override
-          public int compare(Number a, Number b) {
-            return a.intValue() - b.intValue();
-          }
-        };
+    Comparator<Number> numberComparator = comparing(Number::intValue);
     Integer comparand1 = 1;
     Integer comparand2 = 2;
 
diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java
@@ -171,8 +171,8 @@ public void testBuilderPutAllIterable() {
     builder.putAll("bar", Arrays.asList(4, 5));
     builder.putAll("foo", Arrays.asList(6, 7));
     Multimap<String, Integer> multimap = builder.build();
-    assertEquals(Arrays.asList(1, 2, 3, 6, 7), multimap.get("foo"));
-    assertEquals(Arrays.asList(4, 5), multimap.get("bar"));
+    assertThat(multimap.get("foo")).containsExactly(1, 2, 3, 6, 7).inOrder();
+    assertThat(multimap.get("bar")).containsExactly(4, 5).inOrder();
     assertEquals(7, multimap.size());
   }
 
@@ -181,9 +181,9 @@ public void testBuilderPutAllVarargs() {
     builder.putAll("foo", 1, 2, 3);
     builder.putAll("bar", 4, 5);
     builder.putAll("foo", 6, 7);
-    Multimap<String, Integer> multimap = builder.build();
-    assertEquals(Arrays.asList(1, 2, 3, 6, 7), multimap.get("foo"));
-    assertEquals(Arrays.asList(4, 5), multimap.get("bar"));
+    ImmutableListMultimap<String, Integer> multimap = builder.build();
+    assertThat(multimap.get("foo")).containsExactly(1, 2, 3, 6, 7).inOrder();
+    assertThat(multimap.get("bar")).containsExactly(4, 5).inOrder();
     assertEquals(7, multimap.size());
   }
 
@@ -200,9 +200,9 @@ public void testBuilderPutAllMultimap() {
     ImmutableListMultimap.Builder<String, Integer> builder = ImmutableListMultimap.builder();
     builder.putAll(toPut);
     builder.putAll(moreToPut);
-    Multimap<String, Integer> multimap = builder.build();
-    assertEquals(Arrays.asList(1, 2, 3, 6, 7), multimap.get("foo"));
-    assertEquals(Arrays.asList(4, 5), multimap.get("bar"));
+    ImmutableListMultimap<String, Integer> multimap = builder.build();
+    assertThat(multimap.get("foo")).containsExactly(1, 2, 3, 6, 7).inOrder();
+    assertThat(multimap.get("bar")).containsExactly(4, 5).inOrder();
     assertEquals(7, multimap.size());
   }
 
@@ -243,9 +243,9 @@ public void testBuilderPutAllMultimapWithDuplicates() {
     ImmutableListMultimap.Builder<String, Integer> builder = ImmutableListMultimap.builder();
     builder.putAll(toPut);
     builder.putAll(moreToPut);
-    Multimap<String, Integer> multimap = builder.build();
-    assertEquals(Arrays.asList(1, 2, 1, 6, 7, 2), multimap.get("foo"));
-    assertEquals(Arrays.asList(4, 5, 4), multimap.get("bar"));
+    ImmutableListMultimap<String, Integer> multimap = builder.build();
+    assertThat(multimap.get("foo")).containsExactly(1, 2, 1, 6, 7, 2).inOrder();
+    assertThat(multimap.get("bar")).containsExactly(4, 5, 4).inOrder();
     assertEquals(9, multimap.size());
   }
 
@@ -348,9 +348,8 @@ public void testCopyOf() {
     input.put("foo", 1);
     input.put("bar", 2);
     input.put("foo", 3);
-    Multimap<String, Integer> multimap = ImmutableListMultimap.copyOf(input);
-    assertEquals(multimap, input);
-    assertEquals(input, multimap);
+    ImmutableListMultimap<String, Integer> multimap = ImmutableListMultimap.copyOf(input);
+    new EqualsTester().addEqualityGroup(input, multimap).testEquals();
   }
 
   public void testCopyOfWithDuplicates() {
@@ -359,16 +358,14 @@ public void testCopyOfWithDuplicates() {
     input.put("bar", 2);
     input.put("foo", 3);
     input.put("foo", 1);
-    Multimap<String, Integer> multimap = ImmutableListMultimap.copyOf(input);
-    assertEquals(multimap, input);
-    assertEquals(input, multimap);
+    ImmutableListMultimap<String, Integer> multimap = ImmutableListMultimap.copyOf(input);
+    new EqualsTester().addEqualityGroup(input, multimap).testEquals();
   }
 
   public void testCopyOfEmpty() {
     ArrayListMultimap<String, Integer> input = ArrayListMultimap.create();
-    Multimap<String, Integer> multimap = ImmutableListMultimap.copyOf(input);
-    assertEquals(multimap, input);
-    assertEquals(input, multimap);
+    ImmutableListMultimap<String, Integer> multimap = ImmutableListMultimap.copyOf(input);
+    new EqualsTester().addEqualityGroup(input, multimap).testEquals();
   }
 
   public void testCopyOfImmutableListMultimap() {
@@ -407,7 +404,7 @@ public void testToImmutableListMultimap_java7_combine() {
   }
 
   public void testEmptyMultimapReads() {
-    Multimap<String, Integer> multimap = ImmutableListMultimap.of();
+    ImmutableListMultimap<String, Integer> multimap = ImmutableListMultimap.of();
     assertFalse(multimap.containsKey("foo"));
     assertFalse(multimap.containsValue(1));
     assertFalse(multimap.containsEntry("foo", 1));
diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java
@@ -479,11 +479,14 @@ public void testSerialization_entrySet() {
   }
 
   public void testEquals_immutableMultiset() {
-    Collection<String> c = ImmutableMultiset.of("a", "b", "a");
-    assertEquals(c, ImmutableMultiset.of("a", "b", "a"));
-    assertEquals(c, ImmutableMultiset.of("a", "a", "b"));
-    assertThat(c).isNotEqualTo(ImmutableMultiset.of("a", "b"));
-    assertThat(c).isNotEqualTo(ImmutableMultiset.of("a", "b", "c", "d"));
+    new EqualsTester()
+        .addEqualityGroup(
+            ImmutableMultiset.of("a", "b", "a"),
+            ImmutableMultiset.of("a", "b", "a"),
+            ImmutableMultiset.of("a", "a", "b"))
+        .addEqualityGroup(ImmutableMultiset.of("a", "b"))
+        .addEqualityGroup(ImmutableMultiset.of("a", "b", "c", "d"))
+        .testEquals();
   }
 
   public void testIterationOrder() {
diff --git a/android/guava/src/com/google/common/collect/CompactHashing.java b/android/guava/src/com/google/common/collect/CompactHashing.java
@@ -71,7 +71,7 @@ private CompactHashing() {}
    */
   static int tableSize(int expectedSize) {
     // We use entries next == 0 to indicate UNSET, so actual capacity is 1 less than requested.
-    return max(MIN_HASH_TABLE_SIZE, Hashing.closedTableSize(expectedSize + 1, 1.0f));
+    return max(MIN_HASH_TABLE_SIZE, Hashing.closedTableSize(expectedSize + 1, 1.0));
   }
 
   /** Creates and returns a properly-sized array with the given number of buckets. */
diff --git a/guava-tests/test/com/google/common/collect/ComparatorsTest.java b/guava-tests/test/com/google/common/collect/ComparatorsTest.java
@@ -22,6 +22,7 @@
 import static java.util.Arrays.asList;
 import static java.util.Comparator.comparing;
 import static java.util.Comparator.naturalOrder;
+import static java.util.Comparator.reverseOrder;
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.collect.testing.Helpers;
@@ -118,8 +119,7 @@ public void testMinMaxNatural_equalInstances() {
   }
 
   public void testMinMaxComparator() {
-    Comparator<Integer> natural = Ordering.natural();
-    Comparator<Integer> reverse = Collections.reverseOrder(natural);
+    Comparator<Integer> reverse = reverseOrder();
     assertThat(min(1, 2, reverse)).isEqualTo(2);
     assertThat(min(2, 1, reverse)).isEqualTo(2);
     assertThat(max(1, 2, reverse)).isEqualTo(1);
@@ -131,14 +131,7 @@ public void testMinMaxComparator() {
    * instead of {@code Comparator<? super T>}.
    */
   public void testMinMaxWithSupertypeComparator() {
-    Comparator<Number> numberComparator =
-        // Can't use Comparator.comparing(Number::intValue) due to Java 7 compatibility.
-        new Comparator<Number>() {
-          @Override
-          public int compare(Number a, Number b) {
-            return a.intValue() - b.intValue();
-          }
-        };
+    Comparator<Number> numberComparator = comparing(Number::intValue);
     Integer comparand1 = 1;
     Integer comparand2 = 2;
 
diff --git a/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java b/guava-tests/test/com/google/common/collect/ImmutableListMultimapTest.java
@@ -179,8 +179,8 @@ public void testBuilderPutAllIterable() {
     builder.putAll("bar", Arrays.asList(4, 5));
     builder.putAll("foo", Arrays.asList(6, 7));
     Multimap<String, Integer> multimap = builder.build();
-    assertEquals(Arrays.asList(1, 2, 3, 6, 7), multimap.get("foo"));
-    assertEquals(Arrays.asList(4, 5), multimap.get("bar"));
+    assertThat(multimap.get("foo")).containsExactly(1, 2, 3, 6, 7).inOrder();
+    assertThat(multimap.get("bar")).containsExactly(4, 5).inOrder();
     assertEquals(7, multimap.size());
   }
 
@@ -189,9 +189,9 @@ public void testBuilderPutAllVarargs() {
     builder.putAll("foo", 1, 2, 3);
     builder.putAll("bar", 4, 5);
     builder.putAll("foo", 6, 7);
-    Multimap<String, Integer> multimap = builder.build();
-    assertEquals(Arrays.asList(1, 2, 3, 6, 7), multimap.get("foo"));
-    assertEquals(Arrays.asList(4, 5), multimap.get("bar"));
+    ImmutableListMultimap<String, Integer> multimap = builder.build();
+    assertThat(multimap.get("foo")).containsExactly(1, 2, 3, 6, 7).inOrder();
+    assertThat(multimap.get("bar")).containsExactly(4, 5).inOrder();
     assertEquals(7, multimap.size());
   }
 
@@ -208,9 +208,9 @@ public void testBuilderPutAllMultimap() {
     ImmutableListMultimap.Builder<String, Integer> builder = ImmutableListMultimap.builder();
     builder.putAll(toPut);
     builder.putAll(moreToPut);
-    Multimap<String, Integer> multimap = builder.build();
-    assertEquals(Arrays.asList(1, 2, 3, 6, 7), multimap.get("foo"));
-    assertEquals(Arrays.asList(4, 5), multimap.get("bar"));
+    ImmutableListMultimap<String, Integer> multimap = builder.build();
+    assertThat(multimap.get("foo")).containsExactly(1, 2, 3, 6, 7).inOrder();
+    assertThat(multimap.get("bar")).containsExactly(4, 5).inOrder();
     assertEquals(7, multimap.size());
   }
 
@@ -251,9 +251,9 @@ public void testBuilderPutAllMultimapWithDuplicates() {
     ImmutableListMultimap.Builder<String, Integer> builder = ImmutableListMultimap.builder();
     builder.putAll(toPut);
     builder.putAll(moreToPut);
-    Multimap<String, Integer> multimap = builder.build();
-    assertEquals(Arrays.asList(1, 2, 1, 6, 7, 2), multimap.get("foo"));
-    assertEquals(Arrays.asList(4, 5, 4), multimap.get("bar"));
+    ImmutableListMultimap<String, Integer> multimap = builder.build();
+    assertThat(multimap.get("foo")).containsExactly(1, 2, 1, 6, 7, 2).inOrder();
+    assertThat(multimap.get("bar")).containsExactly(4, 5, 4).inOrder();
     assertEquals(9, multimap.size());
   }
 
@@ -356,9 +356,8 @@ public void testCopyOf() {
     input.put("foo", 1);
     input.put("bar", 2);
     input.put("foo", 3);
-    Multimap<String, Integer> multimap = ImmutableListMultimap.copyOf(input);
-    assertEquals(multimap, input);
-    assertEquals(input, multimap);
+    ImmutableListMultimap<String, Integer> multimap = ImmutableListMultimap.copyOf(input);
+    new EqualsTester().addEqualityGroup(input, multimap).testEquals();
   }
 
   public void testCopyOfWithDuplicates() {
@@ -367,16 +366,14 @@ public void testCopyOfWithDuplicates() {
     input.put("bar", 2);
     input.put("foo", 3);
     input.put("foo", 1);
-    Multimap<String, Integer> multimap = ImmutableListMultimap.copyOf(input);
-    assertEquals(multimap, input);
-    assertEquals(input, multimap);
+    ImmutableListMultimap<String, Integer> multimap = ImmutableListMultimap.copyOf(input);
+    new EqualsTester().addEqualityGroup(input, multimap).testEquals();
   }
 
   public void testCopyOfEmpty() {
     ArrayListMultimap<String, Integer> input = ArrayListMultimap.create();
-    Multimap<String, Integer> multimap = ImmutableListMultimap.copyOf(input);
-    assertEquals(multimap, input);
-    assertEquals(input, multimap);
+    ImmutableListMultimap<String, Integer> multimap = ImmutableListMultimap.copyOf(input);
+    new EqualsTester().addEqualityGroup(input, multimap).testEquals();
   }
 
   public void testCopyOfImmutableListMultimap() {
@@ -440,7 +437,7 @@ public void testFlatteningToImmutableListMultimap() {
   }
 
   public void testEmptyMultimapReads() {
-    Multimap<String, Integer> multimap = ImmutableListMultimap.of();
+    ImmutableListMultimap<String, Integer> multimap = ImmutableListMultimap.of();
     assertFalse(multimap.containsKey("foo"));
     assertFalse(multimap.containsValue(1));
     assertFalse(multimap.containsEntry("foo", 1));
diff --git a/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java b/guava-tests/test/com/google/common/collect/ImmutableMultisetTest.java
@@ -586,11 +586,14 @@ public void testSerialization_entrySet() {
   }
 
   public void testEquals_immutableMultiset() {
-    Collection<String> c = ImmutableMultiset.of("a", "b", "a");
-    assertEquals(c, ImmutableMultiset.of("a", "b", "a"));
-    assertEquals(c, ImmutableMultiset.of("a", "a", "b"));
-    assertThat(c).isNotEqualTo(ImmutableMultiset.of("a", "b"));
-    assertThat(c).isNotEqualTo(ImmutableMultiset.of("a", "b", "c", "d"));
+    new EqualsTester()
+        .addEqualityGroup(
+            ImmutableMultiset.of("a", "b", "a"),
+            ImmutableMultiset.of("a", "b", "a"),
+            ImmutableMultiset.of("a", "a", "b"))
+        .addEqualityGroup(ImmutableMultiset.of("a", "b"))
+        .addEqualityGroup(ImmutableMultiset.of("a", "b", "c", "d"))
+        .testEquals();
   }
 
   public void testIterationOrder() {
diff --git a/guava/src/com/google/common/collect/CompactHashing.java b/guava/src/com/google/common/collect/CompactHashing.java
@@ -71,7 +71,7 @@ private CompactHashing() {}
    */
   static int tableSize(int expectedSize) {
     // We use entries next == 0 to indicate UNSET, so actual capacity is 1 less than requested.
-    return max(MIN_HASH_TABLE_SIZE, Hashing.closedTableSize(expectedSize + 1, 1.0f));
+    return max(MIN_HASH_TABLE_SIZE, Hashing.closedTableSize(expectedSize + 1, 1.0));
   }
 
   /** Creates and returns a properly-sized array with the given number of buckets. */

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private CompactHashing() {}`
`71`	`71`	`*/`
`72`	`72`	`static int tableSize(int expectedSize) {`
`73`	`73`	`// We use entries next == 0 to indicate UNSET, so actual capacity is 1 less than requested.`
`74`		`- return max(MIN_HASH_TABLE_SIZE, Hashing.closedTableSize(expectedSize + 1, 1.0f));`
	`74`	`+ return max(MIN_HASH_TABLE_SIZE, Hashing.closedTableSize(expectedSize + 1, 1.0));`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/** Creates and returns a properly-sized array with the given number of buckets. */`