nastra commented on code in PR #9862:
URL: https://github.com/apache/iceberg/pull/9862#discussion_r1517343228
##########
data/src/test/java/org/apache/iceberg/io/TestBaseTaskWriter.java:
##########
@@ -27,47 +29,48 @@
import java.util.List;
import java.util.stream.Collectors;
import org.apache.iceberg.FileFormat;
+import org.apache.iceberg.Parameter;
+import org.apache.iceberg.ParameterizedTestExtension;
+import org.apache.iceberg.Parameters;
import org.apache.iceberg.PartitionSpec;
import org.apache.iceberg.RowDelta;
-import org.apache.iceberg.TableTestBase;
+import org.apache.iceberg.TestBase;
import org.apache.iceberg.data.GenericAppenderFactory;
import org.apache.iceberg.data.GenericRecord;
import org.apache.iceberg.data.IcebergGenerics;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.util.StructLikeSet;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class TestBaseTaskWriter extends TableTestBase {
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+@ExtendWith(ParameterizedTestExtension.class)
+public class TestBaseTaskWriter extends TestBase {
private static final int FORMAT_V2 = 2;
- private final FileFormat format;
private final GenericRecord gRecord = GenericRecord.create(SCHEMA);
private OutputFileFactory fileFactory = null;
private FileAppenderFactory<Record> appenderFactory = null;
- @Parameterized.Parameters(name = "FileFormat = {0}")
- public static Object[][] parameters() {
- return new Object[][] {{"avro"}, {"orc"}, {"parquet"}};
- }
+ @Parameter protected FileFormat format;
- public TestBaseTaskWriter(String fileFormat) {
- super(FORMAT_V2);
- this.format = FileFormat.fromString(fileFormat);
+ @Parameters(name = "FileFormat = {0}")
+ public static List<Object> parameters() {
+ return Arrays.asList(
+ new Object[] {FileFormat.AVRO},
+ new Object[] {FileFormat.ORC},
+ new Object[] {FileFormat.PARQUET});
}
@Override
- @Before
+ @BeforeEach
public void setupTable() throws IOException {
- this.tableDir = temp.newFolder();
- Assert.assertTrue(tableDir.delete()); // created by table create
+ this.tableDir = Files.createTempDirectory(temp, "junit").toFile();
+ assertThat(tableDir.delete()).isTrue(); // created by table create
+ this.formatVersion = FORMAT_V2;
Review Comment:
same as I mentioned in the other class. This should be part of `parameters()`
##########
data/src/test/java/org/apache/iceberg/io/TestBaseTaskWriter.java:
##########
@@ -27,47 +29,48 @@
import java.util.List;
import java.util.stream.Collectors;
import org.apache.iceberg.FileFormat;
+import org.apache.iceberg.Parameter;
+import org.apache.iceberg.ParameterizedTestExtension;
+import org.apache.iceberg.Parameters;
import org.apache.iceberg.PartitionSpec;
import org.apache.iceberg.RowDelta;
-import org.apache.iceberg.TableTestBase;
+import org.apache.iceberg.TestBase;
import org.apache.iceberg.data.GenericAppenderFactory;
import org.apache.iceberg.data.GenericRecord;
import org.apache.iceberg.data.IcebergGenerics;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.util.StructLikeSet;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class TestBaseTaskWriter extends TableTestBase {
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+@ExtendWith(ParameterizedTestExtension.class)
+public class TestBaseTaskWriter extends TestBase {
private static final int FORMAT_V2 = 2;
- private final FileFormat format;
private final GenericRecord gRecord = GenericRecord.create(SCHEMA);
private OutputFileFactory fileFactory = null;
private FileAppenderFactory<Record> appenderFactory = null;
- @Parameterized.Parameters(name = "FileFormat = {0}")
- public static Object[][] parameters() {
- return new Object[][] {{"avro"}, {"orc"}, {"parquet"}};
- }
+ @Parameter protected FileFormat format;
- public TestBaseTaskWriter(String fileFormat) {
- super(FORMAT_V2);
- this.format = FileFormat.fromString(fileFormat);
+ @Parameters(name = "FileFormat = {0}")
+ public static List<Object> parameters() {
Review Comment:
should be `protected`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For additional commands, e-mail: issues-h...@iceberg.apache.org
