[ST] Update skodjob k8s test dependency + test fixes - timeouts (#2414)

* update skodjob
* test utils update
* javadoc

---------

Signed-off-by: jkalinic <jkalinic@redhat.com>

Author: jankalinic

systemtests/pom.xml

@@ -22,7 +22,7 @@
         <!-- Playwright -->
         <playwright.version>1.58.0</playwright.version>
         <!-- Used for test-frame -->
-        <test-frame.version>1.4.0</test-frame.version>
+        <skodjob.kubetest4j.version>1.0.0</skodjob.kubetest4j.version>
         <!-- Allows skipping tests - unit, system or both types -->
         <skipTests>false</skipTests>
         <skipUTs>${skipTests}</skipUTs>
@@ -87,24 +87,24 @@
         </dependency>
         <!-- Test Frame used for handling k8s resources -->
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-common</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>kubetest4j</artifactId>
+            <version>${skodjob.kubetest4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-kubernetes</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>kubernetes-resources</artifactId>
+            <version>${skodjob.kubetest4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-openshift</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>openshift-resources</artifactId>
+            <version>${skodjob.kubetest4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-log-collector</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>log-collector</artifactId>
+            <version>${skodjob.kubetest4j.version}</version>
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>

systemtests/src/main/java/com/github/streamshub/systemtests/Environment.java

@@ -5,13 +5,13 @@
 import com.github.streamshub.systemtests.exceptions.SetupException;
 import com.github.streamshub.systemtests.utils.resourceutils.ClusterUtils;
 import io.fabric8.kubernetes.api.model.Service;
-import io.skodjob.testframe.enums.InstallType;
-import io.skodjob.testframe.environment.TestEnvironmentVariables;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.enums.InstallType;
+import io.skodjob.kubetest4j.environment.TestEnvironmentVariables;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 
 import java.io.IOException;
 
-import static io.skodjob.testframe.TestFrameEnv.USER_PATH;
+import static io.skodjob.kubetest4j.KubeTestEnv.USER_PATH;
 
 public class Environment {
     private static final TestEnvironmentVariables ENVS = new TestEnvironmentVariables();

systemtests/src/main/java/com/github/streamshub/systemtests/MessageStore.java

@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.streamshub.systemtests.exceptions.SetupException;
 import com.github.streamshub.systemtests.logs.LogWrapper;
-import io.skodjob.testframe.TestFrameEnv;
+import io.skodjob.kubetest4j.KubeTestEnv;
 import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
@@ -33,7 +33,7 @@ public class MessageStore {
     private MessageStore() {}
 
     private static JsonNode jsonResources;
-    private static final Path MESSAGES_PATH = Path.of(TestFrameEnv.USER_PATH + "/../ui/messages/en.json");
+    private static final Path MESSAGES_PATH = Path.of(KubeTestEnv.USER_PATH + "/../ui/messages/en.json");
 
     static {
         try {

systemtests/src/main/java/com/github/streamshub/systemtests/TestCaseConfig.java

@@ -1,6 +1,7 @@
 package com.github.streamshub.systemtests;
 
 import com.github.streamshub.systemtests.constants.Constants;
+import com.github.streamshub.systemtests.logs.LogWrapper;
 import com.github.streamshub.systemtests.utils.Utils;
 import com.github.streamshub.systemtests.utils.playwright.PwUtils;
 import com.github.streamshub.systemtests.utils.resourceutils.kafka.KafkaNamingUtils;
@@ -12,19 +13,23 @@
 import com.microsoft.playwright.Tracing;
 import com.microsoft.playwright.options.ColorScheme;
 import com.microsoft.playwright.options.ViewportSize;
+import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
 import java.lang.reflect.Method;
 import java.util.Locale;
 
 public class TestCaseConfig {
+
+    private static final Logger LOGGER = LogWrapper.getLogger(TestCaseConfig.class);
+
     private static final ViewportSize FULL_HD = new ViewportSize(1920, 1080);
     private final String testName;
     private final String namespace;
-    private final Playwright playwright;
-    private final BrowserContext context;
-    private final Browser browser;
-    private final Page page;
+    private Playwright playwright;
+    private BrowserContext context;
+    private Browser browser;
+    private Page page;
     private final int defaultMessageCount;
 
     // Default Kafka
@@ -53,19 +58,7 @@ public TestCaseConfig(ExtensionContext extensionContext) {
             .map(name -> name.toLowerCase(Locale.ENGLISH) + "-" + Utils.hashStub(testName))
             .orElse("nullClass");
 
-        this.playwright = Playwright.create();
-
-        // to keep browser context open it must exist within the TestCaseConfig context - can't be a local var
-        browser = PwUtils.createBrowser(playwright);
-        this.context = browser.newContext(new Browser.NewContextOptions()
-                .setColorScheme(ColorScheme.DARK)
-                .setViewportSize(FULL_HD)
-                .setIgnoreHTTPSErrors(true));
-
-        // Allow tracing
-        this.context.tracing().start(new Tracing.StartOptions().setScreenshots(true).setSnapshots(true).setSources(true));
-
-        this.page = context.newPage();
+        this.initPlaywright();
 
         this.kafkaName = KafkaNamingUtils.kafkaClusterName(namespace);
         this.connectName = KafkaNamingUtils.kafkaConnectName(namespace);
@@ -83,6 +76,38 @@ public TestCaseConfig(ExtensionContext extensionContext) {
         this.apicurioRegistry3Name = Constants.APICURIO_PREFIX + "-" + Utils.hashStub(namespace);
     }
 
+    private void initPlaywright() {
+        this.playwright = Playwright.create();
+        // to keep browser context open it must exist within the TestCaseConfig context - can't be a local var
+        this.browser = PwUtils.createBrowser(playwright);
+
+        this.context = browser.newContext(new Browser.NewContextOptions()
+            .setColorScheme(ColorScheme.DARK)
+            .setViewportSize(FULL_HD)
+            .setIgnoreHTTPSErrors(true));
+
+        // Allow tracing
+        this.context.tracing().start(new Tracing.StartOptions()
+            .setScreenshots(true)
+            .setSnapshots(true)
+            .setSources(true));
+
+        this.page = context.newPage();
+    }
+
+    public void resetBrowserContext() {
+        try {
+            PwUtils.saveTracing(this.context);
+            // closes the context and its page(s), browser stays alive
+            this.context.close();
+            this.browser.close();
+            this.playwright.close();
+        } catch (Exception ignored) {
+            LOGGER.error("Cannot reset context");
+        }
+        initPlaywright();
+    }
+
     // ----------
     // Getters
     // ----------

systemtests/src/main/java/com/github/streamshub/systemtests/TestExecutionWatcher.java

@@ -4,7 +4,7 @@
 import com.github.streamshub.systemtests.logs.LogWrapper;
 import com.github.streamshub.systemtests.logs.TestLogCollector;
 import com.github.streamshub.systemtests.utils.playwright.PwUtils;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.LifecycleMethodExecutionExceptionHandler;

systemtests/src/main/java/com/github/streamshub/systemtests/constants/Constants.java

@@ -13,8 +13,9 @@ private Constants() {}
     // --------------------------------
     // ------------ General -----------
     // --------------------------------
-    public static final int MAX_ACTION_RETRIES = 10;
+    public static final int DEFAULT_ACTION_RETRIES = 8;
     public static final int LOGOUT_RETRIES = 5;
+    public static final int SELECTOR_RETRIES = 10;
 
     /**
      * Commands
@@ -30,7 +31,6 @@ private Constants() {}
     /**
      * Test values
      */
-    public static final int SELECTOR_RETRIES = 10;
     public static final String VALUE_ATTRIBUTE = "value";
     public static final String CHECKED_ATTRIBUTE = "checked";
     public static final int DEFAULT_TOPICS_PER_PAGE = 20;

systemtests/src/main/java/com/github/streamshub/systemtests/constants/ResourceConditions.java

@@ -3,7 +3,7 @@
 import com.github.streamshub.systemtests.enums.ConditionStatus;
 import com.github.streamshub.systemtests.enums.ResourceStatus;
 import io.fabric8.kubernetes.client.CustomResource;
-import io.skodjob.testframe.resources.ResourceCondition;
+import io.skodjob.kubetest4j.resources.ResourceCondition;
 import io.strimzi.api.kafka.model.common.Spec;
 import io.strimzi.api.kafka.model.kafka.Status;
 

systemtests/src/main/java/com/github/streamshub/systemtests/constants/TimeConstants.java

@@ -1,6 +1,6 @@
 package com.github.streamshub.systemtests.constants;
 
-import io.skodjob.testframe.TestFrameConstants;
+import io.skodjob.kubetest4j.KubeTestConstants;
 
 import java.time.Duration;
 
@@ -26,9 +26,12 @@ private static long secondsInMilis(int seconds) {
     // HTML elements
     public static final long ELEMENT_VISIBILITY_TIMEOUT = minutesInMilis(1);
     public static final long UI_COMPONENT_REACTION_INTERVAL_SHORT = secondsInMilis(5);
+    public static final long ACTION_WAIT_LONG = minutesInMilis(1);
+    public static final long ACTION_WAIT_MEDIUM = secondsInMilis(20);
+    public static final long ACTION_WAIT_SHORT = secondsInMilis(10);
 
     // Time values depending on variable
     public static long timeoutForClientFinishJob(int messagesCount) {
-        return messagesCount * (TestFrameConstants.POLL_INTERVAL_FOR_RESOURCE_READINESS + TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM);
+        return messagesCount * (KubeTestConstants.POLL_INTERVAL_FOR_RESOURCE_READINESS + KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM);
     }
 }

systemtests/src/main/java/com/github/streamshub/systemtests/exceptions/ClusterUnreachableException.java

@@ -1,7 +1,7 @@
 package com.github.streamshub.systemtests.exceptions;
 
-import io.skodjob.testframe.clients.KubeClusterException;
-import io.skodjob.testframe.executor.ExecResult;
+import io.skodjob.kubetest4j.clients.KubeClusterException;
+import io.skodjob.kubetest4j.executor.ExecResult;
 
 public class ClusterUnreachableException extends KubeClusterException {
     public ClusterUnreachableException(ExecResult result) {

systemtests/src/main/java/com/github/streamshub/systemtests/interfaces/TestBucketExtension.java

@@ -5,7 +5,7 @@
 import com.github.streamshub.systemtests.annotations.TestBucket;
 import com.github.streamshub.systemtests.exceptions.SetupException;
 import com.github.streamshub.systemtests.logs.LogWrapper;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
 import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;