You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/12/08 18:08:19 UTC
(commons-compress) 04/04: Sort test members
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-compress.git
commit 18086246db1ea5084ab4af26e00db439d61fe7a5
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Dec 8 13:04:50 2025 -0500
Sort test members
---
.../utils/SeekableInMemoryByteChannelTest.java | 170 ++++++++++-----------
1 file changed, 85 insertions(+), 85 deletions(-)
diff --git a/src/test/java/org/apache/commons/compress/utils/SeekableInMemoryByteChannelTest.java b/src/test/java/org/apache/commons/compress/utils/SeekableInMemoryByteChannelTest.java
index 37342fec3..e3d4f9aa2 100644
--- a/src/test/java/org/apache/commons/compress/utils/SeekableInMemoryByteChannelTest.java
+++ b/src/test/java/org/apache/commons/compress/utils/SeekableInMemoryByteChannelTest.java
@@ -52,23 +52,6 @@ void testCloseIsIdempotent() throws Exception {
}
}
- /*
- * <q>Setting the position to a value that is greater than the current size is legal but does not change the size of the entity. A later attempt to read
- * bytes at such a position will immediately return an end-of-file indication</q>
- */
- @ParameterizedTest
- @ValueSource(ints = { 0, 1, 2, 3, 4, 5, 6 })
- void testReadingFromAPositionAfterEndReturnsEOF(final int size) throws Exception {
- try (SeekableByteChannel c = new SeekableInMemoryByteChannel(size)) {
- final int position = 2;
- c.position(position);
- assertEquals(position, c.position());
- final int readSize = 5;
- final ByteBuffer readBuffer = ByteBuffer.allocate(readSize);
- assertEquals(position >= size ? -1 : size - position, c.read(readBuffer));
- }
- }
-
@Test
void testReadContentsProperly() throws IOException {
try (SeekableInMemoryByteChannel c = new SeekableInMemoryByteChannel(testData)) {
@@ -103,6 +86,23 @@ void testReadDataFromSetPosition() throws IOException {
}
}
+ /*
+ * <q>Setting the position to a value that is greater than the current size is legal but does not change the size of the entity. A later attempt to read
+ * bytes at such a position will immediately return an end-of-file indication</q>
+ */
+ @ParameterizedTest
+ @ValueSource(ints = { 0, 1, 2, 3, 4, 5, 6 })
+ void testReadingFromAPositionAfterEndReturnsEOF(final int size) throws Exception {
+ try (SeekableByteChannel c = new SeekableInMemoryByteChannel(size)) {
+ final int position = 2;
+ c.position(position);
+ assertEquals(position, c.position());
+ final int readSize = 5;
+ final ByteBuffer readBuffer = ByteBuffer.allocate(readSize);
+ assertEquals(position >= size ? -1 : size - position, c.read(readBuffer));
+ }
+ }
+
@Test
void testSetProperPosition() throws IOException {
try (SeekableInMemoryByteChannel c = new SeekableInMemoryByteChannel(testData)) {
@@ -151,74 +151,6 @@ void testThrowExceptionOnWritingToClosedChannel() {
assertThrows(ClosedChannelException.class, () -> c.write(ByteBuffer.allocate(1)));
}
- @Test
- void testThrowWhenSettingIncorrectPosition() throws IOException {
- try (SeekableInMemoryByteChannel c = new SeekableInMemoryByteChannel()) {
- final ByteBuffer buffer = ByteBuffer.allocate(1);
- c.position(c.size() + 1);
- assertEquals(c.size() + 1, c.position());
- assertEquals(-1, c.read(buffer));
- c.position(Integer.MAX_VALUE + 1L);
- assertEquals(Integer.MAX_VALUE + 1L, c.position());
- assertEquals(-1, c.read(buffer));
- assertThrows(IOException.class, () -> c.write(buffer));
- assertThrows(IllegalArgumentException.class, () -> c.position(-1));
- assertThrows(IllegalArgumentException.class, () -> c.position(Integer.MIN_VALUE));
- assertThrows(IllegalArgumentException.class, () -> c.position(Long.MIN_VALUE));
- }
- }
-
- @Test
- void testThrowWhenTruncatingToIncorrectSize() throws IOException {
- try (SeekableInMemoryByteChannel c = new SeekableInMemoryByteChannel()) {
- final ByteBuffer buffer = ByteBuffer.allocate(1);
- c.truncate(c.size() + 1);
- assertEquals(1, c.read(buffer));
- c.truncate(Integer.MAX_VALUE + 1L);
- assertEquals(0, c.read(buffer));
- assertThrows(IllegalArgumentException.class, () -> c.truncate(-1));
- assertThrows(IllegalArgumentException.class, () -> c.truncate(Integer.MIN_VALUE));
- assertThrows(IllegalArgumentException.class, () -> c.truncate(Long.MIN_VALUE));
- }
- }
-
- @Test
- void testTruncateContentsProperly() throws ClosedChannelException {
- try (SeekableInMemoryByteChannel c = new SeekableInMemoryByteChannel(testData)) {
- c.truncate(4);
- final byte[] bytes = Arrays.copyOf(c.array(), (int) c.size());
- assertEquals("Some", new String(bytes, StandardCharsets.UTF_8));
- }
- }
- // Contract Tests added in response to https://issues.apache.org/jira/browse/COMPRESS-499
- // https://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html#close()
-
- @Test
- void testWriteDataProperly() throws IOException {
- try (SeekableInMemoryByteChannel c = new SeekableInMemoryByteChannel()) {
- final ByteBuffer inData = ByteBuffer.wrap(testData);
- final int writeCount = c.write(inData);
- assertEquals(testData.length, writeCount);
- assertEquals(testData.length, c.position());
- assertArrayEquals(testData, Arrays.copyOf(c.array(), (int) c.position()));
- }
- }
- // https://docs.oracle.com/javase/8/docs/api/java/nio/channels/SeekableByteChannel.html#position()
-
- @Test
- void testWriteDataProperlyAfterPositionSet() throws IOException {
- try (SeekableInMemoryByteChannel c = new SeekableInMemoryByteChannel(testData)) {
- final ByteBuffer inData = ByteBuffer.wrap(testData);
- final ByteBuffer expectedData = ByteBuffer.allocate(testData.length + 5).put(testData, 0, 5).put(testData);
- c.position(5L);
- final int writeCount = c.write(inData);
- assertEquals(testData.length, writeCount);
- assertArrayEquals(expectedData.array(), Arrays.copyOf(c.array(), (int) c.size()));
- assertEquals(testData.length + 5, c.position());
- }
- }
- // https://docs.oracle.com/javase/8/docs/api/java/nio/channels/SeekableByteChannel.html#size()
-
/*
* <q>ClosedChannelException - If this channel is closed</q>
*/
@@ -284,6 +216,48 @@ void testThrowsIOExceptionWhenPositionIsSetToANegativeValue() throws Exception {
}
}
+ @Test
+ void testThrowWhenSettingIncorrectPosition() throws IOException {
+ try (SeekableInMemoryByteChannel c = new SeekableInMemoryByteChannel()) {
+ final ByteBuffer buffer = ByteBuffer.allocate(1);
+ c.position(c.size() + 1);
+ assertEquals(c.size() + 1, c.position());
+ assertEquals(-1, c.read(buffer));
+ c.position(Integer.MAX_VALUE + 1L);
+ assertEquals(Integer.MAX_VALUE + 1L, c.position());
+ assertEquals(-1, c.read(buffer));
+ assertThrows(IOException.class, () -> c.write(buffer));
+ assertThrows(IllegalArgumentException.class, () -> c.position(-1));
+ assertThrows(IllegalArgumentException.class, () -> c.position(Integer.MIN_VALUE));
+ assertThrows(IllegalArgumentException.class, () -> c.position(Long.MIN_VALUE));
+ }
+ }
+
+ @Test
+ void testThrowWhenTruncatingToIncorrectSize() throws IOException {
+ try (SeekableInMemoryByteChannel c = new SeekableInMemoryByteChannel()) {
+ final ByteBuffer buffer = ByteBuffer.allocate(1);
+ c.truncate(c.size() + 1);
+ assertEquals(1, c.read(buffer));
+ c.truncate(Integer.MAX_VALUE + 1L);
+ assertEquals(0, c.read(buffer));
+ assertThrows(IllegalArgumentException.class, () -> c.truncate(-1));
+ assertThrows(IllegalArgumentException.class, () -> c.truncate(Integer.MIN_VALUE));
+ assertThrows(IllegalArgumentException.class, () -> c.truncate(Long.MIN_VALUE));
+ }
+ }
+
+ @Test
+ void testTruncateContentsProperly() throws ClosedChannelException {
+ try (SeekableInMemoryByteChannel c = new SeekableInMemoryByteChannel(testData)) {
+ c.truncate(4);
+ final byte[] bytes = Arrays.copyOf(c.array(), (int) c.size());
+ assertEquals("Some", new String(bytes, StandardCharsets.UTF_8));
+ }
+ }
+ // Contract Tests added in response to https://issues.apache.org/jira/browse/COMPRESS-499
+ // https://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html#close()
+
/*
* <q> In either case, if the current position is greater than the given size then it is set to that size.</q>
*/
@@ -367,6 +341,32 @@ void testTruncateToCurrentSizeDoesntChangeAnything() throws Exception {
}
}
+ @Test
+ void testWriteDataProperly() throws IOException {
+ try (SeekableInMemoryByteChannel c = new SeekableInMemoryByteChannel()) {
+ final ByteBuffer inData = ByteBuffer.wrap(testData);
+ final int writeCount = c.write(inData);
+ assertEquals(testData.length, writeCount);
+ assertEquals(testData.length, c.position());
+ assertArrayEquals(testData, Arrays.copyOf(c.array(), (int) c.position()));
+ }
+ }
+ // https://docs.oracle.com/javase/8/docs/api/java/nio/channels/SeekableByteChannel.html#position()
+
+ @Test
+ void testWriteDataProperlyAfterPositionSet() throws IOException {
+ try (SeekableInMemoryByteChannel c = new SeekableInMemoryByteChannel(testData)) {
+ final ByteBuffer inData = ByteBuffer.wrap(testData);
+ final ByteBuffer expectedData = ByteBuffer.allocate(testData.length + 5).put(testData, 0, 5).put(testData);
+ c.position(5L);
+ final int writeCount = c.write(inData);
+ assertEquals(testData.length, writeCount);
+ assertArrayEquals(expectedData.array(), Arrays.copyOf(c.array(), (int) c.size()));
+ assertEquals(testData.length + 5, c.position());
+ }
+ }
+ // https://docs.oracle.com/javase/8/docs/api/java/nio/channels/SeekableByteChannel.html#size()
+
/*
* <q>Setting the position to a value that is greater than the current size is legal but does not change the size of the entity. A later attempt to write
* bytes at such a position will cause the entity to grow to accommodate the new bytes; the values of any bytes between the previous end-of-file and the