Fix mistaken service class and simplify assertions

snuyanzin · Aug 30, 2024 · 03ce0de · 03ce0de
1 parent cb98c7b
commit 03ce0de
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/flink-clients/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-clients/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -14,4 +14,3 @@
 # limitations under the License.
 
 org.apache.flink.util.TestLoggerExtension
-org.junit.jupiter.api.extension.Extension
diff --git a/...s/flink-csv/src/test/java/org/apache/flink/formats/csv/CsvFormatStatisticsReportTest.java b/...s/flink-csv/src/test/java/org/apache/flink/formats/csv/CsvFormatStatisticsReportTest.java
@@ -66,9 +66,9 @@ void testCsvFormatStatsReportWithSingleFile() throws Exception {
         // insert data and get statistics.
         DataType dataType = tEnv.from("sourceTable").getResolvedSchema().toPhysicalRowDataType();
         tEnv.fromValues(dataType, getData()).executeInsert("sourceTable").await();
-        assertThat(folder.listFiles()).isNotNull().hasSize(1);
+        assertThat(folder.listFiles()).hasSize(1);
         File[] files = folder.listFiles();
-        assert files != null;
+        assertThat(files).isNotNull();
         TableStats tableStats =
                 csvBulkDecodingFormat.reportStatistics(
                         Collections.singletonList(new Path(files[0].toURI().toString())), null);
@@ -81,10 +81,10 @@ void testCsvFormatStatsReportWithMultiFile() throws Exception {
         DataType dataType = tEnv.from("sourceTable").getResolvedSchema().toPhysicalRowDataType();
         tEnv.fromValues(dataType, getData()).executeInsert("sourceTable").await();
         tEnv.fromValues(dataType, getData()).executeInsert("sourceTable").await();
-        assertThat(folder.listFiles()).isNotNull().hasSize(2);
+        assertThat(folder.listFiles()).hasSize(2);
         File[] files = folder.listFiles();
         List<Path> paths = new ArrayList<>();
-        assert files != null;
+        assertThat(files).isNotNull();
         paths.add(new Path(files[0].toURI().toString()));
         paths.add(new Path(files[1].toURI().toString()));
         TableStats tableStats = csvBulkDecodingFormat.reportStatistics(paths, null);

diff --git a/...k-formats/flink-orc/src/test/java/org/apache/flink/orc/OrcFormatStatisticsReportTest.java b/...k-formats/flink-orc/src/test/java/org/apache/flink/orc/OrcFormatStatisticsReportTest.java
@@ -69,9 +69,9 @@ public void testOrcFormatStatsReportWithSingleFile() throws Exception {
         // insert data and get statistics.
         DataType dataType = tEnv.from("sourceTable").getResolvedSchema().toPhysicalRowDataType();
         tEnv.fromValues(dataType, getData()).executeInsert("sourceTable").await();
-        assertThat(folder.listFiles()).isNotNull().hasSize(1);
+        assertThat(folder.listFiles()).hasSize(1);
         File[] files = folder.listFiles();
-        assert files != null;
+        assertThat(files).isNotNull();
         TableStats tableStats =
                 orcBulkDecodingFormat.reportStatistics(
                         Collections.singletonList(new Path(files[0].toURI().toString())), dataType);