Resolve conflicts

Author: yuxiqian

flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon/src/test/java/org/apache/flink/cdc/connectors/paimon/sink/PaimonHashFunctionTest.java

@@ -31,7 +31,6 @@
 import org.apache.paimon.flink.FlinkCatalogFactory;
 import org.apache.paimon.options.Options;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -122,8 +121,9 @@ public void testHashCodeForAppendOnlyTable() {
                                     BinaryStringData.fromString("2024")
                                 }));
         int key3 = hashFunction.hashcode(dataChangeEvent3);
-        Assertions.assertTrue(
-                key1 >= 0 && key1 < 4 && key2 >= 0 && key2 < 4 && key3 >= 0 && key3 < 4);
+        assertThat(key1).isBetween(0, 3);
+        assertThat(key2).isBetween(0, 3);
+        assertThat(key3).isBetween(0, 3);
     }
 
     @Test

flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-paimon/src/test/java/org/apache/flink/cdc/connectors/paimon/sink/PaimonMetadataApplierTest.java

@@ -278,10 +278,10 @@ public void testCreateTableWithoutPrimaryKey(String metastore)
                                 new DataField(1, "col2", DataTypes.STRING()),
                                 new DataField(2, "col3", DataTypes.STRING()),
                                 new DataField(3, "col4", DataTypes.STRING())));
-        Assertions.assertEquals(tableSchema, table.rowType());
-        Assertions.assertEquals(new ArrayList<>(), table.primaryKeys());
-        Assertions.assertEquals(new ArrayList<>(), table.partitionKeys());
-        Assertions.assertEquals("-1", table.options().get("bucket"));
+        Assertions.assertThat(table.rowType()).isEqualTo(tableSchema);
+        Assertions.assertThat(table.primaryKeys()).isEmpty();
+        Assertions.assertThat(table.partitionKeys()).isEmpty();
+        Assertions.assertThat(table.options()).containsEntry("bucket", "-1");
     }
 
     @ParameterizedTest

flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/PostgresSourceITCase.java

@@ -717,8 +717,9 @@ void testHeartBeat(String scanStartupMode) throws Exception {
         }
     }
 
-    @Test
-    public void testCommitLsnWhenTaskManagerFailover() throws Exception {
+    @ParameterizedTest
+    @ValueSource(strings = {"initial", "latest-offset"})
+    void testCommitLsnWhenTaskManagerFailover(String scanStartupMode) throws Exception {
         int parallelism = 1;
         PostgresTestUtils.FailoverType failoverType = PostgresTestUtils.FailoverType.TM;
         PostgresTestUtils.FailoverPhase failoverPhase = PostgresTestUtils.FailoverPhase.STREAM;
@@ -1239,7 +1240,10 @@ private void checkStreamDataWithTestLsn(
         }
         if (failoverPhase == PostgresTestUtils.FailoverPhase.STREAM) {
             triggerFailover(
-                    failoverType, jobId, miniClusterResource.getMiniCluster(), () -> sleepMs(200));
+                    failoverType,
+                    jobId,
+                    miniClusterResource.get().getMiniCluster(),
+                    () -> sleepMs(200));
             waitUntilJobRunning(tableResult);
         }
         // wait for the stream reading and isCommitOffset is true
@@ -1251,7 +1255,7 @@ private void checkStreamDataWithTestLsn(
         }
         Thread.sleep(5000L);
         try (PostgresConnection connection = getConnection()) {
-            assertTrue(!confirmedFlushLsn.equals(getConfirmedFlushLsn(connection)));
+            Assertions.assertThat(getConfirmedFlushLsn(connection)).isNotEqualTo(confirmedFlushLsn);
         }
     }