Revert "use List<Object[]> for parameters()"

This reverts commit ade28f5.
apache · Jan 15, 2024 · c1d2008 · c1d2008
1 parent ade28f5
commit c1d2008
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/core/src/test/java/org/apache/iceberg/DeleteFileIndexTestBase.java b/core/src/test/java/org/apache/iceberg/DeleteFileIndexTestBase.java
@@ -45,8 +45,8 @@ public abstract class DeleteFileIndexTestBase<
     extends TestBase {
 
   @Parameters(name = "formatVersion = {0}")
-  public static List<Object[]> parameters() {
-    return Arrays.asList(new Object[][] {{2}});
+  public static List<Object> parameters() {
+    return Arrays.asList(new Object[] {2});
   }
 
   static final DeleteFile FILE_A_POS_1 =

diff --git a/core/src/test/java/org/apache/iceberg/ScanPlanningAndReportingTestBase.java b/core/src/test/java/org/apache/iceberg/ScanPlanningAndReportingTestBase.java
@@ -46,8 +46,8 @@ public abstract class ScanPlanningAndReportingTestBase<
   private final TestMetricsReporter reporter = new TestMetricsReporter();
 
   @Parameters(name = "formatVersion = {0}")
-  public static List<Object[]> parameters() {
-    return Arrays.asList(new Object[][] {{2}});
+  public static List<Object> parameters() {
+    return Arrays.asList(new Object[] {2});
   }
 
   protected abstract ScanT newScan(Table table);

diff --git a/core/src/test/java/org/apache/iceberg/TestBase.java b/core/src/test/java/org/apache/iceberg/TestBase.java
@@ -173,7 +173,7 @@ public class TestBase {
   public TestTables.TestTable table = null;
 
   @Parameters(name = "formatVersion = {0}")
-  protected static List<Object[]> parameters() {
+  protected static List<Object> parameters() {
     return Arrays.asList(new Object[] {1}, new Object[] {2});
   }
 

diff --git a/core/src/test/java/org/apache/iceberg/TestLocalFilterFiles.java b/core/src/test/java/org/apache/iceberg/TestLocalFilterFiles.java
@@ -27,7 +27,7 @@ public class TestLocalFilterFiles
     extends FilterFilesTestBase<TableScan, FileScanTask, CombinedScanTask> {
 
   @Parameters(name = "formatVersion = {0}")
-  public static List<Object[]> parameters() {
+  public static List<Object> parameters() {
     return Arrays.asList(new Object[] {1}, new Object[] {2});
   }
 

diff --git a/data/src/test/java/org/apache/iceberg/io/TestGenericSortedPosDeleteWriter.java b/data/src/test/java/org/apache/iceberg/io/TestGenericSortedPosDeleteWriter.java
@@ -62,7 +62,7 @@ public class TestGenericSortedPosDeleteWriter extends TestBase {
   private Record gRecord;
 
   @Parameters(name = "formatVersion = {0}, fileFormat = {1}")
-  public static List<Object[]> parameters() {
+  public static List<Object> parameters() {
     return Arrays.asList(
         new Object[] {FORMAT_V2, FileFormat.AVRO},
         new Object[] {FORMAT_V2, FileFormat.ORC},

diff --git a/spark/v3.5/spark/src/test/java/org/apache/iceberg/SparkDistributedDataScanTestBase.java b/spark/v3.5/spark/src/test/java/org/apache/iceberg/SparkDistributedDataScanTestBase.java
@@ -35,7 +35,7 @@ public abstract class SparkDistributedDataScanTestBase
     extends DataTableScanTestBase<BatchScan, ScanTask, ScanTaskGroup<ScanTask>> {
 
   @Parameters(name = "formatVersion = {0}, dataMode = {1}, deleteMode = {2}")
-  public static List<Object[]> parameters() {
+  public static List<Object> parameters() {
     return Arrays.asList(
         new Object[] {1, LOCAL, LOCAL},
         new Object[] {1, LOCAL, DISTRIBUTED},

diff --git a/spark/v3.5/spark/src/test/java/org/apache/iceberg/TestSparkDistributedDataScanDeletes.java b/spark/v3.5/spark/src/test/java/org/apache/iceberg/TestSparkDistributedDataScanDeletes.java
@@ -37,7 +37,7 @@ public class TestSparkDistributedDataScanDeletes
     extends DeleteFileIndexTestBase<BatchScan, ScanTask, ScanTaskGroup<ScanTask>> {
 
   @Parameters(name = "formatVersion = {0}, dataMode = {1}, deleteMode = {2}")
-  public static List<Object[]> parameters() {
+  public static List<Object> parameters() {
     return Arrays.asList(
         new Object[] {2, LOCAL, LOCAL},
         new Object[] {2, LOCAL, DISTRIBUTED},

diff --git a/spark/v3.5/spark/src/test/java/org/apache/iceberg/TestSparkDistributedDataScanReporting.java b/spark/v3.5/spark/src/test/java/org/apache/iceberg/TestSparkDistributedDataScanReporting.java
@@ -36,7 +36,7 @@ public class TestSparkDistributedDataScanReporting
     extends ScanPlanningAndReportingTestBase<BatchScan, ScanTask, ScanTaskGroup<ScanTask>> {
 
   @Parameters(name = "formatVersion = {0}, dataMode = {1}, deleteMode = {2}")
-  public static List<Object[]> parameters() {
+  public static List<Object> parameters() {
     return Arrays.asList(
         new Object[] {2, LOCAL, LOCAL},
         new Object[] {2, LOCAL, DISTRIBUTED},