From 7f549ac94609e3fdee43bc6ca3b0c9fb625ca59e Mon Sep 17 00:00:00 2001
From: Steven Wu <stevenz3wu@gmail.com>
Date: Tue, 28 Feb 2023 17:25:44 -0800
Subject: [PATCH] Flink: fix compiling error from PR #6954

---
 .../flink/sink/TestFlinkIcebergSinkV2.java    | 15 ++++++-----
 .../flink/sink/TestFlinkIcebergSinkV2.java    | 25 +++++++++++--------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/flink/v1.14/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java b/flink/v1.14/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
index af3cc19635d3..6552fe834c29 100644
--- a/flink/v1.14/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
+++ b/flink/v1.14/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
@@ -18,6 +18,7 @@
  */
 package org.apache.iceberg.flink.sink;
 
+import java.util.List;
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.test.util.MiniClusterWithClientResource;
@@ -27,6 +28,7 @@
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.SnapshotRef;
 import org.apache.iceberg.TableProperties;
+import org.apache.iceberg.data.Record;
 import org.apache.iceberg.flink.HadoopCatalogResource;
 import org.apache.iceberg.flink.MiniClusterResource;
 import org.apache.iceberg.flink.SimpleDataUtil;
@@ -155,11 +157,6 @@ public void testChangeLogOnIdKey() throws Exception {
     testChangeLogOnIdKey(SnapshotRef.MAIN_BRANCH);
   }
 
-  @Test
-  public void testChangeLogOnDataKey() throws Exception {
-    testChangeLogOnDataKey(SnapshotRef.MAIN_BRANCH);
-  }
-
   @Test
   public void testUpsertOnlyDeletesOnDataKey() throws Exception {
     List<List<Row>> elementsPerCheckpoint =
@@ -175,7 +172,13 @@ public void testUpsertOnlyDeletesOnDataKey() throws Exception {
         row -> row.getField(ROW_DATA_POS),
         true,
         elementsPerCheckpoint,
-        expectedRecords);
+        expectedRecords,
+        SnapshotRef.MAIN_BRANCH);
+  }
+
+  @Test
+  public void testChangeLogOnDataKey() throws Exception {
+    testChangeLogOnDataKey(SnapshotRef.MAIN_BRANCH);
   }
 
   @Test
diff --git a/flink/v1.15/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java b/flink/v1.15/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
index 422bd97cd739..6552fe834c29 100644
--- a/flink/v1.15/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
+++ b/flink/v1.15/flink/src/test/java/org/apache/iceberg/flink/sink/TestFlinkIcebergSinkV2.java
@@ -18,6 +18,7 @@
  */
 package org.apache.iceberg.flink.sink;
 
+import java.util.List;
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.test.util.MiniClusterWithClientResource;
@@ -27,6 +28,7 @@
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.SnapshotRef;
 import org.apache.iceberg.TableProperties;
+import org.apache.iceberg.data.Record;
 import org.apache.iceberg.flink.HadoopCatalogResource;
 import org.apache.iceberg.flink.MiniClusterResource;
 import org.apache.iceberg.flink.SimpleDataUtil;
@@ -155,16 +157,6 @@ public void testChangeLogOnIdKey() throws Exception {
     testChangeLogOnIdKey(SnapshotRef.MAIN_BRANCH);
   }
 
-  @Test
-  public void testChangeLogOnDataKey() throws Exception {
-    testChangeLogOnDataKey(SnapshotRef.MAIN_BRANCH);
-  }
-
-  @Test
-  public void testChangeLogOnIdDataKey() throws Exception {
-    testChangeLogOnIdDataKey(SnapshotRef.MAIN_BRANCH);
-  }
-
   @Test
   public void testUpsertOnlyDeletesOnDataKey() throws Exception {
     List<List<Row>> elementsPerCheckpoint =
@@ -180,7 +172,18 @@ public void testUpsertOnlyDeletesOnDataKey() throws Exception {
         row -> row.getField(ROW_DATA_POS),
         true,
         elementsPerCheckpoint,
-        expectedRecords);
+        expectedRecords,
+        SnapshotRef.MAIN_BRANCH);
+  }
+
+  @Test
+  public void testChangeLogOnDataKey() throws Exception {
+    testChangeLogOnDataKey(SnapshotRef.MAIN_BRANCH);
+  }
+
+  @Test
+  public void testChangeLogOnIdDataKey() throws Exception {
+    testChangeLogOnIdDataKey(SnapshotRef.MAIN_BRANCH);
   }
 
   @Test