diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/HiveCatalogITCaseBase.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/HiveCatalogITCaseBase.java
index a9e6c01e39ed..2ff08b5373f9 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/HiveCatalogITCaseBase.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/HiveCatalogITCaseBase.java
@@ -352,11 +352,8 @@ public void testCreateExternalTable() throws Exception {
         tEnv.executeSql("USE test_db").await();
         tEnv.executeSql("CREATE TABLE t ( a INT, b STRING ) WITH ( 'file.format' = 'avro' )")
                 .await();
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t")
-                                .contains("Table Type:         \tEXTERNAL_TABLE      \tNULL"))
-                .isTrue();
+        assertThat(hiveShell.executeQuery("DESC FORMATTED t"))
+                .contains("Table Type:         \tEXTERNAL_TABLE      \tNULL");
         tEnv.executeSql("DROP TABLE t").await();
         Path tablePath = new Path(path, "test_db.db/t");
         assertThat(tablePath.getFileSystem().exists(tablePath)).isTrue();
@@ -383,35 +380,14 @@ public void testCreateCatalogWithSyncTblProperties() throws Exception {
                         "CREATE TABLE t01 ( aa INT, bb STRING, cc STRING, PRIMARY KEY (cc, aa) NOT ENFORCED) PARTITIONED BY (cc) WITH ('file.format' = 'avro', 'bucket' = '3')")
                 .await();
         // assert contain properties
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t01")
-                                .contains("\tfile.format         \tavro                "))
-                .isTrue();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t01")
-                                .contains("\tprimary-key         \tcc,aa               "))
-                .isTrue();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t01")
-                                .contains("\tpartition           \tcc                  "))
-                .isTrue();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t01")
-                                .contains("\tbucket-key          \taa                  "))
-                .isTrue();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t01")
-                                .contains("\tbucket              \t3                   "))
-                .isTrue();
+        List<String> descFormattedT01 = hiveShell.executeQuery("DESC FORMATTED t01");
+        assertThat(descFormattedT01)
+                .contains(
+                        "\tfile.format         \tavro                ",
+                        "\tprimary-key         \tcc,aa               ",
+                        "\tpartition           \tcc                  ",
+                        "\tbucket-key          \taa                  ",
+                        "\tbucket              \t3                   ");
 
         tEnv.executeSql(
                         String.join(
@@ -434,35 +410,13 @@ public void testCreateCatalogWithSyncTblProperties() throws Exception {
 
         // assert not contain properties
         List<String> descFormattedT02 = hiveShell.executeQuery("DESC FORMATTED t02");
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t02")
-                                .contains("\tfile.format         \tavro                "))
-                .isFalse();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t02")
-                                .contains("\tprimary-key         \tcc,aa               "))
-                .isFalse();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t02")
-                                .contains("\tpartition           \tcc                  "))
-                .isFalse();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t02")
-                                .contains("\tbucket-key          \taa                  "))
-                .isFalse();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t02")
-                                .contains("\tbucket              \t3                   "))
-                .isFalse();
+        assertThat(descFormattedT02)
+                .doesNotContain(
+                        "\tfile.format         \tavro                ",
+                        "\tprimary-key         \tcc,aa               ",
+                        "\tpartition           \tcc                  ",
+                        "\tbucket-key          \taa                  ",
+                        "\tbucket              \t3                   ");
     }
 
     @Test
