Merge "Upgrade guava to v33.0.0" into main am: fcb6827395

Original change: https://android-review.googlesource.com/c/platform/external/guava/+/2894060

Change-Id: I59ee73835cab1c252c9a5e630e9b1afcd5c76417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 6 insertions, 17 deletions

diff --git a/guava-tests/test/com/google/common/io/ByteSinkTest.java b/guava-tests/test/com/google/common/io/ByteSinkTest.java
index 208a8fc5e..4ce3981c0 100644
--- a/guava-tests/test/com/google/common/io/ByteSinkTest.java
+++ b/guava-tests/test/com/google/common/io/ByteSinkTest.java
@@ -21,6 +21,7 @@ import static com.google.common.io.TestOption.OPEN_THROWS;
 import static com.google.common.io.TestOption.READ_THROWS;
 import static com.google.common.io.TestOption.WRITE_THROWS;
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertThrows;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -82,11 +83,7 @@ public class ByteSinkTest extends IoTestCase {
     for (TestOption option : EnumSet.of(OPEN_THROWS, READ_THROWS, CLOSE_THROWS)) {
       TestByteSource failSource = new TestByteSource(new byte[10], option);
       TestByteSink okSink = new TestByteSink();
-      try {
-        failSource.copyTo(okSink);
-        fail();
-      } catch (IOException expected) {
-      }
+      assertThrows(IOException.class, () -> failSource.copyTo(okSink));
       // ensure stream was closed IF it was opened (depends on implementation whether or not it's
       // opened at all if source.newInputStream() throws).
       assertTrue(
@@ -97,22 +94,14 @@ public class ByteSinkTest extends IoTestCase {
 
   public void testClosesOnErrors_whenWriteThrows() {
     TestByteSink failSink = new TestByteSink(WRITE_THROWS);
-    try {
-      new TestByteSource(new byte[10]).copyTo(failSink);
-      fail();
-    } catch (IOException expected) {
-    }
+    assertThrows(IOException.class, () -> new TestByteSource(new byte[10]).copyTo(failSink));
     assertTrue(failSink.wasStreamClosed());
   }
 
-  public void testClosesOnErrors_writingFromInputStreamThatThrows() {
+  public void testClosesOnErrors_writingFromInputStreamThatThrows() throws IOException {
     TestByteSink okSink = new TestByteSink();
-    try {
-      TestInputStream in = new TestInputStream(new ByteArrayInputStream(new byte[10]), READ_THROWS);
-      okSink.writeFrom(in);
-      fail();
-    } catch (IOException expected) {
-    }
+    TestInputStream in = new TestInputStream(new ByteArrayInputStream(new byte[10]), READ_THROWS);
+    assertThrows(IOException.class, () -> okSink.writeFrom(in));
     assertTrue(okSink.wasStreamClosed());
   }
 }