Fix soon-to-be CRV-related compile errors.

kluever · Google Java Core Libraries · commit 1a82e5f3a1e9 · 2025-07-23T08:53:11.000-07:00
RELNOTES=n/a
PiperOrigin-RevId: 786298194
diff --git a/android/guava-testlib/src/com/google/common/collect/testing/testers/ListListIteratorTester.java b/android/guava-testlib/src/com/google/common/collect/testing/testers/ListListIteratorTester.java
@@ -102,7 +102,7 @@ public void testListIterator_tooHigh() {
   }
 
   public void testListIterator_atSize() {
-    getList().listIterator(getNumElements());
+    assertNotNull(getList().listIterator(getNumElements()));
     // TODO: run the iterator through ListIteratorTester
   }
 
diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java
@@ -290,15 +290,15 @@ protected SortedMap<String, String> create(Entry<String, String>[] entries) {
   }
 
   public void testComparator() {
-    create().comparator();
+    assertNotNull(create().comparator());
   }
 
   public void testCeilingEntry() {
-    create().ceilingEntry("a");
+    assertNull(create().ceilingEntry("a"));
   }
 
   public void testCeilingKey() {
-    create().ceilingKey("a");
+    assertNull(create().ceilingKey("a"));
   }
 
   public void testDescendingKeySet() {
@@ -316,21 +316,21 @@ public void testDescendingMap() {
   }
 
   public void testFirstEntry() {
-    create().firstEntry();
+    assertNull(create().firstEntry());
   }
 
   public void testFirstKey() {
     NavigableMap<String, Integer> map = create();
     map.put("a", 1);
-    map.firstKey();
+    assertNotNull(map.firstKey());
   }
 
   public void testFloorEntry() {
-    create().floorEntry("a");
+    assertNull(create().floorEntry("a"));
   }
 
   public void testFloorKey() {
-    create().floorKey("a");
+    assertNull(create().floorKey("a"));
   }
 
   public void testHeadMap_k() {
@@ -348,29 +348,29 @@ public void testHeadMap_k_b() {
   }
 
   public void testHigherEntry() {
-    create().higherEntry("a");
+    assertNull(create().higherEntry("a"));
   }
 
   public void testHigherKey() {
-    create().higherKey("a");
+    assertNull(create().higherKey("a"));
   }
 
   public void testLastEntry() {
-    create().lastEntry();
+    assertNull(create().lastEntry());
   }
 
   public void testLastKey() {
     NavigableMap<String, Integer> map = create();
     map.put("a", 1);
-    map.lastKey();
+    assertNotNull(map.lastKey());
   }
 
   public void testLowerEntry() {
-    create().lowerEntry("a");
+    assertNull(create().lowerEntry("a"));
   }
 
   public void testLowerKey() {
-    create().lowerKey("a");
+    assertNull(create().lowerKey("a"));
   }
 
   public void testNavigableKeySet() {
diff --git a/android/guava-tests/test/com/google/common/util/concurrent/JSR166TestCase.java b/android/guava-tests/test/com/google/common/util/concurrent/JSR166TestCase.java
@@ -510,7 +510,7 @@ void assertFutureTimesOut(Future<?> future, long timeoutMillis) {
     long startTime = System.nanoTime();
     try {
       future.get(timeoutMillis, MILLISECONDS);
-      shouldThrow();
+      fail("Should throw exception");
     } catch (TimeoutException success) {
     } catch (Exception e) {
       threadUnexpectedException(e);
@@ -520,16 +520,6 @@ void assertFutureTimesOut(Future<?> future, long timeoutMillis) {
     assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
   }
 
-  /** Fails with message "should throw exception". */
-  public void shouldThrow() {
-    fail("Should throw exception");
-  }
-
-  /** Fails with message "should throw " + exceptionName. */
-  public void shouldThrow(String exceptionName) {
-    fail("Should throw " + exceptionName);
-  }
-
   /** The number of elements to place in collections, arrays, etc. */
   public static final int SIZE = 20;
 
@@ -1184,17 +1174,17 @@ void checkEmpty(BlockingQueue<?> q) {
       assertFalse(q.iterator().hasNext());
       try {
         q.element();
-        shouldThrow();
+        fail("Should throw exception");
       } catch (NoSuchElementException success) {
       }
       try {
         q.iterator().next();
-        shouldThrow();
+        fail("Should throw exception");
       } catch (NoSuchElementException success) {
       }
       try {
         q.remove();
-        shouldThrow();
+        fail("Should throw exception");
       } catch (NoSuchElementException success) {
       }
     } catch (InterruptedException ie) {
diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/ListListIteratorTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/ListListIteratorTester.java
@@ -102,7 +102,7 @@ public void testListIterator_tooHigh() {
   }
 
   public void testListIterator_atSize() {
-    getList().listIterator(getNumElements());
+    assertNotNull(getList().listIterator(getNumElements()));
     // TODO: run the iterator through ListIteratorTester
   }
 
diff --git a/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java b/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java
@@ -290,15 +290,15 @@ protected SortedMap<String, String> create(Entry<String, String>[] entries) {
   }
 
   public void testComparator() {
-    create().comparator();
+    assertNotNull(create().comparator());
   }
 
   public void testCeilingEntry() {
-    create().ceilingEntry("a");
+    assertNull(create().ceilingEntry("a"));
   }
 
   public void testCeilingKey() {
-    create().ceilingKey("a");
+    assertNull(create().ceilingKey("a"));
   }
 
   public void testDescendingKeySet() {
@@ -316,21 +316,21 @@ public void testDescendingMap() {
   }
 
   public void testFirstEntry() {
-    create().firstEntry();
+    assertNull(create().firstEntry());
   }
 
   public void testFirstKey() {
     NavigableMap<String, Integer> map = create();
     map.put("a", 1);
-    map.firstKey();
+    assertNotNull(map.firstKey());
   }
 
   public void testFloorEntry() {
-    create().floorEntry("a");
+    assertNull(create().floorEntry("a"));
   }
 
   public void testFloorKey() {
-    create().floorKey("a");
+    assertNull(create().floorKey("a"));
   }
 
   public void testHeadMap_k() {
@@ -348,29 +348,29 @@ public void testHeadMap_k_b() {
   }
 
   public void testHigherEntry() {
-    create().higherEntry("a");
+    assertNull(create().higherEntry("a"));
   }
 
   public void testHigherKey() {
-    create().higherKey("a");
+    assertNull(create().higherKey("a"));
   }
 
   public void testLastEntry() {
-    create().lastEntry();
+    assertNull(create().lastEntry());
   }
 
   public void testLastKey() {
     NavigableMap<String, Integer> map = create();
     map.put("a", 1);
-    map.lastKey();
+    assertNotNull(map.lastKey());
   }
 
   public void testLowerEntry() {
-    create().lowerEntry("a");
+    assertNull(create().lowerEntry("a"));
   }
 
   public void testLowerKey() {
-    create().lowerKey("a");
+    assertNull(create().lowerKey("a"));
   }
 
   public void testNavigableKeySet() {
diff --git a/guava-tests/test/com/google/common/util/concurrent/JSR166TestCase.java b/guava-tests/test/com/google/common/util/concurrent/JSR166TestCase.java
@@ -510,7 +510,7 @@ void assertFutureTimesOut(Future<?> future, long timeoutMillis) {
     long startTime = System.nanoTime();
     try {
       future.get(timeoutMillis, MILLISECONDS);
-      shouldThrow();
+      fail("Should throw exception");
     } catch (TimeoutException success) {
     } catch (Exception e) {
       threadUnexpectedException(e);
@@ -520,16 +520,6 @@ void assertFutureTimesOut(Future<?> future, long timeoutMillis) {
     assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
   }
 
-  /** Fails with message "should throw exception". */
-  public void shouldThrow() {
-    fail("Should throw exception");
-  }
-
-  /** Fails with message "should throw " + exceptionName. */
-  public void shouldThrow(String exceptionName) {
-    fail("Should throw " + exceptionName);
-  }
-
   /** The number of elements to place in collections, arrays, etc. */
   public static final int SIZE = 20;
 
@@ -1184,17 +1174,17 @@ void checkEmpty(BlockingQueue<?> q) {
       assertFalse(q.iterator().hasNext());
       try {
         q.element();
-        shouldThrow();
+        fail("Should throw exception");
       } catch (NoSuchElementException success) {
       }
       try {
         q.iterator().next();
-        shouldThrow();
+        fail("Should throw exception");
       } catch (NoSuchElementException success) {
       }
       try {
         q.remove();
-        shouldThrow();
+        fail("Should throw exception");
       } catch (NoSuchElementException success) {
       }
     } catch (InterruptedException ie) {

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public void testListIterator_tooHigh() {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`public void testListIterator_atSize() {`
`105`		`- getList().listIterator(getNumElements());`
	`105`	`+ assertNotNull(getList().listIterator(getNumElements()));`
`106`	`106`	`// TODO: run the iterator through ListIteratorTester`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -290,15 +290,15 @@ protected SortedMap<String, String> create(Entry<String, String>[] entries) {`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`public void testComparator() {`
`293`		`- create().comparator();`
	`293`	`+ assertNotNull(create().comparator());`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`public void testCeilingEntry() {`
`297`		`- create().ceilingEntry("a");`
	`297`	`+ assertNull(create().ceilingEntry("a"));`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`public void testCeilingKey() {`
`301`		`- create().ceilingKey("a");`
	`301`	`+ assertNull(create().ceilingKey("a"));`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`public void testDescendingKeySet() {`
`@@ -316,21 +316,21 @@ public void testDescendingMap() {`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`public void testFirstEntry() {`
`319`		`- create().firstEntry();`
	`319`	`+ assertNull(create().firstEntry());`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`public void testFirstKey() {`
`323`	`323`	`NavigableMap<String, Integer> map = create();`
`324`	`324`	`map.put("a", 1);`
`325`		`- map.firstKey();`
	`325`	`+ assertNotNull(map.firstKey());`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`public void testFloorEntry() {`
`329`		`- create().floorEntry("a");`
	`329`	`+ assertNull(create().floorEntry("a"));`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`public void testFloorKey() {`
`333`		`- create().floorKey("a");`
	`333`	`+ assertNull(create().floorKey("a"));`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`public void testHeadMap_k() {`
`@@ -348,29 +348,29 @@ public void testHeadMap_k_b() {`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`public void testHigherEntry() {`
`351`		`- create().higherEntry("a");`
	`351`	`+ assertNull(create().higherEntry("a"));`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`public void testHigherKey() {`
`355`		`- create().higherKey("a");`
	`355`	`+ assertNull(create().higherKey("a"));`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`public void testLastEntry() {`
`359`		`- create().lastEntry();`
	`359`	`+ assertNull(create().lastEntry());`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`public void testLastKey() {`
`363`	`363`	`NavigableMap<String, Integer> map = create();`
`364`	`364`	`map.put("a", 1);`
`365`		`- map.lastKey();`
	`365`	`+ assertNotNull(map.lastKey());`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`public void testLowerEntry() {`
`369`		`- create().lowerEntry("a");`
	`369`	`+ assertNull(create().lowerEntry("a"));`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`public void testLowerKey() {`
`373`		`- create().lowerKey("a");`
	`373`	`+ assertNull(create().lowerKey("a"));`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`public void testNavigableKeySet() {`