@@ -487,29 +441,14 @@ public void testAlterTableWithSyncTblProperties()
                 .await();
 
         tEnv.executeSql("ALTER TABLE t03 SET ( 'file.format' = 'parquet' )").await();
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t03")
-                                .contains("\tfile.format         \tparquet             "))
-                .isFalse();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t03")
-                                .contains("\tprimary-key         \tcc,aa               "))
-                .isFalse();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t03")
-                                .contains("\tpartition           \tcc                  "))
-                .isFalse();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t03")
-                                .contains("\tbucket              \t3                   "))
-                .isFalse();
+        List<String> descFormattedT03 = hiveShell.executeQuery("DESC FORMATTED t03");
+        assertThat(descFormattedT03)
+                .doesNotContain(
+                        "\tfile.format         \tparquet             ",
+                        "\tprimary-key         \tcc,aa               ",
+                        "\tpartition           \tcc                  ",
+                        "\tbucket-key          \taa                  ",
+                        "\tbucket              \t3                   ");
 
         tEnv.executeSql(
                         String.join(
@@ -529,42 +468,18 @@ public void testAlterTableWithSyncTblProperties()
         tEnv.executeSql("USE test_db").await();
 
         tEnv.executeSql("ALTER TABLE t03 SET ( 'file.format' = 'parquet' )").await();
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t03")
-                                .contains("\tfile.format         \tparquet             "))
-                .isTrue();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t03")
-                                .contains("\tprimary-key         \tcc,aa               "))
-                .isTrue();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t03")
-                                .contains("\tpartition           \tcc                  "))
-                .isTrue();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t03")
-                                .contains("\tbucket-key          \taa                  "))
-                .isTrue();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t03")
-                                .contains("\tbucket              \t3                   "))
-                .isTrue();
+        descFormattedT03 = hiveShell.executeQuery("DESC FORMATTED t03");
+        assertThat(descFormattedT03)
+                .contains(
+                        "\tfile.format         \tparquet             ",
+                        "\tprimary-key         \tcc,aa               ",
+                        "\tpartition           \tcc                  ",
+                        "\tbucket-key          \taa                  ",
+                        "\tbucket              \t3                   ");
 
         tEnv.executeSql("ALTER TABLE t03 SET ('owner' = 'test')").await();
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t03")
-                                .contains("\towner               \ttest                "))
-                .isTrue();
+        descFormattedT03 = hiveShell.executeQuery("DESC FORMATTED t03");
+        assertThat(descFormattedT03).contains("\towner               \ttest                ");
     }
 
     @Test
@@ -585,11 +500,8 @@ public void testCreateInsensitiveTable() throws Exception {
         tEnv.executeSql("USE test_db").await();
         tEnv.executeSql("CREATE TABLE t ( aa INT, Bb STRING ) WITH ( 'file.format' = 'avro' )")
                 .await();
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t")
-                                .contains("Table Type:         \tEXTERNAL_TABLE      \tNULL"))
-                .isTrue();
+        assertThat(hiveShell.executeQuery("DESC FORMATTED t"))
+                .contains("Table Type:         \tEXTERNAL_TABLE      \tNULL");
         tEnv.executeSql("DROP TABLE t").await();
         Path tablePath = new Path(path, "test_db.db/t");
         assertThat(tablePath.getFileSystem().exists(tablePath)).isTrue();
@@ -889,8 +801,8 @@ public void testCreateTableAs() throws Exception {
                         "CREATE TABLE t_all_as WITH ('primary-key' = 'dt,hh' , 'partition' = 'dt' ) AS SELECT * FROM t_all")
                 .await();
         List<Row> resultAll = collect("SHOW CREATE TABLE t_all_as");
-        assertThat(resultAll.toString()).contains("PRIMARY KEY (`dt`, `hh`)");
-        assertThat(resultAll.toString()).contains("PARTITIONED BY (`dt`)");
+        assertThat(resultAll.toString())
+                .contains("PRIMARY KEY (`dt`, `hh`)", "PARTITIONED BY (`dt`)");
         List<Row> dataAll = collect("SELECT * FROM t_all_as");
         assertThat(dataAll.toString()).isEqualTo("[+I[1, 2, login, 2020-01-02, 09]]");
 
