Skip to content

Commit 6bbaba4

Browse files
committed
Pull up hub session setup.
1 parent 1800a5e commit 6bbaba4

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,22 @@
77

88
import ch.cyberduck.core.PasswordStoreFactory;
99

10-
import org.apache.logging.log4j.LogManager;
11-
import org.apache.logging.log4j.Logger;
1210
import org.junit.jupiter.api.Test;
13-
import org.testcontainers.containers.ComposeContainer;
1411

1512
import java.util.Optional;
1613

1714
import cloud.katta.client.api.StorageProfileResourceApi;
1815
import cloud.katta.client.model.StorageProfileS3Dto;
19-
import cloud.katta.protocols.hub.HubSession;
2016
import cloud.katta.testcontainers.AbtractAdminCliIT;
21-
import cloud.katta.testsetup.HubTestConfig;
2217

23-
import static org.junit.Assert.assertFalse;
18+
import static org.junit.jupiter.api.Assertions.assertFalse;
2419
import static org.junit.jupiter.api.Assertions.assertTrue;
2520

2621
class StorageProfileArchiveIT extends AbtractAdminCliIT {
27-
private static final Logger log = LogManager.getLogger(StorageProfileArchiveIT.class.getName());
28-
public static ComposeContainer compose;
29-
30-
3122
@Test
3223
public void testStorageProfileArchive() throws Exception {
33-
HubTestConfig.Setup config = new HubTestConfig.Setup().withUserConfig(
34-
new HubTestConfig.Setup.UserConfig("admin", "admin", "setupcode")
35-
).withHubURL("http://localhost:8280");
36-
final HubSession hubSession = setupConnection(config);
3724
final String accessToken = PasswordStoreFactory.get().findOAuthTokens(hubSession.getHost()).getAccessToken();
3825

39-
4026
final String storageProfileId = "732D43FA-3716-46C4-B931-66EA5405EF1C".toLowerCase();
4127
final StorageProfileResourceApi storageProfileResourceApi = new StorageProfileResourceApi(hubSession.getClient());
4228
{

admin-cli/src/test/java/cloud/katta/testcontainers/AbtractAdminCliIT.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.apache.logging.log4j.Logger;
99
import org.junit.jupiter.api.AfterAll;
1010
import org.junit.jupiter.api.BeforeAll;
11+
import org.junit.jupiter.api.BeforeEach;
1112
import org.testcontainers.containers.ComposeContainer;
1213
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
1314

@@ -19,6 +20,7 @@
1920
import java.util.Properties;
2021
import java.util.stream.Collectors;
2122

23+
import cloud.katta.protocols.hub.HubSession;
2224
import cloud.katta.testsetup.AbstractHubTest;
2325
import cloud.katta.testsetup.HubTestConfig;
2426
import cloud.katta.testsetup.HubTestSetupDockerExtension;
@@ -27,6 +29,8 @@ public class AbtractAdminCliIT extends AbstractHubTest {
2729
private static final Logger log = LogManager.getLogger(AbtractAdminCliIT.class.getName());
2830
public static ComposeContainer compose;
2931

32+
protected HubSession hubSession;
33+
3034
@BeforeAll
3135
public static void setupDocker() throws URISyntaxException, IOException {
3236
final HubTestConfig.Setup.DockerConfig configuration = new HubTestConfig.Setup.DockerConfig("/docker-compose-minio-localhost-hub.yml", "/.local.env", "local", "admin", "admin", "top-secret");
@@ -54,6 +58,14 @@ public static void setupDocker() throws URISyntaxException, IOException {
5458
log.info("Done setup docker {}", configuration);
5559
}
5660

61+
@BeforeEach
62+
protected void setup() throws Exception {
63+
final HubTestConfig.Setup config = new HubTestConfig.Setup().withUserConfig(
64+
new HubTestConfig.Setup.UserConfig("admin", "admin", "setupcode")
65+
).withHubURL("http://localhost:8280");
66+
hubSession = setupConnection(config);
67+
}
68+
5769
@AfterAll
5870
public static void teardownDocker() {
5971
try {

0 commit comments

Comments
 (0)