diff --git a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/AwsSecretIntegrationTests.java b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/AwsSecretIntegrationTests.java index 1bb55bc6..fdf33c88 100644 --- a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/AwsSecretIntegrationTests.java +++ b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/AwsSecretIntegrationTests.java @@ -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)); diff --git a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java index e96d2629..8d20aefc 100644 --- a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfigurationTests.java @@ -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" }) diff --git a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java index 04482c94..fa54ecec 100644 --- a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java +++ b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java @@ -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)); diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java index d53767ad..2f2c4b2d 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java @@ -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()); diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/DiscoveryBootstrapConfigurationTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/DiscoveryBootstrapConfigurationTests.java index 2fb6c9f7..3d672549 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/DiscoveryBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/DiscoveryBootstrapConfigurationTests.java @@ -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))); diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java index 29a70fc8..64b8d4bf 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfigurationTests.java @@ -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", diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java index 6952e815..73273579 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java @@ -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(); diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java index 2531fde3..476394f1 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java @@ -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))); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CassandraSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CassandraSecretIntegrationTests.java index c3f1bf95..ce8eabb8 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CassandraSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CassandraSecretIntegrationTests.java @@ -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))); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CouchbaseSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CouchbaseSecretIntegrationTests.java index 46a9eefb..df6f3079 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CouchbaseSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CouchbaseSecretIntegrationTests.java @@ -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))); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/ElasticsearchSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/ElasticsearchSecretIntegrationTests.java index 7a085e27..70e991bf 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/ElasticsearchSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/ElasticsearchSecretIntegrationTests.java @@ -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))); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MongoSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MongoSecretIntegrationTests.java index 43cdab19..80a6fb23 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MongoSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MongoSecretIntegrationTests.java @@ -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))); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java index b5dd3c94..9e2e5345 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java @@ -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))); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java index 2e7817bf..efb32ee6 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java @@ -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))); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java index 66f72029..ab46649d 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java @@ -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))); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java index 173453d2..cb983f1a 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java @@ -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))); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseDatabaseTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseDatabaseTests.java index 690152b2..097df179 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseDatabaseTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseDatabaseTests.java @@ -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 diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseTests.java index 994315dc..dfee4861 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseTests.java @@ -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(); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java index e223f50c..08b6e8d2 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationTests.java @@ -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", diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationUnitTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationUnitTests.java index c2185254..4499e0b0 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationUnitTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfigurationUnitTests.java @@ -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; diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java index bc0652b3..3be6db41 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java @@ -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))); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java index 625ac84b..eb891f7b 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java @@ -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(); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesBootstrapTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesBootstrapTests.java index 0904974c..98ae735b 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesBootstrapTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesBootstrapTests.java @@ -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(); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesTests.java index 909702cf..1dd44a61 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesTests.java @@ -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(); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java index b1f9f457..6a5ecaa1 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java @@ -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))); diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java index 278b50b7..a93e4631 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java @@ -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))); diff --git a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/RabbitMqSecretIntegrationTests.java b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/RabbitMqSecretIntegrationTests.java index 12ca46d6..189832c9 100644 --- a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/RabbitMqSecretIntegrationTests.java +++ b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/RabbitMqSecretIntegrationTests.java @@ -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))); diff --git a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java index a7bf8d50..5d4592cc 100644 --- a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfigurationTests.java @@ -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" }) diff --git a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java index ff3bc663..3bbc44f0 100644 --- a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java +++ b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java @@ -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))); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java index 83db4577..e8aba8bc 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ApplicationFailFastTests.java @@ -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", diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ClientAuthenticationFactoryUnitTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ClientAuthenticationFactoryUnitTests.java index 2841b45a..af4e8336 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ClientAuthenticationFactoryUnitTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ClientAuthenticationFactoryUnitTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ConfigDataShutdownTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ConfigDataShutdownTests.java index b4740b99..6230f0fe 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ConfigDataShutdownTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ConfigDataShutdownTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java index 1982651b..029a024c 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/DiscoveryClientVaultBootstrapConfigurationTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/KeyValueSecretBackendMetadataUnitTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/KeyValueSecretBackendMetadataUnitTests.java index efb6aea5..1d68b74c 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/KeyValueSecretBackendMetadataUnitTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/KeyValueSecretBackendMetadataUnitTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/KeyValueSecretIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/KeyValueSecretIntegrationTests.java index 1b53b76a..9c32c836 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/KeyValueSecretIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/KeyValueSecretIntegrationTests.java @@ -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); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/LeasingVaultPropertySourceLocatorUnitTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/LeasingVaultPropertySourceLocatorUnitTests.java index 26819abe..6291eeab 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/LeasingVaultPropertySourceLocatorUnitTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/LeasingVaultPropertySourceLocatorUnitTests.java @@ -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(), diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/PropertyNameTransformerUnitTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/PropertyNameTransformerUnitTests.java index 8e9f3981..1781e87f 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/PropertyNameTransformerUnitTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/PropertyNameTransformerUnitTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveDiscoveryClientVaultBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveDiscoveryClientVaultBootstrapConfigurationTests.java index 829568ca..fece3299 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveDiscoveryClientVaultBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveDiscoveryClientVaultBootstrapConfigurationTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java index f076322b..04dd1bb5 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultBootstrapConfigurationTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java index 2a5dfaa9..24d3cc39 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapConfigurationTests.java index 3ff744d1..8fced464 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapConfigurationTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java index 62b7fc6e..69175144 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapperIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapperIntegrationTests.java index 8d1ca24f..607d7f61 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapperIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapperIntegrationTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java index dd22838b..95eb902d 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java index 5c6fe23a..a5e7d586 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java index 68f16b94..55f8a227 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java index c34fc41a..adbe4ac1 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java @@ -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"); } diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLoaderIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLoaderIntegrationTests.java index ad3487f6..65d229ef 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLoaderIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLoaderIntegrationTests.java @@ -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() diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLoaderUnitTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLoaderUnitTests.java index aad54435..982b0e40 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLoaderUnitTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLoaderUnitTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLocationResolverUnitTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLocationResolverUnitTests.java index 94103eea..46e77615 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLocationResolverUnitTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDataLocationResolverUnitTests.java @@ -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()); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java index cfafbb38..ab87ec40 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKeyValueBackendDisabledTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKeyValueBackendDisabledTests.java index 48793566..605b6354 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKeyValueBackendDisabledTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKeyValueBackendDisabledTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java index 5cdc0eaa..6c7718a1 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderSingleLocationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderSingleLocationTests.java index 15f4ad65..796181bf 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderSingleLocationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderSingleLocationTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderTests.java index 3db3497d..ee656967 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTemplateIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTemplateIntegrationTests.java index 8c4fa5ec..89063cb5 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTemplateIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTemplateIntegrationTests.java @@ -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")); } diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java index 6fbdc032..2de65154 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java index 2e732c65..0493e9bb 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java index 4c5b07ef..d5144366 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java index c21bd675..2b3351f5 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java index 87c5b867..b2c413d8 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithVaultConfigurerTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfigurationTests.java index 20dcfc53..e68c2bcb 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorAutoConfigurationTests.java @@ -60,7 +60,6 @@ class VaultHealthIndicatorAutoConfigurationTests { this.contextRunner.withUserConfiguration(ReactiveConfiguration.class).run(context -> { assertThat(context).hasBean("vaultReactiveHealthIndicator"); }); - } @Test diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorUnitTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorUnitTests.java index 98a6162c..ad1f928e 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorUnitTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultHealthIndicatorUnitTests.java @@ -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); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultNamespaceTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultNamespaceTests.java index 8e02ef41..b942cc3e 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultNamespaceTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultNamespaceTests.java @@ -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()); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceIntegrationTests.java index 90202ce8..c78a4292 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceIntegrationTests.java @@ -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")); } diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java index b58d7dcb..6f219896 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorIntegrationTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorProfilesIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorProfilesIntegrationTests.java index 1ac71aea..c717b909 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorProfilesIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorProfilesIntegrationTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorUnitTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorUnitTests.java index 7534c9af..74d58861 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorUnitTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceLocatorUnitTests.java @@ -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)); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveAutoConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveAutoConfigurationTests.java index 8f890937..48196f47 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveAutoConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveAutoConfigurationTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java index c576e3ce..ddb534c3 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorIntegrationTests.java index b760f35d..8178f3fb 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveHealthIndicatorIntegrationTests.java @@ -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; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java index a4fc4a63..2c563847 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java @@ -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(); diff --git a/spring-cloud-vault-config/src/test/resources/application.yml b/spring-cloud-vault-config/src/test/resources/application.yml index c598d962..9565b77e 100644 --- a/spring-cloud-vault-config/src/test/resources/application.yml +++ b/spring-cloud-vault-config/src/test/resources/application.yml @@ -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