Pull up testcontainer setup and teardown.

Author: chenkins

admin-cli/src/test/java/cloud/katta/cli/commands/hub/AbtractAdminCliIT.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2025 shift7 GmbH. All rights reserved.
+ */
+
+package cloud.katta.cli.commands.hub;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.testcontainers.containers.ComposeContainer;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.stream.Collectors;
+
+import cloud.katta.testsetup.AbstractHubTest;
+import cloud.katta.testsetup.HubTestConfig;
+import cloud.katta.testsetup.HubTestSetupDockerExtension;
+
+public class AbtractAdminCliIT extends AbstractHubTest {
+    private static final Logger log = LogManager.getLogger(AbtractAdminCliIT.class.getName());
+    public static ComposeContainer compose;
+
+    @BeforeAll
+    public static void setupDocker() throws URISyntaxException, IOException {
+        final HubTestConfig.Setup.DockerConfig configuration = new HubTestConfig.Setup.DockerConfig("/docker-compose-minio-localhost-hub.yml", "/.local.env", "local", "admin", "admin", "top-secret");
+        log.info("Setup docker {}", configuration);
+        final Properties props = new Properties();
+        props.load(StorageProfileArchiveIT.class.getResourceAsStream(configuration.envFile));
+        final HashMap<String, String> env = props.entrySet().stream().collect(
+                Collectors.toMap(
+                        e -> String.valueOf(e.getKey()),
+                        e -> String.valueOf(e.getValue()),
+                        (prev, next) -> next, HashMap::new
+                ));
+        env.put("HUB_ADMIN_USER", configuration.hubAdminUser);
+        env.put("HUB_ADMIN_PASSWORD", configuration.hubAdminPassword);
+        env.put("HUB_KEYCLOAK_SYSTEM_CLIENT_SECRET", configuration.hubKeycloakSystemClientSecret);
+        compose = new ComposeContainer(
+                new File(HubTestSetupDockerExtension.class.getResource(configuration.composeFile).toURI()))
+                .withLocalCompose(true)
+                .withPull(true)
+                .withEnv(env)
+                .withOptions(configuration.profile == null ? "" : String.format("--profile=%s", configuration.profile))
+                .waitingFor("wait-1", new LogMessageWaitStrategy().withRegEx(".*exit 0.*").withStartupTimeout(Duration.ofMinutes(2)));
+        compose.start();
+
+        log.info("Done setup docker {}", configuration);
+    }
+
+    @AfterAll
+    public static void teardownDocker() {
+        try {
+            compose.stop();
+        }
+        catch(Exception e) {
+            log.warn(e);
+        }
+    }
+}

admin-cli/src/test/java/cloud/katta/cli/commands/hub/StorageProfileArchiveIT.java

@@ -9,26 +9,13 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.ComposeContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.Properties;
-import java.util.stream.Collectors;
 
 import cloud.katta.protocols.hub.HubSession;
-import cloud.katta.testsetup.AbstractHubTest;
 import cloud.katta.testsetup.HubTestConfig;
-import cloud.katta.testsetup.HubTestSetupDockerExtension;
 
-class StorageProfileArchiveIT extends AbstractHubTest {
+class StorageProfileArchiveIT extends AbtractAdminCliIT {
     private static final Logger log = LogManager.getLogger(StorageProfileArchiveIT.class.getName());
     public static ComposeContainer compose;
 
@@ -43,41 +30,4 @@ public void testHubWorkflow() throws Exception {
 
         new StorageProfileArchive().call("http://localhost:8280", accessToken, "732D43FA-3716-46C4-B931-66EA5405EF1C");
     }
-
-    @BeforeAll
-    public static void setupDocker() throws URISyntaxException, IOException {
-        final HubTestConfig.Setup.DockerConfig configuration = new HubTestConfig.Setup.DockerConfig("/docker-compose-minio-localhost-hub.yml", "/.local.env", "local", "admin", "admin", "top-secret");
-        log.info("Setup docker {}", configuration);
-        final Properties props = new Properties();
-        props.load(StorageProfileArchiveIT.class.getResourceAsStream(configuration.envFile));
-        final HashMap<String, String> env = props.entrySet().stream().collect(
-                Collectors.toMap(
-                        e -> String.valueOf(e.getKey()),
-                        e -> String.valueOf(e.getValue()),
-                        (prev, next) -> next, HashMap::new
-                ));
-        env.put("HUB_ADMIN_USER", configuration.hubAdminUser);
-        env.put("HUB_ADMIN_PASSWORD", configuration.hubAdminPassword);
-        env.put("HUB_KEYCLOAK_SYSTEM_CLIENT_SECRET", configuration.hubKeycloakSystemClientSecret);
-        compose = new ComposeContainer(
-                new File(HubTestSetupDockerExtension.class.getResource(configuration.composeFile).toURI()))
-                .withLocalCompose(true)
-                .withPull(true)
-                .withEnv(env)
-                .withOptions(configuration.profile == null ? "" : String.format("--profile=%s", configuration.profile))
-                .waitingFor("wait-1", new LogMessageWaitStrategy().withRegEx(".*exit 0.*").withStartupTimeout(Duration.ofMinutes(2)));
-        compose.start();
-
-        log.info("Done setup docker {}", configuration);
-    }
-
-    @AfterAll
-    public static void teardownDocker() {
-        try {
-            compose.stop();
-        }
-        catch(Exception e) {
-            log.warn(e);
-        }
-    }
 }