[FLINK-29846] Add ITCase suffix for hadoop tests extending AbstractTe…

…stBase, allow empty for Minicluster extension rule
snuyanzin · Dec 11, 2022 · ed0f15c · ed0f15c
1 parent 052cd8e
commit ed0f15c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/...rchitecture-tests-test/src/main/java/org/apache/flink/architecture/rules/ITCaseRules.java b/...rchitecture-tests-test/src/main/java/org/apache/flink/architecture/rules/ITCaseRules.java
@@ -57,7 +57,7 @@ public class ITCaseRules {
                                     .doNotHaveModifier(ABSTRACT)
                                     .should()
                                     .haveSimpleNameEndingWith("ITCase"))
-                    // FALSE by default however not every module has inheritors of AbstractTestBase
+                    // FALSE by default since 0.23.0 however not every module has inheritors of AbstractTestBase
                     .allowEmptyShould(true)
                     .as(
                             "Tests inheriting from AbstractTestBase should have name ending with ITCase");
@@ -130,6 +130,8 @@ public class ITCaseRules {
                                                                     miniClusterWithClientResourceClassRule())
                                                             .or(
                                                                     miniClusterWithClientResourceRule()))))
+                    // FALSE by default since 0.23.0 however not every module has *ITCase tests
+                    .allowEmptyShould(true)
                     .as("ITCASE tests should use a MiniCluster resource or extension");
 
     private static DescribedPredicate<JavaClass> miniClusterWithClientResourceClassRule() {

diff --git a/flink-formats/flink-hadoop-bulk/archunit-violations/83371291-f688-4eaf-a207-24981f1067f3 b/flink-formats/flink-hadoop-bulk/archunit-violations/83371291-f688-4eaf-a207-24981f1067f3
@@ -1,3 +0,0 @@
-simple name of org.apache.flink.formats.hadoop.bulk.HadoopPathBasedPartFileWriterTest does not end with 'ITCase' in (HadoopPathBasedPartFileWriterTest.java:0)
-simple name of org.apache.flink.formats.hadoop.bulk.committer.HadoopRenameCommitterHDFSTest does not end with 'ITCase' in (HadoopRenameCommitterHDFSTest.java:0)
-simple name of org.apache.flink.formats.hadoop.bulk.committer.HadoopRenameCommitterLocalFSTest does not end with 'ITCase' in (HadoopRenameCommitterLocalFSTest.java:0)

diff --git a/...lk/HadoopPathBasedPartFileWriterTest.java → .../HadoopPathBasedPartFileWriterITCase.java b/...lk/HadoopPathBasedPartFileWriterTest.java → .../HadoopPathBasedPartFileWriterITCase.java
@@ -49,7 +49,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /** Base class for testing writing data to the hadoop file system with different configurations. */
-public class HadoopPathBasedPartFileWriterTest extends AbstractTestBase {
+public class HadoopPathBasedPartFileWriterITCase extends AbstractTestBase {
     @Rule public final Timeout timeoutPerTest = Timeout.seconds(2000);
 
     @Test

diff --git a/...mitter/HadoopRenameCommitterHDFSTest.java → ...tter/HadoopRenameCommitterHDFSITCase.java b/...mitter/HadoopRenameCommitterHDFSTest.java → ...tter/HadoopRenameCommitterHDFSITCase.java
@@ -34,7 +34,7 @@
 import java.io.IOException;
 
 /** Tests the behaviors of {@link HadoopRenameFileCommitter} with HDFS file system. */
-public class HadoopRenameCommitterHDFSTest extends AbstractFileCommitterTest {
+public class HadoopRenameCommitterHDFSITCase extends AbstractFileCommitterTest {
 
     @ClassRule public static final TemporaryFolder CLASS_TEMPORARY_FOLDER = new TemporaryFolder();
 
@@ -56,7 +56,7 @@ public static void destroyHDFS() {
         hdfsCluster = null;
     }
 
-    public HadoopRenameCommitterHDFSTest(boolean override) throws IOException {
+    public HadoopRenameCommitterHDFSITCase(boolean override) throws IOException {
         super(override);
     }
 

diff --git a/...ter/HadoopRenameCommitterLocalFSTest.java → ...r/HadoopRenameCommitterLocalFSITCase.java b/...ter/HadoopRenameCommitterLocalFSTest.java → ...r/HadoopRenameCommitterLocalFSITCase.java
@@ -27,9 +27,9 @@
 import java.io.IOException;
 
 /** Tests the behaviors of {@link HadoopRenameFileCommitter} with local file system. */
-public class HadoopRenameCommitterLocalFSTest extends AbstractFileCommitterTest {
+public class HadoopRenameCommitterLocalFSITCase extends AbstractFileCommitterTest {
 
-    public HadoopRenameCommitterLocalFSTest(boolean override) throws IOException {
+    public HadoopRenameCommitterLocalFSITCase(boolean override) throws IOException {
         super(override);
     }