This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 237f57c2b05 HIVE-29152. Migrate iceberg-handler Tests to JUnit 5
Part1. (#6034)
237f57c2b05 is described below
commit 237f57c2b05241af8a277f73ad1bd54ed95040e3
Author: slfan1989 <[email protected]>
AuthorDate: Sun Aug 24 15:45:27 2025 +0800
HIVE-29152. Migrate iceberg-handler Tests to JUnit 5 Part1. (#6034)
---
iceberg/iceberg-handler/pom.xml | 15 ++
.../iceberg/data/TestPartitionStatsHandler.java | 12 +-
.../iceberg/metasummary/TestIcebergSummary.java | 70 ++++-----
.../metasummary/TestIcebergSummaryHandler.java | 8 +-
.../task/TestIcebergHouseKeeperService.java | 22 +--
.../TestIcebergBinaryObjectInspector.java | 42 +++---
.../TestIcebergDateObjectInspectorHive3.java | 33 ++---
.../TestIcebergDecimalObjectInspector.java | 44 +++---
.../TestIcebergFixedObjectInspector.java | 37 ++---
.../TestIcebergObjectInspector.java | 160 +++++++++++----------
.../TestIcebergRecordObjectInspector.java | 20 +--
.../TestIcebergTimeObjectInspector.java | 37 ++---
.../TestIcebergTimestampObjectInspectorHive3.java | 37 ++---
...ebergTimestampWithZoneObjectInspectorHive3.java | 45 +++---
.../TestIcebergUUIDObjectInspector.java | 37 ++---
15 files changed, 329 insertions(+), 290 deletions(-)
diff --git a/iceberg/iceberg-handler/pom.xml b/iceberg/iceberg-handler/pom.xml
index aa84920d29e..a4ab0c6b79d 100644
--- a/iceberg/iceberg-handler/pom.xml
+++ b/iceberg/iceberg-handler/pom.xml
@@ -125,6 +125,21 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/data/TestPartitionStatsHandler.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/data/TestPartitionStatsHandler.java
index 8c77486fdc5..753af7505ec 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/data/TestPartitionStatsHandler.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/data/TestPartitionStatsHandler.java
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
+import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
@@ -59,9 +60,8 @@
import org.apache.iceberg.types.Types;
import org.assertj.core.api.Assumptions;
import org.assertj.core.groups.Tuple;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import static org.apache.iceberg.data.PartitionStatsHandler.DATA_FILE_COUNT;
import static org.apache.iceberg.data.PartitionStatsHandler.DATA_RECORD_COUNT;
@@ -89,8 +89,8 @@ public class TestPartitionStatsHandler {
protected static final PartitionSpec SPEC =
PartitionSpec.builderFor(SCHEMA).identity("c2").identity("c3").build();
- @Rule
- public TemporaryFolder temp = new TemporaryFolder();
+ @TempDir
+ public Path temp;
private static final Random RANDOM = ThreadLocalRandom.current();
@@ -577,7 +577,7 @@ private static PositionDelete<GenericRecord> positionDelete(
}
private File tempDir(String folderName) throws IOException {
- return java.nio.file.Files.createTempDirectory(temp.getRoot().toPath(),
folderName).toFile();
+ return java.nio.file.Files.createTempDirectory(temp.toAbsolutePath(),
folderName).toFile();
}
@SuppressWarnings("checkstyle:CyclomaticComplexity")
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/metasummary/TestIcebergSummary.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/metasummary/TestIcebergSummary.java
index 6dc77da8794..6404f5a0af0 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/metasummary/TestIcebergSummary.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/metasummary/TestIcebergSummary.java
@@ -22,6 +22,7 @@
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.Map;
@@ -38,10 +39,9 @@
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Types;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import static org.apache.iceberg.types.Types.NestedField.optional;
import static org.apache.iceberg.types.Types.NestedField.required;
@@ -55,10 +55,10 @@ public class TestIcebergSummary {
optional(3, "alist", Types.ListType.ofOptional(5,
Types.StringType.get())),
optional(4, "amap", Types.MapType.ofOptional(6, 7,
Types.IntegerType.get(), Types.StringType.get())));
- @Rule
- public TemporaryFolder tableDir = new TemporaryFolder();
- @Rule
- public TemporaryFolder dataDir = new TemporaryFolder();
+ @TempDir
+ public Path tableDir;
+ @TempDir
+ public Path dataDir;
private final Configuration conf = MetastoreConf.newMetastoreConf();
@@ -69,12 +69,12 @@ public void testGetMetadataSummary() throws Exception {
PartitionSpec spec = PartitionSpec.builderFor(SCHEMA).bucket("foo",
16).build();
Map<String, String> props = Maps.newHashMap();
props.put("history.expire.min-snapshots-to-keep", "7");
- String location = tableDir.getRoot() + "/test_metadata_summary";
+ String location = tableDir.toAbsolutePath() + "/test_metadata_summary";
TABLES.create(SCHEMA, spec, props, location);
Table table = TABLES.load(location);
AppendFiles append = table.newAppend();
- String data1 = dataDir.getRoot() + "/data1.parquet";
- String data2 = dataDir.getRoot() + "/data2.parquet";
+ String data1 = dataDir.toAbsolutePath() + "/data1.parquet";
+ String data2 = dataDir.toAbsolutePath() + "/data2.parquet";
Files.write(Paths.get(data1), Lists.newArrayList(),
StandardCharsets.UTF_8);
Files.write(Paths.get(data2), Lists.newArrayList(),
StandardCharsets.UTF_8);
PartitionData data = new PartitionData(spec.partitionType());
@@ -105,27 +105,27 @@ public void testGetMetadataSummary() throws Exception {
MetadataTableSummary tableSummary = new MetadataTableSummary();
summary.getMetaSummary(table, tableSummary);
- Assert.assertEquals(1, tableSummary.getPartitionColumnCount());
- Assert.assertEquals(2, tableSummary.getNumFiles());
- Assert.assertEquals(2, tableSummary.getPartitionCount());
- Assert.assertEquals(3, tableSummary.getNumRows());
- Assert.assertEquals(4, tableSummary.getColCount());
- Assert.assertEquals(1, tableSummary.getArrayColumnCount());
- Assert.assertEquals(1, tableSummary.getMapColumnCount());
- Assert.assertEquals(0, tableSummary.getStructColumnCount());
- Assert.assertEquals(30, tableSummary.getTotalSize());
+ Assertions.assertEquals(1, tableSummary.getPartitionColumnCount());
+ Assertions.assertEquals(2, tableSummary.getNumFiles());
+ Assertions.assertEquals(2, tableSummary.getPartitionCount());
+ Assertions.assertEquals(3, tableSummary.getNumRows());
+ Assertions.assertEquals(4, tableSummary.getColCount());
+ Assertions.assertEquals(1, tableSummary.getArrayColumnCount());
+ Assertions.assertEquals(1, tableSummary.getMapColumnCount());
+ Assertions.assertEquals(0, tableSummary.getStructColumnCount());
+ Assertions.assertEquals(30, tableSummary.getTotalSize());
Map<String, Object> extraSummary = tableSummary.getExtraSummary();
- Assert.assertEquals(2, extraSummary.get(MetadataSummary.NUM_SNAPSHOTS));
- Assert.assertEquals(2, extraSummary.get(MetadataSummary.NUM_TAGS));
- Assert.assertEquals(2, extraSummary.get(MetadataSummary.NUM_BRANCHES));
- Assert.assertEquals(-1L,
extraSummary.get(MetadataSummary.SNAPSHOT_MAX_AGE));
- Assert.assertEquals(7L,
extraSummary.get(MetadataSummary.SNAPSHOT_MIN_KEEP));
+ Assertions.assertEquals(2,
extraSummary.get(MetadataSummary.NUM_SNAPSHOTS));
+ Assertions.assertEquals(2, extraSummary.get(MetadataSummary.NUM_TAGS));
+ Assertions.assertEquals(2, extraSummary.get(MetadataSummary.NUM_BRANCHES));
+ Assertions.assertEquals(-1L,
extraSummary.get(MetadataSummary.SNAPSHOT_MAX_AGE));
+ Assertions.assertEquals(7L,
extraSummary.get(MetadataSummary.SNAPSHOT_MIN_KEEP));
File directory = new File(table.location());
List<File> manifestFiles = listManifestFiles(directory);
- Assert.assertEquals(manifestFiles.size(),
extraSummary.get(MetadataSummary.NUM_MANIFESTS));
- Assert.assertEquals(manifestFiles.stream().mapToLong(File::length).sum(),
+ Assertions.assertEquals(manifestFiles.size(),
extraSummary.get(MetadataSummary.NUM_MANIFESTS));
+
Assertions.assertEquals(manifestFiles.stream().mapToLong(File::length).sum(),
extraSummary.get(MetadataSummary.MANIFESTS_SIZE));
}
@@ -141,20 +141,20 @@ public void testTablePropsSummary() {
props.put("format-version", "2");
props.put("write.delete.mode", "merge-on-read");
props.put("write.update.mode", "copy-on-write");
- String location = tableDir.getRoot() + "/test_tabprops_summary";
+ String location = tableDir.toAbsolutePath() + "/test_tabprops_summary";
TABLES.create(SCHEMA, PartitionSpec.unpartitioned(), props, location);
Table table = TABLES.load(location);
MetadataTableSummary tableSummary = new MetadataTableSummary();
summary.getMetaSummary(table, tableSummary);
Map<String, Object> extraSummary = tableSummary.getExtraSummary();
- Assert.assertEquals("orc", extraSummary.get("write.format.default"));
- Assert.assertEquals("parquet",
extraSummary.get("write.delete.format.default"));
- Assert.assertEquals("hash", extraSummary.get("write.distribution-mode"));
- Assert.assertEquals("true", extraSummary.get("write.wap.enabled"));
- Assert.assertEquals("merge-on-read",
extraSummary.get("write.delete.mode"));
- Assert.assertEquals("copy-on-write",
extraSummary.get("write.update.mode"));
- Assert.assertEquals(2, extraSummary.get("version"));
+ Assertions.assertEquals("orc", extraSummary.get("write.format.default"));
+ Assertions.assertEquals("parquet",
extraSummary.get("write.delete.format.default"));
+ Assertions.assertEquals("hash",
extraSummary.get("write.distribution-mode"));
+ Assertions.assertEquals("true", extraSummary.get("write.wap.enabled"));
+ Assertions.assertEquals("merge-on-read",
extraSummary.get("write.delete.mode"));
+ Assertions.assertEquals("copy-on-write",
extraSummary.get("write.update.mode"));
+ Assertions.assertEquals(2, extraSummary.get("version"));
}
List<File> listManifestFiles(File tableDirToList) {
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/metasummary/TestIcebergSummaryHandler.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/metasummary/TestIcebergSummaryHandler.java
index 24f2107a005..aa8295df1f5 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/metasummary/TestIcebergSummaryHandler.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/metasummary/TestIcebergSummaryHandler.java
@@ -24,8 +24,8 @@
import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
import org.apache.hadoop.hive.metastore.metasummary.MetaSummarySchema;
import org.apache.iceberg.relocated.com.google.common.collect.Sets;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestIcebergSummaryHandler {
@@ -36,12 +36,12 @@ public void testInitialize() throws Exception {
MetaSummarySchema schema = new MetaSummarySchema();
handler.initialize("hive", true, schema);
Set<String> fields = Sets.newHashSet(schema.getFields());
- Assert.assertTrue(fields.containsAll(Arrays.asList("metadata", "stats",
+ Assertions.assertTrue(fields.containsAll(Arrays.asList("metadata",
"stats",
"CoW/MoR", "writeFormat", "distribution-mode")));
schema = new MetaSummarySchema();
handler.initialize("hive", false, schema);
fields = Sets.newHashSet(schema.getFields());
- Assert.assertTrue(fields.containsAll(Arrays.asList("puffin_enabled",
"numSnapshots",
+ Assertions.assertTrue(fields.containsAll(Arrays.asList("puffin_enabled",
"numSnapshots",
"manifestsSize", "version", "write.distribution-mode",
"write.format.default", "write.merge.mode")));
}
}
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/metastore/task/TestIcebergHouseKeeperService.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/metastore/task/TestIcebergHouseKeeperService.java
index 879d59b8de1..1635b352781 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/metastore/task/TestIcebergHouseKeeperService.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/metastore/task/TestIcebergHouseKeeperService.java
@@ -35,10 +35,10 @@
import org.apache.iceberg.DataFiles;
import org.apache.iceberg.mr.hive.IcebergTableUtil;
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +48,7 @@ public class TestIcebergHouseKeeperService {
private static final HiveConf conf = new
HiveConf(TestIcebergHouseKeeperService.class);
private static Hive db;
- @BeforeClass
+ @BeforeAll
public static void beforeClass() throws Exception {
conf.set("hive.security.authorization.enabled", "false");
conf.set("hive.security.authorization.manager",
@@ -58,7 +58,7 @@ public static void beforeClass() throws Exception {
db = Hive.get(conf);
}
- @AfterClass
+ @AfterAll
public static void afterClass() {
db.close(true);
}
@@ -71,9 +71,9 @@ public void testIcebergTableFetched() throws Exception {
int maxBatchSize = MetastoreConf.getIntVar(conf,
MetastoreConf.ConfVars.BATCH_RETRIEVE_MAX);
List<org.apache.hadoop.hive.metastore.api.Table> tables =
tableFetcher.getTables(maxBatchSize);
- Assert.assertEquals("hive", tables.get(0).getCatName());
- Assert.assertEquals("default", tables.get(0).getDbName());
- Assert.assertEquals("iceberg_table", tables.get(0).getTableName());
+ Assertions.assertEquals("hive", tables.get(0).getCatName());
+ Assertions.assertEquals("default", tables.get(0).getDbName());
+ Assertions.assertEquals("iceberg_table", tables.get(0).getTableName());
}
@Test
@@ -139,7 +139,7 @@ private void assertSnapshotFiles(String metadataDirectory,
int numberForSnapshot
File[] matchingFiles = new File(metadataDirectory).listFiles((dir, name)
-> name.startsWith("snap-"));
List<File> files =
Optional.ofNullable(matchingFiles).map(Arrays::asList).orElse(Collections.emptyList());
LOG.debug("Snapshot files found in directory({}): {}", metadataDirectory,
files);
- Assert.assertEquals(String.format("Unexpected no. of snapshot files in
metadata directory: %s",
- metadataDirectory), numberForSnapshotFiles, files.size());
+ Assertions.assertEquals(numberForSnapshotFiles, files.size(),
+ String.format("Unexpected no. of snapshot files in metadata directory:
%s", metadataDirectory));
}
}
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergBinaryObjectInspector.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergBinaryObjectInspector.java
index 9d47d74d536..55f9d723313 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergBinaryObjectInspector.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergBinaryObjectInspector.java
@@ -25,8 +25,8 @@
import
org.apache.hadoop.hive.serde2.objectinspector.primitive.BinaryObjectInspector;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
import org.apache.hadoop.io.BytesWritable;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestIcebergBinaryObjectInspector {
@@ -34,39 +34,41 @@ public class TestIcebergBinaryObjectInspector {
public void testIcebergByteBufferObjectInspector() {
BinaryObjectInspector oi = IcebergBinaryObjectInspector.get();
- Assert.assertEquals(ObjectInspector.Category.PRIMITIVE, oi.getCategory());
- Assert.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.BINARY,
oi.getPrimitiveCategory());
+ Assertions.assertEquals(ObjectInspector.Category.PRIMITIVE,
oi.getCategory());
+ Assertions.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.BINARY,
+ oi.getPrimitiveCategory());
- Assert.assertEquals(TypeInfoFactory.binaryTypeInfo, oi.getTypeInfo());
- Assert.assertEquals(TypeInfoFactory.binaryTypeInfo.getTypeName(),
oi.getTypeName());
+ Assertions.assertEquals(TypeInfoFactory.binaryTypeInfo, oi.getTypeInfo());
+ Assertions.assertEquals(TypeInfoFactory.binaryTypeInfo.getTypeName(),
oi.getTypeName());
- Assert.assertEquals(byte[].class, oi.getJavaPrimitiveClass());
- Assert.assertEquals(BytesWritable.class, oi.getPrimitiveWritableClass());
+ Assertions.assertEquals(byte[].class, oi.getJavaPrimitiveClass());
+ Assertions.assertEquals(BytesWritable.class,
oi.getPrimitiveWritableClass());
- Assert.assertNull(oi.copyObject(null));
- Assert.assertNull(oi.getPrimitiveJavaObject(null));
- Assert.assertNull(oi.getPrimitiveWritableObject(null));
+ Assertions.assertNull(oi.copyObject(null));
+ Assertions.assertNull(oi.getPrimitiveJavaObject(null));
+ Assertions.assertNull(oi.getPrimitiveWritableObject(null));
byte[] bytes = new byte[] {0, 1, 2, 3};
ByteBuffer buffer = ByteBuffer.wrap(bytes);
- Assert.assertArrayEquals(bytes, oi.getPrimitiveJavaObject(buffer));
- Assert.assertEquals(new BytesWritable(bytes),
oi.getPrimitiveWritableObject(buffer));
+ Assertions.assertArrayEquals(bytes, oi.getPrimitiveJavaObject(buffer));
+ Assertions.assertEquals(new BytesWritable(bytes),
oi.getPrimitiveWritableObject(buffer));
ByteBuffer slice = ByteBuffer.wrap(bytes, 1, 2).slice();
- Assert.assertArrayEquals(new byte[] {1, 2},
oi.getPrimitiveJavaObject(slice));
- Assert.assertEquals(new BytesWritable(new byte[] {1, 2}),
oi.getPrimitiveWritableObject(slice));
+ Assertions.assertArrayEquals(new byte[] {1, 2},
oi.getPrimitiveJavaObject(slice));
+ Assertions.assertEquals(new BytesWritable(new byte[] {1, 2}),
+ oi.getPrimitiveWritableObject(slice));
slice.position(1);
- Assert.assertArrayEquals(new byte[] {2}, oi.getPrimitiveJavaObject(slice));
- Assert.assertEquals(new BytesWritable(new byte[] {2}),
oi.getPrimitiveWritableObject(slice));
+ Assertions.assertArrayEquals(new byte[] {2},
oi.getPrimitiveJavaObject(slice));
+ Assertions.assertEquals(new BytesWritable(new byte[] {2}),
oi.getPrimitiveWritableObject(slice));
byte[] copy = (byte[]) oi.copyObject(bytes);
- Assert.assertArrayEquals(bytes, copy);
- Assert.assertNotSame(bytes, copy);
+ Assertions.assertArrayEquals(bytes, copy);
+ Assertions.assertNotSame(bytes, copy);
- Assert.assertFalse(oi.preferWritable());
+ Assertions.assertFalse(oi.preferWritable());
}
}
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDateObjectInspectorHive3.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDateObjectInspectorHive3.java
index ca48639eead..7348b739ab8 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDateObjectInspectorHive3.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDateObjectInspectorHive3.java
@@ -26,8 +26,8 @@
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import
org.apache.hadoop.hive.serde2.objectinspector.primitive.DateObjectInspector;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestIcebergDateObjectInspectorHive3 {
@@ -35,32 +35,33 @@ public class TestIcebergDateObjectInspectorHive3 {
public void testIcebergDateObjectInspector() {
DateObjectInspector oi = IcebergDateObjectInspectorHive3.get();
- Assert.assertEquals(ObjectInspector.Category.PRIMITIVE, oi.getCategory());
- Assert.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.DATE,
oi.getPrimitiveCategory());
+ Assertions.assertEquals(ObjectInspector.Category.PRIMITIVE,
oi.getCategory());
+ Assertions.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.DATE,
+ oi.getPrimitiveCategory());
- Assert.assertEquals(TypeInfoFactory.dateTypeInfo, oi.getTypeInfo());
- Assert.assertEquals(TypeInfoFactory.dateTypeInfo.getTypeName(),
oi.getTypeName());
+ Assertions.assertEquals(TypeInfoFactory.dateTypeInfo, oi.getTypeInfo());
+ Assertions.assertEquals(TypeInfoFactory.dateTypeInfo.getTypeName(),
oi.getTypeName());
- Assert.assertEquals(Date.class, oi.getJavaPrimitiveClass());
- Assert.assertEquals(DateWritableV2.class, oi.getPrimitiveWritableClass());
+ Assertions.assertEquals(Date.class, oi.getJavaPrimitiveClass());
+ Assertions.assertEquals(DateWritableV2.class,
oi.getPrimitiveWritableClass());
- Assert.assertNull(oi.copyObject(null));
- Assert.assertNull(oi.getPrimitiveJavaObject(null));
- Assert.assertNull(oi.getPrimitiveWritableObject(null));
+ Assertions.assertNull(oi.copyObject(null));
+ Assertions.assertNull(oi.getPrimitiveJavaObject(null));
+ Assertions.assertNull(oi.getPrimitiveWritableObject(null));
int epochDays = 5005;
LocalDate local = LocalDate.ofEpochDay(epochDays);
Date date = Date.ofEpochDay(epochDays);
- Assert.assertEquals(date, oi.getPrimitiveJavaObject(local));
- Assert.assertEquals(new DateWritableV2(date),
oi.getPrimitiveWritableObject(local));
+ Assertions.assertEquals(date, oi.getPrimitiveJavaObject(local));
+ Assertions.assertEquals(new DateWritableV2(date),
oi.getPrimitiveWritableObject(local));
Date copy = (Date) oi.copyObject(date);
- Assert.assertEquals(date, copy);
- Assert.assertNotSame(date, copy);
+ Assertions.assertEquals(date, copy);
+ Assertions.assertNotSame(date, copy);
- Assert.assertFalse(oi.preferWritable());
+ Assertions.assertFalse(oi.preferWritable());
}
}
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDecimalObjectInspector.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDecimalObjectInspector.java
index 4d04eee1622..e72e0c524dc 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDecimalObjectInspector.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergDecimalObjectInspector.java
@@ -27,8 +27,8 @@
import
org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveDecimalObjectInspector;
import org.apache.hadoop.hive.serde2.typeinfo.DecimalTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestIcebergDecimalObjectInspector {
@@ -36,42 +36,44 @@ public class TestIcebergDecimalObjectInspector {
public void testCache() {
HiveDecimalObjectInspector oi = IcebergDecimalObjectInspector.get(38, 18);
- Assert.assertSame(oi, IcebergDecimalObjectInspector.get(38, 18));
- Assert.assertNotSame(oi, IcebergDecimalObjectInspector.get(28, 18));
- Assert.assertNotSame(oi, IcebergDecimalObjectInspector.get(38, 28));
+ Assertions.assertSame(oi, IcebergDecimalObjectInspector.get(38, 18));
+ Assertions.assertNotSame(oi, IcebergDecimalObjectInspector.get(28, 18));
+ Assertions.assertNotSame(oi, IcebergDecimalObjectInspector.get(38, 28));
}
@Test
public void testIcebergDecimalObjectInspector() {
HiveDecimalObjectInspector oi = IcebergDecimalObjectInspector.get(38, 18);
- Assert.assertEquals(ObjectInspector.Category.PRIMITIVE, oi.getCategory());
- Assert.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.DECIMAL,
oi.getPrimitiveCategory());
+ Assertions.assertEquals(ObjectInspector.Category.PRIMITIVE,
oi.getCategory());
+ Assertions.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.DECIMAL,
+ oi.getPrimitiveCategory());
- Assert.assertEquals(new DecimalTypeInfo(38, 18), oi.getTypeInfo());
- Assert.assertEquals(TypeInfoFactory.decimalTypeInfo.getTypeName(),
oi.getTypeName());
+ Assertions.assertEquals(new DecimalTypeInfo(38, 18), oi.getTypeInfo());
+ Assertions.assertEquals(TypeInfoFactory.decimalTypeInfo.getTypeName(),
oi.getTypeName());
- Assert.assertEquals(38, oi.precision());
- Assert.assertEquals(18, oi.scale());
+ Assertions.assertEquals(38, oi.precision());
+ Assertions.assertEquals(18, oi.scale());
- Assert.assertEquals(HiveDecimal.class, oi.getJavaPrimitiveClass());
- Assert.assertEquals(HiveDecimalWritable.class,
oi.getPrimitiveWritableClass());
+ Assertions.assertEquals(HiveDecimal.class, oi.getJavaPrimitiveClass());
+ Assertions.assertEquals(HiveDecimalWritable.class,
oi.getPrimitiveWritableClass());
- Assert.assertNull(oi.copyObject(null));
- Assert.assertNull(oi.getPrimitiveJavaObject(null));
- Assert.assertNull(oi.getPrimitiveWritableObject(null));
+ Assertions.assertNull(oi.copyObject(null));
+ Assertions.assertNull(oi.getPrimitiveJavaObject(null));
+ Assertions.assertNull(oi.getPrimitiveWritableObject(null));
HiveDecimal one = HiveDecimal.create(BigDecimal.ONE);
- Assert.assertEquals(one, oi.getPrimitiveJavaObject(BigDecimal.ONE));
- Assert.assertEquals(new HiveDecimalWritable(one),
oi.getPrimitiveWritableObject(BigDecimal.ONE));
+ Assertions.assertEquals(one, oi.getPrimitiveJavaObject(BigDecimal.ONE));
+ Assertions.assertEquals(new HiveDecimalWritable(one),
+ oi.getPrimitiveWritableObject(BigDecimal.ONE));
HiveDecimal copy = (HiveDecimal) oi.copyObject(one);
- Assert.assertEquals(one, copy);
- Assert.assertNotSame(one, copy);
+ Assertions.assertEquals(one, copy);
+ Assertions.assertNotSame(one, copy);
- Assert.assertFalse(oi.preferWritable());
+ Assertions.assertFalse(oi.preferWritable());
}
}
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergFixedObjectInspector.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergFixedObjectInspector.java
index 82bfa5e162a..acbf4e44fff 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergFixedObjectInspector.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergFixedObjectInspector.java
@@ -23,8 +23,8 @@
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
import org.apache.hadoop.io.BytesWritable;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestIcebergFixedObjectInspector {
@@ -32,33 +32,34 @@ public class TestIcebergFixedObjectInspector {
public void testIcebergFixedObjectInspector() {
IcebergFixedObjectInspector oi = IcebergFixedObjectInspector.get();
- Assert.assertEquals(ObjectInspector.Category.PRIMITIVE, oi.getCategory());
- Assert.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.BINARY,
oi.getPrimitiveCategory());
+ Assertions.assertEquals(ObjectInspector.Category.PRIMITIVE,
oi.getCategory());
+ Assertions.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.BINARY,
+ oi.getPrimitiveCategory());
- Assert.assertEquals(TypeInfoFactory.binaryTypeInfo, oi.getTypeInfo());
- Assert.assertEquals(TypeInfoFactory.binaryTypeInfo.getTypeName(),
oi.getTypeName());
+ Assertions.assertEquals(TypeInfoFactory.binaryTypeInfo, oi.getTypeInfo());
+ Assertions.assertEquals(TypeInfoFactory.binaryTypeInfo.getTypeName(),
oi.getTypeName());
- Assert.assertEquals(byte[].class, oi.getJavaPrimitiveClass());
- Assert.assertEquals(BytesWritable.class, oi.getPrimitiveWritableClass());
+ Assertions.assertEquals(byte[].class, oi.getJavaPrimitiveClass());
+ Assertions.assertEquals(BytesWritable.class,
oi.getPrimitiveWritableClass());
- Assert.assertNull(oi.copyObject(null));
- Assert.assertNull(oi.getPrimitiveJavaObject(null));
- Assert.assertNull(oi.getPrimitiveWritableObject(null));
- Assert.assertNull(oi.convert(null));
+ Assertions.assertNull(oi.copyObject(null));
+ Assertions.assertNull(oi.getPrimitiveJavaObject(null));
+ Assertions.assertNull(oi.getPrimitiveWritableObject(null));
+ Assertions.assertNull(oi.convert(null));
byte[] bytes = new byte[] { 0, 1 };
BytesWritable bytesWritable = new BytesWritable(bytes);
- Assert.assertArrayEquals(bytes, oi.getPrimitiveJavaObject(bytes));
- Assert.assertEquals(bytesWritable, oi.getPrimitiveWritableObject(bytes));
- Assert.assertEquals(bytes, oi.convert(bytes));
+ Assertions.assertArrayEquals(bytes, oi.getPrimitiveJavaObject(bytes));
+ Assertions.assertEquals(bytesWritable,
oi.getPrimitiveWritableObject(bytes));
+ Assertions.assertEquals(bytes, oi.convert(bytes));
byte[] copy = (byte[]) oi.copyObject(bytes);
- Assert.assertArrayEquals(bytes, copy);
- Assert.assertNotSame(bytes, copy);
+ Assertions.assertArrayEquals(bytes, copy);
+ Assertions.assertNotSame(bytes, copy);
- Assert.assertFalse(oi.preferWritable());
+ Assertions.assertFalse(oi.preferWritable());
}
}
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergObjectInspector.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergObjectInspector.java
index b6577a3dd25..6ce860b32d8 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergObjectInspector.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergObjectInspector.java
@@ -30,8 +30,8 @@
import org.apache.iceberg.hive.HiveVersion;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
import org.apache.iceberg.types.Types;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import static org.apache.iceberg.types.Types.NestedField.required;
@@ -67,140 +67,150 @@ public class TestIcebergObjectInspector {
@Test
public void testIcebergObjectInspector() {
ObjectInspector oi = IcebergObjectInspector.create(schema);
- Assert.assertNotNull(oi);
- Assert.assertEquals(ObjectInspector.Category.STRUCT, oi.getCategory());
+ Assertions.assertNotNull(oi);
+ Assertions.assertEquals(ObjectInspector.Category.STRUCT, oi.getCategory());
StructObjectInspector soi = (StructObjectInspector) oi;
// binary
StructField binaryField = soi.getStructFieldRef("binary_field");
- Assert.assertEquals(1, binaryField.getFieldID());
- Assert.assertEquals("binary_field", binaryField.getFieldName());
- Assert.assertEquals("binary comment", binaryField.getFieldComment());
- Assert.assertEquals(IcebergBinaryObjectInspector.get(),
binaryField.getFieldObjectInspector());
+ Assertions.assertEquals(1, binaryField.getFieldID());
+ Assertions.assertEquals("binary_field", binaryField.getFieldName());
+ Assertions.assertEquals("binary comment", binaryField.getFieldComment());
+ Assertions.assertEquals(IcebergBinaryObjectInspector.get(),
+ binaryField.getFieldObjectInspector());
// boolean
StructField booleanField = soi.getStructFieldRef("boolean_field");
- Assert.assertEquals(2, booleanField.getFieldID());
- Assert.assertEquals("boolean_field", booleanField.getFieldName());
- Assert.assertEquals("boolean comment", booleanField.getFieldComment());
- Assert.assertEquals(getPrimitiveObjectInspector(boolean.class),
booleanField.getFieldObjectInspector());
+ Assertions.assertEquals(2, booleanField.getFieldID());
+ Assertions.assertEquals("boolean_field", booleanField.getFieldName());
+ Assertions.assertEquals("boolean comment", booleanField.getFieldComment());
+ Assertions.assertEquals(getPrimitiveObjectInspector(boolean.class),
+ booleanField.getFieldObjectInspector());
// date
StructField dateField = soi.getStructFieldRef("date_field");
- Assert.assertEquals(3, dateField.getFieldID());
- Assert.assertEquals("date_field", dateField.getFieldName());
- Assert.assertEquals("date comment", dateField.getFieldComment());
+ Assertions.assertEquals(3, dateField.getFieldID());
+ Assertions.assertEquals("date_field", dateField.getFieldName());
+ Assertions.assertEquals("date comment", dateField.getFieldComment());
if (HiveVersion.min(HiveVersion.HIVE_3)) {
- Assert.assertEquals(
-
"org.apache.iceberg.mr.hive.serde.objectinspector.IcebergDateObjectInspectorHive3",
+
Assertions.assertEquals("org.apache.iceberg.mr.hive.serde.objectinspector.IcebergDateObjectInspectorHive3",
dateField.getFieldObjectInspector().getClass().getName());
} else {
- Assert.assertEquals(
-
"org.apache.iceberg.mr.hive.serde.objectinspector.IcebergDateObjectInspector",
+
Assertions.assertEquals("org.apache.iceberg.mr.hive.serde.objectinspector.IcebergDateObjectInspector",
dateField.getFieldObjectInspector().getClass().getName());
}
// decimal
StructField decimalField = soi.getStructFieldRef("decimal_field");
- Assert.assertEquals(4, decimalField.getFieldID());
- Assert.assertEquals("decimal_field", decimalField.getFieldName());
- Assert.assertEquals("decimal comment", decimalField.getFieldComment());
- Assert.assertEquals(IcebergDecimalObjectInspector.get(38, 18),
decimalField.getFieldObjectInspector());
+ Assertions.assertEquals(4, decimalField.getFieldID());
+ Assertions.assertEquals("decimal_field", decimalField.getFieldName());
+ Assertions.assertEquals("decimal comment", decimalField.getFieldComment());
+ Assertions.assertEquals(IcebergDecimalObjectInspector.get(38, 18),
+ decimalField.getFieldObjectInspector());
// double
StructField doubleField = soi.getStructFieldRef("double_field");
- Assert.assertEquals(5, doubleField.getFieldID());
- Assert.assertEquals("double_field", doubleField.getFieldName());
- Assert.assertEquals("double comment", doubleField.getFieldComment());
- Assert.assertEquals(getPrimitiveObjectInspector(double.class),
doubleField.getFieldObjectInspector());
+ Assertions.assertEquals(5, doubleField.getFieldID());
+ Assertions.assertEquals("double_field", doubleField.getFieldName());
+ Assertions.assertEquals("double comment", doubleField.getFieldComment());
+ Assertions.assertEquals(getPrimitiveObjectInspector(double.class),
+ doubleField.getFieldObjectInspector());
// fixed
StructField fixedField = soi.getStructFieldRef("fixed_field");
- Assert.assertEquals(6, fixedField.getFieldID());
- Assert.assertEquals("fixed_field", fixedField.getFieldName());
- Assert.assertEquals("fixed comment", fixedField.getFieldComment());
- Assert.assertEquals(IcebergFixedObjectInspector.get(),
fixedField.getFieldObjectInspector());
+ Assertions.assertEquals(6, fixedField.getFieldID());
+ Assertions.assertEquals("fixed_field", fixedField.getFieldName());
+ Assertions.assertEquals("fixed comment", fixedField.getFieldComment());
+ Assertions.assertEquals(IcebergFixedObjectInspector.get(),
fixedField.getFieldObjectInspector());
// float
StructField floatField = soi.getStructFieldRef("float_field");
- Assert.assertEquals(7, floatField.getFieldID());
- Assert.assertEquals("float_field", floatField.getFieldName());
- Assert.assertEquals("float comment", floatField.getFieldComment());
- Assert.assertEquals(getPrimitiveObjectInspector(float.class),
floatField.getFieldObjectInspector());
+ Assertions.assertEquals(7, floatField.getFieldID());
+ Assertions.assertEquals("float_field", floatField.getFieldName());
+ Assertions.assertEquals("float comment", floatField.getFieldComment());
+ Assertions.assertEquals(getPrimitiveObjectInspector(float.class),
+ floatField.getFieldObjectInspector());
// integer
StructField integerField = soi.getStructFieldRef("integer_field");
- Assert.assertEquals(8, integerField.getFieldID());
- Assert.assertEquals("integer_field", integerField.getFieldName());
- Assert.assertEquals("integer comment", integerField.getFieldComment());
- Assert.assertEquals(getPrimitiveObjectInspector(int.class),
integerField.getFieldObjectInspector());
+ Assertions.assertEquals(8, integerField.getFieldID());
+ Assertions.assertEquals("integer_field", integerField.getFieldName());
+ Assertions.assertEquals("integer comment", integerField.getFieldComment());
+ Assertions.assertEquals(getPrimitiveObjectInspector(int.class),
+ integerField.getFieldObjectInspector());
// long
StructField longField = soi.getStructFieldRef("long_field");
- Assert.assertEquals(9, longField.getFieldID());
- Assert.assertEquals("long_field", longField.getFieldName());
- Assert.assertEquals("long comment", longField.getFieldComment());
- Assert.assertEquals(getPrimitiveObjectInspector(long.class),
longField.getFieldObjectInspector());
+ Assertions.assertEquals(9, longField.getFieldID());
+ Assertions.assertEquals("long_field", longField.getFieldName());
+ Assertions.assertEquals("long comment", longField.getFieldComment());
+ Assertions.assertEquals(getPrimitiveObjectInspector(long.class),
+ longField.getFieldObjectInspector());
// string
StructField stringField = soi.getStructFieldRef("string_field");
- Assert.assertEquals(10, stringField.getFieldID());
- Assert.assertEquals("string_field", stringField.getFieldName());
- Assert.assertEquals("string comment", stringField.getFieldComment());
- Assert.assertEquals(getPrimitiveObjectInspector(String.class),
stringField.getFieldObjectInspector());
+ Assertions.assertEquals(10, stringField.getFieldID());
+ Assertions.assertEquals("string_field", stringField.getFieldName());
+ Assertions.assertEquals("string comment", stringField.getFieldComment());
+ Assertions.assertEquals(getPrimitiveObjectInspector(String.class),
+ stringField.getFieldObjectInspector());
// timestamp without tz
StructField timestampField = soi.getStructFieldRef("timestamp_field");
- Assert.assertEquals(11, timestampField.getFieldID());
- Assert.assertEquals("timestamp_field", timestampField.getFieldName());
- Assert.assertEquals("timestamp comment", timestampField.getFieldComment());
- Assert.assertEquals(IcebergTimestampObjectInspectorHive3.get(),
timestampField.getFieldObjectInspector());
+ Assertions.assertEquals(11, timestampField.getFieldID());
+ Assertions.assertEquals("timestamp_field", timestampField.getFieldName());
+ Assertions.assertEquals("timestamp comment",
timestampField.getFieldComment());
+ Assertions.assertEquals(IcebergTimestampObjectInspectorHive3.get(),
+ timestampField.getFieldObjectInspector());
// timestamp with tz
StructField timestampTzField = soi.getStructFieldRef("timestamptz_field");
- Assert.assertEquals(12, timestampTzField.getFieldID());
- Assert.assertEquals("timestamptz_field", timestampTzField.getFieldName());
- Assert.assertEquals("timestamptz comment",
timestampTzField.getFieldComment());
- Assert.assertEquals(IcebergTimestampWithZoneObjectInspectorHive3.get(),
timestampTzField.getFieldObjectInspector());
+ Assertions.assertEquals(12, timestampTzField.getFieldID());
+ Assertions.assertEquals("timestamptz_field",
timestampTzField.getFieldName());
+ Assertions.assertEquals("timestamptz comment",
timestampTzField.getFieldComment());
+ Assertions.assertEquals(IcebergTimestampWithZoneObjectInspectorHive3.get(),
+ timestampTzField.getFieldObjectInspector());
// UUID
StructField uuidField = soi.getStructFieldRef("uuid_field");
- Assert.assertEquals(13, uuidField.getFieldID());
- Assert.assertEquals("uuid_field", uuidField.getFieldName());
- Assert.assertEquals("uuid comment", uuidField.getFieldComment());
- Assert.assertEquals(IcebergUUIDObjectInspector.get(),
uuidField.getFieldObjectInspector());
+ Assertions.assertEquals(13, uuidField.getFieldID());
+ Assertions.assertEquals("uuid_field", uuidField.getFieldName());
+ Assertions.assertEquals("uuid comment", uuidField.getFieldComment());
+ Assertions.assertEquals(IcebergUUIDObjectInspector.get(),
uuidField.getFieldObjectInspector());
// list
StructField listField = soi.getStructFieldRef("list_field");
- Assert.assertEquals(14, listField.getFieldID());
- Assert.assertEquals("list_field", listField.getFieldName());
- Assert.assertEquals("list comment", listField.getFieldComment());
- Assert.assertEquals(getListObjectInspector(String.class),
listField.getFieldObjectInspector());
+ Assertions.assertEquals(14, listField.getFieldID());
+ Assertions.assertEquals("list_field", listField.getFieldName());
+ Assertions.assertEquals("list comment", listField.getFieldComment());
+ Assertions.assertEquals(getListObjectInspector(String.class),
+ listField.getFieldObjectInspector());
// map
StructField mapField = soi.getStructFieldRef("map_field");
- Assert.assertEquals(16, mapField.getFieldID());
- Assert.assertEquals("map_field", mapField.getFieldName());
- Assert.assertEquals("map comment", mapField.getFieldComment());
- Assert.assertEquals(getMapObjectInspector(String.class, int.class),
mapField.getFieldObjectInspector());
+ Assertions.assertEquals(16, mapField.getFieldID());
+ Assertions.assertEquals("map_field", mapField.getFieldName());
+ Assertions.assertEquals("map comment", mapField.getFieldComment());
+ Assertions.assertEquals(getMapObjectInspector(String.class, int.class),
+ mapField.getFieldObjectInspector());
// struct
StructField structField = soi.getStructFieldRef("struct_field");
- Assert.assertEquals(19, structField.getFieldID());
- Assert.assertEquals("struct_field", structField.getFieldName());
- Assert.assertEquals("struct comment", structField.getFieldComment());
+ Assertions.assertEquals(19, structField.getFieldID());
+ Assertions.assertEquals("struct_field", structField.getFieldName());
+ Assertions.assertEquals("struct comment", structField.getFieldComment());
ObjectInspector expectedObjectInspector = new IcebergRecordObjectInspector(
(Types.StructType) schema.findType(19),
ImmutableList.of(getPrimitiveObjectInspector(String.class)));
- Assert.assertEquals(expectedObjectInspector,
structField.getFieldObjectInspector());
+ Assertions.assertEquals(expectedObjectInspector,
structField.getFieldObjectInspector());
// time
StructField timeField = soi.getStructFieldRef("time_field");
- Assert.assertEquals(21, timeField.getFieldID());
- Assert.assertEquals("time_field", timeField.getFieldName());
- Assert.assertEquals("time comment", timeField.getFieldComment());
- Assert.assertEquals(IcebergTimeObjectInspector.get(),
timeField.getFieldObjectInspector());
+ Assertions.assertEquals(21, timeField.getFieldID());
+ Assertions.assertEquals("time_field", timeField.getFieldName());
+ Assertions.assertEquals("time comment", timeField.getFieldComment());
+ Assertions.assertEquals(IcebergTimeObjectInspector.get(),
timeField.getFieldObjectInspector());
}
private static ObjectInspector getPrimitiveObjectInspector(Class<?> clazz) {
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergRecordObjectInspector.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergRecordObjectInspector.java
index 80a687f6f4a..62bff136a0e 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergRecordObjectInspector.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergRecordObjectInspector.java
@@ -26,8 +26,8 @@
import org.apache.iceberg.data.Record;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
import org.apache.iceberg.types.Types;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import static org.apache.iceberg.types.Types.NestedField.required;
@@ -45,20 +45,22 @@ public void testIcebergRecordObjectInspector() {
Record innerRecord = record.get(1, Record.class);
StructObjectInspector soi = (StructObjectInspector)
IcebergObjectInspector.create(schema);
- Assert.assertEquals(ImmutableList.of(record.get(0), record.get(1)),
soi.getStructFieldsDataAsList(record));
+ Assertions.assertEquals(ImmutableList.of(record.get(0), record.get(1)),
+ soi.getStructFieldsDataAsList(record));
StructField integerField = soi.getStructFieldRef("integer_field");
- Assert.assertEquals(record.get(0), soi.getStructFieldData(record,
integerField));
+ Assertions.assertEquals(record.get(0), soi.getStructFieldData(record,
integerField));
StructField structField = soi.getStructFieldRef("struct_field");
Object innerData = soi.getStructFieldData(record, structField);
- Assert.assertEquals(innerRecord, innerData);
+ Assertions.assertEquals(innerRecord, innerData);
StructObjectInspector innerSoi = (StructObjectInspector)
structField.getFieldObjectInspector();
StructField stringField = innerSoi.getStructFieldRef("string_field");
- Assert.assertEquals(ImmutableList.of(innerRecord.get(0)),
innerSoi.getStructFieldsDataAsList(innerRecord));
- Assert.assertEquals(innerRecord.get(0),
innerSoi.getStructFieldData(innerData, stringField));
+ Assertions.assertEquals(ImmutableList.of(innerRecord.get(0)),
+ innerSoi.getStructFieldsDataAsList(innerRecord));
+ Assertions.assertEquals(innerRecord.get(0),
innerSoi.getStructFieldData(innerData, stringField));
}
@Test
@@ -67,8 +69,8 @@ public void testIcebergRecordObjectInspectorWithRowNull() {
required(2, "struct_field",
Types.StructType.of(Types.NestedField.required(3, "string_field",
Types.StringType.get()))));
StructObjectInspector soi = (StructObjectInspector)
IcebergObjectInspector.create(schema);
- Assert.assertNull(soi.getStructFieldsDataAsList(null));
+ Assertions.assertNull(soi.getStructFieldsDataAsList(null));
StructField integerField = soi.getStructFieldRef("integer_field");
- Assert.assertNull(soi.getStructFieldData(null, integerField));
+ Assertions.assertNull(soi.getStructFieldData(null, integerField));
}
}
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimeObjectInspector.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimeObjectInspector.java
index c635920ed4c..2c933aee8d2 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimeObjectInspector.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimeObjectInspector.java
@@ -24,8 +24,8 @@
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
import org.apache.hadoop.io.Text;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestIcebergTimeObjectInspector {
@@ -34,33 +34,34 @@ public void testIcebergTimeObjectInspector() {
IcebergTimeObjectInspector oi = IcebergTimeObjectInspector.get();
- Assert.assertEquals(ObjectInspector.Category.PRIMITIVE, oi.getCategory());
- Assert.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.STRING,
oi.getPrimitiveCategory());
+ Assertions.assertEquals(ObjectInspector.Category.PRIMITIVE,
oi.getCategory());
+ Assertions.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.STRING,
+ oi.getPrimitiveCategory());
- Assert.assertEquals(TypeInfoFactory.stringTypeInfo, oi.getTypeInfo());
- Assert.assertEquals(TypeInfoFactory.stringTypeInfo.getTypeName(),
oi.getTypeName());
+ Assertions.assertEquals(TypeInfoFactory.stringTypeInfo, oi.getTypeInfo());
+ Assertions.assertEquals(TypeInfoFactory.stringTypeInfo.getTypeName(),
oi.getTypeName());
- Assert.assertEquals(String.class, oi.getJavaPrimitiveClass());
- Assert.assertEquals(Text.class, oi.getPrimitiveWritableClass());
+ Assertions.assertEquals(String.class, oi.getJavaPrimitiveClass());
+ Assertions.assertEquals(Text.class, oi.getPrimitiveWritableClass());
- Assert.assertNull(oi.copyObject(null));
- Assert.assertNull(oi.getPrimitiveJavaObject(null));
- Assert.assertNull(oi.getPrimitiveWritableObject(null));
- Assert.assertNull(oi.convert(null));
+ Assertions.assertNull(oi.copyObject(null));
+ Assertions.assertNull(oi.getPrimitiveJavaObject(null));
+ Assertions.assertNull(oi.getPrimitiveWritableObject(null));
+ Assertions.assertNull(oi.convert(null));
LocalTime localTime = LocalTime.now();
String time = localTime.toString();
Text text = new Text(time);
- Assert.assertEquals(time, oi.getPrimitiveJavaObject(text));
- Assert.assertEquals(text, oi.getPrimitiveWritableObject(time));
- Assert.assertEquals(localTime, oi.convert(time));
+ Assertions.assertEquals(time, oi.getPrimitiveJavaObject(text));
+ Assertions.assertEquals(text, oi.getPrimitiveWritableObject(time));
+ Assertions.assertEquals(localTime, oi.convert(time));
Text copy = (Text) oi.copyObject(text);
- Assert.assertEquals(text, copy);
- Assert.assertNotSame(text, copy);
+ Assertions.assertEquals(text, copy);
+ Assertions.assertNotSame(text, copy);
- Assert.assertFalse(oi.preferWritable());
+ Assertions.assertFalse(oi.preferWritable());
}
}
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimestampObjectInspectorHive3.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimestampObjectInspectorHive3.java
index 89ee0cd3116..3d85bf5812a 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimestampObjectInspectorHive3.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimestampObjectInspectorHive3.java
@@ -27,8 +27,8 @@
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestIcebergTimestampObjectInspectorHive3 {
@@ -36,36 +36,37 @@ public class TestIcebergTimestampObjectInspectorHive3 {
public void testIcebergTimestampObjectInspector() {
IcebergTimestampObjectInspectorHive3 oi =
IcebergTimestampObjectInspectorHive3.get();
- Assert.assertEquals(ObjectInspector.Category.PRIMITIVE, oi.getCategory());
- Assert.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.TIMESTAMP,
oi.getPrimitiveCategory());
+ Assertions.assertEquals(ObjectInspector.Category.PRIMITIVE,
oi.getCategory());
+
Assertions.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.TIMESTAMP,
+ oi.getPrimitiveCategory());
- Assert.assertEquals(TypeInfoFactory.timestampTypeInfo, oi.getTypeInfo());
- Assert.assertEquals(TypeInfoFactory.timestampTypeInfo.getTypeName(),
oi.getTypeName());
+ Assertions.assertEquals(TypeInfoFactory.timestampTypeInfo,
oi.getTypeInfo());
+ Assertions.assertEquals(TypeInfoFactory.timestampTypeInfo.getTypeName(),
oi.getTypeName());
- Assert.assertEquals(Timestamp.class, oi.getJavaPrimitiveClass());
- Assert.assertEquals(TimestampWritableV2.class,
oi.getPrimitiveWritableClass());
+ Assertions.assertEquals(Timestamp.class, oi.getJavaPrimitiveClass());
+ Assertions.assertEquals(TimestampWritableV2.class,
oi.getPrimitiveWritableClass());
- Assert.assertNull(oi.copyObject(null));
- Assert.assertNull(oi.getPrimitiveJavaObject(null));
- Assert.assertNull(oi.getPrimitiveWritableObject(null));
- Assert.assertNull(oi.convert(null));
+ Assertions.assertNull(oi.copyObject(null));
+ Assertions.assertNull(oi.getPrimitiveJavaObject(null));
+ Assertions.assertNull(oi.getPrimitiveWritableObject(null));
+ Assertions.assertNull(oi.convert(null));
long epochMilli = 1601471970000L;
LocalDateTime local =
LocalDateTime.ofInstant(Instant.ofEpochMilli(epochMilli),
ZoneId.of("UTC")).plusNanos(34000);
Timestamp ts = Timestamp.ofEpochMilli(epochMilli);
ts.setNanos(34000);
- Assert.assertEquals(ts, oi.getPrimitiveJavaObject(local));
- Assert.assertEquals(new TimestampWritableV2(ts),
oi.getPrimitiveWritableObject(local));
+ Assertions.assertEquals(ts, oi.getPrimitiveJavaObject(local));
+ Assertions.assertEquals(new TimestampWritableV2(ts),
oi.getPrimitiveWritableObject(local));
Timestamp copy = (Timestamp) oi.copyObject(ts);
- Assert.assertEquals(ts, copy);
- Assert.assertNotSame(ts, copy);
+ Assertions.assertEquals(ts, copy);
+ Assertions.assertNotSame(ts, copy);
- Assert.assertFalse(oi.preferWritable());
+ Assertions.assertFalse(oi.preferWritable());
- Assert.assertEquals(local, oi.convert(ts));
+ Assertions.assertEquals(local, oi.convert(ts));
}
}
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimestampWithZoneObjectInspectorHive3.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimestampWithZoneObjectInspectorHive3.java
index cc34958e95a..b1d7450f749 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimestampWithZoneObjectInspectorHive3.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergTimestampWithZoneObjectInspectorHive3.java
@@ -29,8 +29,8 @@
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestIcebergTimestampWithZoneObjectInspectorHive3 {
@@ -38,42 +38,45 @@ public class
TestIcebergTimestampWithZoneObjectInspectorHive3 {
public void testIcebergTimestampLocalTZObjectInspector() {
IcebergTimestampWithZoneObjectInspectorHive3 oi =
IcebergTimestampWithZoneObjectInspectorHive3.get();
- Assert.assertEquals(ObjectInspector.Category.PRIMITIVE, oi.getCategory());
-
Assert.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.TIMESTAMPLOCALTZ,
oi.getPrimitiveCategory());
+ Assertions.assertEquals(ObjectInspector.Category.PRIMITIVE,
oi.getCategory());
+
Assertions.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.TIMESTAMPLOCALTZ,
+ oi.getPrimitiveCategory());
- Assert.assertEquals(TypeInfoFactory.timestampLocalTZTypeInfo,
oi.getTypeInfo());
-
Assert.assertEquals(TypeInfoFactory.timestampLocalTZTypeInfo.getTypeName(),
oi.getTypeName());
+ Assertions.assertEquals(TypeInfoFactory.timestampLocalTZTypeInfo,
oi.getTypeInfo());
+
Assertions.assertEquals(TypeInfoFactory.timestampLocalTZTypeInfo.getTypeName(),
oi.getTypeName());
- Assert.assertEquals(TimestampTZ.class, oi.getJavaPrimitiveClass());
- Assert.assertEquals(TimestampLocalTZWritable.class,
oi.getPrimitiveWritableClass());
+ Assertions.assertEquals(TimestampTZ.class, oi.getJavaPrimitiveClass());
+ Assertions.assertEquals(TimestampLocalTZWritable.class,
oi.getPrimitiveWritableClass());
- Assert.assertNull(oi.copyObject(null));
- Assert.assertNull(oi.getPrimitiveJavaObject(null));
- Assert.assertNull(oi.getPrimitiveWritableObject(null));
- Assert.assertNull(oi.convert(null));
+ Assertions.assertNull(oi.copyObject(null));
+ Assertions.assertNull(oi.getPrimitiveJavaObject(null));
+ Assertions.assertNull(oi.getPrimitiveWritableObject(null));
+ Assertions.assertNull(oi.convert(null));
LocalDateTime dateTimeAtUTC = LocalDateTime.of(2020, 12, 10, 15, 55, 20,
30000);
OffsetDateTime offsetDateTime =
OffsetDateTime.of(dateTimeAtUTC.plusHours(4), ZoneOffset.ofHours(4));
ZonedDateTime zdt =
offsetDateTime.atZoneSameInstant(TypeInfoFactory.timestampLocalTZTypeInfo.getTimeZone());
TimestampTZ ts = new TimestampTZ(dateTimeAtUTC.atZone(ZoneId.of("UTC")));
- Assert.assertEquals(ts, oi.getPrimitiveJavaObject(offsetDateTime));
- Assert.assertEquals(zdt,
oi.getPrimitiveJavaObject(offsetDateTime).getZonedDateTime());
- Assert.assertEquals(new TimestampLocalTZWritable(ts),
oi.getPrimitiveWritableObject(offsetDateTime));
+ Assertions.assertEquals(ts, oi.getPrimitiveJavaObject(offsetDateTime));
+ Assertions.assertEquals(zdt,
oi.getPrimitiveJavaObject(offsetDateTime).getZonedDateTime());
+ Assertions.assertEquals(new TimestampLocalTZWritable(ts),
+ oi.getPrimitiveWritableObject(offsetDateTime));
// try with another offset as well
offsetDateTime = OffsetDateTime.of(dateTimeAtUTC.plusHours(11),
ZoneOffset.ofHours(11));
- Assert.assertEquals(ts, oi.getPrimitiveJavaObject(offsetDateTime));
- Assert.assertEquals(new TimestampLocalTZWritable(ts),
oi.getPrimitiveWritableObject(offsetDateTime));
+ Assertions.assertEquals(ts, oi.getPrimitiveJavaObject(offsetDateTime));
+ Assertions.assertEquals(new TimestampLocalTZWritable(ts),
+ oi.getPrimitiveWritableObject(offsetDateTime));
TimestampTZ copy = (TimestampTZ) oi.copyObject(ts);
- Assert.assertEquals(ts, copy);
- Assert.assertNotSame(ts, copy);
+ Assertions.assertEquals(ts, copy);
+ Assertions.assertNotSame(ts, copy);
- Assert.assertFalse(oi.preferWritable());
+ Assertions.assertFalse(oi.preferWritable());
- Assert.assertEquals(OffsetDateTime.of(dateTimeAtUTC, ZoneOffset.UTC),
oi.convert(ts));
+ Assertions.assertEquals(OffsetDateTime.of(dateTimeAtUTC, ZoneOffset.UTC),
oi.convert(ts));
}
}
diff --git
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergUUIDObjectInspector.java
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergUUIDObjectInspector.java
index cbf55e3f388..7f3970b7fad 100644
---
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergUUIDObjectInspector.java
+++
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/serde/objectinspector/TestIcebergUUIDObjectInspector.java
@@ -24,8 +24,8 @@
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
import org.apache.hadoop.io.Text;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestIcebergUUIDObjectInspector {
@@ -33,33 +33,34 @@ public class TestIcebergUUIDObjectInspector {
public void testIcebergUUIDObjectInspector() {
IcebergUUIDObjectInspector oi = IcebergUUIDObjectInspector.get();
- Assert.assertEquals(ObjectInspector.Category.PRIMITIVE, oi.getCategory());
- Assert.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.STRING,
oi.getPrimitiveCategory());
+ Assertions.assertEquals(ObjectInspector.Category.PRIMITIVE,
oi.getCategory());
+ Assertions.assertEquals(PrimitiveObjectInspector.PrimitiveCategory.STRING,
+ oi.getPrimitiveCategory());
- Assert.assertEquals(TypeInfoFactory.stringTypeInfo, oi.getTypeInfo());
- Assert.assertEquals(TypeInfoFactory.stringTypeInfo.getTypeName(),
oi.getTypeName());
+ Assertions.assertEquals(TypeInfoFactory.stringTypeInfo, oi.getTypeInfo());
+ Assertions.assertEquals(TypeInfoFactory.stringTypeInfo.getTypeName(),
oi.getTypeName());
- Assert.assertEquals(String.class, oi.getJavaPrimitiveClass());
- Assert.assertEquals(Text.class, oi.getPrimitiveWritableClass());
+ Assertions.assertEquals(String.class, oi.getJavaPrimitiveClass());
+ Assertions.assertEquals(Text.class, oi.getPrimitiveWritableClass());
- Assert.assertNull(oi.copyObject(null));
- Assert.assertNull(oi.getPrimitiveJavaObject(null));
- Assert.assertNull(oi.getPrimitiveWritableObject(null));
- Assert.assertNull(oi.convert(null));
+ Assertions.assertNull(oi.copyObject(null));
+ Assertions.assertNull(oi.getPrimitiveJavaObject(null));
+ Assertions.assertNull(oi.getPrimitiveWritableObject(null));
+ Assertions.assertNull(oi.convert(null));
UUID uuid = UUID.randomUUID();
String uuidStr = uuid.toString();
Text text = new Text(uuidStr);
- Assert.assertEquals(uuidStr, oi.getPrimitiveJavaObject(text));
- Assert.assertEquals(text, oi.getPrimitiveWritableObject(uuidStr));
- Assert.assertEquals(uuid, oi.convert(uuidStr));
+ Assertions.assertEquals(uuidStr, oi.getPrimitiveJavaObject(text));
+ Assertions.assertEquals(text, oi.getPrimitiveWritableObject(uuidStr));
+ Assertions.assertEquals(uuid, oi.convert(uuidStr));
Text copy = (Text) oi.copyObject(text);
- Assert.assertEquals(text, copy);
- Assert.assertNotSame(text, copy);
+ Assertions.assertEquals(text, copy);
+ Assertions.assertNotSame(text, copy);
- Assert.assertFalse(oi.preferWritable());
+ Assertions.assertFalse(oi.preferWritable());
}
}
