Skip to content

Commit e01a2d7

Browse files
author
admitrov
committed
fix some tests with Value
1 parent 59e624f commit e01a2d7

File tree

32 files changed

+428
-214
lines changed

32 files changed

+428
-214
lines changed

‎embedded-cassandra/src/test/java/com/playtika/testcontainer/cassandra/EmbeddedCassandraTest.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import org.junit.jupiter.api.Test;
88
import org.springframework.beans.factory.BeanFactoryUtils;
99
import org.springframework.beans.factory.annotation.Autowired;
10+
import org.springframework.beans.factory.annotation.Value;
1011
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
1112
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
1213
import org.springframework.boot.test.context.SpringBootTest;
1314
import org.springframework.context.annotation.Configuration;
14-
import org.springframework.core.env.ConfigurableEnvironment;
1515
import org.springframework.data.cassandra.core.mapping.PrimaryKey;
1616
import org.springframework.data.cassandra.core.mapping.Table;
1717
import org.springframework.data.cassandra.repository.AllowFiltering;
@@ -38,8 +38,11 @@ public class EmbeddedCassandraTest {
3838
@Autowired
3939
protected DummyCassandraRepository dummyCassandraRepository;
4040

41-
@Autowired
42-
protected ConfigurableEnvironment environment;
41+
@Value("${embedded.cassandra.port}")
42+
protected String cassandraPort;
43+
44+
@Value("${embedded.cassandra.host}")
45+
protected String cassandraHost;
4346

4447

4548
@Test
@@ -52,8 +55,8 @@ public void springDataCassandraShouldWork() {
5255

5356
@Test
5457
public void propertiesAreAvailable() {
55-
assertThat(environment.getProperty("embedded.cassandra.port")).isNotEmpty();
56-
assertThat(environment.getProperty("embedded.cassandra.host")).isNotEmpty();
58+
assertThat(cassandraPort).isNotEmpty();
59+
assertThat(cassandraHost).isNotEmpty();
5760
}
5861

5962
@Test

‎embedded-couchbase/src/test/java/com/playtika/testcontainer/couchbase/EmbeddedCouchbaseBootstrapConfigurationTest.java‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.playtika.testcontainer.couchbase;
22

33
import org.junit.jupiter.api.Test;
4-
import org.springframework.beans.factory.annotation.Autowired;
4+
import org.springframework.beans.factory.annotation.Value;
55
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
66
import org.springframework.boot.test.context.SpringBootTest;
77
import org.springframework.context.annotation.Configuration;
8-
import org.springframework.core.env.ConfigurableEnvironment;
98

109
import static org.assertj.core.api.Assertions.assertThat;
1110

@@ -17,17 +16,32 @@
1716
})
1817
public abstract class EmbeddedCouchbaseBootstrapConfigurationTest {
1918

20-
@Autowired
21-
ConfigurableEnvironment environment;
19+
@Value("${embedded.couchbase.bootstrapHttpDirectPort}")
20+
String couchbaseBootstrapHttpDirectPort;
21+
22+
@Value("${embedded.couchbase.bootstrapCarrierDirectPort}")
23+
String couchbaseBootstrapCarrierDirectPort;
24+
25+
@Value("${embedded.couchbase.host}")
26+
String couchbaseHost;
27+
28+
@Value("${embedded.couchbase.bucket}")
29+
String couchbaseBucket;
30+
31+
@Value("${embedded.couchbase.user}")
32+
String couchbaseUser;
33+
34+
@Value("${embedded.couchbase.password}")
35+
String couchbasePassword;
2236

2337
@Test
2438
public void propertiesAreAvailable() {
25-
assertThat(environment.getProperty("embedded.couchbase.bootstrapHttpDirectPort")).isNotEmpty();
26-
assertThat(environment.getProperty("embedded.couchbase.bootstrapCarrierDirectPort")).isNotEmpty();
27-
assertThat(environment.getProperty("embedded.couchbase.host")).isNotEmpty();
28-
assertThat(environment.getProperty("embedded.couchbase.bucket")).isNotEmpty();
29-
assertThat(environment.getProperty("embedded.couchbase.user")).isNotEmpty();
30-
assertThat(environment.getProperty("embedded.couchbase.password")).isNotEmpty();
39+
assertThat(couchbaseBootstrapHttpDirectPort).isNotEmpty();
40+
assertThat(couchbaseBootstrapCarrierDirectPort).isNotEmpty();
41+
assertThat(couchbaseHost).isNotEmpty();
42+
assertThat(couchbaseBucket).isNotEmpty();
43+
assertThat(couchbaseUser).isNotEmpty();
44+
assertThat(couchbasePassword).isNotEmpty();
3145
assertThat(System.getProperty("com.couchbase.bootstrapHttpDirectPort")).isNotEmpty();
3246
assertThat(System.getProperty("com.couchbase.bootstrapCarrierDirectPort")).isNotEmpty();
3347
}

‎embedded-elasticsearch/src/test/java/com/playtika/testcontainer/elasticsearch/DisabledElasticSearchTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
import static org.assertj.core.api.Assertions.assertThat;
99

10-
public class DisabledElasticSearchTest {
10+
public class
11+
DisabledElasticSearchTest {
1112

1213
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
1314
.withConfiguration(AutoConfigurations.of(

‎embedded-elasticsearch/src/test/java/com/playtika/testcontainer/elasticsearch/EmbeddedElasticSearchBootstrapConfigurationTest.java‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.playtika.testcontainer.elasticsearch;
22

33
import org.junit.jupiter.api.Test;
4-
import org.springframework.beans.factory.annotation.Autowired;
4+
import org.springframework.beans.factory.annotation.Value;
55
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
66
import org.springframework.boot.test.context.SpringBootTest;
77
import org.springframework.context.annotation.Configuration;
8-
import org.springframework.core.env.ConfigurableEnvironment;
98
import org.springframework.test.context.ActiveProfiles;
109

1110
import static org.assertj.core.api.Assertions.assertThat;
@@ -17,15 +16,24 @@
1716
})
1817
public abstract class EmbeddedElasticSearchBootstrapConfigurationTest {
1918

20-
@Autowired
21-
private ConfigurableEnvironment environment;
19+
@Value("${embedded.elasticsearch.clusterName}")
20+
String elasticsearchClusterName;
21+
22+
@Value("${embedded.elasticsearch.host}")
23+
String elasticsearchHost;
24+
25+
@Value("${embedded.elasticsearch.httpPort}")
26+
String elasticsearchHttpPort;
27+
28+
@Value("${embedded.elasticsearch.transportPort}")
29+
String elasticsearchTransportPort;
2230

2331
@Test
2432
public void propertiesAreAvailable() {
25-
assertThat(environment.getProperty("embedded.elasticsearch.clusterName")).isNotEmpty();
26-
assertThat(environment.getProperty("embedded.elasticsearch.host")).isNotEmpty();
27-
assertThat(environment.getProperty("embedded.elasticsearch.httpPort")).isNotEmpty();
28-
assertThat(environment.getProperty("embedded.elasticsearch.transportPort")).isNotEmpty();
33+
assertThat(elasticsearchClusterName).isNotEmpty();
34+
assertThat(elasticsearchHost).isNotEmpty();
35+
assertThat(elasticsearchHttpPort).isNotEmpty();
36+
assertThat(elasticsearchTransportPort).isNotEmpty();
2937
}
3038

3139
@Configuration

‎embedded-influxdb/src/test/java/com/playtika/testcontainer/influxdb/EmbeddedInfluxDBBootstrapConfigurationTest.java‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import org.junit.jupiter.api.Test;
77
import org.junit.jupiter.api.extension.ExtendWith;
88
import org.springframework.beans.factory.annotation.Autowired;
9+
import org.springframework.beans.factory.annotation.Value;
910
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
1011
import org.springframework.boot.test.context.SpringBootTest;
1112
import org.springframework.context.annotation.Configuration;
12-
import org.springframework.core.env.ConfigurableEnvironment;
1313
import org.springframework.test.context.junit.jupiter.SpringExtension;
1414

1515
import static io.restassured.RestAssured.given;
@@ -22,16 +22,28 @@ class EmbeddedInfluxDBBootstrapConfigurationTest {
2222
@Autowired
2323
private InfluxDBProperties influxDBProperties;
2424

25-
@Autowired
26-
private ConfigurableEnvironment environment;
25+
@Value("${embedded.influxdb.port}")
26+
String influxdbPort;
27+
28+
@Value("${embedded.influxdb.host}")
29+
String influxdbHost;
30+
31+
@Value("${embedded.influxdb.database}")
32+
String influxdbDatabase;
33+
34+
@Value("${embedded.influxdb.user}")
35+
String influxdbUser;
36+
37+
@Value("${embedded.influxdb.password}")
38+
String influxdbPassword;
2739

2840
@Test
2941
void propertiesAreAvailable() {
30-
assertThat(environment.getProperty("embedded.influxdb.port")).isNotEmpty();
31-
assertThat(environment.getProperty("embedded.influxdb.host")).isNotEmpty();
32-
assertThat(environment.getProperty("embedded.influxdb.database")).isNotEmpty();
33-
assertThat(environment.getProperty("embedded.influxdb.user")).isNotEmpty();
34-
assertThat(environment.getProperty("embedded.influxdb.password")).isNotEmpty();
42+
assertThat(influxdbPort).isNotEmpty();
43+
assertThat(influxdbHost).isNotEmpty();
44+
assertThat(influxdbDatabase).isNotEmpty();
45+
assertThat(influxdbUser).isNotEmpty();
46+
assertThat(influxdbPassword).isNotEmpty();
3547
}
3648

3749
@Test

‎embedded-k3s/src/test/java/com/playtika/testcontainer/k3s/EmbeddedK3sBootstrapConfigurationTest.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
66
import org.junit.jupiter.api.Test;
77
import org.junit.jupiter.api.extension.ExtendWith;
8-
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.beans.factory.annotation.Value;
99
import org.springframework.boot.test.context.SpringBootTest;
1010
import org.springframework.context.annotation.Configuration;
11-
import org.springframework.core.env.ConfigurableEnvironment;
1211
import org.springframework.test.context.junit.jupiter.SpringExtension;
1312

1413
import static org.assertj.core.api.Assertions.assertThat;
@@ -18,18 +17,17 @@
1817
@SpringBootTest
1918
class EmbeddedK3sBootstrapConfigurationTest {
2019

21-
@Autowired
22-
private ConfigurableEnvironment environment;
20+
@Value("${embedded.k3s.kubeconfig}")
21+
private String k3sKubeconfig;
2322

2423
@Test
2524
void propertiesAreAvailable() {
26-
assertThat(environment.getProperty("embedded.k3s.kubeconfig")).isNotEmpty();
25+
assertThat(k3sKubeconfig).isNotEmpty();
2726
}
2827

2928
@Test
3029
void k3sIsAvailable() {
31-
final var kubeconfig = environment.getProperty("embedded.k3s.kubeconfig");
32-
final var config = Config.fromKubeconfig(kubeconfig);
30+
final var config = Config.fromKubeconfig(k3sKubeconfig);
3331

3432
try (final var client = new KubernetesClientBuilder().withConfig(config).build()) {
3533
assertFalse(client.nodes()

‎embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/spring/EmbeddedKeycloakBootstrapConfigurationTest.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.playtika.testcontainer.keycloak.KeycloakContainer;
44
import com.playtika.testcontainer.keycloak.util.KeyCloakToken;
5+
import com.playtika.testcontainer.keycloak.util.KeycloakClient;
56
import org.junit.jupiter.api.Test;
67
import org.springframework.beans.factory.annotation.Autowired;
78
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -16,7 +17,6 @@
1617
import org.springframework.web.client.RestTemplate;
1718

1819
import static com.playtika.testcontainer.keycloak.KeycloakProperties.DEFAULT_REALM;
19-
import static com.playtika.testcontainer.keycloak.util.KeycloakClient.newKeycloakClient;
2020
import static java.lang.String.format;
2121
import static org.assertj.core.api.Assertions.assertThat;
2222
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -35,6 +35,8 @@ public class EmbeddedKeycloakBootstrapConfigurationTest {
3535
private ConfigurableListableBeanFactory beanFactory;
3636
@Autowired
3737
private KeycloakContainer keycloakContainer;
38+
@Autowired
39+
private KeycloakClient keycloakClient;
3840

3941
@LocalServerPort
4042
private int httpPort;
@@ -59,12 +61,12 @@ public void propertiesAreAvailable() {
5961

6062
@Test
6163
public void shouldGetMasterRealmInfoFromKeycloak() {
62-
String realmInfo = newKeycloakClient(environment).getRealmInfo(DEFAULT_REALM).getRealm();
64+
String realmInfo = keycloakClient.getRealmInfo(DEFAULT_REALM).getRealm();
6365
assertThat(realmInfo).isEqualTo(DEFAULT_REALM);
6466
}
6567

6668
private String callSecuredPingEndpoint() {
67-
KeyCloakToken keyCloakToken = newKeycloakClient(environment).keycloakToken();
69+
KeyCloakToken keyCloakToken = keycloakClient.keycloakToken();
6870

6971
HttpHeaders headers = new HttpHeaders();
7072
headers.set(AUTHORIZATION, format("Bearer %s", keyCloakToken.getAccessToken()));

‎embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/spring/SpringTestApplication.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.springframework.beans.factory.annotation.Value;
66
import org.springframework.boot.autoconfigure.SpringBootApplication;
77
import org.springframework.context.annotation.Bean;
8+
import org.springframework.context.annotation.ComponentScan;
89
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
910
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
1011
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
@@ -17,6 +18,7 @@
1718
@EnableWebMvc
1819
@EnableMethodSecurity(jsr250Enabled = true)
1920
@SpringBootApplication
21+
@ComponentScan(basePackages = {"com.playtika.testcontainer.keycloak"})
2022
public class SpringTestApplication {
2123

2224
@Value("${testing.keycloak.client}")

‎embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/util/KeycloakClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ public final class KeycloakClient {
1717
private final RestTemplate restTemplate;
1818

1919
private KeycloakClient(Environment environment) {
20-
this.environment = environment;
20+
this.environment = requireNonNull(environment);
2121
this.restTemplate = new RestTemplate();
2222
}
2323

2424
public static KeycloakClient newKeycloakClient(Environment environment) {
25-
return new KeycloakClient(requireNonNull(environment));
25+
return new KeycloakClient(environment);
2626
}
2727

2828
public KeyCloakToken keycloakToken() {
@@ -48,9 +48,9 @@ public String realm() {
4848
return fromEnv("testing.keycloak.realm");
4949
}
5050

51-
public RealmInfo getRealmInfo(String realm) {
51+
public RealmInfo getRealmInfo(String realmName) {
5252
return restTemplate.getForObject(
53-
format("%s/realms/%s", baseUrl(), requireNonNull(realm)),
53+
format("%s/realms/%s", baseUrl(), realmName),
5454
RealmInfo.class);
5555
}
5656

‎embedded-keycloak/src/test/java/com/playtika/testcontainer/keycloak/vanilla/EmbeddedKeycloakRealmBootstrapConfigurationTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.springframework.core.env.Environment;
99
import org.springframework.test.context.ActiveProfiles;
1010

11-
import static com.playtika.testcontainer.keycloak.util.KeycloakClient.newKeycloakClient;
1211
import static org.assertj.core.api.Assertions.assertThat;
1312

1413
@SpringBootTest(classes = VanillaTestApplication.class)
@@ -17,19 +16,20 @@ public class EmbeddedKeycloakRealmBootstrapConfigurationTest {
1716

1817
@Autowired
1918
private Environment environment;
19+
@Autowired
20+
private KeycloakClient keycloakClient;
2021

2122
@Test
2223
public void shouldGetTestRealmInfoFromKeycloak() {
23-
KeycloakClient client = newKeycloakClient(environment);
24-
String realm = client.realm();
25-
RealmInfo realmInfo = client.getRealmInfo(realm);
24+
String realm = keycloakClient.realm();
25+
RealmInfo realmInfo = keycloakClient.getRealmInfo(realm);
2626

2727
assertThat(realmInfo.getRealm()).isEqualTo(realm);
2828
}
2929

3030
@Test
3131
public void shouldGetAccessTokenFromKeycloak() {
32-
String token = newKeycloakClient(environment).keycloakToken().getAccessToken();
32+
String token = keycloakClient.keycloakToken().getAccessToken();
3333
assertThat(token).isNotEmpty();
3434
}
3535
}

0 commit comments

Comments
 (0)