SpringCloud/spring-cloud-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate tests to JUnit 5.

Browse Source 
Closes gh-753
This commit is contained in:
Mark Paluch
2025-06-06 14:56:45 +02:00
parent 48a6adaa2e
commit d79a72c878
73 changed files with 254 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/AwsSecretIntegrationTests.java
View File

@@ -20,9 +20,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.config.VaultConfigOperations;
import org.springframework.cloud.vault.config.VaultConfigTemplate;
@@ -44,7 +44,7 @@ import static org.springframework.cloud.vault.config.aws.VaultConfigAwsBootstrap
* @author Mark Paluch
*/
// FIXME: 4.0.0
@Ignore("NoClassDefFoundError: org/springframework/http/client/Netty4ClientHttpRequestFactory")
@Disabled("NoClassDefFoundError: org/springframework/http/client/Netty4ClientHttpRequestFactory")
public class AwsSecretIntegrationTests extends IntegrationTestSupport {
private static final String AWS_REGION = "eu-west-1";
@@ -64,7 +64,7 @@ public class AwsSecretIntegrationTests extends IntegrationTestSupport {
/**
* Initialize the aws secret backend.
*/
@Before
@BeforeEach
public void setUp() {
assumeTrue(StringUtils.hasText(AWS_ACCESS_KEY) && StringUtils.hasText(AWS_SECRET_KEY));

10
spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java
View File

@@ -16,9 +16,8 @@
package org.springframework.cloud.vault.config.aws;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -30,7 +29,6 @@ import org.springframework.cloud.vault.config.aws.VaultConfigAwsBootstrapConfigu
import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
@@ -40,8 +38,8 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Mark Paluch
*/
// FIXME: 4.0.0
@Ignore("NoClassDefFoundError: org/springframework/http/client/Netty4ClientHttpRequestFactory")
@RunWith(SpringRunner.class)
@Disabled("NoClassDefFoundError: org/springframework/http/client/Netty4ClientHttpRequestFactory")
@SpringBootTest(classes = CustomBootstrapConfiguration.class,
properties = { "VaultConfigAwsBootstrapConfigurationTests.custom.config=true",
"spring.cloud.vault.aws.role=foo", "spring.cloud.bootstrap.enabled=true" })

10
spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java
View File

@@ -20,16 +20,14 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.StringUtils;
import org.springframework.vault.core.VaultOperations;
@@ -49,7 +47,7 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigAwsTests.TestApplication.class,
properties = { "spring.cloud.vault.aws.enabled=true", "spring.cloud.vault.aws.role=readonly",
"cloud.aws.region.auto=false", "cloud.aws.region.static=eu-west-1",
@@ -73,7 +71,7 @@ public class VaultConfigAwsTests {
/**
* Initialize the aws secret backend.
*/
@BeforeClass
@BeforeAll
public static void beforeClass() {
assumeTrue(StringUtils.hasText(AWS_ACCESS_KEY) && StringUtils.hasText(AWS_SECRET_KEY));

6
spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java
View File

@@ -20,8 +20,8 @@ import java.util.Base64;
import java.util.Collections;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.config.VaultConfigOperations;
import org.springframework.cloud.vault.config.VaultConfigTemplate;
@@ -53,7 +53,7 @@ public class ConsulSecretIntegrationTests extends IntegrationTestSupport {
/**
* Initialize the consul secret backend.
*/
@Before
@BeforeEach
public void setUp() {
assumeTrue(SetupConsul.isConsulAvailable());

14
spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/DiscoveryBootstrapConfigurationTests.java
View File

@@ -24,16 +24,14 @@ import com.ecwid.consul.v1.QueryParams;
import com.ecwid.consul.v1.Response;
import com.ecwid.consul.v1.agent.model.NewService;
import com.ecwid.consul.v1.catalog.model.CatalogService;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import org.springframework.vault.support.VaultHealth;
@@ -45,9 +43,9 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(properties = { "spring.cloud.vault.discovery.enabled=true" })
@Ignore("Consul discovery client is set up in the main context, no longer in the bootstrap context")
@Disabled("Consul discovery client is set up in the main context, no longer in the bootstrap context")
public class DiscoveryBootstrapConfigurationTests extends IntegrationTestSupport {
private static final String CONSUL_HOST = "localhost";
@@ -57,7 +55,7 @@ public class DiscoveryBootstrapConfigurationTests extends IntegrationTestSupport
@Autowired
VaultOperations vaultOperations;
@BeforeClass
@BeforeAll
public static void beforeClass() {
assumeTrue(CanConnect.to(new InetSocketAddress(CONSUL_HOST, CONSUL_PORT)));

6
spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java
View File

@@ -16,8 +16,7 @@
package org.springframework.cloud.vault.config.consul;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -30,7 +29,6 @@ import org.springframework.cloud.vault.config.consul.VaultConfigConsulBootstrapC
import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
@@ -39,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = CustomBootstrapConfiguration.class,
properties = { "VaultConfigConsulBootstrapConfigurationTests.custom.config=true",
"spring.cloud.vault.consul.role=foo", "spring.cloud.vault.consul.enabled=true",

10
spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java
View File

@@ -23,9 +23,9 @@ import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.SpringBootConfiguration;
@@ -51,7 +51,7 @@ public class VaultConfigConsulConfigDataTests extends IntegrationTestSupport {
private ConfigurableApplicationContext context;
@Before
@BeforeEach
public void before() {
assumeTrue(SetupConsul.isConsulAvailable());
@@ -96,7 +96,7 @@ public class VaultConfigConsulConfigDataTests extends IntegrationTestSupport {
assertThat(config.events).isNotEmpty();
}
@After
@AfterEach
public void after() {
if (this.context != null) {
this.context.close();

10
spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java
View File

@@ -22,9 +22,8 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -41,7 +40,6 @@ import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
@@ -59,7 +57,7 @@ import static org.junit.Assume.assumeTrue;
* @author Mark Paluch
* @author Spencer Gibb
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigConsulTests.TestApplication.class,
properties = { "spring.cloud.vault.consul.enabled=true", "spring.cloud.vault.consul.role=readonly",
"spring.cloud.consul.discovery.catalog-services-watch.enabled=false",
@@ -97,7 +95,7 @@ public class VaultConfigConsulTests {
/**
* Initialize the consul secret backend.
*/
@BeforeClass
@BeforeAll
public static void beforeClass() {
assumeTrue(CanConnect.to(new InetSocketAddress(CONSUL_HOST, CONSUL_PORT)));

6
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CassandraSecretIntegrationTests.java
View File

@@ -20,8 +20,8 @@ import java.net.InetSocketAddress;
import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.config.VaultConfigOperations;
import org.springframework.cloud.vault.config.VaultConfigTemplate;
@@ -64,7 +64,7 @@ public class CassandraSecretIntegrationTests extends IntegrationTestSupport {
/**
* Initialize cassandra secret backend.
*/
@Before
@BeforeEach
public void setUp() {
assumeTrue(CanConnect.to(new InetSocketAddress(CASSANDRA_HOST, CASSANDRA_PORT)));

6
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CouchbaseSecretIntegrationTests.java
View File

@@ -20,8 +20,8 @@ import java.net.InetSocketAddress;
import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.config.VaultConfigOperations;
import org.springframework.cloud.vault.config.VaultConfigTemplate;
@@ -57,7 +57,7 @@ public class CouchbaseSecretIntegrationTests extends IntegrationTestSupport {
/**
* Initialize couchbase secret backend.
*/
@Before
@BeforeEach
public void setUp() {
assumeTrue(CanConnect.to(new InetSocketAddress(COUCHBASE_HOST, COUCHBASE_PORT)));

6
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/ElasticsearchSecretIntegrationTests.java
View File

@@ -20,8 +20,8 @@ import java.net.InetSocketAddress;
import java.util.LinkedHashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.config.VaultConfigOperations;
import org.springframework.cloud.vault.config.VaultConfigTemplate;
@@ -60,7 +60,7 @@ public class ElasticsearchSecretIntegrationTests extends IntegrationTestSupport
/**
* Initialize the elasticsearch secret backend.
*/
@Before
@BeforeEach
public void setUp() {
assumeTrue(CanConnect.to(new InetSocketAddress(ELASTICSEARCH_HOST, ELASTICSEARCH_PORT)));

6
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MongoSecretIntegrationTests.java
View File

@@ -21,8 +21,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.config.VaultConfigOperations;
import org.springframework.cloud.vault.config.VaultConfigTemplate;
@@ -63,7 +63,7 @@ public class MongoSecretIntegrationTests extends IntegrationTestSupport {
/**
* Initialize the mongodb secret backend.
*/
@Before
@BeforeEach
public void setUp() {
assumeTrue(CanConnect.to(new InetSocketAddress(MONGODB_HOST, MONGODB_PORT)));

6
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java
View File

@@ -19,8 +19,8 @@ package org.springframework.cloud.vault.config.databases;
import java.net.InetSocketAddress;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.config.VaultConfigOperations;
import org.springframework.cloud.vault.config.VaultConfigTemplate;
@@ -53,7 +53,7 @@ public class MySqlDatabaseSecretIntegrationTests extends IntegrationTestSupport
/**
* Initialize the mysql secret backend.
*/
@Before
@BeforeEach
public void setUp() {
assumeTrue(CanConnect.to(new InetSocketAddress(MySqlFixtures.MYSQL_HOST, MySqlFixtures.MYSQL_PORT)));

6
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java
View File

@@ -20,8 +20,8 @@ import java.net.InetSocketAddress;
import java.util.Collections;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.config.VaultConfigOperations;
import org.springframework.cloud.vault.config.VaultConfigTemplate;
@@ -63,7 +63,7 @@ public class MySqlSecretIntegrationTests extends IntegrationTestSupport {
/**
* Initialize the mysql secret backend.
*/
@Before
@BeforeEach
public void setUp() {
assumeTrue(CanConnect.to(new InetSocketAddress(MYSQL_HOST, MYSQL_PORT)));

6
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java
View File

@@ -20,8 +20,8 @@ import java.net.InetSocketAddress;
import java.util.Collections;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.config.VaultConfigOperations;
import org.springframework.cloud.vault.config.VaultConfigTemplate;
@@ -66,7 +66,7 @@ public class PostgreSqlSecretIntegrationTests extends IntegrationTestSupport {
/**
* Initialize the postgresql secret backend.
*/
@Before
@BeforeEach
public void setUp() {
assumeTrue(CanConnect.to(new InetSocketAddress(POSTGRES_HOST, POSTGRES_PORT)));

10
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java
View File

@@ -21,9 +21,8 @@ import java.util.HashMap;
import java.util.Map;
import com.datastax.oss.driver.api.core.CqlSession;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -32,7 +31,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.assertThat;
@@ -46,7 +44,7 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigCassandraTests.TestApplication.class,
properties = { "spring.cloud.vault.cassandra.enabled=true", "spring.cloud.vault.cassandra.role=readonly",
"spring.data.cassandra.jmx-enabled=false", "spring.cloud.bootstrap.enabled=true" })
@@ -75,7 +73,7 @@ public class VaultConfigCassandraTests {
/**
* Initialize the cassandra secret backend.
*/
@BeforeClass
@BeforeAll
public static void beforeClass() {
assumeTrue(CanConnect.to(new InetSocketAddress(CASSANDRA_HOST, CASSANDRA_PORT)));

28
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseDatabaseTests.java
View File

@@ -17,17 +17,14 @@
package org.springframework.cloud.vault.config.databases;
import java.net.InetSocketAddress;
import com.couchbase.client.java.Cluster;
import com.couchbase.client.core.error.UnambiguousTimeoutException;
import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
import java.time.Duration;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import com.couchbase.client.core.error.UnambiguousTimeoutException;
import com.couchbase.client.java.Cluster;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
@@ -36,9 +33,9 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.cloud.vault.util.Version;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assume.assumeTrue;
/**
@@ -49,7 +46,6 @@ import static org.junit.Assume.assumeTrue;
*
* @author Francis Hitchens
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigCouchbaseDatabaseTests.TestApplication.class,
properties = { "spring.cloud.vault.couchbase.enabled=true", "spring.config.import=vault://",
"spring.cloud.vault.couchbase.role=couchbase-readonly",
@@ -71,7 +67,7 @@ public class VaultConfigCouchbaseDatabaseTests {
/**
* Initialize the couchbase secret backend.
*/
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();
@@ -110,12 +106,16 @@ public class VaultConfigCouchbaseDatabaseTests {
this.cluster.disconnect();
}
@Test(expected = UnambiguousTimeoutException.class)
@Test
public void shouldFailConnectConnection() throws UnambiguousTimeoutException {
this.cluster = Cluster.connect("127.0.0.1", this.username, "fake.pwd");
this.cluster.waitUntilReady(Duration.ofSeconds(5));
this.cluster.disconnect();
assertThatExceptionOfType(UnambiguousTimeoutException.class).isThrownBy(() -> {
this.cluster.waitUntilReady(Duration.ofSeconds(5));
this.cluster.disconnect();
});
}
@SpringBootApplication

10
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseTests.java
View File

@@ -21,9 +21,8 @@ import java.util.HashMap;
import java.util.Map;
import com.couchbase.client.java.Cluster;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -33,7 +32,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.cloud.vault.util.Version;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.assertThat;
@@ -47,7 +45,7 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigCouchbaseTests.TestApplication.class,
properties = { "spring.cloud.vault.couchbase.enabled=true", "spring.config.import=vault://",
"spring.cloud.vault.couchbase.role=couchbase-readonly",
@@ -70,7 +68,7 @@ public class VaultConfigCouchbaseTests {
/**
* Initialize the couchbase secret backend.
*/
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

6
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java
View File

@@ -16,8 +16,7 @@
package org.springframework.cloud.vault.config.databases;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -30,7 +29,6 @@ import org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBoots
import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
@@ -39,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = CustomBootstrapConfiguration.class,
properties = { "VaultConfigDatabaseBootstrapConfigurationTests.custom.config=true",
"spring.cloud.vault.mysql.role=foo", "spring.cloud.vault.mysql.enabled=true",

2
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationUnitTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.vault.config.databases;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.config.SecretBackendMetadata;

10
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java
View File

@@ -26,9 +26,8 @@ import java.util.Map;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoDatabase;
import org.bson.Document;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -38,7 +37,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.cloud.vault.util.Version;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.junit.Assume.assumeTrue;
@@ -51,7 +49,7 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigMongoTests.TestApplication.class,
properties = { "spring.cloud.vault.mongodb.enabled=true", "spring.cloud.vault.mongodb.role=readonly",
"spring.data.mongodb.url=mongodb://localhost", "spring.data.mongodb.database=admin",
@@ -79,7 +77,7 @@ public class VaultConfigMongoTests {
/**
* Initialize the mongo secret backend.
*/
@BeforeClass
@BeforeAll
public static void beforeClass() {
assumeTrue(CanConnect.to(new InetSocketAddress(MONGODB_HOST, MONGODB_PORT)));

10
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java
View File

@@ -22,9 +22,8 @@ import java.sql.SQLException;
import javax.sql.DataSource;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -34,7 +33,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.cloud.vault.util.Version;
import org.springframework.test.context.junit4.SpringRunner;
import static org.junit.Assume.assumeTrue;
@@ -46,7 +44,7 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigMySqlDatabaseTests.TestApplication.class,
properties = { "spring.cloud.vault.database.enabled=true", "spring.cloud.vault.database.role=readonly",
"spring.datasource.url=" + MySqlFixtures.JDBC_URL, "spring.main.allow-bean-definition-overriding=true",
@@ -65,7 +63,7 @@ public class VaultConfigMySqlDatabaseTests {
/**
* Initialize the mysql secret backend.
*/
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesBootstrapTests.java
View File

@@ -24,9 +24,8 @@ import java.util.Map;
import javax.sql.DataSource;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -36,7 +35,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.cloud.vault.util.Version;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.junit.Assume.assumeTrue;
@@ -49,7 +47,7 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigMySqlDatabasesBootstrapTests.TestApplication.class, properties = {
"spring.cloud.vault.databases.mysql.enabled=true", "spring.cloud.vault.databases.mysql.role=readonly",
"spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true",
@@ -78,7 +76,7 @@ public class VaultConfigMySqlDatabasesBootstrapTests {
/**
* Initialize the mysql secret backend.
*/
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesTests.java
View File

@@ -22,9 +22,8 @@ import java.sql.SQLException;
import javax.sql.DataSource;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -34,7 +33,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.cloud.vault.util.Version;
import org.springframework.test.context.junit4.SpringRunner;
import static org.junit.Assume.assumeTrue;
@@ -46,7 +44,7 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigMySqlDatabasesTests.TestApplication.class,
properties = { "spring.cloud.vault.databases.mysql.enabled=true",
"spring.cloud.vault.databases.mysql.role=readonly", "spring.datasource.url=" + MySqlFixtures.JDBC_URL,
@@ -65,7 +63,7 @@ public class VaultConfigMySqlDatabasesTests {
/**
* Initialize the mysql secret backend.
*/
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java
View File

@@ -23,9 +23,8 @@ import java.util.Collections;
import javax.sql.DataSource;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -34,7 +33,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.junit.Assume.assumeTrue;
@@ -47,7 +45,7 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigMySqlTests.TestApplication.class,
properties = { "spring.cloud.vault.mysql.enabled=true", "spring.cloud.vault.mysql.role=readonly",
"spring.datasource.url=" + MySqlFixtures.JDBC_URL, "spring.main.allow-bean-definition-overriding=true",
@@ -66,7 +64,7 @@ public class VaultConfigMySqlTests {
/**
* Initialize the mysql secret backend.
*/
@BeforeClass
@BeforeAll
public static void beforeClass() {
assumeTrue(CanConnect.to(new InetSocketAddress(MySqlFixtures.MYSQL_HOST, MySqlFixtures.MYSQL_PORT)));

10
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java
View File

@@ -24,9 +24,8 @@ import java.util.Collections;
import javax.sql.DataSource;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -35,7 +34,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.assertThat;
@@ -49,7 +47,7 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigPostgreSqlTests.TestApplication.class,
properties = { "spring.cloud.vault.postgresql.enabled=true", "spring.cloud.vault.postgresql.role=readonly",
"spring.datasource.url=jdbc:postgresql://localhost:5432/postgres?ssl=false",
@@ -79,7 +77,7 @@ public class VaultConfigPostgreSqlTests {
/**
* Initialize the postgresql secret backend.
*/
@BeforeClass
@BeforeAll
public static void beforeClass() {
assumeTrue(CanConnect.to(new InetSocketAddress(POSTGRES_HOST, POSTGRES_PORT)));

10
spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/RabbitMqSecretIntegrationTests.java
View File

@@ -21,9 +21,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.config.VaultConfigTemplate;
import org.springframework.cloud.vault.config.VaultProperties;
@@ -43,7 +43,7 @@ import static org.springframework.cloud.vault.config.rabbitmq.VaultConfigRabbitM
*
* @author Mark Paluch
*/
@Ignore
@Disabled
public class RabbitMqSecretIntegrationTests extends IntegrationTestSupport {
private static final int RABBITMQ_HTTP_MANAGEMENT_PORT = 15672;
@@ -68,7 +68,7 @@ public class RabbitMqSecretIntegrationTests extends IntegrationTestSupport {
/**
* Initialize the rabbitmq secret backend.
*/
@Before
@BeforeEach
public void setUp() {
assumeTrue(CanConnect.to(new InetSocketAddress(RABBITMQ_HOST, RABBITMQ_HTTP_MANAGEMENT_PORT)));

6
spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java
View File

@@ -16,8 +16,7 @@
package org.springframework.cloud.vault.config.rabbitmq;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -29,7 +28,6 @@ import org.springframework.cloud.vault.config.rabbitmq.VaultConfigRabbitMqBootst
import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
@@ -38,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = CustomBootstrapConfiguration.class,
properties = { "VaultConfigRabbitMqBootstrapConfigurationTests.custom.config=true",
"spring.cloud.vault.rabbitmq.role=foo", "spring.cloud.bootstrap.enabled=true" })

14
spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java
View File

@@ -23,10 +23,9 @@ import java.util.Map;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.ConnectionFactory;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -36,7 +35,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.CanConnect;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.cloud.vault.util.Version;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.junit.Assume.assumeTrue;
@@ -49,11 +47,11 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigRabbitMqTests.TestApplication.class,
properties = { "spring.cloud.vault.rabbitmq.enabled=true", "spring.cloud.vault.rabbitmq.role=readonly",
"spring.rabbitmq.address=localhost", "spring.cloud.bootstrap.enabled=true" })
@Ignore
@Disabled
public class VaultConfigRabbitMqTests {
private static final int RABBITMQ_HTTP_MANAGEMENT_PORT = 15672;
@@ -83,7 +81,7 @@ public class VaultConfigRabbitMqTests {
/**
* Initialize the rabbitmq secret backend.
*/
@BeforeClass
@BeforeAll
public static void beforeClass() {
assumeTrue(CanConnect.to(new InetSocketAddress(RABBITMQ_HOST, RABBITMQ_HTTP_MANAGEMENT_PORT)));

6
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java
View File

@@ -16,8 +16,8 @@
package org.springframework.cloud.vault.config;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -62,7 +62,7 @@ public class ApplicationFailFastTests {
}
@Test
@Ignore("Fails because of method errors in Discovery health check")
@Disabled("Fails because of method errors in Discovery health check")
public void contextLoadsWithoutFailFast() {
new SpringApplicationBuilder().sources(ApplicationFailFastTests.class)
.run("--server.port=0", "--spring.cloud.bootstrap.enabled=true", "--spring.cloud.vault.failFast=false",

8
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ClientAuthenticationFactoryUnitTests.java
View File

@@ -23,7 +23,10 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.SdkSystemSetting;
import software.amazon.awssdk.regions.Region;
import org.springframework.boot.system.SystemProperties;
import org.springframework.core.io.ClassPathResource;
import org.springframework.test.util.ReflectionTestUtils;
@@ -39,9 +42,6 @@ import org.springframework.vault.authentication.TokenAuthentication;
import org.springframework.vault.support.VaultToken;
import org.springframework.web.client.RestTemplate;
import software.amazon.awssdk.core.SdkSystemSetting;
import software.amazon.awssdk.regions.Region;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ConfigDataShutdownTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.vault.config;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java
View File

@@ -21,7 +21,7 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.boot.autoconfigure.AutoConfigurations;

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/KeyValueSecretBackendMetadataUnitTests.java
View File

@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

6
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/KeyValueSecretIntegrationTests.java
View File

@@ -19,8 +19,8 @@ package org.springframework.cloud.vault.config;
import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.cloud.vault.util.Settings;
@@ -38,7 +38,7 @@ public class KeyValueSecretIntegrationTests extends IntegrationTestSupport {
private VaultConfigOperations configOperations;
@Before
@BeforeEach
public void setUp() {
this.vaultProperties.setFailFast(false);

12
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/LeasingVaultPropertySourceLocatorUnitTests.java
View File

@@ -16,11 +16,11 @@
package org.springframework.cloud.vault.config;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.springframework.core.env.CompositePropertySource;
import org.springframework.core.env.ConfigurableEnvironment;
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.verify;
*
* @author Mark Paluch
*/
@RunWith(MockitoJUnitRunner.class)
@MockitoSettings(strictness = Strictness.LENIENT)
public class LeasingVaultPropertySourceLocatorUnitTests {
private LeasingVaultPropertySourceLocator propertySourceLocator;
@@ -49,7 +49,7 @@ public class LeasingVaultPropertySourceLocatorUnitTests {
private VaultKeyValueBackendProperties properties = new VaultKeyValueBackendProperties();
@Before
@BeforeEach
public void before() {
this.propertySourceLocator = new LeasingVaultPropertySourceLocator(new VaultProperties(),

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/PropertyNameTransformerUnitTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.vault.config;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveDiscoveryClientVaultBootstrapConfigurationTests.java
View File

@@ -20,7 +20,7 @@ import java.net.URI;
import java.util.LinkedHashMap;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import reactor.core.publisher.Flux;
import reactor.test.StepVerifier;

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.vault.config;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java
View File

@@ -20,9 +20,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import reactor.test.StepVerifier;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +29,6 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.ReactiveVaultOperations;
import static org.assertj.core.api.Assertions.assertThat;
@@ -45,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = ReactiveVaultOperationsTests.TestApplication.class,
properties = { "spring.cloud.vault.host=foo", "spring.cloud.vault.uri=https://localhost:8200",
"spring.cloud.bootstrap.enabled=true" })
@@ -54,7 +52,7 @@ public class ReactiveVaultOperationsTests {
@Autowired
ReactiveVaultOperations reactiveOperations;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapConfigurationTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.vault.config;
import java.time.Duration;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.vault.config;
import java.time.Duration;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.context.properties.EnableConfigurationProperties;

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapperIntegrationTests.java
View File

@@ -18,9 +18,9 @@ package org.springframework.cloud.vault.config;
import java.util.Collections;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.SpringBootConfiguration;
@@ -41,7 +41,7 @@ public class VaultBootstrapperIntegrationTests extends IntegrationTestSupport {
private ConfigurableApplicationContext context;
@Before
@BeforeEach
public void before() {
this.vaultRule.prepare()
@@ -69,7 +69,7 @@ public class VaultBootstrapperIntegrationTests extends IntegrationTestSupport {
assertThat(this.context.getEnvironment().getProperty("key")).isEqualTo("customized");
}
@After
@AfterEach
public void after() {
if (this.context != null) {
this.context.close();

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java
View File

@@ -20,9 +20,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
@@ -34,7 +33,6 @@ import org.springframework.cloud.vault.util.TestRestTemplateFactory;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.authentication.AppIdAuthentication;
import org.springframework.vault.authentication.AppIdAuthenticationOptions;
import org.springframework.vault.authentication.AppIdUserIdMechanism;
@@ -47,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = { VaultConfigAppIdCustomMechanismTests.TestApplication.class },
properties = { "spring.cloud.vault.authentication=appid",
"VaultConfigAppIdCustomMechanismTests.custom.config=true",
@@ -58,7 +56,7 @@ public class VaultConfigAppIdCustomMechanismTests {
@Value("${vault.value}")
String configValue;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java
View File

@@ -20,9 +20,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
@@ -30,7 +29,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.Settings;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.authentication.IpAddressUserId;
import org.springframework.vault.core.VaultOperations;
@@ -46,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigAppIdTests.TestApplication.class,
properties = { "spring.cloud.vault.authentication=appid", "spring.cloud.vault.app-id.user-id=IP_ADDRESS",
"spring.cloud.vault.application-name=VaultConfigAppIdTests", "spring.cloud.bootstrap.enabled=true" })
@@ -55,7 +53,7 @@ public class VaultConfigAppIdTests {
@Value("${vault.value}")
String configValue;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java
View File

@@ -20,9 +20,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
@@ -31,7 +30,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.Settings;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.cloud.vault.util.Version;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.assertThat;
@@ -47,7 +45,7 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigAppRoleTests.TestApplication.class,
properties = { "spring.cloud.vault.authentication=approle",
"spring.cloud.vault.application-name=VaultConfigAppRoleTests", "spring.cloud.bootstrap.enabled=true" })
@@ -58,7 +56,7 @@ public class VaultConfigAppRoleTests {
@Value("${vault.value}")
String configValue;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

14
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java
View File

@@ -18,10 +18,9 @@ package org.springframework.cloud.vault.config;
import java.util.Collections;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
@@ -31,7 +30,6 @@ import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.cloud.vault.util.Version;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import org.springframework.vault.support.VaultResponse;
@@ -48,7 +46,7 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigCubbyholeAuthenticationTests.TestApplication.class,
properties = { "spring.cloud.vault.authentication=cubbyhole",
"spring.cloud.vault.kv.applicationName=VaultConfigCubbyholeAuthenticationTests",
@@ -58,7 +56,7 @@ public class VaultConfigCubbyholeAuthenticationTests {
@Value("${vault.value}")
String configValue;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();
@@ -83,7 +81,7 @@ public class VaultConfigCubbyholeAuthenticationTests {
System.setProperty("spring.cloud.vault.token", initialToken);
}
@AfterClass
@AfterAll
public static void afterClass() {
System.clearProperty("spring.cloud.vault.token");
}

6
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLoaderIntegrationTests.java
View File

@@ -18,8 +18,8 @@ package org.springframework.cloud.vault.config;
import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.SpringBootConfiguration;
@@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.fail;
*/
public class VaultConfigDataLoaderIntegrationTests extends IntegrationTestSupport {
@Before
@BeforeEach
public void before() {
this.vaultRule.prepare()

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLoaderUnitTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.vault.config;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.DefaultBootstrapContext;
import org.springframework.boot.context.config.ConfigData;

7
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLocationResolverUnitTests.java
View File

@@ -20,8 +20,9 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.DefaultBootstrapContext;
import org.springframework.boot.context.config.ConfigDataLocation;
import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
@@ -50,7 +51,7 @@ public class VaultConfigDataLocationResolverUnitTests {
DefaultBootstrapContext bootstrapContext = new DefaultBootstrapContext();
@Before
@BeforeEach
public void before() {
when(this.contextMock.getBootstrapContext()).thenReturn(this.bootstrapContext);
when(this.contextMock.getBinder()).thenReturn(new Binder());

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java
View File

@@ -18,9 +18,8 @@ package org.springframework.cloud.vault.config;
import java.util.Collections;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
@@ -29,7 +28,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.context.ApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultTemplate;
import static org.assertj.core.api.Assertions.assertThat;
@@ -44,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigDisabledTests.TestApplication.class,
properties = { "spring.cloud.vault.enabled=false", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigDisabledTests {
@@ -55,7 +53,7 @@ public class VaultConfigDisabledTests {
@Autowired
ApplicationContext applicationContext;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKeyValueBackendDisabledTests.java
View File

@@ -18,9 +18,8 @@ package org.springframework.cloud.vault.config;
import java.util.Collections;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
@@ -28,7 +27,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
@@ -42,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigKeyValueBackendDisabledTests.TestApplication.class,
properties = "spring.cloud.vault.kv.enabled=false")
public class VaultConfigKeyValueBackendDisabledTests {
@@ -50,7 +48,7 @@ public class VaultConfigKeyValueBackendDisabledTests {
@Autowired
Environment environment;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java
View File

@@ -23,9 +23,8 @@ import java.util.HashMap;
import java.util.Map;
import org.assertj.core.util.Files;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
@@ -33,7 +32,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.cloud.vault.util.Version;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.StringUtils;
import org.springframework.vault.core.VaultOperations;
import org.springframework.vault.support.Policy;
@@ -49,7 +47,7 @@ import static org.springframework.cloud.vault.util.Settings.findWorkDir;
*
* @author Michal Budzyn
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigKubernetesTests.TestApplication.class,
properties = { "spring.cloud.vault.authentication=kubernetes", "spring.cloud.vault.kubernetes.role=my-role",
"spring.cloud.vault.kubernetes.service-account-token-file=../work/minikube/hello-minikube-token",
@@ -60,7 +58,7 @@ public class VaultConfigKubernetesTests {
@Value("${vault.value}")
String configValue;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderSingleLocationTests.java
View File

@@ -20,9 +20,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
@@ -32,7 +31,6 @@ import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.context.ApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
@@ -46,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigLoaderSingleLocationTests.TestApplication.class, properties = {
"spring.cloud.vault.uri=https://localhost:8200", "spring.config.import=vault:secret/config-location" })
public class VaultConfigLoaderSingleLocationTests {
@@ -57,7 +55,7 @@ public class VaultConfigLoaderSingleLocationTests {
@Autowired
ApplicationContext applicationContext;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderTests.java
View File

@@ -20,9 +20,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -34,7 +33,6 @@ import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.context.ApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultTemplate;
import org.springframework.web.client.RestTemplate;
@@ -50,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigLoaderTests.TestApplication.class,
properties = { "spring.cloud.vault.uri=https://localhost:8200",
"spring.cloud.vault.application-name=config-data", "spring.config.import=vault:" })
@@ -65,7 +63,7 @@ public class VaultConfigLoaderTests {
@Autowired
ApplicationContext applicationContext;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

6
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTemplateIntegrationTests.java
View File

@@ -18,8 +18,8 @@ package org.springframework.cloud.vault.config;
import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.cloud.vault.util.Settings;
@@ -35,7 +35,7 @@ import static org.junit.Assume.assumeTrue;
*/
public class VaultConfigTemplateIntegrationTests extends IntegrationTestSupport {
@Before
@BeforeEach
public void before() {
prepare().getVaultOperations().write("secret/myapp", Collections.singletonMap("key", "value"));
}

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java
View File

@@ -20,9 +20,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -33,7 +32,6 @@ import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.context.ApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultTemplate;
import org.springframework.web.client.RestTemplate;
@@ -49,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigTests.TestApplication.class,
properties = { "spring.cloud.vault.host=foo", "spring.cloud.vault.port=80",
"spring.cloud.vault.uri=https://localhost:8200", "spring.cloud.vault.application-name=testVaultApp",
@@ -65,7 +63,7 @@ public class VaultConfigTests {
@Autowired
ApplicationContext applicationContext;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java
View File

@@ -23,16 +23,15 @@ import java.util.HashMap;
import java.util.Map;
import org.assertj.core.util.Files;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.Settings;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import org.springframework.vault.support.VaultMount;
@@ -47,7 +46,6 @@ import static org.springframework.cloud.vault.util.Settings.findWorkDir;
*
* @author Quincy Conduff
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigTlsCertAuthenticationMountPathTests.TestApplication.class, properties = {
"spring.cloud.vault.authentication=CERT", "spring.cloud.vault.ssl.key-store=file:../work/client-cert.jks",
"spring.cloud.vault.ssl.key-store-password=changeit", "spring.cloud.vault.ssl.cert-auth-path=nonstandard",
@@ -58,7 +56,7 @@ public class VaultConfigTlsCertAuthenticationMountPathTests {
@Value("${vault.value}")
String configValue;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java
View File

@@ -23,9 +23,8 @@ import java.util.HashMap;
import java.util.Map;
import org.assertj.core.util.Files;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
@@ -33,7 +32,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.Settings;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.assertThat;
@@ -47,7 +45,7 @@ import static org.springframework.cloud.vault.util.Settings.findWorkDir;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigTlsCertAuthenticationTests.TestApplication.class,
properties = { "spring.cloud.vault.authentication=cert",
"spring.cloud.vault.ssl.key-store=file:../work/client-cert.jks",
@@ -59,7 +57,7 @@ public class VaultConfigTlsCertAuthenticationTests {
@Value("${vault.value}")
String configValue;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java
View File

@@ -18,9 +18,8 @@ package org.springframework.cloud.vault.config;
import java.util.Collections;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
@@ -28,7 +27,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.assertThat;
@@ -43,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigWithContextTests.TestApplication.class,
properties = { "spring.cloud.vault.application-name=testVaultApp", "spring.cloud.bootstrap.enabled=true" })
@ActiveProfiles("my-profile")
@@ -52,7 +50,7 @@ public class VaultConfigWithContextTests {
@Value("${vault.value}")
String configValue;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java
View File

@@ -18,9 +18,8 @@ package org.springframework.cloud.vault.config;
import java.util.Collections;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
@@ -29,7 +28,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultOperations;
import static org.assertj.core.api.Assertions.assertThat;
@@ -44,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultConfigWithVaultConfigurerTests.TestApplication.class, properties = {
"VaultConfigWithVaultConfigurerTests.custom.config=true", "spring.cloud.bootstrap.enabled=true" })
public class VaultConfigWithVaultConfigurerTests {
@@ -52,7 +50,7 @@ public class VaultConfigWithVaultConfigurerTests {
@Value("${vault.value}")
String configValue;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

1
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfigurationTests.java
View File

@@ -60,7 +60,6 @@ class VaultHealthIndicatorAutoConfigurationTests {
this.contextRunner.withUserConfiguration(ReactiveConfiguration.class).run(context -> {
assertThat(context).hasBean("vaultReactiveHealthIndicator");
});
}
@Test

12
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorUnitTests.java
View File

@@ -16,11 +16,11 @@
package org.springframework.cloud.vault.config;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.Status;
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.when;
*
* @author Mark Paluch
*/
@RunWith(MockitoJUnitRunner.class)
@MockitoSettings(strictness = Strictness.LENIENT)
public class VaultHealthIndicatorUnitTests {
@Mock
@@ -51,7 +51,7 @@ public class VaultHealthIndicatorUnitTests {
VaultHealthIndicator healthIndicator;
@Before
@BeforeEach
public void before() {
this.healthIndicator = new VaultHealthIndicator(this.vaultOperations);

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultNamespaceTests.java
View File

@@ -23,10 +23,9 @@ import java.util.List;
import java.util.Map;
import org.junit.Assume;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
@@ -35,7 +34,6 @@ import org.springframework.boot.actuate.health.Status;
import org.springframework.cloud.vault.util.Settings;
import org.springframework.cloud.vault.util.TestRestTemplateFactory;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.authentication.SimpleSessionManager;
import org.springframework.vault.authentication.TokenAuthentication;
import org.springframework.vault.client.ClientHttpConnectorFactory;
@@ -57,7 +55,7 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* Integration tests for Vault's namespace feature.
*/
@RunWith(SpringRunner.class)
public class VaultNamespaceTests {
@ClassRule
@@ -78,7 +76,7 @@ public class VaultNamespaceTests {
String marketingToken;
@Before
@BeforeEach
public void before() {
Assume.assumeTrue("Namespaces require enterprise version",
this.vaultRule.prepare().getVersion().isEnterprise());

6
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceIntegrationTests.java
View File

@@ -18,8 +18,8 @@ package org.springframework.cloud.vault.config;
import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.cloud.vault.util.Settings;
@@ -35,7 +35,7 @@ import static org.junit.Assume.assumeTrue;
*/
public class VaultPropertySourceIntegrationTests extends IntegrationTestSupport {
@Before
@BeforeEach
public void before() {
prepare().getVaultOperations().write("secret/myapp", Collections.singletonMap("key", "value"));
}

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java
View File

@@ -18,9 +18,8 @@ package org.springframework.cloud.vault.config;
import java.util.Collections;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -28,7 +27,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
@@ -39,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Ryan Hoegg
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultPropertySourceLocatorIntegrationTests.TestApplication.class,
properties = { "spring.cloud.vault.kv.application-name=neuromancer,icebreaker",
"spring.cloud.bootstrap.enabled=false", "spring.config.import=vault://" })
@@ -52,7 +50,7 @@ public class VaultPropertySourceLocatorIntegrationTests extends IntegrationTestS
@Value("${icebreaker.value}")
String additionalValue;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorProfilesIntegrationTests.java
View File

@@ -18,9 +18,8 @@ package org.springframework.cloud.vault.config;
import java.util.Collections;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -29,7 +28,6 @@ import org.springframework.cloud.vault.util.IntegrationTestSupport;
import org.springframework.cloud.vault.util.VaultRule;
import org.springframework.core.env.Environment;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
@@ -39,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultPropertySourceLocatorProfilesIntegrationTests.TestApplication.class,
properties = { "spring.application.name=my-profiles-app", "spring.cloud.vault.kv.profiles=hello, world",
"spring.cloud.vault.kv.default-context=", "spring.cloud.bootstrap.enabled=true" })
@@ -49,7 +47,7 @@ public class VaultPropertySourceLocatorProfilesIntegrationTests extends Integrat
@Autowired
Environment environment;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

12
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorUnitTests.java
View File

@@ -18,11 +18,11 @@ package org.springframework.cloud.vault.config;
import java.util.Arrays;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.springframework.core.annotation.Order;
import org.springframework.core.env.CompositePropertySource;
@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Ryan Hoegg
* @author Mark Paluch
*/
@RunWith(MockitoJUnitRunner.class)
@MockitoSettings(strictness = Strictness.LENIENT)
public class VaultPropertySourceLocatorUnitTests {
private VaultPropertySourceLocator propertySourceLocator;
@@ -50,7 +50,7 @@ public class VaultPropertySourceLocatorUnitTests {
private VaultKeyValueBackendProperties properties = new VaultKeyValueBackendProperties();
@Before
@BeforeEach
public void before() {
this.propertySourceLocator = new VaultPropertySourceLocator(this.operations, new VaultProperties(),
VaultPropertySourceLocatorSupport.createConfiguration(this.properties));

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveAutoConfigurationTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.vault.config;
import java.time.Duration;
import java.util.concurrent.atomic.AtomicLong;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.vault.config;
import java.time.Duration;
import java.util.concurrent.atomic.AtomicLong;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import org.springframework.boot.autoconfigure.AutoConfigurations;

2
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorIntegrationTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.vault.config;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;

10
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java
View File

@@ -20,9 +20,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -34,7 +33,6 @@ import org.springframework.cloud.vault.util.Version;
import org.springframework.context.ApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.vault.core.VaultTemplate;
import org.springframework.web.client.RestTemplate;
@@ -51,7 +49,7 @@ import static org.junit.Assume.assumeTrue;
*
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = VaultVersionedKvBackendConfigTests.TestApplication.class,
properties = { "spring.cloud.vault.host=foo", "spring.cloud.vault.port=80",
"spring.cloud.vault.uri=https://localhost:8200", "spring.cloud.vault.kv.enabled=true",
@@ -68,7 +66,7 @@ public class VaultVersionedKvBackendConfigTests {
@Autowired
ApplicationContext applicationContext;
@BeforeClass
@BeforeAll
public static void beforeClass() {
VaultRule vaultRule = new VaultRule();

2
spring-cloud-vault-config/src/test/resources/application.yml
View File

@@ -3,3 +3,5 @@ spring:
cloud.vault.token: 00000000-0000-0000-0000-000000000000
cloud.vault.ssl.trust-store: file:../work/keystore.jks
cloud.vault.ssl.trust-store-password: changeit
main:
banner-mode: off