Skip to content

Backport Flink 1.18 JUnit5 migration to Flink 1.17 #10163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nastra merged 1 commit into from
Apr 17, 2024
Merged

Backport Flink 1.18 JUnit5 migration to Flink 1.17 #10163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/AvroGenericRecordConverterBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.iceberg.flink;

import org.junit.Test;
import org.junit.jupiter.api.Test;

public abstract class AvroGenericRecordConverterBase {
protected abstract void testConverter(DataGenerator dataGenerator) throws Exception;
Expand Down
14 changes: 5 additions & 9 deletions flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestDataFileSerialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import static org.apache.iceberg.types.Types.NestedField.optional;
import static org.apache.iceberg.types.Types.NestedField.required;
import static org.assertj.core.api.Assertions.assertThat;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand All @@ -44,8 +45,7 @@
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Types;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.junit.jupiter.api.Test;

public class TestDataFileSerialization {

Expand Down Expand Up @@ -135,23 +135,19 @@ public void testJavaSerialization() throws Exception {
new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()))) {
for (int i = 0; i < 2; i += 1) {
Object obj = in.readObject();
Assertions.assertThat(obj).as("Should be a DataFile").isInstanceOf(DataFile.class);
assertThat(obj).as("Should be a DataFile").isInstanceOf(DataFile.class);
TestHelpers.assertEquals(DATA_FILE, (DataFile) obj);
}

for (int i = 0; i < 2; i += 1) {
Object obj = in.readObject();
Assertions.assertThat(obj)
.as("Should be a position DeleteFile")
.isInstanceOf(DeleteFile.class);
assertThat(obj).as("Should be a position DeleteFile").isInstanceOf(DeleteFile.class);
TestHelpers.assertEquals(POS_DELETE_FILE, (DeleteFile) obj);
}

for (int i = 0; i < 2; i += 1) {
Object obj = in.readObject();
Assertions.assertThat(obj)
.as("Should be a equality DeleteFile")
.isInstanceOf(DeleteFile.class);
assertThat(obj).as("Should be a equality DeleteFile").isInstanceOf(DeleteFile.class);
TestHelpers.assertEquals(EQ_DELETE_FILE, (DeleteFile) obj);
}
}
Expand Down
20 changes: 11 additions & 9 deletions flink/v1.17/flink/src/test/java/org/apache/iceberg/flink/TestFlinkCatalogFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
*/
package org.apache.iceberg.flink;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.iceberg.CatalogProperties;
Expand All @@ -26,15 +29,14 @@
import org.apache.iceberg.hive.HiveCatalog;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.assertj.core.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class TestFlinkCatalogFactory {

private Map<String, String> props;

@Before
@BeforeEach
public void before() {
props = Maps.newHashMap();
props.put("type", "iceberg");
Expand All @@ -51,7 +53,7 @@ public void testCreateCatalogHive() {
FlinkCatalogFactory.createCatalogLoader(catalogName, props, new Configuration())
.loadCatalog();

Assertions.assertThat(catalog).isNotNull().isInstanceOf(HiveCatalog.class);
assertThat(catalog).isNotNull().isInstanceOf(HiveCatalog.class);
}

@Test
Expand All @@ -64,7 +66,7 @@ public void testCreateCatalogHadoop() {
FlinkCatalogFactory.createCatalogLoader(catalogName, props, new Configuration())
.loadCatalog();

Assertions.assertThat(catalog).isNotNull().isInstanceOf(HadoopCatalog.class);
assertThat(catalog).isNotNull().isInstanceOf(HadoopCatalog.class);
}

@Test
Expand All @@ -76,7 +78,7 @@ public void testCreateCatalogCustom() {
FlinkCatalogFactory.createCatalogLoader(catalogName, props, new Configuration())
.loadCatalog();

Assertions.assertThat(catalog).isNotNull().isInstanceOf(CustomHadoopCatalog.class);
assertThat(catalog).isNotNull().isInstanceOf(CustomHadoopCatalog.class);
}

@Test
Expand All @@ -86,7 +88,7 @@ public void testCreateCatalogCustomWithHiveCatalogTypeSet() {
props.put(
FlinkCatalogFactory.ICEBERG_CATALOG_TYPE, FlinkCatalogFactory.ICEBERG_CATALOG_TYPE_HIVE);

Assertions.assertThatThrownBy(
assertThatThrownBy(
() -> FlinkCatalogFactory.createCatalogLoader(catalogName, props, new Configuration()))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageStartingWith(
Expand All @@ -98,7 +100,7 @@ public void testLoadCatalogUnknown() {
String catalogName = "unknownCatalog";
props.put(FlinkCatalogFactory.ICEBERG_CATALOG_TYPE, "fooType");

Assertions.assertThatThrownBy(
assertThatThrownBy(
() -> FlinkCatalogFactory.createCatalogLoader(catalogName, props, new Configuration()))
.isInstanceOf(UnsupportedOperationException.class)
.hasMessageStartingWith("Unknown catalog-type: fooType");
Expand Down
Loading