This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 7c15568aa7 GH-42042: [Java] Update Unit Tests for Compressions Module
(#42044)
7c15568aa7 is described below
commit 7c15568aa71c1366af5eadb6140fa445f6ce4cd0
Author: Hyunseok Seo <[email protected]>
AuthorDate: Mon Jun 10 09:48:05 2024 +0900
GH-42042: [Java] Update Unit Tests for Compressions Module (#42044)
### Rationale for this change
Update package from JUnit 4(`org.junit`) to JUnit 5(`org.junit.jupiter`).
### What changes are included in this PR?
- [x] Replacing `org.junit` with `org.junit.jupiter.api`.
- [x] Updating `Assertions.assertXXX` to `assertXXX` using static imports
- [x] Updating annotations such as `@ After`.
- `@ After` -> `@ AfterEach`
- [x] Doing self review
### Are these changes tested?
Yes, existing tests have passed.
### Are there any user-facing changes?
No.
* GitHub Issue: #42042
Authored-by: Hyunseok Seo <[email protected]>
Signed-off-by: David Li <[email protected]>
---
.../TestArrowReaderWriterWithCompression.java | 59 ++++++++++++----------
1 file changed, 31 insertions(+), 28 deletions(-)
diff --git
a/java/compression/src/test/java/org/apache/arrow/compression/TestArrowReaderWriterWithCompression.java
b/java/compression/src/test/java/org/apache/arrow/compression/TestArrowReaderWriterWithCompression.java
index af28333746..24d6abf3cb 100644
---
a/java/compression/src/test/java/org/apache/arrow/compression/TestArrowReaderWriterWithCompression.java
+++
b/java/compression/src/test/java/org/apache/arrow/compression/TestArrowReaderWriterWithCompression.java
@@ -17,6 +17,11 @@
package org.apache.arrow.compression;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.channels.Channels;
@@ -46,9 +51,7 @@ import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -67,7 +70,7 @@ public class TestArrowReaderWriterWithCompression {
root = null;
}
- @After
+ @AfterEach
public void tearDown() {
if (root != null) {
root.close();
@@ -134,19 +137,19 @@ public class TestArrowReaderWriterWithCompression {
try (ArrowFileReader reader =
new ArrowFileReader(new
ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
CommonsCompressionFactory.INSTANCE)) {
- Assertions.assertEquals(1, reader.getRecordBlocks().size());
- Assertions.assertTrue(reader.loadNextBatch());
- Assertions.assertTrue(root.equals(reader.getVectorSchemaRoot()));
- Assertions.assertFalse(reader.loadNextBatch());
+ assertEquals(1, reader.getRecordBlocks().size());
+ assertTrue(reader.loadNextBatch());
+ assertTrue(root.equals(reader.getVectorSchemaRoot()));
+ assertFalse(reader.loadNextBatch());
}
// without compression
try (ArrowFileReader reader =
new ArrowFileReader(new
ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
NoCompressionCodec.Factory.INSTANCE)) {
- Assertions.assertEquals(1, reader.getRecordBlocks().size());
- Exception exception = Assert.assertThrows(IllegalArgumentException.class,
+ assertEquals(1, reader.getRecordBlocks().size());
+ Exception exception = assertThrows(IllegalArgumentException.class,
reader::loadNextBatch);
- Assertions.assertEquals("Please add arrow-compression module to use
CommonsCompressionFactory for ZSTD",
+ assertEquals("Please add arrow-compression module to use
CommonsCompressionFactory for ZSTD",
exception.getMessage());
}
}
@@ -158,17 +161,17 @@ public class TestArrowReaderWriterWithCompression {
try (ArrowStreamReader reader =
new ArrowStreamReader(new
ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
CommonsCompressionFactory.INSTANCE)) {
- Assert.assertTrue(reader.loadNextBatch());
- Assert.assertTrue(root.equals(reader.getVectorSchemaRoot()));
- Assert.assertFalse(reader.loadNextBatch());
+ assertTrue(reader.loadNextBatch());
+ assertTrue(root.equals(reader.getVectorSchemaRoot()));
+ assertFalse(reader.loadNextBatch());
}
// without compression
try (ArrowStreamReader reader =
new ArrowStreamReader(new
ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
NoCompressionCodec.Factory.INSTANCE)) {
- Exception exception = Assert.assertThrows(IllegalArgumentException.class,
+ Exception exception = assertThrows(IllegalArgumentException.class,
reader::loadNextBatch);
- Assert.assertEquals(
+ assertEquals(
"Please add arrow-compression module to use
CommonsCompressionFactory for ZSTD",
exception.getMessage()
);
@@ -189,19 +192,19 @@ public class TestArrowReaderWriterWithCompression {
try (ArrowFileReader reader =
new ArrowFileReader(new
ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
CommonsCompressionFactory.INSTANCE)) {
- Assertions.assertEquals(1, reader.getRecordBlocks().size());
- Assertions.assertTrue(reader.loadNextBatch());
- Assertions.assertTrue(root.equals(reader.getVectorSchemaRoot()));
- Assertions.assertFalse(reader.loadNextBatch());
+ assertEquals(1, reader.getRecordBlocks().size());
+ assertTrue(reader.loadNextBatch());
+ assertTrue(root.equals(reader.getVectorSchemaRoot()));
+ assertFalse(reader.loadNextBatch());
}
// without compression
try (ArrowFileReader reader =
new ArrowFileReader(new
ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
NoCompressionCodec.Factory.INSTANCE)) {
- Assertions.assertEquals(1, reader.getRecordBlocks().size());
- Exception exception = Assert.assertThrows(IllegalArgumentException.class,
+ assertEquals(1, reader.getRecordBlocks().size());
+ Exception exception = assertThrows(IllegalArgumentException.class,
reader::loadNextBatch);
- Assertions.assertEquals("Please add arrow-compression module to use
CommonsCompressionFactory for ZSTD",
+ assertEquals("Please add arrow-compression module to use
CommonsCompressionFactory for ZSTD",
exception.getMessage());
}
dictionaryVector.close();
@@ -221,17 +224,17 @@ public class TestArrowReaderWriterWithCompression {
try (ArrowStreamReader reader =
new ArrowStreamReader(new
ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
CommonsCompressionFactory.INSTANCE)) {
- Assertions.assertTrue(reader.loadNextBatch());
- Assertions.assertTrue(root.equals(reader.getVectorSchemaRoot()));
- Assertions.assertFalse(reader.loadNextBatch());
+ assertTrue(reader.loadNextBatch());
+ assertTrue(root.equals(reader.getVectorSchemaRoot()));
+ assertFalse(reader.loadNextBatch());
}
// without compression
try (ArrowStreamReader reader =
new ArrowStreamReader(new
ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
NoCompressionCodec.Factory.INSTANCE)) {
- Exception exception = Assert.assertThrows(IllegalArgumentException.class,
+ Exception exception = assertThrows(IllegalArgumentException.class,
reader::loadNextBatch);
- Assertions.assertEquals("Please add arrow-compression module to use
CommonsCompressionFactory for ZSTD",
+ assertEquals("Please add arrow-compression module to use
CommonsCompressionFactory for ZSTD",
exception.getMessage());
}
dictionaryVector.close();