@@ -989,8 +901,8 @@ public void testRenameTable() throws Exception {
 
         // hive read
         List<String> tables = hiveShell.executeQuery("SHOW TABLES");
-        assertThat(tables.contains("t3")).isTrue();
-        assertThat(tables.contains("t1")).isFalse();
+        assertThat(tables).contains("t3");
+        assertThat(tables).doesNotContain("t1");
         List<String> data = hiveShell.executeQuery("SELECT * FROM t3");
         assertThat(data).containsExactlyInAnyOrder("1");
 
@@ -1581,11 +1493,8 @@ public void testRepairDatabasesOrTables() throws Exception {
         // metastore.
         tEnv.executeSql("CALL sys.repair('test_db.t_repair_hive')");
 
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED test_db.t_repair_hive")
-                                .contains("item_id\tbigint\titem id"))
-                .isTrue();
+        assertThat(hiveShell.executeQuery("DESC FORMATTED test_db.t_repair_hive"))
+                .contains("item_id\tbigint\titem id");
         assertThat(hiveShell.executeQuery("SHOW PARTITIONS test_db.t_repair_hive"))
                 .containsExactlyInAnyOrder("dt=2020-01-02/hh=09", "dt=2020-01-03/hh=10");
 
@@ -1600,11 +1509,8 @@ public void testRepairDatabasesOrTables() throws Exception {
         // When the Hive table exists, specify the paimon table to update hive table in hive
         // metastore.
         tEnv.executeSql("CALL sys.repair('test_db_01.t_repair_hive')");
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED test_db_01.t_repair_hive")
-                                .contains("item_id\tbigint\titem id"))
-                .isTrue();
+        assertThat(hiveShell.executeQuery("DESC FORMATTED test_db_01.t_repair_hive"))
+                .contains("item_id\tbigint\titem id");
         assertThat(hiveShell.executeQuery("SHOW PARTITIONS test_db_01.t_repair_hive"))
                 .containsExactlyInAnyOrder("dt=2020-01-02/hh=09", "dt=2020-01-03/hh=10");
     }
@@ -1628,11 +1534,8 @@ public void testRepairDatabasesOrTablesWithNamedArgument() throws Exception {
         // metastore.
         tEnv.executeSql("CALL sys.repair(`table` => 'test_db.t_repair_hive')");
 
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED test_db.t_repair_hive")
-                                .contains("item_id\tbigint\titem id"))
-                .isTrue();
+        assertThat(hiveShell.executeQuery("DESC FORMATTED test_db.t_repair_hive"))
+                .contains("item_id\tbigint\titem id");
         assertThat(hiveShell.executeQuery("SHOW PARTITIONS test_db.t_repair_hive"))
                 .containsExactlyInAnyOrder("dt=2020-01-02/hh=09", "dt=2020-01-03/hh=10");
 
@@ -1647,11 +1550,8 @@ public void testRepairDatabasesOrTablesWithNamedArgument() throws Exception {
         // When the Hive table exists, specify the paimon table to update hive table in hive
         // metastore.
         tEnv.executeSql("CALL sys.repair(`table` => 'test_db_02.t_repair_hive')");
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED test_db_02.t_repair_hive")
-                                .contains("item_id\tbigint\titem id"))
-                .isTrue();
+        assertThat(hiveShell.executeQuery("DESC FORMATTED test_db_02.t_repair_hive"))
+                .contains("item_id\tbigint\titem id");
         assertThat(hiveShell.executeQuery("SHOW PARTITIONS test_db_02.t_repair_hive"))
                 .containsExactlyInAnyOrder("dt=2020-01-02/hh=09", "dt=2020-01-03/hh=10");
         hiveShell.execute("DROP TABLE test_db.t_repair_hive");
@@ -1690,11 +1590,8 @@ private void testRepairTable(boolean isNamedArgument) throws Exception {
                 isNamedArgument
                         ? "CALL sys.repair(`table` => 'test_db.t_repair_hive')"
                         : "CALL sys.repair('test_db.t_repair_hive')");
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t_repair_hive")
-                                .contains("item_id\tbigint\titem id"))
-                .isTrue();
+        assertThat(hiveShell.executeQuery("DESC FORMATTED t_repair_hive"))
+                .contains("item_id\tbigint\titem id");
         assertThat(hiveShell.executeQuery("SHOW PARTITIONS t_repair_hive"))
                 .containsExactlyInAnyOrder("dt=2020-01-02/hh=09", "dt=2020-01-03/hh=10");
     }
