This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
commit 69531f03ba2eb69b9b52ce89e76c3f82d48ec95a Author: Gary D. Gregory <[email protected]> AuthorDate: Sat Mar 1 10:05:22 2025 -0500 Reuse IOUtils in assertSameContent() --- .../commons/vfs2/AbstractProviderTestCase.java | 34 +++------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java index ed4c2551d..3c5151aaa 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java @@ -71,31 +71,15 @@ public abstract class AbstractProviderTestCase extends TestCase { assertTrue(fileObject.exists()); assertSame(FileType.FILE, fileObject.getType()); assertTrue(fileObject.isFile()); - // Get file content as a binary stream final byte[] expectedBytes = expected.getBytes(StandardCharsets.UTF_8); - // Check lengths final FileContent content = fileObject.getContent(); assertEquals("same content length", expectedBytes.length, content.getSize()); - - // Read content into byte array - final InputStream instr = content.getInputStream(); - final ByteArrayOutputStream outstr; - try { - outstr = new ByteArrayOutputStream(expectedBytes.length); - final byte[] buffer = new byte[256]; - int nread = 0; - while (nread >= 0) { - outstr.write(buffer, 0, nread); - nread = instr.read(buffer); - } - } finally { - instr.close(); + // Compare input streams + try (InputStream in = content.getInputStream()) { + assertTrue(IOUtils.contentEquals(UnsynchronizedByteArrayInputStream.builder().setByteArray(expectedBytes).get(), in)); } - - // Compare - assertArrayEquals(expectedBytes, outstr.toByteArray(), "same binary content"); } /** @@ -108,20 +92,10 @@ public abstract class AbstractProviderTestCase extends TestCase { final byte[] expectedBytes = expected.getBytes(StandardCharsets.UTF_8); // Check lengths assertEquals("same content length", expectedBytes.length, urlConnection.getContentLength()); - // Read content into byte array -// final ByteArrayOutputStream outstr; + // Compare input streams try (InputStream in = urlConnection.getInputStream()) { -// outstr = new ByteArrayOutputStream(); -// final byte[] buffer = new byte[256]; -// int nread = 0; -// while (nread >= 0) { -// outstr.write(buffer, 0, nread); -// nread = instr.read(buffer); -// } assertTrue(IOUtils.contentEquals(UnsynchronizedByteArrayInputStream.builder().setByteArray(expectedBytes).get(), in)); } - // Compare - // assertArrayEquals(expectedBin, outstr.toByteArray(), "same binary content"); } /**
