diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/vfs')
3 files changed, 26 insertions, 23 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/NativePathTest.java b/src/test/java/com/google/devtools/build/lib/vfs/NativePathTest.java index 5dc43a2567..42f34c30ae 100644 --- a/src/test/java/com/google/devtools/build/lib/vfs/NativePathTest.java +++ b/src/test/java/com/google/devtools/build/lib/vfs/NativePathTest.java @@ -222,16 +222,16 @@ public class NativePathTest { @Test public void testInputOutputStreams() throws IOException { Path path = fs.getPath(aFile.getPath()); - OutputStream out = path.getOutputStream(); - for (int i = 0; i < 256; i++) { - out.write(i); + try (OutputStream out = path.getOutputStream()) { + for (int i = 0; i < 256; i++) { + out.write(i); + } } - out.close(); - InputStream in = path.getInputStream(); - for (int i = 0; i < 256; i++) { - assertThat(in.read()).isEqualTo(i); + try (InputStream in = path.getInputStream()) { + for (int i = 0; i < 256; i++) { + assertThat(in.read()).isEqualTo(i); + } + assertThat(in.read()).isEqualTo(-1); } - assertThat(in.read()).isEqualTo(-1); - in.close(); } } diff --git a/src/test/java/com/google/devtools/build/lib/vfs/UnionFileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/UnionFileSystemTest.java index 3799cfdd46..b34c0c0412 100644 --- a/src/test/java/com/google/devtools/build/lib/vfs/UnionFileSystemTest.java +++ b/src/test/java/com/google/devtools/build/lib/vfs/UnionFileSystemTest.java @@ -201,9 +201,9 @@ public class UnionFileSystemTest extends SymlinkAwareFileSystemTest { // Create an "/in" directory directly on the output delegate to bypass the // UnionFileSystem's mapping. assertThat(inDelegate.getPath("/in").createDirectory()).isTrue(); - OutputStream outStream = inDelegate.getPath("/in/bar.txt").getOutputStream(); - outStream.write('i'); - outStream.close(); + try (OutputStream outStream = inDelegate.getPath("/in/bar.txt").getOutputStream()) { + outStream.write('i'); + } Path outFoo = unionfs.getPath("/out/foo"); unionfs.createSymbolicLink(outFoo, PathFragment.create("../in/bar.txt")); @@ -218,9 +218,10 @@ public class UnionFileSystemTest extends SymlinkAwareFileSystemTest { Path resolved = unionfs.resolveSymbolicLinks(outFoo); assertThat(resolved.getFileSystem()).isSameAs(unionfs); - InputStream barInput = resolved.getInputStream(); - int barChar = barInput.read(); - barInput.close(); + int barChar = -1; + try (InputStream barInput = resolved.getInputStream()) { + barChar = barInput.read(); + } assertThat(barChar).isEqualTo('i'); } diff --git a/src/test/java/com/google/devtools/build/lib/vfs/inmemoryfs/InMemoryFileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/inmemoryfs/InMemoryFileSystemTest.java index 30f4064b60..1989e9bb34 100644 --- a/src/test/java/com/google/devtools/build/lib/vfs/inmemoryfs/InMemoryFileSystemTest.java +++ b/src/test/java/com/google/devtools/build/lib/vfs/inmemoryfs/InMemoryFileSystemTest.java @@ -155,10 +155,11 @@ public class InMemoryFileSystemTest extends SymlinkAwareFileSystemTest { assertThat(file.isWritable()).isFalse(); assertThat(file.isExecutable()).isFalse(); assertThat(file.getLastModifiedTime()).isEqualTo(300); - BufferedReader reader = new BufferedReader( - new InputStreamReader(file.getInputStream(), Charset.defaultCharset())); - assertThat(reader.readLine()).isEqualTo(TEST_FILE_DATA); - assertThat(reader.readLine()).isNull(); + try (BufferedReader reader = new BufferedReader( + new InputStreamReader(file.getInputStream(), Charset.defaultCharset()))) { + assertThat(reader.readLine()).isEqualTo(TEST_FILE_DATA); + assertThat(reader.readLine()).isNull(); + } Path symlink = base.getRelative("symlink" + i); assertThat(symlink.exists()).isTrue(); @@ -239,10 +240,11 @@ public class InMemoryFileSystemTest extends SymlinkAwareFileSystemTest { assertThat(file.isExecutable()).isEqualTo(i % 4 == 0); assertThat(file.getLastModifiedTime()).isEqualTo(i); if (file.isReadable()) { - BufferedReader reader = new BufferedReader( - new InputStreamReader(file.getInputStream(), Charset.defaultCharset())); - assertThat(reader.readLine()).isEqualTo(TEST_FILE_DATA); - assertThat(reader.readLine()).isNull(); + try (BufferedReader reader = new BufferedReader( + new InputStreamReader(file.getInputStream(), Charset.defaultCharset()))) { + assertThat(reader.readLine()).isEqualTo(TEST_FILE_DATA); + assertThat(reader.readLine()).isNull(); + } } Path symlink = base.getRelative("symlink_" + threadId + "_" + i); |