Merge "Fix Base64OutputStream swallowing/throwing the wrong exception." (c1d27f3b) · Commits · e / os / android_frameworks_base

core/java/android/util/Base64OutputStream.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -117,8 +117,10 @@ public class Base64OutputStream extends FilterOutputStream {
		out.flush();
		}
		} catch (IOException e) {
		if (thrown != null) {
		if (thrown == null) {
		thrown = e;
		} else {
		thrown.addSuppressed(e);
		}
		}

core/tests/coretests/src/android/util/Base64Test.java

+76 −1

Original line number	Diff line number	Diff line
		@@ -18,13 +18,18 @@ package android.util;

		import android.support.test.filters.LargeTest;

		import junit.framework.TestCase;

		import java.io.ByteArrayInputStream;
		import java.io.ByteArrayOutputStream;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.OutputStream;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.List;
		import java.util.Random;
		import junit.framework.TestCase;
		import java.util.stream.Collectors;

		@LargeTest
		public class Base64Test extends TestCase {
		@@ -530,4 +535,74 @@ public class Base64Test extends TestCase {
		assertEquals(plain, actual);
		}
		}

		public void testOutputStream_ioExceptionDuringClose() {
		OutputStream out = new OutputStream() {
		@Override public void write(int b) throws IOException { }
		@Override public void close() throws IOException {
		throw new IOException("close()");
		}
		};
		OutputStream out2 = new Base64OutputStream(out, Base64.DEFAULT);
		try {
		out2.close();
		fail();
		} catch (IOException expected) {
		}
		}

		public void testOutputStream_ioExceptionDuringCloseAndWrite() {
		OutputStream out = new OutputStream() {
		@Override public void write(int b) throws IOException {
		throw new IOException("write()");
		}
		@Override public void write(byte[] b) throws IOException {
		throw new IOException("write()");
		}
		@Override public void write(byte[] b, int off, int len) throws IOException {
		throw new IOException("write()");
		}
		@Override public void close() throws IOException {
		throw new IOException("close()");
		}
		};
		OutputStream out2 = new Base64OutputStream(out, Base64.DEFAULT);
		try {
		out2.close();
		fail();
		} catch (IOException expected) {
		// Base64OutputStream write()s pending (possibly empty) data
		// before close(), so the IOE from write() should be thrown and
		// any later exception suppressed.
		assertEquals("write()", expected.getMessage());
		Throwable[] suppressed = expected.getSuppressed();
		List<String> suppressedMessages = Arrays.asList(suppressed).stream()
		.map((e) -> e.getMessage())
		.collect(Collectors.toList());
		assertEquals(Collections.singletonList("close()"), suppressedMessages);
		}
		}

		public void testOutputStream_ioExceptionDuringWrite() {
		OutputStream out = new OutputStream() {
		@Override public void write(int b) throws IOException {
		throw new IOException("write()");
		}
		@Override public void write(byte[] b) throws IOException {
		throw new IOException("write()");
		}
		@Override public void write(byte[] b, int off, int len) throws IOException {
		throw new IOException("write()");
		}
		};
		// Base64OutputStream write()s pending (possibly empty) data
		// before close(), so the IOE from write() should be thrown.
		OutputStream out2 = new Base64OutputStream(out, Base64.DEFAULT);
		try {
		out2.close();
		fail();
		} catch (IOException expected) {
		}
		}

		}