This is an automated email from the ASF dual-hosted git repository.
wgtmac pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/parquet-java.git
The following commit(s) were added to refs/heads/master by this push:
new 07812b9e3 Fix CI due to silent merge conflict with AssertJ migration
(#3677)
07812b9e3 is described below
commit 07812b9e3ea4f9a2bd7bf613c75edbc87825deb7
Author: Eduard Tudenhoefner <[email protected]>
AuthorDate: Mon Jul 20 09:28:42 2026 +0200
Fix CI due to silent merge conflict with AssertJ migration (#3677)
---
.../parquet/format/converter/TestParquetMetadataConverter.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java
b/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java
index 80d758d39..1a523521b 100644
---
a/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java
+++
b/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java
@@ -377,8 +377,8 @@ public class TestParquetMetadataConverter {
MessageType schema = converter.fromParquetSchema(parquetSchema, null);
PrimitiveType unknown = schema.getType("unknown").asPrimitiveType();
- assertEquals(PrimitiveTypeName.BINARY, unknown.getPrimitiveTypeName());
- assertNull(unknown.getLogicalTypeAnnotation());
+
assertThat(unknown.getPrimitiveTypeName()).isEqualTo(PrimitiveTypeName.BINARY);
+ assertThat(unknown.getLogicalTypeAnnotation()).isNull();
}
@Test
@@ -400,8 +400,8 @@ public class TestParquetMetadataConverter {
PrimitiveType unknownWithConvertedType =
schema.getType("unknownWithConvertedType").asPrimitiveType();
- assertEquals(PrimitiveTypeName.BINARY,
unknownWithConvertedType.getPrimitiveTypeName());
- assertEquals(decimalType(2, 9),
unknownWithConvertedType.getLogicalTypeAnnotation());
+
assertThat(unknownWithConvertedType.getPrimitiveTypeName()).isEqualTo(PrimitiveTypeName.BINARY);
+
assertThat(unknownWithConvertedType.getLogicalTypeAnnotation()).isEqualTo(decimalType(2,
9));
}
@Test
