Use try-with-resources for input and output streams in TestUtil

Many of these streams were previously never closed.

PiperOrigin-RevId: 613580471
This commit is contained in:
ibaker 2024-03-07 07:41:43 -08:00 committed by Copybara-Service
parent 0f72126c20
commit ab8b77a6d3

View File

@ -191,23 +191,26 @@ public class TestUtil {
/** Writes test data with the specified length to the file and returns it. */ /** Writes test data with the specified length to the file and returns it. */
public static File createTestFile(File file, long length) throws IOException { public static File createTestFile(File file, long length) throws IOException {
FileOutputStream output = new FileOutputStream(file); try (FileOutputStream output = new FileOutputStream(file)) {
for (long i = 0; i < length; i++) { for (long i = 0; i < length; i++) {
output.write((int) i); output.write((int) i);
}
} }
output.close();
return file; return file;
} }
/** Returns the bytes of an asset file. */ /** Returns the bytes of an asset file. */
public static byte[] getByteArray(Context context, String fileName) throws IOException { public static byte[] getByteArray(Context context, String fileName) throws IOException {
return Util.toByteArray(getInputStream(context, fileName)); try (InputStream inputStream = getInputStream(context, fileName)) {
return Util.toByteArray(inputStream);
}
} }
/** Returns the bytes of a file using its file path. */ /** Returns the bytes of a file using its file path. */
public static byte[] getByteArrayFromFilePath(String filePath) throws IOException { public static byte[] getByteArrayFromFilePath(String filePath) throws IOException {
InputStream inputStream = new FileInputStream(filePath); try (InputStream inputStream = new FileInputStream(filePath)) {
return Util.toByteArray(inputStream); return Util.toByteArray(inputStream);
}
} }
/** Returns an {@link InputStream} for reading from an asset file. */ /** Returns an {@link InputStream} for reading from an asset file. */