@@ -1725,11 +1622,8 @@ private void testRepairTableWithCustomLocation(boolean isNamedArgument) throws E
                 .await();
 
         String tableLocation = databaseLocation + "/t_repair_hive";
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t_repair_hive")
-                                .contains("Location:           \t" + tableLocation + "\tNULL"))
-                .isTrue();
+        assertThat(hiveShell.executeQuery("DESC FORMATTED t_repair_hive"))
+                .contains("Location:           \t" + tableLocation + "\tNULL");
         assertThat(hiveShell.executeQuery("SHOW PARTITIONS t_repair_hive"))
                 .containsExactlyInAnyOrder("dt=2020-01-02/hh=09");
 
@@ -1741,16 +1635,10 @@ private void testRepairTableWithCustomLocation(boolean isNamedArgument) throws E
                 isNamedArgument
                         ? "CALL sys.repair(`table` => 'my_database.t_repair_hive')"
                         : "CALL sys.repair('my_database.t_repair_hive')");
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t_repair_hive")
-                                .contains("Location:           \t" + tableLocation + "\tNULL"))
-                .isTrue();
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t_repair_hive")
-                                .contains("item_id\tbigint\titem id"))
-                .isTrue();
+        assertThat(hiveShell.executeQuery("DESC FORMATTED t_repair_hive"))
+                .contains(
+                        "Location:           \t" + tableLocation + "\tNULL",
+                        "item_id\tbigint\titem id");
         assertThat(hiveShell.executeQuery("SHOW PARTITIONS t_repair_hive"))
                 .containsExactlyInAnyOrder("dt=2020-01-02/hh=09", "dt=2020-01-03/hh=10");
         hiveShell.execute("DROP TABLE my_database.t_repair_hive");
@@ -1780,29 +1668,13 @@ public void testRepairTableWithSyncTblProperties()
 
         tEnv.executeSql("CALL sys.repair('test_db.repair_t03')");
 
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED repair_t03")
-                                .contains("\tfile.format         \tavro                "))
-                .isFalse();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED repair_t03")
-                                .contains("\tprimary-key         \tcc,aa               "))
-                .isFalse();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED repair_t03")
-                                .contains("\tpartition           \tcc                  "))
-                .isFalse();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED repair_t03")
-                                .contains("\tbucket              \t3                   "))
-                .isFalse();
+        List<String> descFormattedResult = hiveShell.executeQuery("DESC FORMATTED repair_t03");
+        assertThat(descFormattedResult)
+                .doesNotContain(
+                        "\tfile.format         \tavro                ",
+                        "\tprimary-key         \tcc,aa               ",
+                        "\tpartition           \tcc                  ",
+                        "\tbucket              \t3                   ");
 
         tEnv.executeSql(
                         String.join(
@@ -1821,30 +1693,13 @@ public void testRepairTableWithSyncTblProperties()
         hiveShell.execute("use test_db");
 
         tEnv.executeSql("CALL sys.repair('test_db.repair_t03')");
-        hiveShell.executeQuery("DESC FORMATTED repair_t03").stream().forEach(System.out::println);
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED repair_t03")
-                                .contains("\tfile.format         \tavro                "))
-                .isTrue();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED repair_t03")
-                                .contains("\tprimary-key         \tcc,aa               "))
-                .isTrue();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED repair_t03")
-                                .contains("\tpartition           \tcc                  "))
-                .isTrue();
-
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED repair_t03")
-                                .contains("\tbucket              \t3                   "))
-                .isTrue();
+        descFormattedResult = hiveShell.executeQuery("DESC FORMATTED repair_t03");
+        assertThat(descFormattedResult)
+                .contains(
+                        "\tfile.format         \tavro                ",
+                        "\tprimary-key         \tcc,aa               ",
+                        "\tpartition           \tcc                  ",
+                        "\tbucket              \t3                   ");
     }
 
     @Test