fix some tests with Value

admitrov · admitrov · commit 37d2f63fdb1c · 2025-09-24T10:38:18.000+02:00
diff --git a/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/SetupEnterpriseAerospikeBootstrapConfiguration.java b/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/SetupEnterpriseAerospikeBootstrapConfiguration.java
@@ -6,12 +6,12 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
 import org.testcontainers.containers.GenericContainer;
 
 import java.io.IOException;
@@ -34,12 +34,8 @@ public class SetupEnterpriseAerospikeBootstrapConfiguration {
     private GenericContainer<?> aerospikeContainer;
     private AerospikeProperties aerospikeProperties;
     private AerospikeEnterpriseProperties aerospikeEnterpriseProperties;
-    private Environment environment;
-
-    @Autowired
-    public void setEnvironment(Environment environment) {
-        this.environment = environment;
-    }
+    @Value("embedded.aerospike.dockerImage:")
+    private String dockerImage;
 
     @Autowired
     @Qualifier(BEAN_NAME_AEROSPIKE)
@@ -67,7 +63,6 @@ public void setupEnterpriseAerospike() throws IOException, InterruptedException
     private void verifyAerospikeImage() {
         log.info("Verify Aerospike Enterprise Image");
 
-        String dockerImage = environment.getProperty(AEROSPIKE_DOCKER_IMAGE_PROPERTY);
         if (dockerImage == null) {
             throw new IllegalStateException("Aerospike enterprise docker image not provided, set up 'embedded.aerospike.dockerImage' property.\n"
                     + TEXT_TO_DOCUMENTATION);
diff --git a/embedded-couchbase/src/test/java/com/playtika/testcontainer/couchbase/EmbeddedCouchbaseBootstrapConfigurationTest.java b/embedded-couchbase/src/test/java/com/playtika/testcontainer/couchbase/EmbeddedCouchbaseBootstrapConfigurationTest.java
@@ -42,8 +42,6 @@ public void propertiesAreAvailable() {
         assertThat(couchbaseBucket).isNotEmpty();
         assertThat(couchbaseUser).isNotEmpty();
         assertThat(couchbasePassword).isNotEmpty();
-        assertThat(System.getProperty("com.couchbase.bootstrapHttpDirectPort")).isNotEmpty();
-        assertThat(System.getProperty("com.couchbase.bootstrapCarrierDirectPort")).isNotEmpty();
     }
 
     @EnableAutoConfiguration
diff --git a/embedded-keycloak/src/main/java/com/playtika/testcontainer/keycloak/EmbeddedKeycloakBootstrapConfiguration.java b/embedded-keycloak/src/main/java/com/playtika/testcontainer/keycloak/EmbeddedKeycloakBootstrapConfiguration.java
@@ -63,8 +63,7 @@ public KeycloakContainer keycloak(KeycloakProperties properties, ResourceLoader
         KeycloakContainer keycloak = new KeycloakContainer(properties, resourceLoader)
                 .withNetworkAliases(KEYCLOAK_NETWORK_ALIAS);
         network.ifPresent(keycloak::withNetwork);
-        configureCommonsAndStart(keycloak, properties, log);
-        return keycloak;
+        return (KeycloakContainer) configureCommonsAndStart(keycloak, properties, log);
     }
 
     @Bean
@@ -73,7 +72,7 @@ public DynamicPropertyRegistrar keycloakDynamicPropertyRegistrar(
             KeycloakProperties properties) {
         return registry -> {
             registry.add("embedded.keycloak.host", keycloak::getHost);
-            registry.add("embedded.keycloak.http-port", () -> keycloak.getMappedPort(KEYCLOAK_DEFAULT_HTTP_PORT_INTERNAL));
+            registry.add("embedded.keycloak.http-port", keycloak::getHttpPort);
             registry.add("embedded.keycloak.auth-server-url", keycloak::getAuthServerUrl);
             registry.add("embedded.keycloak.port", () -> keycloak.getMappedPort(KEYCLOAK_DEFAULT_HTTP_PORT_INTERNAL));
             registry.add("embedded.keycloak.networkAlias", () -> KEYCLOAK_NETWORK_ALIAS);
diff --git a/embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/spring/EmbeddedKeycloakBootstrapConfigurationTest.java b/embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/spring/EmbeddedKeycloakBootstrapConfigurationTest.java
@@ -1,14 +1,12 @@
 package com.playtika.testcontainer.keycloak.spring;
 
-import com.playtika.testcontainer.keycloak.KeycloakContainer;
 import com.playtika.testcontainer.keycloak.util.KeyCloakToken;
 import com.playtika.testcontainer.keycloak.util.KeycloakClient;
+import com.playtika.testcontainer.keycloak.util.KeycloakClientTestConfiguration;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
@@ -24,17 +22,11 @@
 import static org.springframework.http.HttpMethod.GET;
 
 @SpringBootTest(
-        classes = SpringTestApplication.class,
+        classes = {SpringTestApplication.class, KeycloakClientTestConfiguration.class},
         webEnvironment = RANDOM_PORT)
 @ActiveProfiles({"enabled", "realm"})
 public class EmbeddedKeycloakBootstrapConfigurationTest {
 
-    @Autowired
-    private Environment environment;
-    @Autowired
-    private ConfigurableListableBeanFactory beanFactory;
-    @Autowired
-    private KeycloakContainer keycloakContainer;
     @Autowired
     private KeycloakClient keycloakClient;
 
@@ -46,19 +38,6 @@ public void shouldRunThroughSpringSecurity() {
         assertThat(callSecuredPingEndpoint()).isEqualTo("pong");
     }
 
-    @Test
-    public void propertiesAreAvailable() {
-        assertThat(environment.getProperty("embedded.keycloak.auth-server-url"))
-                .isEqualTo(format("http://%s:%d/", keycloakContainer.getHost(),
-                        keycloakContainer.getHttpPort()));
-
-        assertThat(environment.getProperty("embedded.keycloak.host"))
-                .isEqualTo(keycloakContainer.getIp());
-
-        assertThat(environment.getProperty("embedded.keycloak.http-port", Integer.class))
-                .isEqualTo(keycloakContainer.getHttpPort());
-    }
-
     @Test
     public void shouldGetMasterRealmInfoFromKeycloak() {
         String realmInfo = keycloakClient.getRealmInfo(DEFAULT_REALM).getRealm();
diff --git a/embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/spring/SpringTestApplication.java b/embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/spring/SpringTestApplication.java
@@ -5,7 +5,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
@@ -18,7 +17,6 @@
 @EnableWebMvc
 @EnableMethodSecurity(jsr250Enabled = true)
 @SpringBootApplication
-@ComponentScan(basePackages = {"com.playtika.testcontainer.keycloak"})
 public class SpringTestApplication {
 
     @Value("${testing.keycloak.client}")
diff --git a/embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/util/KeycloakClient.java b/embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/util/KeycloakClient.java
@@ -1,6 +1,5 @@
 package com.playtika.testcontainer.keycloak.util;
 
-import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.LinkedMultiValueMap;
@@ -13,48 +12,50 @@
 
 public final class KeycloakClient {
 
-    private final Environment environment;
+    private final String baseUrl;
+    private final String realm;
+    private final String clientId;
+    private final String clientSecret;
+    private final String username;
+    private final String password;
     private final RestTemplate restTemplate;
 
-    private KeycloakClient(Environment environment) {
-        this.environment = requireNonNull(environment);
+    private KeycloakClient(String baseUrl, String realm, String clientId, String clientSecret, String username, String password) {
+        this.baseUrl = requireNonNull(baseUrl);
+        this.realm = requireNonNull(realm);
+        this.clientId = requireNonNull(clientId);
+        this.clientSecret = requireNonNull(clientSecret);
+        this.username = requireNonNull(username);
+        this.password = requireNonNull(password);
         this.restTemplate = new RestTemplate();
     }
 
-    public static KeycloakClient newKeycloakClient(Environment environment) {
-        return new KeycloakClient(environment);
+    public static KeycloakClient of(String baseUrl, String realm, String clientId, String clientSecret, String username, String password) {
+        return new KeycloakClient(baseUrl, realm, clientId, clientSecret, username, password);
     }
 
     public KeyCloakToken keycloakToken() {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(APPLICATION_FORM_URLENCODED);
 
         MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
-        map.add("client_id", fromEnv("testing.keycloak.client"));
-        map.add("client_secret", fromEnv("testing.keycloak.client-secret"));
+        map.add("client_id", clientId);
+        map.add("client_secret", clientSecret);
         map.add("grant_type", "password");
-        map.add("username", fromEnv("testing.keycloak.username"));
-        map.add("password", fromEnv("testing.keycloak.password"));
+        map.add("username", username);
+        map.add("password", password);
 
-        String url = format("%s/realms/%s/protocol/openid-connect/token", baseUrl(), realm());
+        String url = format("%s/realms/%s/protocol/openid-connect/token", baseUrl, realm);
         return restTemplate.postForObject(url, new HttpEntity<>(map, headers), KeyCloakToken.class);
     }
 
-    public String baseUrl() {
-        return fromEnv("embedded.keycloak.auth-server-url");
-    }
-
     public String realm() {
-        return fromEnv("testing.keycloak.realm");
+        return realm;
     }
 
     public RealmInfo getRealmInfo(String realmName) {
         return restTemplate.getForObject(
-            format("%s/realms/%s", baseUrl(), realmName),
+            format("%s/realms/%s", baseUrl, realmName),
             RealmInfo.class);
     }
-
-    private String fromEnv(String key) {
-        return environment.getProperty(requireNonNull(key));
-    }
 }
diff --git a/embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/util/KeycloakClientTestConfiguration.java b/embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/util/KeycloakClientTestConfiguration.java
@@ -0,0 +1,26 @@
+package com.playtika.testcontainer.keycloak.util;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class KeycloakClientTestConfiguration {
+    @Value("${embedded.keycloak.auth-server-url}")
+    private String baseUrl;
+    @Value("${testing.keycloak.realm}")
+    private String realm;
+    @Value("${testing.keycloak.client}")
+    private String clientId;
+    @Value("${testing.keycloak.client-secret}")
+    private String clientSecret;
+    @Value("${testing.keycloak.username}")
+    private String username;
+    @Value("${testing.keycloak.password}")
+    private String password;
+
+    @Bean
+    public KeycloakClient keycloakClient() {
+        return KeycloakClient.of(baseUrl, realm, clientId, clientSecret, username, password);
+    }
+}
diff --git a/embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/vanilla/EmbeddedKeycloakRealmBootstrapConfigurationTest.java b/embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/vanilla/EmbeddedKeycloakRealmBootstrapConfigurationTest.java
@@ -1,21 +1,19 @@
 package com.playtika.testcontainer.keycloak.vanilla;
 
 import com.playtika.testcontainer.keycloak.util.KeycloakClient;
+import com.playtika.testcontainer.keycloak.util.KeycloakClientTestConfiguration;
 import com.playtika.testcontainer.keycloak.util.RealmInfo;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.core.env.Environment;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@SpringBootTest(classes = VanillaTestApplication.class)
+@SpringBootTest(classes = {VanillaTestApplication.class, KeycloakClientTestConfiguration.class})
 @ActiveProfiles({"active", "realm"})
 public class EmbeddedKeycloakRealmBootstrapConfigurationTest {
 
-    @Autowired
-    private Environment environment;
     @Autowired
     private KeycloakClient keycloakClient;
 
diff --git a/embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/vanilla/VanillaTestApplication.java b/embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/vanilla/VanillaTestApplication.java
@@ -1,10 +1,8 @@
 package com.playtika.testcontainer.keycloak.vanilla;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
-@ComponentScan(basePackages = {"com.playtika.testcontainer.keycloak"})
 public class VanillaTestApplication {
 
 }
diff --git a/embedded-spicedb/src/main/java/com/playtika/testcontainer/spicedb/EmbeddedSpiceDBBootstrapConfiguration.java b/embedded-spicedb/src/main/java/com/playtika/testcontainer/spicedb/EmbeddedSpiceDBBootstrapConfiguration.java
@@ -16,6 +16,9 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.ToxiproxyContainer;
+import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
+import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
 
 import java.util.Optional;
 
@@ -43,14 +46,24 @@ public ToxiproxyContainer.ContainerProxy spicedbContainerProxy(ToxiproxyContaine
     @Bean(name = BEAN_NAME_EMBEDDED_SPICEDB, destroyMethod = "stop")
     public GenericContainer<?> spicedb(SpiceDBProperties properties,
                                        Optional<Network> network) {
-        GenericContainer<?> spicedb = new GenericContainer<>(ContainerUtils.getDockerImageName(properties))
-                .withExposedPorts(properties.getPort())
-                .withNetworkAliases("spicedb.testcontainer.docker");
-        network.ifPresent(spicedb::withNetwork);
-        configureCommonsAndStart(spicedb, properties, log);
-        return spicedb;
+        WaitStrategy waitStrategy = new WaitAllStrategy()
+            .withStrategy(new HostPortWaitStrategy())
+            .withStartupTimeout(properties.getTimeoutDuration());
+
+        GenericContainer<?> spicedbContainer = new GenericContainer<>(ContainerUtils.getDockerImageName(properties))
+            .withExposedPorts(properties.getPort())
+            .withCommand("serve", "--grpc-preshared-key", properties.getPresharedKey(), "--skip-release-check")
+            .waitingFor(waitStrategy)
+            .withNetworkAliases(NATS_NETWORK_ALIAS);
+
+        network.ifPresent(spicedbContainer::withNetwork);
+
+        spicedbContainer = configureCommonsAndStart(spicedbContainer, properties, log);
+
+        return spicedbContainer;
     }
 
+
     @Bean
     public DynamicPropertyRegistrar spicedbDynamicPropertyRegistrar(
             @Qualifier(BEAN_NAME_EMBEDDED_SPICEDB) GenericContainer<?> spicedb,
@@ -59,6 +72,7 @@ public DynamicPropertyRegistrar spicedbDynamicPropertyRegistrar(
             registry.add("embedded.spicedb.host", spicedb::getHost);
             registry.add("embedded.spicedb.port", () -> spicedb.getMappedPort(properties.getPort()));
             registry.add("embedded.spicedb.networkAlias", () -> "spicedb.testcontainer.docker");
+            registry.add("embedded.spicedb.token", properties::getPresharedKey);
             registry.add("embedded.spicedb.internalPort", properties::getPort);
         };
     }
diff --git a/embedded-spicedb/src/test/java/com/playtika/testcontainer/spicedb/BaseSpiceDbTest.java b/embedded-spicedb/src/test/java/com/playtika/testcontainer/spicedb/BaseSpiceDbTest.java
@@ -1,8 +1,6 @@
 package com.playtika.testcontainer.spicedb;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Configuration;
@@ -13,9 +11,6 @@
 )
 public abstract class BaseSpiceDbTest {
 
-    @Autowired
-    ConfigurableListableBeanFactory beanFactory;
-
     @EnableAutoConfiguration
     @Configuration
     static class TestConfiguration {
diff --git a/embedded-spicedb/src/test/java/com/playtika/testcontainer/spicedb/EmbeddedSpiceDbBootstrapConfigurationTest.java b/embedded-spicedb/src/test/java/com/playtika/testcontainer/spicedb/EmbeddedSpiceDbBootstrapConfigurationTest.java
@@ -8,9 +8,7 @@
 import io.grpc.ManagedChannelBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 
@@ -19,9 +17,6 @@
 @Slf4j
 class EmbeddedSpiceDbBootstrapConfigurationTest extends BaseSpiceDbTest {
 
-    @Autowired
-    ConfigurableListableBeanFactory beanFactory;
-
     @Value("${embedded.spicedb.host}")
     String host;
 
@@ -35,7 +30,7 @@ class EmbeddedSpiceDbBootstrapConfigurationTest extends BaseSpiceDbTest {
     String networkAlias;
 
     @Test
-    void shouldConnect() throws InterruptedException {
+    void shouldConnect() {
         ManagedChannel channel = ManagedChannelBuilder
                 .forAddress(host, port)
                 .usePlaintext()

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,6 @@ public void propertiesAreAvailable() {`
`42`	`42`	`assertThat(couchbaseBucket).isNotEmpty();`
`43`	`43`	`assertThat(couchbaseUser).isNotEmpty();`
`44`	`44`	`assertThat(couchbasePassword).isNotEmpty();`
`45`		`- assertThat(System.getProperty("com.couchbase.bootstrapHttpDirectPort")).isNotEmpty();`
`46`		`- assertThat(System.getProperty("com.couchbase.bootstrapCarrierDirectPort")).isNotEmpty();`
`47`	`45`	`}`
`48`	`46`
`49`	`47`	`@EnableAutoConfiguration`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`package com.playtika.testcontainer.keycloak.vanilla;`
`2`	`2`
`3`	`3`	`import org.springframework.boot.autoconfigure.SpringBootApplication;`
`4`		`-import org.springframework.context.annotation.ComponentScan;`
`5`	`4`
`6`	`5`	`@SpringBootApplication`
`7`		`-@ComponentScan(basePackages = {"com.playtika.testcontainer.keycloak"})`
`8`	`6`	`public class VanillaTestApplication {`
`9`	`7`
`10`	`8`	`}`