From f7cc996826f72f1a9524b5845cb93e5430c1dc59 Mon Sep 17 00:00:00 2001
From: Chesnay Schepler <chesnay@apache.org>
Date: Tue, 26 Apr 2022 11:52:55 +0200
Subject: [PATCH] [FLINK-26246][build][tests] Setup JUnit 5 infrastructure for
 parallel test execution

---
 .../junit-platform.properties                 | 25 -------------------
 .../test/resources/junit-platform.properties  | 25 -------------------
 pom.xml                                       |  9 +++++++
 3 files changed, 9 insertions(+), 50 deletions(-)
 delete mode 100644 flink-table/flink-sql-parser/src/main/resources/org.apache.flink.sql.parser.utils/junit-platform.properties
 delete mode 100644 flink-table/flink-table-planner/src/test/resources/junit-platform.properties

diff --git a/flink-table/flink-sql-parser/src/main/resources/org.apache.flink.sql.parser.utils/junit-platform.properties b/flink-table/flink-sql-parser/src/main/resources/org.apache.flink.sql.parser.utils/junit-platform.properties
deleted file mode 100644
index 0b01a273c960c..0000000000000
--- a/flink-table/flink-sql-parser/src/main/resources/org.apache.flink.sql.parser.utils/junit-platform.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# This configuration makes sure parallel tests are opt-in
-# To flag a test class to run parallel, use @Execution(CONCURRENT)
-junit.jupiter.execution.parallel.enabled = true
-junit.jupiter.execution.parallel.config.strategy = dynamic
-junit.jupiter.execution.parallel.mode.default = same_thread
-junit.jupiter.execution.parallel.mode.classes.default = same_thread
-
diff --git a/flink-table/flink-table-planner/src/test/resources/junit-platform.properties b/flink-table/flink-table-planner/src/test/resources/junit-platform.properties
deleted file mode 100644
index 0b01a273c960c..0000000000000
--- a/flink-table/flink-table-planner/src/test/resources/junit-platform.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# This configuration makes sure parallel tests are opt-in
-# To flag a test class to run parallel, use @Execution(CONCURRENT)
-junit.jupiter.execution.parallel.enabled = true
-junit.jupiter.execution.parallel.config.strategy = dynamic
-junit.jupiter.execution.parallel.mode.default = same_thread
-junit.jupiter.execution.parallel.mode.classes.default = same_thread
-
diff --git a/pom.xml b/pom.xml
index 1245dd5912bea..1475f0a4cdae0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1603,6 +1603,15 @@ under the License.
 						<!--suppress MavenModelInspection -->
 						<test.randomization.seed>${test.randomization.seed}</test.randomization.seed>
 						<junit.jupiter.extensions.autodetection.enabled>true</junit.jupiter.extensions.autodetection.enabled>
+						<!-- Enabled the parallel test execution feature. -->
+						<!-- Tests and test classes can be enabled for concurrent execution using @Execution(ExecutionMode.CONCURRENT). -->
+						<junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
+						<!-- Tests are by default executed by a single thread; parallel execution is opt-in. -->
+						<junit.jupiter.execution.parallel.mode.default>same_thread</junit.jupiter.execution.parallel.mode.default>
+						<!-- Tests suites are by default executed by a single thread; parallel execution is opt-in. -->
+						<junit.jupiter.execution.parallel.mode.classes.default>same_thread</junit.jupiter.execution.parallel.mode.classes.default>
+						<!-- automatically adjust parallelism based on available cpu/processor cores-->
+						<junit.jupiter.execution.parallel.config.strategy>dynamic</junit.jupiter.execution.parallel.config.strategy>
 					</systemPropertyVariables>
 				</configuration>
 				<executions>