Migrate junit5 to junit6 (strimzi#11965)

Signed-off-by: David Kornel <kornys@outlook.com>

Author: kornys

pom.xml

@@ -48,8 +48,8 @@
 
         <!-- Maven plugin versions -->
         <maven.compiler.version>3.10.1</maven.compiler.version>
-        <maven.surefire.version>3.1.2</maven.surefire.version>
-        <maven.failsafe.version>3.1.2</maven.failsafe.version>
+        <maven.surefire.version>3.5.4</maven.surefire.version>
+        <maven.failsafe.version>3.5.4</maven.failsafe.version>
         <maven.assembly.version>3.4.2</maven.assembly.version>
         <maven.shade.version>3.4.1</maven.shade.version>
         <maven.javadoc.version>3.10.0</maven.javadoc.version>
@@ -103,9 +103,8 @@
         <!-- Test only dependencies -->
         <hamcrest.version>2.2</hamcrest.version>
         <mockito.version>4.11.0</mockito.version>
-        <junit.platform.version>1.9.3</junit.platform.version>
         <opentest4j.version>1.2.0</opentest4j.version>
-        <jupiter.version>5.9.3</jupiter.version>
+        <jupiter.version>6.0.0</jupiter.version>
         <strimzi-test-container.version>0.112.0</strimzi-test-container.version>
         <mockserver.version>5.13.2</mockserver.version>
         <valid4j.version>1.1</valid4j.version>
@@ -115,7 +114,7 @@
         <testcontainer.version>1.20.1</testcontainer.version>
         <docker-java.version>3.4.0</docker-java.version>
         <junit4.version>4.13.2</junit4.version>
-        <skodjob.test-frame.version>1.1.0</skodjob.test-frame.version>
+        <skodjob.test-frame.version>1.2.0</skodjob.test-frame.version>
         <skodjob-doc.version>0.5.0</skodjob-doc.version>
         <helm-client.version>0.0.15</helm-client.version>
         <access-operator.version>0.2.0</access-operator.version>
@@ -722,26 +721,31 @@
                 <version>${jupiter.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>io.vertx</groupId>
-                <artifactId>vertx-junit5</artifactId>
-                <version>${vertx-junit5.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.junit.platform</groupId>
                 <artifactId>junit-platform-commons</artifactId>
-                <version>${junit.platform.version}</version>
+                <version>${jupiter.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.junit.platform</groupId>
                 <artifactId>junit-platform-launcher</artifactId>
-                <version>${junit.platform.version}</version>
+                <version>${jupiter.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${jupiter.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.junit.platform</groupId>
                 <artifactId>junit-platform-engine</artifactId>
-                <version>${junit.platform.version}</version>
+                <version>${jupiter.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.vertx</groupId>
+                <artifactId>vertx-junit5</artifactId>
+                <version>${vertx-junit5.version}</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
@@ -969,18 +973,6 @@
                     <useModulePath>false</useModulePath>
                     <skipTests>${skip.surefire.tests}</skipTests>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.junit.jupiter</groupId>
-                        <artifactId>junit-jupiter-engine</artifactId>
-                        <version>${jupiter.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>io.vertx</groupId>
-                        <artifactId>vertx-junit5</artifactId>
-                        <version>${vertx-junit5.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

systemtest/src/main/java/io/strimzi/systemtest/interfaces/IndicativeSentences.java

@@ -27,7 +27,6 @@
 import io.skodjob.testframe.resources.ValidatingWebhookConfigurationType;
 import io.skodjob.testframe.utils.KubeUtils;
 import io.strimzi.systemtest.exceptions.KubernetesClusterUnstableException;
-import io.strimzi.systemtest.interfaces.IndicativeSentences;
 import io.strimzi.systemtest.logs.TestExecutionWatcher;
 import io.strimzi.systemtest.parallel.SuiteThreadController;
 import io.strimzi.systemtest.parallel.TestSuiteNamespaceManager;
@@ -54,7 +53,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -67,7 +65,6 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @ExtendWith({TestExecutionWatcher.class})
-@DisplayNameGeneration(IndicativeSentences.class)
 @ResourceManager()
 @SuppressWarnings({"checkstyle:ClassDataAbstractionCoupling", "checkstyle:ClassFanOutComplexity"})
 public abstract class AbstractST implements TestSeparator {

systemtest/src/test/java/io/strimzi/systemtest/AbstractST.java

@@ -226,7 +226,7 @@ void testNodePoolsRolesChanging() {
 
         // remove topic which blocks role change (removal of broker role thus decreasing number of broker nodes available)
         LOGGER.info("Delete Kafka Topic {}/{}", testStorage.getNamespaceName(), testStorage.getTopicName());
-        KubeResourceManager.get().deleteResource(kafkaTopic);
+        KubeResourceManager.get().deleteResourceWithWait(kafkaTopic);
         KafkaTopicUtils.waitForKafkaTopicDeletion(testStorage.getNamespaceName(), testStorage.getTopicName());
 
         // wait for final roll changing
@@ -319,7 +319,7 @@ private void transmitMessagesWithNewTopicAndClean(TestStorage testStorage, int t
         ClientUtils.waitForInstantClientSuccess(testStorage);
 
         // clean topic
-        KubeResourceManager.get().deleteResource(kafkaTopic);
+        KubeResourceManager.get().deleteResourceWithWait(kafkaTopic);
         KafkaTopicUtils.waitForKafkaTopicDeletion(testStorage.getNamespaceName(), topicName);
     }
 

systemtest/src/test/java/io/strimzi/systemtest/kafka/KafkaNodePoolST.java

@@ -276,7 +276,7 @@ void testDeleteTopicEnableFalse() {
         KafkaTopic kafkaTopic = CrdClients.kafkaTopicClient().inNamespace(testStorage.getNamespaceName()).withName(testStorage.getTopicName()).get();
         if (kafkaTopic != null) {
             LOGGER.info("Deleting KafkaTopic: {}/{}", testStorage.getNamespaceName(), testStorage.getTopicName());
-            KubeResourceManager.get().deleteResource(kafkaTopic);
+            KubeResourceManager.get().deleteResourceWithWait(kafkaTopic);
         }
     }
 

systemtest/src/test/java/io/strimzi/systemtest/operators/topic/TopicST.java

@@ -197,7 +197,7 @@ void testCapacity(String maxBatchSize, String maxBatchLingerMs) throws IOExcepti
             // I saw a behaviour where deleting one by one might lead to 10s delay for deleting each KafkaTopic
             LOGGER.info("Start deletion KafkaTopics in namespace:{}", testStorage.getNamespaceName());
             List<KafkaTopic> kafkaTopics = CrdClients.kafkaTopicClient().inNamespace(testStorage.getNamespaceName()).list().getItems();
-            KubeResourceManager.get().deleteResource(kafkaTopics.toArray(new KafkaTopic[0]));
+            KubeResourceManager.get().deleteResourceAsyncWait(kafkaTopics.toArray(new KafkaTopic[0]));
             KafkaTopicUtils.waitForTopicWithPrefixDeletion(testStorage.getNamespaceName(), testStorage.getTopicName());
 
             if (this.topicOperatorMetricsGatherer != null) {

systemtest/src/test/java/io/strimzi/systemtest/performance/TopicOperatorPerformance.java

@@ -69,7 +69,7 @@ void testScalability() {
                 // safe net if something went wrong during test case and KafkaTopic is not properly deleted
                 LOGGER.info("Cleaning namespace: {}", suiteTestStorage.getNamespaceName());
                 List<KafkaTopic> kafkaTopics = CrdClients.kafkaTopicClient().inNamespace(suiteTestStorage.getNamespaceName()).list().getItems();
-                KubeResourceManager.get().deleteResource(kafkaTopics.toArray(new KafkaTopic[0]));
+                KubeResourceManager.get().deleteResourceAsyncWait(kafkaTopics.toArray(new KafkaTopic[0]));
                 KafkaTopicUtils.waitForTopicWithPrefixDeletion(suiteTestStorage.getNamespaceName(), suiteTestStorage.getTopicName());
 
                 final Map<String, Object> performanceAttributes = new LinkedHashMap<>();

systemtest/src/test/java/io/strimzi/systemtest/performance/TopicOperatorScalabilityPerformance.java

@@ -207,7 +207,7 @@ void testCapacity(String controllerThreadPoolSize, String cacheRefreshIntervalMs
             // to enchantment a process of deleting we should delete all resources at once
             // I saw a behaviour where deleting one by one might lead to 10s delay for deleting each KafkaUser
             List<KafkaUser> kafkaUsers = CrdClients.kafkaUserClient().inNamespace(testStorage.getNamespaceName()).list().getItems();
-            KubeResourceManager.get().deleteResource(kafkaUsers.toArray(new KafkaUser[0]));
+            KubeResourceManager.get().deleteResourceAsyncWait(kafkaUsers.toArray(new KafkaUser[0]));
             KafkaUserUtils.waitForUserWithPrefixDeletion(testStorage.getNamespaceName(), testStorage.getUsername());
 
             if (this.userOperatorMetricsGatherer != null) {

systemtest/src/test/java/io/strimzi/systemtest/performance/UserOperatorPerformance.java

@@ -160,7 +160,7 @@ void testKafkaDoesNotRollsWhenTopicIsUnderReplicated() {
         kafkaPods = RollingUpdateUtils.waitTillComponentHasRolled(testStorage.getNamespaceName(), testStorage.getBrokerSelector(), scaledUpBrokerReplicaCount, kafkaPods);
 
         LOGGER.info("Remove Topic, thereby remove all partitions located on broker to be scaled down");
-        KubeResourceManager.get().deleteResource(kafkaTopicWith4Replicas);
+        KubeResourceManager.get().deleteResourceWithWait(kafkaTopicWith4Replicas);
         RollingUpdateUtils.waitForComponentScaleUpOrDown(testStorage.getNamespaceName(), testStorage.getBrokerSelector(), initialBrokerReplicaCount);
 
         //Test that CO doesn't have any exceptions in log